Modified IVOA Arch 2 diagram along with version and author lists

Arch diagram 2 and reference updates in the Doc are sync'd up; modified version, author and editor lists.
ivoa-std · Sep 11, 2024 · db07bca · db07bca
1 parent 42941f8
commit db07bca
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/IVOAArchitecture.tex b/IVOAArchitecture.tex
@@ -18,13 +18,14 @@
 
 \ivoagroup{Technical Coordination Group}
 
-\author{Patrick Dowler}
 \author{Janet Evans}
+\author{Marco Molinaro}
+\author{Patrick Dowler}
 \author{Christophe Arviset}
 \author{Severin Gaudet}
 \author{IVOA Technical Coordination Group}
 
-\editor{Patrick Dowler, Janet Evans}
+\editor{Janet Evans, Marco Molinaro}
 
 \previousversion{IVOAArchitecture-2.0-20211029}
 \previousversion{IVOAArchitecture-1.0-20101123}

diff --git a/Makefile b/Makefile
@@ -6,13 +6,13 @@
 DOCNAME = IVOAArchitecture
 
 # count up; you probably do not want to bother with versions <1.0
-DOCVERSION = Draft 2.1
+DOCVERSION = 2.1
 
 # Publication date, ISO format; update manually for "releases"
-DOCDATE = 2024-08-29
+DOCDATE = 2024-09-10
 
 # What is it you're writing: NOTE, WD, PR, or REC
-DOCTYPE = EN
+DOCTYPE = NOTE
 
 # Source files for the TeX document (but the main file must always
 # be called $(DOCNAME).tex

diff --git a/archdiag-full.xml b/archdiag-full.xml
@@ -58,43 +58,43 @@ of the various sections) to have the box centered.
 	<rec name="DALI" x="310" y="290" w="33"/>
 	<rec name="ADQL" x="250" y="160" w="37"/>
 
-    <rec name="ConeSearch" x="665.5" y="155" w="69"/>
+        <rec name="ConeSearch" x="665.5" y="155" w="69"/>
 	<rec name="SSAP" x="682" y="180" w="36"/>
 	<rec name="SLAP" x="682.5" y="205" w="35"/>
 	<rec name="SIAP" x="683.5" y="230" w="33"/>
-    <rec name="TAP" x="686" y="255" w="28"/>
-    <prerec name="ObjVisSAP" x="667" y="330" w="66"/>
+        <rec name="TAP" x="686" y="255" w="28"/>
+        <prerec name="ObjVisSAP" x="667" y="330" w="66"/>
 	<rec name="SimDAL" x="676" y="355" w="48"/>
 	<rec name="VTP" x="684" y="380" w="30.5"/>
 	<rec name="DataLink" x="628" y="405" w="53"/>
 	<rec name="SODA" x="681" y="430" w="38"/>
 	<rec name="ObsCore" x="619" y="180" w="52"/>
-	<prerec name="EPN-TAP" x="617.5" y="205" w="55"/>
+	<rec name="EPN-TAP" x="617.5" y="205" w="55"/>
 	<rec name="ObsLocTAP" x="612" y="230" w="66"/>
 
 	<!-- Data Models: x=430..580, y=250..400 -->
 	<prerec name="VODML-Map" x="440" y="355" w="72"/>
 	<rec name="VODML" x="512" y="195" w="46"/>
 	<rec name="SimDM" x="473" y="230" w="44"/>
-	<rec name="STC" x="580" y="255" w="30"/>
 	<rec name="CharDM" x="470.5" y="255" w="49"/>
 	<rec name="SSLDM" x="572.5" y="280" w="45"/>
 	<rec name="SpectralDM" x="461.5" y="280" w="67"/>
 	<rec name="PhotDM" x="571" y="305" w="48"/>
-	<prerec name="Meas" x="456" y="305" w="35"/>
-	<prerec name="Coords" x="501" y="305" w="44"/>
+	<rec name="Meas" x="456" y="305" w="35"/>
+	<rec name="Coords" x="501" y="305" w="44"/>
 	<prerec name="Transform" x="465" y="330" w="60"/>
 	<prerec name="DatasetDM" x="490" y="380" w="65"/>
 	<prerec name="CubeDM" x="497" y="405" w="51"/>
 	<rec name="ProvDM" x="571" y="330" w="48"/>
+	<rec name="MIVOT" x="500" y="430"  w="46"/>	
 
 	<!-- GWS: all over the place -->
 	<rec name="PDL" x="430" y="380" w="33"/>
 	<rec name="SSO" x="450" y="115" w="31"/>
 	<rec name="VOSpace" x="173" y="455" w="54"/>
 	<rec name="CDP" x="500" y="115" w="31"/>
 	<rec name="UWS" x="633.5" y="460" w="33"/>
-	<prerec name="GMS" x="534" y="460" w="32"/>
+	<rec name="GMS" x="534" y="460" w="32"/>
 	<rec name="VOSI" x="568" y="435" w="34"/>
 
 	<!-- Semantics: x=160..250 y=250..400 -->