diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e74f7c2..9c7ecd4 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -29,7 +29,7 @@ jobs: test -f VOTable.pdf test -f VOTable.bbl - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 with: name: VOTable.pdf Preview path: VOTable.pdf diff --git a/VOTable.tex b/VOTable.tex index 126c5ec..ba94f12 100644 --- a/VOTable.tex +++ b/VOTable.tex @@ -644,6 +644,9 @@ \subsection{{\attr{name}, \attr{ID} and \attr{ref} attributes}} For this reason, earlier versions of VOTable recommended placing the \attr{ID} attribute before any references to it, but there may be cases where the opposite is more appropriate. +In practical terms, no requirement has ever been placed on the ordering +of an \attr{ID} and its references, so VOTable creators are free to use either +order and parsers/consumers should handle either order. While the {\attr{ID}} attribute has to be unique in a VOTable document, the {\attr{name}} attribute need not. It is however recommended, @@ -773,7 +776,7 @@ \subsection{\elem{TIMESYS} Element} given. When using calendar epochs written in julian or besselian years, note that conventionally Julian years are tied to the TDB timescale and Besselian years to -the ET timescale \citep{2015A+A...574A..36R}. +the ET (equivalent to TT) 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}). @@ -863,16 +866,16 @@ \subsection{\elem{RESOURCE} Element} should exist in any of its sub-elements. A \elem{RESOURCE} without this attribute {\em may} however have no \elem{DATA} sub-element. -\elem{RESOURCE} elements qualified by -\attrval{type}{meta} are also used to transmit +For example, a \elem{RESOURCE} qualified by +\attrval{type}{meta} can be used to transmit MIVOT (Model Instances in VOTables) annotations \citep{2023ivoa.spec.0620M}. MIVOT defines a syntax to map VOTable contents to any model serizalized in VO-DML \citep{2018ivoa.spec.0910L}. It operates as a bridge between models and data that associates VOTable metadata to data model entities, possibly adding advanced metadata not representable in plain VOTable. -MIVOT annotations have their own XMLnamespace; -they have no impact on the VOTable schema. +MIVOT annotations have their own XMLnamespace. The VOTable schema allows MIVOT, +and any elements from a foreign namespace, in a \elem{RESOURCE}. Finally, the \elem{RESOURCE} element may have a \attr{utype} attribute to link the element to some external data model @@ -2573,7 +2576,7 @@ \subsection{FIELDs as Data Pointers} Spectrum absolutely calibrated - diff --git a/ivoatex b/ivoatex index dd11806..4600b84 160000 --- a/ivoatex +++ b/ivoatex @@ -1 +1 @@ -Subproject commit dd1180689db58b7660fbfea9f38a9db953650629 +Subproject commit 4600b84c811b53a6ee5645723824f75102d2190c diff --git a/role_diagram.pdf b/role_diagram.pdf index 05554f2..af66350 100644 Binary files a/role_diagram.pdf and b/role_diagram.pdf differ diff --git a/role_diagram.png b/role_diagram.png deleted file mode 100644 index 1c38007..0000000 Binary files a/role_diagram.png and /dev/null differ diff --git a/role_diagram.svg b/role_diagram.svg index abf870d..23b40a3 100644 --- a/role_diagram.svg +++ b/role_diagram.svg @@ -1,56 +1,53 @@ -IVOA Architecture DiagramThis image shows the architecture of the Virtual Observatory - (cf. http://ivoa.net), together with the relevant standards.UsersComputersProvidersRegistryData Access ProtocolsUser LayerUsingResource LayerSharingVOCoreFindingGettingDesktop AppsIn-BrowserAppsUserProgramsData and Metadata CollectionStorageComputationSemanticsDataModelsVO QueryLanguagesFormats - - - - VOTable - - - DALI - - - Utypes +IVOA Architecture DiagramThis image shows the architecture of the Virtual Observatory + (cf. http://ivoa.net), together with the relevant standards.UsersComputersProvidersRegistryData Access ProtocolsUser LayerUsingResource LayerSharingVOCoreFindingGettingDesktop AppsIn-BrowserAppsUserProgramsData and Metadata CollectionStorageComputationSemanticsDataModelsVO QueryLanguagesFormats + + VOTable + + DALI + + Utypes - + UCD + VOUnits - - UCD - VOUnits + MIVOT - diff --git a/role_diagram.xml b/role_diagram.xml index 2bf7c8a..e3b6c08 100644 --- a/role_diagram.xml +++ b/role_diagram.xml @@ -26,4 +26,6 @@ with missing dependencies. + +