diff --git a/Makefile b/Makefile index 96e3df8..9085ff8 100644 --- a/Makefile +++ b/Makefile @@ -7,14 +7,14 @@ DOCNAME = VOTable DOCVERSION = 1.6 # Publication date, ISO format; update manually for "releases" -DOCDATE = 2026-01-28 +DOCDATE = 2026-04-13 # What is it you're writing: NOTE, WD, PR, REC, PEN, or EN DOCTYPE = WD # An e-mail address of the person doing the submission to the document # repository (can be empty until a make upload is being made) -AUTHOR_EMAIL=tdonaldson@stsci.edu +AUTHOR_EMAIL=m.b.taylor@bristol.ac.uk # Source files for the TeX document (but the main file must always # be called $(DOCNAME).tex @@ -27,14 +27,14 @@ SOURCES = $(DOCNAME).tex role_diagram.pdf gitmeta.tex \ # List of image files to be included in submitted package (anything that # can be rendered directly by common web browsers) FIGURES = role_diagram.svg \ - serial.png binary.png binary2.png circ2.gif leadsto2.gif oplus.gif + serial.png binary.png binary2.png # List of PDF figures (figures that must be converted to pixel images to # work in web browsers). VECTORFIGURES = # Additional files to distribute (e.g., CSS, schema files, examples...) -AUX_FILES = VOTable.xsd +AUX_FILES = VOTable.xsd tablefix.css # Include Makefile from ivoatex include ivoatex/Makefile diff --git a/VOTable.elem.tex b/VOTable.elem.tex index c74720c..21a39ec 100644 --- a/VOTable.elem.tex +++ b/VOTable.elem.tex @@ -106,7 +106,6 @@ \mv\unorder\optelem{OPTION}$\cdots$\\ \element{\slash VALUES}\\ \hline\end{tabular} -\\ \\ %\begin{tabular}{|l|}\hline %\element{TABLEDATA} \\ %\order \optelem{TR}$\cdots$ \\ @@ -130,5 +129,4 @@ %\element{LINK} \\ %\element{\slash LINK} \\ %\hline\end{tabular} -\\ \end{tabular} diff --git a/VOTable.tex b/VOTable.tex index 3c623bc..05f6261 100644 --- a/VOTable.tex +++ b/VOTable.tex @@ -732,6 +732,7 @@ \subsection{\elem{COOSYS} Element} \textsl{GALACTIC}, \textsl{GALACTIC\_I}, \textsl{GENERIC\_GALACTIC}, +\textsl{geo\_app}, \textsl{ICRS}, \textsl{SUPER\_GALACTIC}, \textsl{UNKNOWN} @@ -1424,7 +1425,8 @@ \subsection{\elem{GROUP}ing \elem{FIELD}s and \elem{PARAM}eters} -\end{verbatim}\endgroup +\end{verbatim} +\endgroup The \elem{GROUP} element can have the \attr{name}, \attr{ID}, \attr{ucd}, @@ -2157,6 +2159,7 @@ \subsection{Element Hierarchy} The hierarchy of the elements existing in VOTable \ivoaDocversion{} is illustrated below; it uses the following conventions: \begin{itemize} +\setlength\itemsep{0ex} \item {\em italicized} text represents {\em optional} elements; \item \order{} indicates that the order of the elements is mandatory, while \item \unorder{} {\em(open bullet)} indicates that the corresponding @@ -2169,7 +2172,6 @@ \subsection{Element Hierarchy} and are therefore explained in a dedicated box of the figure. \end{itemize} -\bigskip \begin{quote}\small %\begin{table}[htbp]\caption{\label{tab:elem}View of the relations between % VOTable {\bf elements}}. @@ -2184,6 +2186,7 @@ \subsection{Attribute Summary} The list of the attributes is summarized in the table below, with the following conventions: \begin{itemize} +\setlength\itemsep{0ex} \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} @@ -2191,7 +2194,6 @@ \subsection{Attribute Summary} for possible extensions (mentioned in an Appendix). \end{itemize} -\bigskip \begin{quote}\small \input{VOTable.attr.tex} \end{quote} diff --git a/binary.gif b/binary.gif deleted file mode 100644 index 922fadd..0000000 Binary files a/binary.gif and /dev/null differ diff --git a/circ2.gif b/circ2.gif deleted file mode 100644 index 58bd664..0000000 Binary files a/circ2.gif and /dev/null differ diff --git a/ivoatex b/ivoatex index 4535116..70412a1 160000 --- a/ivoatex +++ b/ivoatex @@ -1 +1 @@ -Subproject commit 453511692dd9efbcc09f677bbf344c107eefd411 +Subproject commit 70412a13d8f4ed9f590ab1a116589b48b25fec73 diff --git a/leadsto2.gif b/leadsto2.gif deleted file mode 100644 index 678db37..0000000 Binary files a/leadsto2.gif and /dev/null differ diff --git a/oplus.gif b/oplus.gif deleted file mode 100644 index f6d64f7..0000000 Binary files a/oplus.gif and /dev/null differ