move data-types UML to separate section

.github/workflows/build.yml

@@ -31,7 +31,7 @@ jobs:
         sudo apt install texlive-latex-base texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended xsltproc latexmk cm-super
 
     - name: Build the document
-      run: make
+      run: make biblio forcetex
 
     - name: Check the output
       run: |

.gitignore

@@ -12,7 +12,6 @@ ivoatexmeta.tex
 *.fls
 gitmeta.tex
 *.swp
-role_diagram.svg
 
 # OS-specific
 .DS_Store

CAOM.tex

@@ -1,6 +1,7 @@
 \documentclass[11pt,a4paper]{ivoa}
 \input tthdefs
 \usepackage{todonotes}
+\usepackage{caption}
 
 \title{Common Archive Observation Model}
 
@@ -188,30 +189,21 @@ \subsection{DeletedArtifactDescriptionEvent}
 the same entity identifier (Entity.id) and logical identifier (ArtifactDescription.uri) so that 
 other sites can synchronise the event and perform the correct deletion locally.
 
-\subsection{Data Types}
-Some of the classes in the model are intended to be used as data types (e.g. columns
-types in a database and exposed as such in a TAP service).
-
-\begin{figure}
-\centering
-\includegraphics[width=0.9\textwidth]{src/uml/CAOM2datatypes.png}
-\caption{CAOM Data Types}
-\label{fig:datatypes}
-\end{figure}
-
 \subsection{Vocabularies}
 
 CAOM uses a mixture of enumerations and vocabulary references. As it has evolved,
 several concepts began as enumerations and were later converted to use a vocabulary
 when it became clear that the IVOA Vocabularies process was a more appropriate way
 to support the gradual evolution of set of concepts needed by the community.
 
-\begin{figure}
-\centering
+\begin{center}
+%\begin{figure}
+%\centering
 \includegraphics[width=0.9\textwidth]{src/uml/CAOM3vocabularies.png}
-\caption{Enumerations and Vocabularies}
+\captionof{figure}{Enumerations and Vocabularies}
 \label{fig:vocab}
-\end{figure}
+%\end{figure}
+\end{center}
 
 \subsection{Entity}
 
@@ -222,17 +214,33 @@ \subsection{Entity}
 table and one table per entity would be the minimum number of tables required 
 to persist complete instances).
 
-\begin{figure}
-\centering
+\begin{center}
+%\begin{figure}
+%\centering
 \includegraphics[width=0.9\textwidth]{src/uml/CAOM4entities.png}
-\caption{CAOM Entities}
+\captionof{figure}{CAOM Entities}
 \label{fig:entity}
-\end{figure}
-
+%\end{figure}
+\end{center}
 
 % include external generated file so this tex doc is easy to edit
 \input{generated-caom2.tex}
 
+\section{Data Types Overview}
+Some of the classes in the model are intended to be used as data types (e.g. columns
+types in a database and exposed as such in a TAP service) and are inherently more reusable.
+The types required by the \verb|caom2| data model are specified in the separate \verb|dt| model
+below.
+
+\begin{center}
+%\begin{figure}
+%\centering
+\includegraphics[width=0.9\textwidth]{src/uml/DataTypes.png}
+\captionof{figure}{Data Types}
+\label{fig:datatypes}
+%\end{figure}
+\end{center}
+
 \input{generated-data-types.tex}
 
 \appendix

Makefile

@@ -8,7 +8,7 @@ DOCNAME = CAOM
 DOCVERSION = 2.5
 
 # Publication date, ISO format; update manually for "releases"
-DOCDATE = 2024-09-27
+DOCDATE = 2025-10-31
 
 # What is it you're writing: NOTE, WD, PR, REC, PEN, or EN
 DOCTYPE = WD
@@ -19,18 +19,18 @@ AUTHOR_EMAIL=pdowler.cadc@gmail.com
 
 # Source files for the TeX document (but the main file must always
 # be called $(DOCNAME).tex)
-SOURCES = $(DOCNAME).tex
+SOURCES = $(DOCNAME).tex role_diagram.pdf
 
 # List of image files to be included in submitted package (anything that
 # can be rendered directly by common web browsers)
-FIGURES = role_diagram.svg src/main/resources/draft-CAOM-2.5.png
+FIGURES = role_diagram.svg src/uml/CAOM1core.png src/uml/CAOM3vocabularies.png src/uml/CAOM4entities.png src/uml/DataTypes.png
 
 # List of PDF figures (figures that must be converted to pixel images to
 # work in web browsers).
 VECTORFIGURES = role_diagram.pdf
 
 # Additional files to distribute (e.g., CSS, schema files, examples...)
-AUX_FILES = generated.tex src/main/resources/CAOM-current-vodml.xml
+AUX_FILES = generated-caom2.tex generated-data-types.tex src/main/resources/CAOM-current-vodml.xml src/main/resources/DataTypes-current-vodml.xml
 
 -include ivoatex/Makefile
 
@@ -45,4 +45,3 @@ test:
 vodml:
 	xsltproc --huge --output generated-caom2.tex ivoatex/vo-dml2ivoatex.xslt src/main/resources/CAOM-current-vodml.xml
 	xsltproc --huge --output generated-data-types.tex ivoatex/vo-dml2ivoatex.xslt src/main/resources/DataTypes-current-vodml.xml
-