Adding (somewhat lame) support for attributeGroup-s to schemadoc.

regressiontest/run-regression.py

@@ -329,8 +329,8 @@ def test_auxiliaryurl_and_test():
     execute("make Regress.html")
 
     assert_in_file("Regress.html",
-        'See (<a href="https://www.ivoa.net/documents/Regress/20230201/'
-        'our-instance.xml">https://www.ivoa.net/documents/Regress/'
+        'See (<a href="https://www.ivoa.net/documents/Notes/Regress/20230201/'
+        'our-instance.xml">https://www.ivoa.net/documents/Notes/Regress/'
         '20230201/our-instance.xml</a>) for')
 
     edit_file("Makefile", [

schemadoc.xslt

@@ -47,6 +47,12 @@ Copyright 2015, The GAVO project
 
   <xsl:template match="xs:simpleType" mode="content"/>
 
+	<xsl:template match="xs:attributeGroup[@ref]">
+		<xsl:variable name="group-name" select="substring-after(@ref, ':')"/>
+    <xsl:apply-templates select="//xs:attributeGroup[@name=$group-name]//xs:attribute"
+    	mode="attributes"/>
+  </xsl:template>
+
   <xsl:template match="xs:complexType|xs:simpleType" mode="attributes">
     <xsl:if test=".//xs:attribute">
       <xsl:attribute namespace="" name="title">
@@ -269,7 +275,8 @@ Copyright 2015, The GAVO project
        </xsl:when>
        <xsl:otherwise>
          <xsl:if test="descendant::xs:enumeration">
-           <xsl:text>\item[Allowed Values]\hfil&#10;\begin{longtermsdescription}</xsl:text>
+           <xsl:text>\item[Allowed Values\vrule width 0pt depth 5pt]\hfil
+           \begin{longtermsdescription}</xsl:text>
            <xsl:apply-templates
              select="descendant::xs:enumeration"
              mode="controlledVocab"/>
@@ -633,8 +640,9 @@ Copyright 2015, The GAVO project
     <xsl:text>\end{lstlisting}</xsl:text>
   </xsl:template>
 
+
   <xsl:template match="xs:documentation" mode="typedesc">
-    <xsl:text>\noindent{\small</xsl:text>
+    <xsl:text>\noindent{\small{}</xsl:text>
   	<xsl:call-template name="escape-for-TeX">
  			<xsl:with-param name="tx" select="."/>
  		</xsl:call-template>
@@ -675,11 +683,12 @@ Copyright 2015, The GAVO project
       <xsl:text> Type Schema Definition}&#10;&#10;</xsl:text>
       <xsl:apply-templates select="." mode="xsddef"/>
 
-      <xsl:if test=".//xs:attribute">
+      <xsl:if test=".//xs:attribute or .//xs:attributeGroup[@ref]">
         <xsl:text>&#10;&#10;\vspace{0.5ex}\noindent\textbf{</xsl:text>
         <xsl:apply-templates select="." mode="attributeTitle"/>
         <xsl:text>}&#10;&#10;\begingroup\small\begin{bigdescription}</xsl:text>
         <xsl:apply-templates select="." mode="attributes"/>
+     		<xsl:apply-templates select=".//xs:attributeGroup[@ref]"/>
         <xsl:text>&#10;\end{bigdescription}\endgroup&#10;&#10;</xsl:text>
       </xsl:if>
 

update_generated.py

@@ -50,7 +50,7 @@ def escape_for_TeX(tx):
         ).replace("_", "\\_"
         ).replace("}", "\\}"
         ).replace("{", "\\{"
-        ).replace('"', '{"}')
+        ).replace('"', '{"}').strip()
 
     # long URLs in documentation strings are a pain because TeX
     # will not break them.  Let's see if things break badly if we