diff --git a/Makefile b/Makefile index 8b68c9f..223ca46 100644 --- a/Makefile +++ b/Makefile @@ -7,14 +7,14 @@ DOCNAME = VOTable DOCVERSION = 1.5 # Publication date, ISO format; update manually for "releases" -DOCDATE = 2024-02-13 +DOCDATE = 2025-01-16 # What is it you're writing: NOTE, WD, PR, REC, PEN, or EN -DOCTYPE = PR +DOCTYPE = REC # 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=??? +AUTHOR_EMAIL=tdonaldson@stsci.edu # Source files for the TeX document (but the main file must always # be called $(DOCNAME).tex diff --git a/VOTable.tex b/VOTable.tex index aeb74e9..16d97c5 100644 --- a/VOTable.tex +++ b/VOTable.tex @@ -1,5 +1,6 @@ \documentclass[11pt,a4paper]{ivoa} \input tthdefs +\tolerance=2000 \customcss{tablefix.css} \usepackage{verbatim} @@ -568,7 +569,7 @@ \section{The VOTable Document Structure} 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 +$$\hbox{\attrval{xmlns}{http://www.ivoa.net/xml/VOTable/v1.3}~,}$$ but instance documents are free to use whatever namespace prefix is convenient for them. Note that starting with VOTable 1.3, the namespace URI for VOTable will @@ -928,7 +929,7 @@ \subsection{\elem{LINK} Element} standards that make use of VOTable. In addition the \elem{LINK} element -may announce the MIME type of the data it references +may announce the RFC 2046 media type of the data it references with a \attr{content-type} attribute (e.g.\ \attrval{content-type}{image/fits}). Although this might be overridden by metadata received during the retrieval operation (e.g.\ the HTTP Content-Type header) @@ -1140,7 +1141,7 @@ \subsection{Extended Datatype \attr{xtype}} and corresponds therefore exactly to the {\em FITS} definitions. It fills the gap between the datatypes known by FITS and those required to express queries -(Astronomical Data Query Language or ADQL, \citet{2008ivoa.spec.1030O}) +(Astronomical Data Query Language or ADQL, \citet{2023ivoa.spec.1215M}) and their results in tabular form (Table Access Protocol or TAP, \citet{2010ivoa.spec.0327D}). @@ -1184,7 +1185,7 @@ \subsection{Unified Content Descriptors} Two versions of UCDs have been developed: the initial version (UCD1) created at CDS, which uses atomic words separated by underscores (e.g. {\tt POS\_EQ\_RA\_MAIN}); -and a more flexible one, UCD1+ \citep{2021ivoa.spec.0616C}, +and a more flexible one, UCD1+ \citep{2023ivoa.spec.0125C}, developed in the frame of the IVOA Semantics Working Group, which uses a reduced vocabulary of dot-separated atoms which can be combined with semi-colons (e.g. {\tt pos.eq.ra;meta.main}). diff --git a/VOTable.vor b/VOTable.vor index 606d2d8..fe11482 100644 --- a/VOTable.vor +++ b/VOTable.vor @@ -62,19 +62,20 @@ Andreas Wicenec + 2025-01-16 2019-10-21 2013-09-20 2009-11-30 2004-08-11 - 1.4 + 1.5 Applications WG apps@ivoa.net - Virtual observatory + virtual-observatories 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 the standard. @@ -83,7 +84,7 @@ This document describes the structures making up the VOTable standard. The main Research - 1.4 + 1.5 http://www.ivoa.net/xml/VOTable/v1.3 diff --git a/VOTable.xsd b/VOTable.xsd index 84a7cba..0979a2a 100644 --- a/VOTable.xsd +++ b/VOTable.xsd @@ -26,12 +26,13 @@ in COOSYS, which no longer is derived from xs:string, either. .Version 1.5pre2: MD: vocabularising system attribute in COOSYS .Version 1.5pre3: TD: Undo the FIELDref/PARAMref addition to COOSYS +.Version 1.5: TD: Update version to 1.5 for REC --> VOTable is meant to serialize tabular documents in the diff --git a/ivoatex b/ivoatex index 4600b84..4535116 160000 --- a/ivoatex +++ b/ivoatex @@ -1 +1 @@ -Subproject commit 4600b84c811b53a6ee5645723824f75102d2190c +Subproject commit 453511692dd9efbcc09f677bbf344c107eefd411