Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 0 additions & 2 deletions VOTable.elem.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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$ \\
Expand All @@ -130,5 +129,4 @@
%\element{LINK} \\
%\element{\slash LINK} \\
%\hline\end{tabular}
\\
\end{tabular}
8 changes: 5 additions & 3 deletions VOTable.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -1424,7 +1425,8 @@ \subsection{\elem{GROUP}ing \elem{FIELD}s and \elem{PARAM}eters}
<FIELDref ref="col4"/>
<FIELDref ref="col5"/>
</GROUP>
\end{verbatim}\endgroup
\end{verbatim}
\endgroup


The \elem{GROUP} element can have the \attr{name}, \attr{ID}, \attr{ucd},
Expand Down Expand Up @@ -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
Expand All @@ -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}}.
Expand All @@ -2184,14 +2186,14 @@ \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}
are not part of VOTable \ivoaDocversion{}, but are {\it reserved}
for possible extensions (mentioned in an Appendix).
\end{itemize}

\bigskip
\begin{quote}\small
\input{VOTable.attr.tex}
\end{quote}
Expand Down
Binary file removed binary.gif
Binary file not shown.
Binary file removed circ2.gif
Binary file not shown.
Binary file removed leadsto2.gif
Binary file not shown.
Binary file removed oplus.gif
Binary file not shown.
Loading