metanorma-ogc 2.9.9 → 2.9.10

data/lib/isodoc/ogc/ogc.white-paper.xsl

@@ -156,7 +156,7 @@
 							</fo:bookmark>
 						</xsl:if>
 
-						<xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:toc[@type='example']/mn:title)">
+						<xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:toc[@type='example']/mn:title)">
 							<xsl:variable name="list_of_examples_">
 								<xsl:for-each select="//mn:example[@id and mn:fmt-name and not(@unnumbered = 'true')]">
 									<example id="{@id}"><xsl:apply-templates select="mn:fmt-name" mode="bookmarks"/></example>
@@ -970,45 +970,59 @@
 
 	<xsl:variable name="ace_tag">ace-tag_</xsl:variable>
 
-	<xsl:variable name="title-list-tables">
-		<xsl:variable name="toc_table_title" select="//mn:metanorma/mn:metanorma-extension/mn:toc[@type='table']/mn:title"/>
-		<xsl:value-of select="$toc_table_title"/>
-		<xsl:if test="normalize-space($toc_table_title) = ''">
-			<xsl:call-template name="getLocalizedString">
-				<xsl:with-param name="key">toc_tables</xsl:with-param>
-			</xsl:call-template>
-		</xsl:if>
-	</xsl:variable>
+	<xsl:variable name="toc_title_lists_">
+		<xsl:for-each select="//mn:metanorma">
+			<xsl:variable name="num"><xsl:number level="any" count="mn:metanorma"/></xsl:variable>
+			<xsl:variable name="docid"><xsl:call-template name="getDocumentId"/></xsl:variable>
+			<xsl:variable name="current_document">
+				<xsl:copy-of select="."/>
+			</xsl:variable>
+			<xsl:for-each select="xalan:nodeset($current_document)">
+				<mnx:doc id="{$docid}" num="{$num}">
+					<mnx:title-list-tables>
+						<xsl:variable name="toc_table_title" select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:toc[@type='table']/mn:title"/>
+						<xsl:value-of select="$toc_table_title"/>
+						<xsl:if test="normalize-space($toc_table_title) = ''">
+							<xsl:call-template name="getLocalizedString">
+								<xsl:with-param name="key">toc_tables</xsl:with-param>
+							</xsl:call-template>
+						</xsl:if>
+					</mnx:title-list-tables>
 
-	<xsl:variable name="title-list-figures">
-		<xsl:variable name="toc_figure_title" select="//mn:metanorma/mn:metanorma-extension/mn:toc[@type='figure']/mn:title"/>
-		<xsl:value-of select="$toc_figure_title"/>
-		<xsl:if test="normalize-space($toc_figure_title) = ''">
-			<xsl:call-template name="getLocalizedString">
-				<xsl:with-param name="key">toc_figures</xsl:with-param>
-			</xsl:call-template>
-		</xsl:if>
-	</xsl:variable>
+					<mnx:title-list-figures>
+						<xsl:variable name="toc_figure_title" select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:toc[@type='figure']/mn:title"/>
+						<xsl:value-of select="$toc_figure_title"/>
+						<xsl:if test="normalize-space($toc_figure_title) = ''">
+							<xsl:call-template name="getLocalizedString">
+								<xsl:with-param name="key">toc_figures</xsl:with-param>
+							</xsl:call-template>
+						</xsl:if>
+					</mnx:title-list-figures>
 
-	<xsl:variable name="title-list-examples">
-		<xsl:variable name="toc_example_title" select="//mn:metanorma/mn:metanorma-extension/mn:toc[@type='example']/mn:title"/>
-		<xsl:value-of select="$toc_example_title"/>
-		<xsl:if test="normalize-space($toc_example_title) = ''">
-			<xsl:call-template name="getLocalizedString">
-				<xsl:with-param name="key">toc_examples</xsl:with-param>
-			</xsl:call-template>
-		</xsl:if>
-	</xsl:variable>
+					<mnx:title-list-examples>
+						<xsl:variable name="toc_example_title" select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:toc[@type='example']/mn:title"/>
+						<xsl:value-of select="$toc_example_title"/>
+						<xsl:if test="normalize-space($toc_example_title) = ''">
+							<xsl:call-template name="getLocalizedString">
+								<xsl:with-param name="key">toc_examples</xsl:with-param>
+							</xsl:call-template>
+						</xsl:if>
+					</mnx:title-list-examples>
 
-	<xsl:variable name="title-list-recommendations">
-		<xsl:variable name="toc_requirement_title" select="//mn:metanorma/mn:metanorma-extension/mn:toc[@type='requirement']/mn:title"/>
-		<xsl:value-of select="$toc_requirement_title"/>
-		<xsl:if test="normalize-space($toc_requirement_title) = ''">
-			<xsl:call-template name="getLocalizedString">
-				<xsl:with-param name="key">toc_recommendations</xsl:with-param>
-			</xsl:call-template>
-		</xsl:if>
+					<mnx:title-list-recommendations>
+						<xsl:variable name="toc_requirement_title" select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:toc[@type='requirement']/mn:title"/>
+						<xsl:value-of select="$toc_requirement_title"/>
+						<xsl:if test="normalize-space($toc_requirement_title) = ''">
+							<xsl:call-template name="getLocalizedString">
+								<xsl:with-param name="key">toc_recommendations</xsl:with-param>
+							</xsl:call-template>
+						</xsl:if>
+					</mnx:title-list-recommendations>
+				</mnx:doc>
+			</xsl:for-each>
+		</xsl:for-each>
 	</xsl:variable>
+	<xsl:variable name="toc_title_lists" select="xalan:nodeset($toc_title_lists_)"/>
 
 	<xsl:variable name="bibdata">
 		<xsl:copy-of select="//mn:metanorma/mn:bibdata"/>
@@ -1798,7 +1812,7 @@
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
 
-	<xsl:template match="mn:semx" mode="update_xml_step1">
+	<xsl:template match="mn:semx[not(@element = 'name')]" mode="update_xml_step1">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
 
@@ -2081,7 +2095,7 @@
 	<xsl:variable name="non_white_space">[^\s\u3000-\u9FFF]</xsl:variable>
 	<xsl:variable name="regex_dots_units">((\b((<xsl:value-of select="$non_white_space"/>{1,3}\.<xsl:value-of select="$non_white_space"/>+)|(<xsl:value-of select="$non_white_space"/>+\.<xsl:value-of select="$non_white_space"/>{1,3}))\b)|(\.<xsl:value-of select="$non_white_space"/>{1,3})\b)</xsl:variable>
 
-	<xsl:template match="text()[not(ancestor::mn:bibdata or      ancestor::mn:fmt-link[not(contains(normalize-space(),' '))] or      ancestor::mn:sourcecode or      (ancestor::mn:tt and ancestor::mn:table and string-length() &gt; 20) or     ancestor::*[local-name() = 'math'] or     ancestor::*[local-name() = 'svg'] or     ancestor::mn:name or ancestor::mn:fmt-name or     starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') or normalize-space() = '' )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
+	<xsl:template match="text()[not( (ancestor::mn:bibdata and not(ancestor::mn:title)) or      ancestor::mn:fmt-link[not(contains(normalize-space(),' '))] or      ancestor::mn:sourcecode or      (ancestor::mn:tt and ancestor::mn:table and string-length() &gt; 20) or     ancestor::*[local-name() = 'math'] or     ancestor::*[local-name() = 'svg'] or     ancestor::mn:name or (ancestor::mn:fmt-name and not(ancestor::mn:semx[@element = 'name'])) or     starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') or normalize-space() = '' )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
 
 		<xsl:variable name="parent" select="local-name(..)"/>
 
@@ -2126,7 +2140,7 @@
 		<xsl:variable name="text">
 			<xsl:element name="text" namespace="{$namespace_full}">
 				<xsl:choose>
-					<xsl:when test="ancestor::mn:table"><xsl:value-of select="."/></xsl:when> <!-- no need enclose standard's number into tag 'keep-together_within-line' in table cells -->
+					<xsl:when test="ancestor::mn:table and not(ancestor::mn:fmt-name)"><xsl:value-of select="."/></xsl:when> <!-- no need enclose standard's number into tag 'keep-together_within-line' in table cells -->
 					<xsl:otherwise>
 						<xsl:variable name="text_" select="java:replaceAll(java:java.lang.String.new(.), $regex_standard_reference, concat($tag_keep-together_within-line_open,'$1',$tag_keep-together_within-line_close))"/>
 						<!-- <xsl:value-of select="$text__"/> -->
@@ -2204,6 +2218,10 @@
 		<xsl:copy-of select="."/>
 	</xsl:template>
 
+	<xsl:template match="mn:semx" mode="update_xml_enclose_keep-together_within-line">
+		<xsl:apply-templates mode="update_xml_enclose_keep-together_within-line"/>
+	</xsl:template>
+
 	<xsl:template name="replace_text_tags">
 		<xsl:param name="tag_open"/>
 		<xsl:param name="tag_close"/>
@@ -9585,6 +9603,7 @@
 		<xsl:variable name="svg_content">
 			<xsl:apply-templates select="." mode="svg_update"/>
 		</xsl:variable>
+		<!-- <svg_content><xsl:copy-of select="$svg_content"/></svg_content> -->
 
 		<xsl:variable name="alt-text">
 			<xsl:choose>
@@ -9799,7 +9818,7 @@
 		</xsl:copy>
 	</xsl:template>
 
-	<xsl:template match="mn:image/@href" mode="svg_update">
+	<xsl:template match="*[local-name() = 'image']/@href" mode="svg_update">
 		<xsl:attribute name="href" namespace="http://www.w3.org/1999/xlink">
 			<xsl:value-of select="."/>
 		</xsl:attribute>
@@ -12402,13 +12421,13 @@
 
 	<xsl:template name="processTablesFigures_Contents">
 		<xsl:param name="always"/>
-		<xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:toc[@type='table']/mn:title) or normalize-space($always) = 'true'">
+		<xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:toc[@type='table']/mn:title) or normalize-space($always) = 'true'">
 			<xsl:call-template name="processTables_Contents"/>
 		</xsl:if>
-		<xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:toc[@type='figure']/mn:title) or normalize-space($always) = 'true'">
+		<xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:toc[@type='figure']/mn:title) or normalize-space($always) = 'true'">
 			<xsl:call-template name="processFigures_Contents"/>
 		</xsl:if>
-		<xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:toc[@type='example']/mn:title)">
+		<xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:toc[@type='example']/mn:title)">
 			<xsl:call-template name="processExamples_Contents"/>
 		</xsl:if>
 	</xsl:template>
@@ -12459,22 +12478,22 @@
 
 	<xsl:template name="processExamples_Contents">
 		<mnx:examples>
-			<xsl:for-each select="//mn:example[@id and mn:fmt-name and not(@unnumbered = 'true') and normalize-space(@id) != '']">
-				<xsl:choose>
-					<xsl:when test="mn:fmt-name">
-						<xsl:variable name="fmt_name">
-							<xsl:apply-templates select="mn:fmt-name" mode="update_xml_step1"/>
-						</xsl:variable>
-						<mnx:example id="{@id}" alt-text="{normalize-space($fmt_name)}">
-							<xsl:copy-of select="$fmt_name"/>
-						</mnx:example>
-					</xsl:when>
-					<xsl:otherwise>
-						<mnx:example id="{@id}" alt-text="{mn:name}">
-							<xsl:copy-of select="mn:name"/>
-						</mnx:example>
-					</xsl:otherwise>
-				</xsl:choose>
+			<xsl:for-each select="//mn:example[@id and mn:fmt-name and normalize-space(@id) != '']">
+				<!-- https://github.com/metanorma/metanorma-pdfa/issues/32#issuecomment-4929133938:
+				//example/fmt-xref-label[@container] + //example/fmt-name/span[@class = 'fmt-caption-delim'] + //example/name, 
+				with the last two elements dropped if //example/name does not exist. -->
+				<xsl:variable name="example_name">
+					<xsl:apply-templates select="mn:name/node()" mode="update_xml_step1"/>
+				</xsl:variable>
+				<mnx:example id="{@id}" alt-text="{normalize-space($example_name)}">
+					<xsl:element name="fmt-name" namespace="{$namespace_full}">
+						<xsl:value-of select="mn:fmt-xref-label[@container]"/>
+						<xsl:if test="normalize-space($example_name) != ''">
+							<xsl:value-of select="mn:fmt-name/mn:span[@class = 'fmt-caption-delim']"/>
+							<xsl:copy-of select="$example_name"/>
+						</xsl:if>
+					</xsl:element>
+				</mnx:example>
 			</xsl:for-each>
 		</mnx:examples>
 	</xsl:template>
@@ -12747,15 +12766,18 @@
 
 										<xsl:call-template name="insertFigureBookmarks">
 											<xsl:with-param name="contents" select="mnx:contents"/>
+											<xsl:with-param name="num" select="@num"/>
 										</xsl:call-template>
 
 										<xsl:call-template name="insertTableBookmarks">
 											<xsl:with-param name="contents" select="mnx:contents"/>
+											<xsl:with-param name="num" select="@num"/>
 											<xsl:with-param name="lang" select="@lang"/>
 										</xsl:call-template>
 
 										<xsl:call-template name="insertExampleBookmarks">
 											<xsl:with-param name="contents" select="mnx:contents"/>
+											<xsl:with-param name="num" select="@num"/>
 											<xsl:with-param name="lang" select="@lang"/>
 										</xsl:call-template>
 
@@ -12770,15 +12792,18 @@
 
 									<xsl:call-template name="insertFigureBookmarks">
 										<xsl:with-param name="contents" select="mnx:contents"/>
+										<xsl:with-param name="num" select="@num"/>
 									</xsl:call-template>
 
 									<xsl:call-template name="insertTableBookmarks">
 										<xsl:with-param name="contents" select="mnx:contents"/>
+										<xsl:with-param name="num" select="@num"/>
 										<xsl:with-param name="lang" select="@lang"/>
 									</xsl:call-template>
 
 									<xsl:call-template name="insertExampleBookmarks">
 										<xsl:with-param name="contents" select="mnx:contents"/>
+										<xsl:with-param name="num" select="@num"/>
 										<xsl:with-param name="lang" select="@lang"/>
 									</xsl:call-template>
 
@@ -12791,15 +12816,18 @@
 
 						<xsl:call-template name="insertFigureBookmarks">
 							<xsl:with-param name="contents" select="$contents_nodes/mnx:contents"/>
+							<xsl:with-param name="num" select="@num"/>
 						</xsl:call-template>
 
 						<xsl:call-template name="insertTableBookmarks">
 							<xsl:with-param name="contents" select="$contents_nodes/mnx:contents"/>
+							<xsl:with-param name="num" select="@num"/>
 							<xsl:with-param name="lang" select="@lang"/>
 						</xsl:call-template>
 
 						<xsl:call-template name="insertExampleBookmarks">
 							<xsl:with-param name="contents" select="$contents_nodes/mnx:contents"/>
+							<xsl:with-param name="num" select="@num"/>
 							<xsl:with-param name="lang" select="@lang"/>
 						</xsl:call-template>
 
@@ -12815,6 +12843,7 @@
 
 	<xsl:template name="insertFigureBookmarks">
 		<xsl:param name="contents"/>
+		<xsl:param name="num"/>
 		<xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
 		<xsl:if test="$contents_nodes/mnx:figure">
 			<fo:bookmark internal-destination="{$contents_nodes/mnx:figure[1]/@id}" starting-state="hide">
@@ -12832,6 +12861,7 @@
 
 	<xsl:template name="insertTableBookmarks">
 		<xsl:param name="contents"/>
+		<xsl:param name="num"/>
 		<xsl:param name="lang"/>
 		<xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
 		<xsl:if test="$contents_nodes/mnx:table">
@@ -12853,8 +12883,9 @@
 		</xsl:if><!-- see template addBookmarks -->
 	</xsl:template> <!-- insertTableBookmarks -->
 
-		<xsl:template name="insertExampleBookmarks">
+	<xsl:template name="insertExampleBookmarks">
 		<xsl:param name="contents"/>
+		<xsl:param name="num"/>
 		<xsl:param name="lang"/>
 		<xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
 		<xsl:if test="$contents_nodes/mnx:example">
@@ -13022,6 +13053,18 @@
 		</xsl:copy>
 	</xsl:template>
 
+	<xsl:template match="mn:tt" mode="contents_item">
+		<xsl:copy>
+			<xsl:apply-templates mode="contents_item"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'keep-together_within-line']" mode="contents_item">
+		<xsl:copy>
+			<xsl:apply-templates mode="contents_item"/>
+		</xsl:copy>
+	</xsl:template>
+
 	<xsl:template match="mn:stem" mode="contents_item"/>
 	<xsl:template match="mn:fmt-stem" mode="contents_item">
 		<xsl:copy-of select="."/>

data/lib/metanorma/ogc/basicdoc.rng

@@ -1931,7 +1931,7 @@ or as the string "auto"</a:documentation>
     </element>
   </define>
   <define name="mathml">
-    <a:documentation>Encoding of MathML: the official W3C MathML 3.0 grammar (namespace
+    <a:documentation>Encoding of MathML: the official W3C MathML 4 grammar (namespace
 http://www.w3.org/1998/Math/MathML), via the metanorma wrapper in
 grammars/mathml/. See grammars/mathml/README.adoc and basicdoc-models#35.</a:documentation>
     <externalRef href="metanorma-mathml.rng"/>

data/lib/metanorma/ogc/cleanup.rb

@@ -146,14 +146,15 @@ module Metanorma
 
       PUBLISHER = "./contributor[role/@type = 'publisher']/organization".freeze
 
-      def pub_class(bib)
-        return 1 if bib.at("#{PUBLISHER}[abbreviation = 'OGC']")
-        return 1 if bib.at("#{PUBLISHER}[name = 'Open Geospatial " \
-                           "Consortium']")
-        return 2 if bib.at("./docidentifier[@type][not(#{@conv.skip_docid} or " \
-                           "@type = 'metanorma')]")
+      # OGC first, then other standards, then everything else. Overridable
+      # per-document / per-taste via :sort-biblio-<abbrev>: through the shared
+      # Standoc::Ref helpers.
+      DEFAULT_PUBLISHER_SORT = [
+        { abbrev: "OGC", name: "Open Geospatial Consortium", rank: 1 },
+      ].freeze
 
-        3
+      def pub_class(bib)
+        publisher_sort_rank(bib, DEFAULT_PUBLISHER_SORT)
       end
 
       # sort by: doc class (OGC, other standard (not DOI &c), other

data/lib/metanorma/ogc/{mathml3-content.rng → mathml4-content.rng}

@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <!--
-        This is the Mathematical Markup Language (MathML) 3.0, an XML
-        application for describing mathematical notation and capturing
-        both its structure and content.
-    
-        Copyright 1998-2014 W3C (MIT, ERCIM, Keio, Beihang)
-    
-        Use and distribution of this code are permitted under the terms
-        W3C Software Notice and License
-        http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-  -->
-  <include href="mathml3-strict-content.rng">
+<!--
+  MathML 4 (Content)
+  ##################
+-->
+<!--
+      Copyright 1998-2026 W3C (MIT, ERCIM, Keio, Beihang)
+  
+      Use and distribution of this code are permitted under the terms
+      W3C Software Notice and License
+      http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+-->
+<grammar ns="http://www.w3.org/1998/Math/MathML" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <include href="mathml4-strict-content.rng">
     <define name="cn.content">
       <zeroOrMore>
         <choice>
           <text/>
-          <ref name="mglyph"/>
           <ref name="sep"/>
           <ref name="PresentationExpression"/>
         </choice>
@@ -46,7 +45,6 @@
       <zeroOrMore>
         <choice>
           <text/>
-          <ref name="mglyph"/>
           <ref name="PresentationExpression"/>
         </choice>
       </zeroOrMore>
@@ -65,11 +63,22 @@
       <zeroOrMore>
         <choice>
           <text/>
-          <ref name="mglyph"/>
           <ref name="PresentationExpression"/>
         </choice>
       </zeroOrMore>
     </define>
+    <define name="annotation-xml.attributes" combine="choice">
+      <ref name="CommonAtt"/>
+      <optional>
+        <ref name="cd"/>
+      </optional>
+      <optional>
+        <ref name="name"/>
+      </optional>
+      <optional>
+        <ref name="encoding"/>
+      </optional>
+    </define>
     <define name="bvar">
       <element name="bvar">
         <ref name="CommonAtt"/>
@@ -113,6 +122,63 @@
       <ref name="apply.content"/>
     </define>
   </include>
+  <define name="NonMathMLAtt" combine="choice">
+    <attribute>
+      <anyName>
+        <except>
+          <nsName ns=""/>
+          <nsName/>
+        </except>
+      </anyName>
+      <data type="string"/>
+    </attribute>
+  </define>
+  <!--
+    METANORMA MODIFICATION (basicdoc-models#39): upstream re-adds
+    `attribute alttext` to math.attributes here, but mathml4-core.rnc already
+    defines it on math; RELAX NG's duplicate-attribute restriction rejects the
+    composed grammar (jing: 'duplicate attribute "alttext"').
+    Upstream text was:
+      math.attributes &=
+          attribute alttext {text}?
+  -->
+  <!--
+    METANORMA MODIFICATION (basicdoc-models#39): upstream re-adds the
+    `data-other` placeholder to MathMLDataAttributes here; dropped for the
+    same reason as the core placeholder (see mathml4-core.rnc modification).
+    Upstream text was:
+      MathMLDataAttributes &=
+        attribute data-other {text}?
+  -->
+  <define name="CommonAtt" combine="interleave">
+    <zeroOrMore>
+      <ref name="NonMathMLAtt"/>
+    </zeroOrMore>
+    <ref name="MathMLDataAttributes"/>
+    <optional>
+      <attribute name="class">
+        <data type="NCName"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="style">
+        <data type="string"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="href">
+        <data type="anyURI"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="intent"/>
+    </optional>
+    <optional>
+      <attribute name="arg">
+        <data type="NCName"/>
+      </attribute>
+    </optional>
+  </define>
   <define name="base">
     <attribute name="base"/>
   </define>
@@ -124,6 +190,18 @@
   <define name="PresentationExpression" combine="choice">
     <notAllowed/>
   </define>
+  <define name="DefEncAtt">
+    <optional>
+      <attribute name="encoding">
+        <data type="string"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="definitionURL">
+        <data type="anyURI"/>
+      </attribute>
+    </optional>
+  </define>
   <define name="DomainQ">
     <zeroOrMore>
       <choice>
@@ -228,60 +306,6 @@
       <ref name="ContExp"/>
     </element>
   </define>
-  <define name="DeprecatedContExp">
-    <choice>
-      <ref name="reln"/>
-      <ref name="fn"/>
-      <ref name="declare"/>
-    </choice>
-  </define>
-  <define name="ContExp" combine="choice">
-    <ref name="DeprecatedContExp"/>
-  </define>
-  <define name="reln">
-    <element name="reln">
-      <zeroOrMore>
-        <ref name="ContExp"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="fn">
-    <element name="fn">
-      <ref name="ContExp"/>
-    </element>
-  </define>
-  <define name="declare">
-    <element name="declare">
-      <optional>
-        <attribute name="type">
-          <data type="string"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="scope">
-          <data type="string"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="nargs">
-          <data type="nonNegativeInteger"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="occurrence">
-          <choice>
-            <value>prefix</value>
-            <value>infix</value>
-            <value>function-model</value>
-          </choice>
-        </attribute>
-      </optional>
-      <ref name="DefEncAtt"/>
-      <oneOrMore>
-        <ref name="ContExp"/>
-      </oneOrMore>
-    </element>
-  </define>
   <define name="interval.class">
     <ref name="interval"/>
   </define>
@@ -1253,10 +1277,10 @@
   <define name="nary-stats.class">
     <choice>
       <ref name="mean"/>
-      <ref name="sdev"/>
-      <ref name="variance"/>
       <ref name="median"/>
       <ref name="mode"/>
+      <ref name="sdev"/>
+      <ref name="variance"/>
     </choice>
   </define>
   <define name="ContExp" combine="choice">
@@ -1269,29 +1293,29 @@
       <empty/>
     </element>
   </define>
-  <define name="sdev">
-    <element name="sdev">
+  <define name="median">
+    <element name="median">
       <ref name="CommonAtt"/>
       <ref name="DefEncAtt"/>
       <empty/>
     </element>
   </define>
-  <define name="variance">
-    <element name="variance">
+  <define name="mode">
+    <element name="mode">
       <ref name="CommonAtt"/>
       <ref name="DefEncAtt"/>
       <empty/>
     </element>
   </define>
-  <define name="median">
-    <element name="median">
+  <define name="sdev">
+    <element name="sdev">
       <ref name="CommonAtt"/>
       <ref name="DefEncAtt"/>
       <empty/>
     </element>
   </define>
-  <define name="mode">
-    <element name="mode">
+  <define name="variance">
+    <element name="variance">
       <ref name="CommonAtt"/>
       <ref name="DefEncAtt"/>
       <empty/>