metanorma-ogc 2.2.5 → 2.2.6

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

@@ -1060,6 +1060,14 @@
 
 	</xsl:attribute-set>
 
+	<xsl:attribute-set name="pre-style">
+		<xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
+		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+
+			<xsl:attribute name="line-height">113%</xsl:attribute>
+
+	</xsl:attribute-set>
+
 	<xsl:attribute-set name="permission-style">
 
 			<xsl:attribute name="margin-top">6pt</xsl:attribute>
@@ -1208,6 +1216,11 @@
 	</xsl:variable>
 	<xsl:variable name="table-border" select="normalize-space($table-border_)"/>
 
+	<xsl:variable name="table-cell-border_">
+
+	</xsl:variable>
+	<xsl:variable name="table-cell-border" select="normalize-space($table-cell-border_)"/>
+
 	<xsl:attribute-set name="table-container-style">
 		<xsl:attribute name="margin-left">0mm</xsl:attribute>
 		<xsl:attribute name="margin-right">0mm</xsl:attribute>
@@ -1220,8 +1233,6 @@
 	<xsl:attribute-set name="table-style">
 		<xsl:attribute name="table-omit-footer-at-break">true</xsl:attribute>
 		<xsl:attribute name="table-layout">fixed</xsl:attribute>
-		<xsl:attribute name="margin-left">0mm</xsl:attribute>
-		<xsl:attribute name="margin-right">0mm</xsl:attribute>
 
 	</xsl:attribute-set><!-- table-style -->
 
@@ -2407,6 +2418,12 @@
 				<xsl:variable name="table_attributes">
 
 					<xsl:element name="table_attributes" use-attribute-sets="table-style">
+
+						<xsl:if test="$margin-side != 0">
+							<xsl:attribute name="margin-left">0mm</xsl:attribute>
+							<xsl:attribute name="margin-right">0mm</xsl:attribute>
+						</xsl:if>
+
 						<xsl:attribute name="width"><xsl:value-of select="normalize-space($table_width)"/></xsl:attribute>
 
 					</xsl:element>
@@ -3162,6 +3179,10 @@
 	<xsl:template match="*[local-name()='tr']">
 		<fo:table-row xsl:use-attribute-sets="table-body-row-style">
 
+			<xsl:if test="*[local-name() = 'th']">
+				<xsl:attribute name="keep-with-next">always</xsl:attribute>
+			</xsl:if>
+
 			<xsl:call-template name="setTableRowAttributes"/>
 			<xsl:apply-templates/>
 		</fo:table-row>
@@ -5140,6 +5161,9 @@
 		<xsl:value-of select="substring($str, 2)"/>
 	</xsl:template>
 
+	<!-- ======================================= -->
+	<!-- math -->
+	<!-- ======================================= -->
 	<xsl:template match="mathml:math">
 		<xsl:variable name="isAdded" select="@added"/>
 		<xsl:variable name="isDeleted" select="@deleted"/>
@@ -5190,14 +5214,57 @@
 		<xsl:value-of select="$comment_text"/>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'asciimath']">
+		<xsl:param name="process" select="'false'"/>
+		<xsl:if test="$process = 'true'">
+			<xsl:apply-templates/>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'latexmath']"/>
+
+	<xsl:template name="getMathml_asciimath_text">
+		<xsl:variable name="asciimath" select="../*[local-name() = 'asciimath']"/>
+		<xsl:variable name="latexmath">
+
+		</xsl:variable>
+		<xsl:variable name="asciimath_text_following">
+			<xsl:choose>
+				<xsl:when test="normalize-space($latexmath) != ''">
+					<xsl:value-of select="$latexmath"/>
+				</xsl:when>
+				<xsl:when test="normalize-space($asciimath) != ''">
+					<xsl:value-of select="$asciimath"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="following-sibling::node()[1][self::comment()]"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="asciimath_text_">
+			<xsl:choose>
+				<xsl:when test="normalize-space($asciimath_text_following) != ''">
+					<xsl:value-of select="$asciimath_text_following"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="normalize-space(translate(.,' ⁢','  '))"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="asciimath_text_2" select="java:org.metanorma.fop.Util.unescape($asciimath_text_)"/>
+		<xsl:variable name="asciimath_text" select="java:trim(java:java.lang.String.new($asciimath_text_2))"/>
+		<xsl:value-of select="$asciimath_text"/>
+	</xsl:template>
+
 	<xsl:template name="mathml_instream_object">
-		<xsl:param name="comment_text"/>
+		<xsl:param name="asciimath_text"/>
 		<xsl:param name="mathml_content"/>
 
-		<xsl:variable name="comment_text_">
+		<xsl:variable name="asciimath_text_">
 			<xsl:choose>
-				<xsl:when test="normalize-space($comment_text) != ''"><xsl:value-of select="$comment_text"/></xsl:when>
-				<xsl:otherwise><xsl:call-template name="getMathml_comment_text"/></xsl:otherwise>
+				<xsl:when test="normalize-space($asciimath_text) != ''"><xsl:value-of select="$asciimath_text"/></xsl:when>
+				<!-- <xsl:otherwise><xsl:call-template name="getMathml_comment_text"/></xsl:otherwise> -->
+				<xsl:otherwise><xsl:call-template name="getMathml_asciimath_text"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
 
@@ -5214,10 +5281,10 @@
 			</xsl:attribute>
 
 			<!-- <xsl:if test="$add_math_as_text = 'true'"> -->
-			<xsl:if test="normalize-space($comment_text_) != ''">
+			<xsl:if test="normalize-space($asciimath_text_) != ''">
 			<!-- put Mathin Alternate Text -->
 				<xsl:attribute name="fox:alt-text">
-					<xsl:value-of select="$comment_text_"/>
+					<xsl:value-of select="$asciimath_text_"/>
 				</xsl:attribute>
 			</xsl:if>
 			<!-- </xsl:if> -->
@@ -5290,6 +5357,29 @@
 		<xsl:value-of select="."/><xsl:value-of select="$zero_width_space"/>
 	</xsl:template>
 
+	<!-- Examples: 
+		<stem type="AsciiMath">x = 1</stem> 
+		<stem type="AsciiMath"><asciimath>x = 1</asciimath></stem>
+		<stem type="AsciiMath"><asciimath>x = 1</asciimath><latexmath>x = 1</latexmath></stem>
+	-->
+	<xsl:template match="*[local-name() = 'stem'][@type = 'AsciiMath'][count(*) = 0]/text() | *[local-name() = 'stem'][@type = 'AsciiMath'][*[local-name() = 'asciimath']]" priority="3">
+		<fo:inline xsl:use-attribute-sets="mathml-style">
+
+			<xsl:choose>
+				<xsl:when test="self::text()"><xsl:value-of select="."/></xsl:when>
+				<xsl:otherwise>
+					<xsl:apply-templates>
+						<xsl:with-param name="process">true</xsl:with-param>
+					</xsl:apply-templates>
+				</xsl:otherwise>
+			</xsl:choose>
+
+		</fo:inline>
+	</xsl:template>
+	<!-- ======================================= -->
+	<!-- END: math -->
+	<!-- ======================================= -->
+
 	<xsl:template match="*[local-name()='localityStack']"/>
 
 	<xsl:template match="*[local-name()='link']" name="link">
@@ -6627,9 +6717,9 @@
 		<xsl:apply-templates mode="contents_item"/>
 	</xsl:template>
 
-	<!-- ====== -->
-	<!-- sourcecode   -->
-	<!-- ====== -->
+	<!-- =============== -->
+	<!-- sourcecode  -->
+	<!-- =============== -->
 	<xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
 
 		<fo:block-container xsl:use-attribute-sets="sourcecode-container-style">
@@ -6931,8 +7021,22 @@
 			</fo:block>
 		</xsl:if>
 	</xsl:template>
-	<!-- ====== -->
-	<!-- ====== -->
+	<!-- =============== -->
+	<!-- END sourcecode  -->
+	<!-- =============== -->
+
+	<!-- =============== -->
+	<!-- pre  -->
+	<!-- =============== -->
+	<xsl:template match="*[local-name()='pre']" name="pre">
+		<fo:block xsl:use-attribute-sets="pre-style">
+			<xsl:copy-of select="@id"/>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+	<!-- =============== -->
+	<!-- pre  -->
+	<!-- =============== -->
 
 	<!-- ========== -->
 	<!-- permission -->
@@ -9496,13 +9600,14 @@
 	</xsl:template>
 
 	<xsl:template name="setId">
+		<xsl:param name="prefix"/>
 		<xsl:attribute name="id">
 			<xsl:choose>
 				<xsl:when test="@id">
-					<xsl:value-of select="@id"/>
+					<xsl:value-of select="concat($prefix, @id)"/>
 				</xsl:when>
 				<xsl:otherwise>
-					<xsl:value-of select="generate-id()"/>
+					<xsl:value-of select="concat($prefix, generate-id())"/>
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>

data/lib/isodoc/ogc/pdf_convert.rb

@@ -13,10 +13,11 @@ module IsoDoc
 
       def pdf_stylesheet(docxml)
         doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
-        doctype = "other" unless %w(abstract-specification-topic best-practice
-        change-request-supporting-document community-practice community-standard 
-        discussion-paper engineering-report policy reference-model release-notes 
-        standard user-guide test-suite white-paper).include? doctype
+        %w(abstract-specification-topic best-practice draft-standard
+           change-request-supporting-document community-practice
+           community-standard discussion-paper engineering-report policy
+           reference-model release-notes standard user-guide test-suite
+           white-paper).include? doctype or doctype = "other"
         "ogc.#{doctype}.xsl"
       end
     end

data/lib/isodoc/ogc/presentation_xml_convert.rb

@@ -12,7 +12,7 @@ module IsoDoc
       end
 
       def insert_preface_sections(doc)
-        preface_insert(doc.at(ns("//preface/clause"\
+        preface_insert(doc.at(ns("//preface/clause" \
                                  "[@type = 'executivesummary']")),
                        doc.at(ns("//preface/abstract")), doc)
         preface_insert(doc.at(ns("//preface//submitters")),
@@ -109,7 +109,7 @@ module IsoDoc
 
       def clause(docxml)
         super
-        docxml.xpath(ns("//foreword | //preface/abstract | "\
+        docxml.xpath(ns("//foreword | //preface/abstract | " \
                         "//submitters | //introduction | //acknowledgements"))
           .each do |f|
           clause1(f)
@@ -146,7 +146,7 @@ module IsoDoc
 
       def rename_stage(stage, doctype, _bib)
         stage&.text == "approved" &&
-          !%w(standard abstract-specification-topic
+          !%w(standard abstract-specification-topic draft-standard
               community-standard).include?(doctype&.text) and
           stage.children = "published"
       end
@@ -170,7 +170,7 @@ module IsoDoc
         while elem&.next_element&.name == "termsource"
           elem << "; #{elem.next_element.remove.children.to_xml}"
         end
-        elem.children = l10n("[<strong>#{@i18n.source}:</strong> "\
+        elem.children = l10n("[<strong>#{@i18n.source}:</strong> " \
                              "#{elem.children.to_xml.strip}]")
       end
 
@@ -199,7 +199,7 @@ module IsoDoc
         i = display_order_at(docxml, "//clause[@type = 'scope']", i)
         i = display_order_at(docxml, "//clause[@type = 'conformance']", i)
         i = display_order_at(docxml, @xrefs.klass.norm_ref_xpath, i)
-        i = display_order_at(docxml, "//sections/terms | "\
+        i = display_order_at(docxml, "//sections/terms | " \
                                      "//sections/clause[descendant::terms]", i)
         i = display_order_at(docxml, "//sections/definitions", i)
         i = display_order_xpath(docxml, @xrefs.klass.middle_clause(docxml), i)

data/lib/metanorma/ogc/biblio.rng

@@ -188,6 +188,11 @@
           <value>adapter</value>
           <value>translator</value>
           <value>distributor</value>
+          <value>realizer</value>
+          <value>owner</value>
+          <value>authorizer</value>
+          <value>enabler</value>
+          <value>subject</value>
         </choice>
       </attribute>
       <zeroOrMore>

data/lib/metanorma/ogc/cleanup.rb

@@ -30,12 +30,12 @@ module Metanorma
       def insert_security(xml, sect)
         description = "document"
         description = "standard" if %w(standard community-standard)
-          .include?(sect&.at("//bibdata/ext/doctype")&.text)
+          .include?(sect.at("//bibdata/ext/doctype")&.text)
         preface = sect.at("//preface") ||
           sect.add_previous_sibling("<preface/>").first
-        sect = xml&.at("//clause[@type = 'security']")&.remove ||
-          "<clause type='security' #{add_id}>"\
-          "<title>Security considerations</title>"\
+        sect = xml.at("//clause[@type = 'security']")&.remove ||
+          "<clause type='security' #{add_id}>" \
+          "<title>Security considerations</title>" \
           "<p>#{@i18n.security_empty.sub(/%/, description)}</p></clause>"
         preface.add_child sect
       end
@@ -68,19 +68,19 @@ module Metanorma
         replace_title(xml, "//definitions[@type = 'abbreviated_terms']",
                       @i18n&.abbrev)
         replace_title(xml, "//definitions[not(@type)]", @i18n&.symbolsabbrev)
-        replace_title(xml, "//sections//terms#{SYMnoABBR} | "\
+        replace_title(xml, "//sections//terms#{SYMnoABBR} | " \
                            "//sections//clause[.//terms]#{SYMnoABBR}",
                       @i18n&.termsdefsymbols, true)
-        replace_title(xml, "//sections//terms#{ABBRnoSYM} | "\
+        replace_title(xml, "//sections//terms#{ABBRnoSYM} | " \
                            "//sections//clause[.//terms]#{ABBRnoSYM}",
                       @i18n&.termsdefabbrev, true)
-        replace_title(xml, "//sections//terms#{SYMABBR} | "\
+        replace_title(xml, "//sections//terms#{SYMABBR} | " \
                            "//sections//clause[.//terms]#{SYMABBR}",
                       @i18n&.termsdefsymbolsabbrev, true)
-        replace_title(xml, "//sections//terms#{NO_SYMABBR} | "\
+        replace_title(xml, "//sections//terms#{NO_SYMABBR} | " \
                            "//sections//clause[.//terms]#{NO_SYMABBR}",
                       @i18n&.termsdefsymbolsabbrev, true)
-        replace_title(xml, "//sections//terms[not(.//definitions)] | "\
+        replace_title(xml, "//sections//terms[not(.//definitions)] | " \
                            "//sections//clause[.//terms][not(.//definitions)]",
                       @i18n&.termsdef, true)
       end
@@ -101,7 +101,7 @@ module Metanorma
       end
 
       def normref_cleanup(xmldoc)
-        r1 = xmldoc.at("//references[title[translate(text(), 'R', 'r') = "\
+        r1 = xmldoc.at("//references[title[translate(text(), 'R', 'r') = " \
                        "'Normative references']]")
         r2 = xmldoc.at("//references[title[text() = 'References']]")
         if r1 && r2
@@ -118,7 +118,7 @@ module Metanorma
           r["obligation"] = "normative" unless r["obligation"]
         end
         xml.xpath(::Metanorma::Standoc::Utils::SUBCLAUSE_XPATH).each do |r|
-          o = r&.at("./ancestor::*/@obligation")&.text and r["obligation"] = o
+          o = r.at("./ancestor::*/@obligation")&.text and r["obligation"] = o
         end
       end
 
@@ -145,12 +145,12 @@ module Metanorma
 
       PUBLISHER = "./contributor[role/@type = 'publisher']/organization".freeze
 
-      OTHERIDS = "@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or "\
+      OTHERIDS = "@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or " \
                  "@type = 'ISBN'".freeze
 
       def pub_class(bib)
         return 1 if bib.at("#{PUBLISHER}[abbreviation = 'OGC']")
-        return 1 if bib.at("#{PUBLISHER}[name = 'Open Geospatial "\
+        return 1 if bib.at("#{PUBLISHER}[name = 'Open Geospatial " \
                            "Consortium']")
         return 2 if bib.at("./docidentifier[@type][not(#{OTHERIDS})]")
 
@@ -173,7 +173,7 @@ module Metanorma
         num = if ids[:num].nil? then ids[:abbrid]
               else sprintf("%09d", ids[:num].to_i)
               end
-        "#{pubclass} :: #{ids[:type]} :: #{sortkey3} :: #{num} :: "\
+        "#{pubclass} :: #{ids[:type]} :: #{sortkey3} :: #{num} :: " \
           "#{sprintf('%09d', ids[:partid])} :: #{ids[:id]} :: #{title}"
       end
 

data/lib/metanorma/ogc/converter.rb

@@ -42,7 +42,7 @@ module Metanorma
                   change-request-supporting-document community-practice
                   community-standard discussion-paper engineering-report
                   reference-model release-notes standard user-guide white-paper
-                  technical-paper test-suite}.include? d
+                  technical-paper test-suite draft-standard}.include? d
           @warned_doctype or
             @log.add("Document Attributes", nil,
                      "'#{d}' is not a legal document type: reverting to 'standard'")
@@ -83,7 +83,7 @@ module Metanorma
       end
 
       def clause_parse(attrs, xml, node)
-        case node&.attr("heading")&.downcase || node.title.downcase
+        case node.attr("heading")&.downcase || node.title.downcase
         when "submitters" then return submitters_parse(attrs, xml, node)
         when "conformance" then attrs = attrs.merge(type: "conformance")
         when "security considerations"

data/lib/metanorma/ogc/front.rb

@@ -85,16 +85,20 @@ module Metanorma
         return unless node.attr("committee")
 
         xml.editorialgroup do |a|
-          a.committee(node.attr("committee") || "technical")
-          node.attr("subcommittee") and
-            a.subcommittee(node.attr("subcommittee"),
+          metadata_committee1(node, a)
+        end
+      end
+
+      def metadata_committee1(node, xml)
+        xml.committee(node.attr("committee") || "technical")
+        node.attr("subcommittee") and
+          xml.subcommittee(node.attr("subcommittee"),
                            **attr_code(type: node.attr("subcommittee-type"),
                                        number: node.attr("subcommittee-number")))
-          (node.attr("workgroup") || node.attr("workinggroup")) and
-            a.workgroup(node.attr("workgroup") || node.attr("workinggroup"),
+        (node.attr("workgroup") || node.attr("workinggroup")) and
+          xml.workgroup(node.attr("workgroup") || node.attr("workinggroup"),
                         **attr_code(type: node.attr("workgroup-type"),
                                     number: node.attr("workgroup-number")))
-        end
       end
 
       def externalid(node)
@@ -170,7 +174,7 @@ module Metanorma
                     conceptual-model-and-implementation encoding extension
                     implementation profile profile-with-extension}.include? s
             @log.add("Document Attributes", nil,
-                     "'#{s}' is not a permitted subtype of Standard: "\
+                     "'#{s}' is not a permitted subtype of Standard: " \
                      "reverting to 'implementation'")
             s = "implementation"
           end
@@ -178,7 +182,7 @@ module Metanorma
           unless %w{general encoding extension profile
                     profile-with-extension}.include? s
             @log.add("Document Attributes", nil,
-                     "'#{s}' is not a permitted subtype of Standard: "\
+                     "'#{s}' is not a permitted subtype of Standard: " \
                      "reverting to 'implementation'")
             s = "general"
           end

data/lib/metanorma/ogc/isodoc.rng

@@ -177,11 +177,7 @@
         </optional>
         <optional>
           <attribute name="style">
-            <choice>
-              <value>basic</value>
-              <value>full</value>
-              <value>short</value>
-            </choice>
+            <ref name="XrefStyleType"/>
           </attribute>
         </optional>
         <ref name="XrefBody"/>
@@ -1031,6 +1027,7 @@
             <ref name="stem"/>
             <ref name="index"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
@@ -1045,6 +1042,7 @@
             <ref name="stem"/>
             <ref name="index"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
@@ -1058,6 +1056,7 @@
             <ref name="PureTextElement"/>
             <ref name="index"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
@@ -1195,6 +1194,7 @@
       <ref name="add"/>
       <ref name="del"/>
       <ref name="span"/>
+      <ref name="erefstack"/>
     </choice>
   </define>
   <define name="add">
@@ -1202,6 +1202,7 @@
       <choice>
         <ref name="PureTextElement"/>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="stem"/>
         <ref name="keyword"/>
         <ref name="xref"/>
@@ -1214,6 +1215,7 @@
       <choice>
         <ref name="PureTextElement"/>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="stem"/>
         <ref name="keyword"/>
         <ref name="xref"/>
@@ -1278,6 +1280,7 @@
       </optional>
       <choice>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="xref"/>
         <ref name="termref"/>
       </choice>
@@ -1970,6 +1973,7 @@
       </element>
       <choice>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="xref"/>
         <ref name="termref"/>
       </choice>
@@ -2525,6 +2529,7 @@
             <ref name="xref"/>
             <ref name="hyperlink"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
           </choice>
           <oneOrMore>
             <element name="coords">
@@ -2572,6 +2577,7 @@
             <ref name="xref"/>
             <ref name="hyperlink"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
           </choice>
         </element>
       </zeroOrMore>
@@ -2620,6 +2626,15 @@
       <ref name="PureTextElement"/>
     </oneOrMore>
   </define>
+  <define name="XrefConnectiveType">
+    <choice>
+      <value>and</value>
+      <value>or</value>
+      <value>from</value>
+      <value>to</value>
+      <value/>
+    </choice>
+  </define>
   <define name="XrefTarget">
     <element name="location">
       <attribute name="target">
@@ -2628,16 +2643,35 @@
         </data>
       </attribute>
       <attribute name="connective">
-        <choice>
-          <value>and</value>
-          <value>or</value>
-          <value>from</value>
-          <value>to</value>
-          <value/>
-        </choice>
+        <ref name="XrefConnectiveType"/>
       </attribute>
     </element>
   </define>
+  <define name="XrefStyleType">
+    <choice>
+      <value>basic</value>
+      <value>full</value>
+      <value>short</value>
+      <value>id</value>
+    </choice>
+  </define>
+  <define name="erefTypeWithConnective">
+    <optional>
+      <attribute name="connective">
+        <ref name="XrefConnectiveType"/>
+      </attribute>
+    </optional>
+    <ref name="erefType"/>
+  </define>
+  <define name="erefstack">
+    <element name="erefstack">
+      <oneOrMore>
+        <element name="eref">
+          <ref name="erefTypeWithConnective"/>
+        </element>
+      </oneOrMore>
+    </element>
+  </define>
   <start>
     <ref name="standard-document"/>
   </start>

data/lib/metanorma/ogc/relaton-ogc.rng

@@ -18,6 +18,7 @@
         <value>user-guide</value>
         <value>white-paper</value>
         <value>test-suite</value>
+        <value>draft-standard</value>
       </choice>
     </define>
     <define name="DocumentSubtype">