Skip to content

Commit

Permalink
Where possible, use \ivoaDocversion in references to "current version"
Browse files Browse the repository at this point in the history
  • Loading branch information
tomdonaldson committed Nov 10, 2023
1 parent 2fd15b7 commit 2f4531d
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions VOTable.tex
Original file line number Diff line number Diff line change
Expand Up @@ -545,9 +545,9 @@ \section{The VOTable Document Structure}
\label{elem:VOTABLE}

The overall VOTable document structure is described and controlled
by its XML Schema \citep{std:XSD}. The schema for VOTable version 1.4 is
by its XML Schema \citep{std:XSD}. The schema for VOTable version \ivoaDocversion{} is
given in \Arefx{XML-schema} of this document. It can also
be retrieved from \url{http://www.ivoa.net/xml/VOTable/votable-1.4.xsd}.
be retrieved from \url{http://www.ivoa.net/xml/VOTable/votable-1.5.xsd}.

A VOTable document consists of a single all-containing element
called {\elem{VOTABLE}}, which contains descriptive elements and global definitions
Expand All @@ -563,8 +563,8 @@ \section{The VOTable Document Structure}
(described in \Aref{sec:data}).

As the root element, \elem{VOTABLE} has attributes which specify the VOTable version
number and XML namespaces used in the document. For VOTable 1.4, the \elem{VOTABLE}
element MUST define \attrval{version}{1.4}. All VOTable 1.4 elements come from the
number and XML namespaces used in the document. For VOTable \ivoaDocversion{}, the \elem{VOTABLE}
element MUST define \attrval{version}{\ivoaDocversion{}}. All VOTable \ivoaDocversion{} elements come from the
namespace \nolinkurl{http://www.ivoa.net/xml/VOTable/v1.3}. It is recommended to bind
the empty namespace prefix to this URI, as in
\attrval{xmlns}{http://www.ivoa.net/xml/VOTable/v1.3}, but instance
Expand Down Expand Up @@ -702,8 +702,8 @@ \subsection{\elem{COOSYS} Element}
% /GENERATED

As that vocabulary can be extended at any time, clients should fail
gracefully when they encounter unknown reference frames. Until VOTable
1.4, these identifiers were defined in the VOTable schema, and some
gracefully when they encounter unknown reference frames. Up through
VOTable 1.4, these identifiers were defined in the VOTable schema, and some
systems had different identifiers. These legacy identifiers are still
in the vocabulary, but they are deprecated. Clients should use the
vocabulary (see sect. 3 of \citet{2023ivoa.spec.0206D} for how to do
Expand Down Expand Up @@ -1788,7 +1788,7 @@ \subsection{Data Encoding}
convert a binary file to text (through base64 encoding), so that binary
data can be used in the XML document.

In this version (1.4) of VOTable, it is not possible to encode
In this version of VOTable, it is not possible to encode
individual columns of the table: the whole table must be encoded in
the same way. However, the possibility of encoding selected table cells
is being examined for future versions of VOTable
Expand Down Expand Up @@ -2087,12 +2087,12 @@ \section{Definitions of Primitive Datatypes}


\clearpage
\section{A Simplified View of the VOTable 1.4 Schema}
\section{A Simplified View of the VOTable \ivoaDocversion{} Schema}
\label{dtd}

The XML Schema defining a VOTable 1.4 document
The XML Schema defining a VOTable \ivoaDocversion{} document
is available from
\url{http://www.ivoa.net/xml/VOTable/votable-1.4.xsd}
\url{http://www.ivoa.net/xml/VOTable/votable-1.5.xsd}
as well as in \Arefx{XML-schema} of this document.
In this section we illustrate this XML Schema
by a set of boxes describing the structure of a VOTable,
Expand All @@ -2103,7 +2103,7 @@ \section{A Simplified View of the VOTable 1.4 Schema}

\subsection{Element Hierarchy}

The hierarchy of the elements existing in VOTable 1.4 is illustrated below;
The hierarchy of the elements existing in VOTable \ivoaDocversion{} is illustrated below;
it uses the following conventions:
\begin{itemize}
\item {\em italicized} text represents {\em optional} elements;
Expand Down Expand Up @@ -2136,7 +2136,7 @@ \subsection{Attribute Summary}
\item Attributes written in bold are \requiredattr{required attributes}
\item Attributes written in a {fixed font} are \attr{optional}.
\item Attributes written in {\it italics}
are not part of VOTable 1.4, but are {\it reserved}
are not part of VOTable \ivoaDocversion{}, but are {\it reserved}
for possible extensions (mentioned in an Appendix).
\end{itemize}

Expand Down Expand Up @@ -2749,11 +2749,11 @@ \subsection{A New {\tt XMLDATA} Serialization}
element, their definition can be generated automatically from the set of
\elem{FIELD} definitions.

\section{The VOTable V1.5 XML Schema}
\section{The VOTable version \ivoaDocversion{} XML Schema}
\label{XML-schema}
The XML Schema of VOTable 1.4 is included here as a reference.
The XML Schema of VOTable \ivoaDocversion{} is included here as a reference.
This schema includes a couple of extra optional attributes which are not
part of VOTable-1.4 ({\em ID} in TR and {\em encoding} in TD),
part of VOTable-\ivoaDocversion{} ({\em ID} in TR and {\em encoding} in TD),
but proved to be useful to fix some problems encountered in the
usage of some code generators.
\bigskip
Expand Down

0 comments on commit 2f4531d

Please sign in to comment.