From 2325afbc6506e4a7af09b1eafd54fea7fbd4dca3 Mon Sep 17 00:00:00 2001 From: Tom Donaldson Date: Thu, 9 Nov 2023 02:21:03 -0500 Subject: [PATCH 1/9] Update appendix B title to V1.5 --- VOTable.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VOTable.tex b/VOTable.tex index 580ff8a..4d78445 100644 --- a/VOTable.tex +++ b/VOTable.tex @@ -2729,7 +2729,7 @@ \subsection{A New {\tt XMLDATA} Serialization} element, their definition can be generated automatically from the set of \elem{FIELD} definitions. -\section{The VOTable V1.4 XML Schema} +\section{The VOTable V1.5 XML Schema} \label{XML-schema} The XML Schema of VOTable 1.4 is included here as a reference. This schema includes a couple of extra optional attributes which are not From a3c1cdafab288469a88ea1814ff6cf6abc697d8a Mon Sep 17 00:00:00 2001 From: Tom Donaldson Date: Thu, 9 Nov 2023 02:26:01 -0500 Subject: [PATCH 2/9] Remove space from xtype="circle" in section 4.7 --- VOTable.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VOTable.tex b/VOTable.tex index 4d78445..d64a790 100644 --- a/VOTable.tex +++ b/VOTable.tex @@ -1277,7 +1277,7 @@ \subsection{\elem{VALUES} Element} both the single value of \emph{flux} and all items in the \emph{fluxes} array are declared as being between 0 and $10^{-4}$, and clients could, for instance, raise warnings if they are not. In the last example, -\emph{CIRCLE}, clients not familiar with \attrval{xtype }{circle} would +\emph{CIRCLE}, clients not familiar with \attrval{xtype}{circle} would ignore the MAX declaration. Clients familiar with this xtype's particular interpretation of MAX would learn about a spatial coverage of a spherical circle with radius two degrees around the point From f426f72d5b3b231b1e9af473e38eba2435dab882 Mon Sep 17 00:00:00 2001 From: Tom Donaldson Date: Thu, 9 Nov 2023 03:23:37 -0500 Subject: [PATCH 3/9] Explicitly list current vocabs for TIMESYS timescale and refposition --- VOTable.tex | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/VOTable.tex b/VOTable.tex index d64a790..775c3da 100644 --- a/VOTable.tex +++ b/VOTable.tex @@ -724,7 +724,7 @@ \subsection{\elem{COOSYS} Element} \item[\attr{refposition}] The reference position for which the positions are given. The values of this attribute should be taken from the IVOA \emph{refposition} vocabulary (\url{http://www.ivoa.net/rdf/refposition}). -At the time or writing, this vocabulary includes the terms +At the time of writing, this vocabulary includes the terms % GENERATED: !vocterms refposition \textsl{BARYCENTER}, \textsl{EMBARYCENTER}, @@ -777,14 +777,35 @@ \subsection{\elem{TIMESYS} Element} the ET timescale \citep{2015A+A...574A..36R}. \item[\attr{timescale}] This is the time scale used. Values SHOULD be -taken from the IVOA \emph{timescale} -vocabulary -(\url{http://www.ivoa.net/rdf/timescale}). +taken from the IVOA \emph{timescale} vocabulary (\url{http://www.ivoa.net/rdf/timescale}). +At the time of writing, this vocabulary includes the terms: +% GENERATED: !vocterms timescale +\textsl{GPS}, +\textsl{TAI}, +\textsl{TCB}, +\textsl{TCG}, +\textsl{TDB}, +\textsl{TT}, +\textsl{UNKNOWN}, +\textsl{UT}, +\textsl{UTC} +% /GENERATED + This attribute is mandatory. \item[\attr{refposition}] The reference position again is a simple string. As with the COOSYS attribute of this name, the values SHOULD be taken from the IVOA \emph{refposition} vocabulary -(\url{http://www.ivoa.net/rdf/refposition}). +(\url{http://www.ivoa.net/rdf/refposition}) which at the time of writing +includes the terms +% GENERATED: !vocterms refposition +\textsl{BARYCENTER}, +\textsl{EMBARYCENTER}, +\textsl{GEOCENTER}, +\textsl{HELIOCENTER}, +\textsl{TOPOCENTER}, +\textsl{UNKNOWN} +% /GENERATED. + This attribute is mandatory. \end{description} From 48d15da4f1f45c11f641b89ece749a7dfbb1d983 Mon Sep 17 00:00:00 2001 From: Tom Donaldson Date: Thu, 9 Nov 2023 03:51:56 -0500 Subject: [PATCH 4/9] Add reference to arch diagram in section 1.4 --- VOTable.tex | 1 + 1 file changed, 1 insertion(+) diff --git a/VOTable.tex b/VOTable.tex index 775c3da..ebbe0b9 100644 --- a/VOTable.tex +++ b/VOTable.tex @@ -263,6 +263,7 @@ \subsection{VOTable in the VO Architecture} \end{figure} VOTable is a core IVOA standard. +\Fref{fig:archdiag} shows the role this document plays within the IVOA architecture. Wherever tabular data is transferred between Virtual Observatory components, VOTable provides the preferred serialization format. From 44809963868300a5731ea3dd6c3ca96f453a5850 Mon Sep 17 00:00:00 2001 From: Tom Donaldson Date: Thu, 9 Nov 2023 04:15:37 -0500 Subject: [PATCH 5/9] Remove \parindent=0pt to make paragraph breaks more apparent --- VOTable.tex | 2 -- 1 file changed, 2 deletions(-) diff --git a/VOTable.tex b/VOTable.tex index ebbe0b9..dbd6955 100644 --- a/VOTable.tex +++ b/VOTable.tex @@ -16,7 +16,6 @@ \evensidemargin=-0.8cm \textwidth=17.5cm \textheight=23.5cm -\parindent=0pt \arrayrulewidth=0.75pt\renewcommand{\arraystretch}{1.2} \definecolor{DarkRed}{rgb}{0.5,0,0} \definecolor{DarkBlue}{rgb}{0,0,0.5} @@ -82,7 +81,6 @@ \begin{abstract} This document describes the structures making up the VOTable standard. - The main part of this document describes the adopted part of the VOTable standard; it is followed by appendices presenting extensions which have been proposed and/or discussed, but which are not part of From 68f3ed41fd87160c71466265560f80804f65de35 Mon Sep 17 00:00:00 2001 From: Tom Donaldson Date: Thu, 9 Nov 2023 14:07:30 -0500 Subject: [PATCH 6/9] Remove unwanted indentation after example in sect. 4.7, p18 --- VOTable.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VOTable.tex b/VOTable.tex index dbd6955..4093aaf 100644 --- a/VOTable.tex +++ b/VOTable.tex @@ -1294,7 +1294,7 @@ \subsection{\elem{VALUES} Element} \end{verbatim} -both the single value of \emph{flux} and all items in the \emph{fluxes} +\noindent both the single value of \emph{flux} and all items in the \emph{fluxes} array are declared as being between 0 and $10^{-4}$, and clients could, for instance, raise warnings if they are not. In the last example, \emph{CIRCLE}, clients not familiar with \attrval{xtype}{circle} would From 2fd15b7f943c5b6f26211099faf1b89b288a8b9f Mon Sep 17 00:00:00 2001 From: Tom Donaldson Date: Fri, 10 Nov 2023 10:23:40 -0500 Subject: [PATCH 7/9] eq_FK4/5 ==> FK4/5; update examples to v1.5; remove one indentation --- VOTable.tex | 4 ++-- stc_example1.vot | 4 ++-- stc_example2.vot | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VOTable.tex b/VOTable.tex index 4093aaf..555752c 100644 --- a/VOTable.tex +++ b/VOTable.tex @@ -712,8 +712,8 @@ \subsection{\elem{COOSYS} Element} \item[\attr{equinox}] Fixes the equatorial or ecliptic systems (as e.g., \verb|"J2000"| as the default -for \verb|"eq_FK5"| or \verb|"B1950"|, as the default for -\verb|"eq_FK4"|). +for \verb|"FK5"| or \verb|"B1950"|, as the default for +\verb|"FK4"|). \item[\attr{epoch}] Specifies the epoch of the positions if necessary, again as an astroYear (i.e, prefixed with J or B depending diff --git a/stc_example1.vot b/stc_example1.vot index 4801174..59ee06b 100644 --- a/stc_example1.vot +++ b/stc_example1.vot @@ -1,7 +1,7 @@ - + - + Velocities and Distance estimations -
From 2f4531d99a8dd1744524d0136abb4f86be21a7da Mon Sep 17 00:00:00 2001 From: Tom Donaldson Date: Fri, 10 Nov 2023 11:26:54 -0500 Subject: [PATCH 8/9] Where possible, use \ivoaDocversion in references to "current version" --- VOTable.tex | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/VOTable.tex b/VOTable.tex index 555752c..ee9cb87 100644 --- a/VOTable.tex +++ b/VOTable.tex @@ -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 @@ -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 @@ -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 @@ -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 @@ -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, @@ -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; @@ -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} @@ -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 From ab195339e5b7a1c3a96627df7671ef64cd36eb89 Mon Sep 17 00:00:00 2001 From: Mark Taylor Date: Tue, 14 Nov 2023 12:39:02 +0000 Subject: [PATCH 9/9] Fix one mismatched quote --- VOTable.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VOTable.tex b/VOTable.tex index ee9cb87..cf5f8e6 100644 --- a/VOTable.tex +++ b/VOTable.tex @@ -156,7 +156,7 @@ \subsubsection*{Grid Computing} meaning that arbitrarily complex protocols are allowed. When we are working with very large tables in a -distributed-computing environment (``the Grid"), the data +distributed-computing environment (``the Grid''), the data stream between processors, with flows being filtered, joined, and cached in different geographic locations. It would be very difficult if the number of rows of the table were required in the header --