From 976c89a9343c098e93217350165afbf8d9996da5 Mon Sep 17 00:00:00 2001 From: Mark Taylor Date: Mon, 13 Apr 2026 09:50:02 +0100 Subject: [PATCH 1/8] Add tablefix.css to AUX_FILES Should have been done at e74ed2d034 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 96e3df8..2b855ac 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ FIGURES = role_diagram.svg \ 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 From f30134607885e4c8e215aefdd77e430f322e6ddf Mon Sep 17 00:00:00 2001 From: Mark Taylor Date: Wed, 1 Apr 2026 14:23:18 +0100 Subject: [PATCH 2/8] Avoid LaTeX warning --- VOTable.tex | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/VOTable.tex b/VOTable.tex index 3c623bc..3d3ad4f 100644 --- a/VOTable.tex +++ b/VOTable.tex @@ -1424,7 +1424,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}, From 4d4443402fbce70b41e92548ac9172a4d1bb59f3 Mon Sep 17 00:00:00 2001 From: Mark Taylor Date: Mon, 13 Apr 2026 09:34:00 +0100 Subject: [PATCH 3/8] Remove unused GIF files --- Makefile | 2 +- binary.gif | Bin 4983 -> 0 bytes circ2.gif | Bin 104 -> 0 bytes leadsto2.gif | Bin 167 -> 0 bytes oplus.gif | Bin 174 -> 0 bytes 5 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 binary.gif delete mode 100644 circ2.gif delete mode 100644 leadsto2.gif delete mode 100644 oplus.gif diff --git a/Makefile b/Makefile index 2b855ac..a5510d6 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ 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). diff --git a/binary.gif b/binary.gif deleted file mode 100644 index 922fadd564a55973fe4d27b2d714a045b5ebbe56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4983 zcmV--6Nv0bNk%v~VFv;i0m1+P0002L|NsC0v;Y65|Ns900000000000EC2ui00#mW z0RRL32)f+}*y*O)1y8mEEY-DMkXsWK9D6()C0&YFpFFxxa&3nFIC-@`sj5;Jv zDP#(t&}MW>l~%9VUQ@vBdcWYXcuX#XkeSAPJAqNAdUlt-sYsj79AlBkxRvLBtZi?*|% zq`SOhrme8Atir>t#=*y{xO}zC$kE>ZI1s z+~7;$Y}e@Y-k;}v=J{{@nbPY58fu5EU@?R7xRT`(j4*xm1Ick=$(cYxqNKIc(a3w_TJ{9A4~S5kJdIk6 z$utqpjSFUSjQVtHO{E}#(xQsgqso&B8HN>ibq0g2REypzOEc|RpU@g$V>{xiuBPf5 ze9`E@=7Xwzv2N80m8;;JUB`MQ>=NupM~2b9{i{i2PP&Do{uT7I;byaJ-*QfZC{*cD zrV}~v!k0#5B5sYKsmWCd=FxSbCRXhDEAQW8cdL~9B8c(hxEGrgowYgV%8_b^d|ex0 zq0|FWcUiC>TUTdN=wf)tDVZdf8Xn2vdqu*>B!s%DDd#-t)pH_k zR>nEyV6HXTCW+pFd0;7GaJL}ut zC!)uyI_+f_P&-4dX3R*VYN?6oRGsKu=>&VAhPr35?2=2YyKr7BB4w=_D=%^L){7p# zu&s&bthUk$<^#E^JJxN!p8G7F2EW^Ir^#w-@1d|lJC(k>T}$Ppa8_&Le*N+%=~CYo zSR=UNj{C5MYs}_w#}L1)EV41vobJr+<}9(zIWuZxLtE`F8DE2aG}uW;O|{u)FB~zvIJ4dL+irIP3dUA@9b>nQ z<}G8{YG)01-BthHHsEm&HF)5HBmVc+PiuX*(M3bPx7&*Tqb)SymP2hg;F({pc;$Ws zS2*2)hux^&CSS)l!-;o3y6CM}1pDE3_x&d0QeXYJ*pc%-`J^!fFZ}StYw$_&$S1G- z^20a5eDg;|Fa7k?S8x6G*k`Z(_S|>x{rBL9FaG%Cmv8?0=%=s#`s}yw{`>I9FaP}X z*Khy*_~)p$JDv!V;SBgeXj*3RlR&7P|0-FpQxLXGp^u+VF-r%%Ki<$ip70;dwv| zq7a8j#3CB;h{9VR00O|oCOYwnP>iA!r%1&rLUI0yR?MOnx5&i+V6lr}3?mo6D8@3H z@rq|mV;ae*#x{0QEz)D78|P?6InwctQM4l-_sB#&@)3`I{No%0DM&ZMF?xh7q#6^c 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 BPM-h( From 0f0ad573c9593600da6d366466ba4d8bae8c3751 Mon Sep 17 00:00:00 2001 From: Mark Taylor Date: Mon, 13 Apr 2026 10:13:20 +0100 Subject: [PATCH 4/8] Adjust PDF output whitespace for better pagebreaks Remove some unnecessary vertical spacing so that the Element Summary in section 7.1 has the commentary and figure on the same page in the PDF. There was already some whitespace management in place (a \clearpage) to make that happen, but by VOTable 1.5 it wasn't doing the right thing. --- VOTable.elem.tex | 2 -- VOTable.tex | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) 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 3d3ad4f..e709d77 100644 --- a/VOTable.tex +++ b/VOTable.tex @@ -2158,6 +2158,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 @@ -2170,7 +2171,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}}. @@ -2185,6 +2185,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} @@ -2192,7 +2193,6 @@ \subsection{Attribute Summary} for possible extensions (mentioned in an Appendix). \end{itemize} -\bigskip \begin{quote}\small \input{VOTable.attr.tex} \end{quote} From 4f90ab38c37ddb0f1b8bbb7ffcc55fd3362e2bb5 Mon Sep 17 00:00:00 2001 From: Mark Taylor Date: Wed, 1 Apr 2026 14:36:18 +0100 Subject: [PATCH 5/8] Update ivoatex to latest --- ivoatex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ivoatex b/ivoatex index 4535116..c5c7e22 160000 --- a/ivoatex +++ b/ivoatex @@ -1 +1 @@ -Subproject commit 453511692dd9efbcc09f677bbf344c107eefd411 +Subproject commit c5c7e224a01eb3c5586563529317148c919dafb3 From 15467da8d56bcc808f50b274333945826c4a9afd Mon Sep 17 00:00:00 2001 From: Mark Taylor Date: Wed, 1 Apr 2026 14:15:55 +0100 Subject: [PATCH 6/8] Update generated content --- VOTable.tex | 1 + 1 file changed, 1 insertion(+) diff --git a/VOTable.tex b/VOTable.tex index e709d77..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} From bbe09536f3a1ca3f365a6138e24803325b6782cc Mon Sep 17 00:00:00 2001 From: Mark Taylor Date: Mon, 13 Apr 2026 11:24:38 +0100 Subject: [PATCH 7/8] Makefile updates for WD-VOTable-1.6-20260413 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a5510d6..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 From 044812cf3cafee96a7010c26eb42fb48e3cee849 Mon Sep 17 00:00:00 2001 From: Mark Taylor Date: Mon, 13 Apr 2026 13:22:38 +0100 Subject: [PATCH 8/8] Update ivoatex to latest --- ivoatex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ivoatex b/ivoatex index c5c7e22..70412a1 160000 --- a/ivoatex +++ b/ivoatex @@ -1 +1 @@ -Subproject commit c5c7e224a01eb3c5586563529317148c919dafb3 +Subproject commit 70412a13d8f4ed9f590ab1a116589b48b25fec73