From d2a05a9a5411e387387d38e07d493591db544dce Mon Sep 17 00:00:00 2001 From: Mireille LOUYS <33840665+loumir@users.noreply.github.com> Date: Mon, 9 Mar 2026 21:39:09 +0100 Subject: [PATCH 1/7] Fix captions in ObsCore.tex for clarity --- ObsCore.tex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ObsCore.tex b/ObsCore.tex index 49878f6..3a036fe 100644 --- a/ObsCore.tex +++ b/ObsCore.tex @@ -1705,7 +1705,7 @@ \section{ObsCore Data Model Detailed Description} {proposal\_id } & \seqsplit{Provenance.Proposal.identifier} & unitless & string & Identifier of proposal to which observation belongs & NO\\\hline -\caption{Table X: Data model summary (with addition of axes dimension and UCD for each axis)} +\caption{Data model summary (with addition of axes dimension and UCD for each axis)} \label{tab:6} \end{tabularx} %\end{landscape} @@ -2490,7 +2490,7 @@ \subsubsection{Implementing a package of multiple data products} meta.number \\\hline \end{tabular} -\caption{TAP.schema.columns values for the mandatory fields for an ObsTAP table. Part 1. All Utypes have the data model namespace prefix {\emph obscore:} omitted in the table..} +\caption{TAP\_SCHEMA.columns values for the mandatory fields for an ObsTAP table. Part 1. All Utypes have the data model namespace prefix {\emph obscore:} omitted in the table..} \label{table:tapschema-mandatory1} \end{sidewaystable} From 7b09d52d966fec85ddb456a9b78e0fe3f1816800 Mon Sep 17 00:00:00 2001 From: Mireille LOUYS <33840665+loumir@users.noreply.github.com> Date: Mon, 9 Mar 2026 21:45:00 +0100 Subject: [PATCH 2/7] Update captions for TAP.schema.columns in ObsCore.tex --- ObsCore.tex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ObsCore.tex b/ObsCore.tex index 3a036fe..d606ca2 100644 --- a/ObsCore.tex +++ b/ObsCore.tex @@ -2598,7 +2598,7 @@ \subsubsection{Implementing a package of multiple data products} meta.id;instr \\\hline \end{tabular} -\caption{TAP.schema.columns values for the mandatory fields for an ObsTAP table. Part 2.} +\caption{TAP\_SCHEMA.columns values for the mandatory fields for an ObsTAP table. Part 2.} \label{table:tapschema-mandatory2} \end{sidewaystable} @@ -2820,7 +2820,7 @@ \subsubsection{Implementing a package of multiple data products} meta.id; obs.proposal \\\hline \end{tabular} -\caption{TAP.schema.columns values for the optional fields for an ObsTAP table. All Utypes have the data model namespace prefix {\emph obscore:'} omitted in the table..} +\caption{TAP\_SCHEMA.columns values for the optional fields for an ObsTAP table. All Utypes have the data model namespace prefix {\emph obscore:'} omitted in the table..} \label{table:tapschema-optional} \end{sidewaystable} From fa30d8e07b7aa6fd7797893b908c46103d4a33d6 Mon Sep 17 00:00:00 2001 From: Mireille LOUYS <33840665+loumir@users.noreply.github.com> Date: Mon, 9 Mar 2026 22:06:39 +0100 Subject: [PATCH 3/7] Update XML language settings in ObsCore.tex from MIVOT config --- ObsCore.tex | 69 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 45 insertions(+), 24 deletions(-) diff --git a/ObsCore.tex b/ObsCore.tex index d606ca2..d9a982f 100644 --- a/ObsCore.tex +++ b/ObsCore.tex @@ -38,30 +38,50 @@ \usepackage{xcolor} \usepackage[usenames,dvipsnames,svgnames,table]{xcolor} +% -mireille- listing params from MIVOT spec +\lstset{flexiblecolumns=true, + columns=fullflexible, + tagstyle=\ttfamily, + showstringspaces=False, + basicstyle=\tiny, + captionpos=b, + frame=single, + commentstyle=\color{gray}\upshape} \lstdefinelanguage{XML} - { - frame=single, - xleftmargin=20pt, - framexleftmargin=15pt, - numbers=left, - numberstyle=\tiny, - numbersep=5pt, - breaklines=true, - showstringspaces=false, - basicstyle=\ttfamily\footnotesize, - morestring=[b]", - moredelim=[s][\bfseries\color{red}]{<}{\ }, - moredelim=[s][\bfseries\color{red}]{}, - moredelim=[l][\bfseries\color{red}]{/>}, - moredelim=[l][\bfseries\color{red}]{>}, - moredelim=[s][\bfseries\color{black}]{>}{<}, - morecomment=[s]{}, - morecomment=[s]{}, - commentstyle=\color{gray}, - stringstyle=\color{black}, - keywordstyle=\color{blue}, - identifierstyle=\color{red} - } +{ + morestring=[s][\color{mauve}]{"}{"}, + morestring=[s][\color{black}]{>}{<}, + morecomment=[s][\color{gray}]{!--}{-->} , + stringstyle=\color{black}, + identifierstyle=\color{lightblue}, + keywordstyle=\color{darkgreen}, + morekeywords={xmlns,xsi,status,name,url, ref,tableref,dmid,dmref,dmrole,dmtype,value }% list your attributes here + } +% +%\lstdefinelanguage{XML} +% { +% frame=single, +% xleftmargin=20pt, +% framexleftmargin=15pt, +% numbers=left, +% numberstyle=\tiny, +% numbersep=5pt, +% breaklines=true, +% showstringspaces=false, +% basicstyle=\ttfamily\footnotesize, +% morestring=[b]", +% moredelim=[s][\bfseries\color{red}]{<}{\ }, +% moredelim=[s][\bfseries\color{red}]{}, +% moredelim=[l][\bfseries\color{red}]{/>}, +% moredelim=[l][\bfseries\color{red}]{>}, +% moredelim=[s][\bfseries\color{black}]{>}{<}, +% morecomment=[s]{}, +% morecomment=[s]{}, +% commentstyle=\color{gray}, +% stringstyle=\color{black}, +% keywordstyle=\color{blue}, +% identifierstyle=\color{red} +% } \begin{document} @@ -2841,7 +2861,8 @@ \section{Examples of ObsTAP query responses} language=XML, caption={Query Response}, label={lst:xml_example}, - basicstyle=\ttfamily\small, + %basicstyle=\ttfamily\small, + basicstyle=\footnotesize\ttfamily, breaklines=true ]{VOtableResponseExemple.xml} From 41d499c9169de50da4adb1ad5571bf68ea4a35a8 Mon Sep 17 00:00:00 2001 From: Mireille LOUYS <33840665+loumir@users.noreply.github.com> Date: Mon, 9 Mar 2026 22:17:59 +0100 Subject: [PATCH 4/7] Comment out tagstyle in lstset configuration Commented out the tagstyle setting in lstset. --- ObsCore.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ObsCore.tex b/ObsCore.tex index d9a982f..ed41b32 100644 --- a/ObsCore.tex +++ b/ObsCore.tex @@ -41,7 +41,7 @@ % -mireille- listing params from MIVOT spec \lstset{flexiblecolumns=true, columns=fullflexible, - tagstyle=\ttfamily, + % tagstyle=\ttfamily, showstringspaces=False, basicstyle=\tiny, captionpos=b, From 3c30d299e3225ea1eee46b0162bcbe37b8dc7dde Mon Sep 17 00:00:00 2001 From: Mathieu Servillat Date: Tue, 10 Mar 2026 11:52:08 +0100 Subject: [PATCH 5/7] change colors --- ObsCore.tex | 53 +++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/ObsCore.tex b/ObsCore.tex index ed41b32..526936b 100644 --- a/ObsCore.tex +++ b/ObsCore.tex @@ -35,28 +35,35 @@ \usepackage{ltablex} \usepackage{seqsplit} \usepackage{soul} -\usepackage{xcolor} -\usepackage[usenames,dvipsnames,svgnames,table]{xcolor} +\usepackage[dvipsnames]{xcolor} % -mireille- listing params from MIVOT spec -\lstset{flexiblecolumns=true, - columns=fullflexible, - % tagstyle=\ttfamily, - showstringspaces=False, - basicstyle=\tiny, - captionpos=b, - frame=single, - commentstyle=\color{gray}\upshape} -\lstdefinelanguage{XML} -{ - morestring=[s][\color{mauve}]{"}{"}, - morestring=[s][\color{black}]{>}{<}, - morecomment=[s][\color{gray}]{!--}{-->} , +\lstset{ + flexiblecolumns=true, + columns=fullflexible, + % tagstyle=\ttfamily, + showstringspaces=False, + basicstyle=\tiny, + captionpos=b, + frame=single, + commentstyle=\color{gray}\upshape, + xleftmargin=20pt, + framexleftmargin=15pt, + numbers=left, + numberstyle=\tiny, + numbersep=5pt, +} + +\lstdefinelanguage{XML}{ + morestring=[s][\color{Mulberry}]{"}{"}, + morestring=[s][\color{darkgray}]{>}{<}, + morecomment=[s][\color{lightgray}]{!--}{-->} , stringstyle=\color{black}, - identifierstyle=\color{lightblue}, - keywordstyle=\color{darkgreen}, - morekeywords={xmlns,xsi,status,name,url, ref,tableref,dmid,dmref,dmrole,dmtype,value }% list your attributes here - } + identifierstyle=\color{RoyalBlue}, + keywordstyle=\color{PineGreen}, + morekeywords={xmlns,version,encoding,schemaLocation,,xsi,status,name,url,ref,tableref,dmid,dmref,dmrole,dmtype,value,datatype,ucd,utype,xtype,arraysize,unit}, % list your attributes here +} + % %\lstdefinelanguage{XML} % { @@ -2390,7 +2397,7 @@ \subsubsection{Implementing a package of multiple data products} are informative for TAP 1.0 only; later versions of TAP may specify different values. %TITOTOTO -\begin{sidewaystable} +\begin{sidewaystable}[hbt] %\begin{longtable}[hbt] \small \begin{tabular}{|l|l|l|l|l|l|}% 6 left justified @@ -2852,11 +2859,6 @@ \section{Examples of ObsTAP query responses} It contains all mandatory fields for ObsCore1.1. and the implementation details for the Datalink service attached to the TAP response. -% ML : use listing environment instead - -%\begin{lstlisting} [language=XML, caption= Query Response]{VOtableResponseExemple.xml} -% Customize tag and attribute highlighting - \lstinputlisting[ language=XML, caption={Query Response}, @@ -2866,5 +2868,4 @@ \section{Examples of ObsTAP query responses} breaklines=true ]{VOtableResponseExemple.xml} - \end{document} From fc38aa35355e192aaaebc14f3062bfcd8af74f60 Mon Sep 17 00:00:00 2001 From: Mathieu Servillat Date: Tue, 10 Mar 2026 11:57:40 +0100 Subject: [PATCH 6/7] update colors --- ObsCore.tex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ObsCore.tex b/ObsCore.tex index 526936b..f6a14df 100644 --- a/ObsCore.tex +++ b/ObsCore.tex @@ -60,8 +60,8 @@ morecomment=[s][\color{lightgray}]{!--}{-->} , stringstyle=\color{black}, identifierstyle=\color{RoyalBlue}, - keywordstyle=\color{PineGreen}, - morekeywords={xmlns,version,encoding,schemaLocation,,xsi,status,name,url,ref,tableref,dmid,dmref,dmrole,dmtype,value,datatype,ucd,utype,xtype,arraysize,unit}, % list your attributes here + keywordstyle=\color{ForestGreen}, + morekeywords={xmlns,version,encoding,schemaLocation,,xsi,status,name,url,ref,tableref,dmid,dmref,dmrole,dmtype,value,datatype,ucd,utype,xtype,arraysize,unit,type,id,ID}, % list your attributes here } % From 276f7bbedc32afa9dda3c8de6c83c7fe194fdaea Mon Sep 17 00:00:00 2001 From: Mathieu Servillat Date: Tue, 10 Mar 2026 12:15:38 +0100 Subject: [PATCH 7/7] add table 9 ref --- ObsCore.tex | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/ObsCore.tex b/ObsCore.tex index f6a14df..04fffe5 100644 --- a/ObsCore.tex +++ b/ObsCore.tex @@ -64,32 +64,6 @@ morekeywords={xmlns,version,encoding,schemaLocation,,xsi,status,name,url,ref,tableref,dmid,dmref,dmrole,dmtype,value,datatype,ucd,utype,xtype,arraysize,unit,type,id,ID}, % list your attributes here } -% -%\lstdefinelanguage{XML} -% { -% frame=single, -% xleftmargin=20pt, -% framexleftmargin=15pt, -% numbers=left, -% numberstyle=\tiny, -% numbersep=5pt, -% breaklines=true, -% showstringspaces=false, -% basicstyle=\ttfamily\footnotesize, -% morestring=[b]", -% moredelim=[s][\bfseries\color{red}]{<}{\ }, -% moredelim=[s][\bfseries\color{red}]{}, -% moredelim=[l][\bfseries\color{red}]{/>}, -% moredelim=[l][\bfseries\color{red}]{>}, -% moredelim=[s][\bfseries\color{black}]{>}{<}, -% morecomment=[s]{}, -% morecomment=[s]{}, -% commentstyle=\color{gray}, -% stringstyle=\color{black}, -% keywordstyle=\color{blue}, -% identifierstyle=\color{red} -% } - \begin{document} %setup listing printing parameters @@ -2392,8 +2366,8 @@ \subsubsection{Implementing a package of multiple data products} three fields are integers, with this convention: (0=false, 1=true). \end{itemize} -Tables \ref{table:tapschema-mandatory1} and \ref{table:tapschema-mandatory2} show TAP\_SCHEMA.columns values for the mandatory fields of an ObsTAP table. All Utypes have the data model -namespace prefix {}``obscore:'' omitted in the table. The Datatype, Size, Principal, Index, and Std values shown here +Tables \ref{table:tapschema-mandatory1} and \ref{table:tapschema-mandatory2} show TAP\_SCHEMA.columns values for the mandatory fields of an ObsTAP table, and Tables \ref{table:tapschema-optional} shows optional fields. All Utypes have the data model +namespace prefix ``obscore:'' omitted in the table. The Datatype, Size, Principal, Index, and Std values shown here are informative for TAP 1.0 only; later versions of TAP may specify different values. %TITOTOTO