metanorma-ogc 2.5.14 → 2.6.1

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

@@ -23,12 +23,9 @@
 	<xsl:variable name="selectedStyle" select="normalize-space($selectedStyle_)"/>
 
 	<xsl:variable name="color">rgb(0, 51, 102)</xsl:variable>
-	<xsl:variable name="color_design">
-		<xsl:choose>
-			<xsl:when test="$selectedStyle = '2'">rgb(0, 177, 255)</xsl:when>
-			<xsl:otherwise>rgb(237, 193, 35)</xsl:otherwise>
-		</xsl:choose>
-	</xsl:variable>
+
+	<xsl:variable name="color_text_title" select="/ogc:ogc-standard/ogc:metanorma-extension/ogc:presentation-metadata[ogc:name = 'color-text-title']/ogc:value"/>
+	<xsl:variable name="color_table_header_row" select="/ogc:ogc-standard/ogc:metanorma-extension/ogc:presentation-metadata[ogc:name = 'color-background-table-header']/ogc:value"/>
 
 	<xsl:attribute-set name="title-toc-style">
 		<xsl:attribute name="font-size">26pt</xsl:attribute>
@@ -86,12 +83,6 @@
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
 
-		<xsl:variable name="updated_xml_step1">
-			<xsl:apply-templates mode="update_xml_step1"/>
-		</xsl:variable>
-
-		<xsl:for-each select="xalan:nodeset($updated_xml_step1)">
-
 			<fo:root xml:lang="{$lang}">
 				<xsl:variable name="root-style">
 					<root-style xsl:use-attribute-sets="root-style"/>
@@ -286,7 +277,6 @@
 
 			</fo:root>
 
-		</xsl:for-each>
 	</xsl:template>
 
 	<xsl:template name="processPrefaceAndMainSectionsOGC_items">
@@ -2642,13 +2632,35 @@
 			</xsl:for-each>
 		</xsl:element>
 
-		<xsl:call-template name="insertAnnexInSeparatePageSequences"/>
+		<xsl:call-template name="insertAnnexAndBibliographyInSeparatePageSequences"/>
 
-		<xsl:call-template name="insertBibliographyInSeparatePageSequences"/>
+		<!-- <xsl:call-template name="insertBibliographyInSeparatePageSequences"/> -->
 
 		<!-- <xsl:call-template name="insertIndexInSeparatePageSequences"/> -->
 	</xsl:template> <!-- END: insertMainSectionsInSeparatePageSequences -->
 
+	<xsl:template name="insertAnnexAndBibliographyInSeparatePageSequences">
+		<xsl:for-each select="/*/*[local-name()='annex'] |           /*/*[local-name()='bibliography']/*[not(@normative='true')] |           /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]] |          /*/*[local-name()='indexsect']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:choose>
+				<xsl:when test="local-name() = 'annex' or local-name() = 'indexsect'">
+					<xsl:element name="page_sequence" namespace="{$namespace_full}">
+						<xsl:attribute name="main_page_sequence"/>
+						<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
+					</xsl:element>
+				</xsl:when>
+				<xsl:otherwise> <!-- bibliography -->
+					<xsl:element name="bibliography" namespace="{$namespace_full}"> <!-- save context element -->
+						<xsl:element name="page_sequence" namespace="{$namespace_full}">
+							<xsl:attribute name="main_page_sequence"/>
+							<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
+						</xsl:element>
+					</xsl:element>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:for-each>
+	</xsl:template>
+
 	<xsl:template name="insertAnnexInSeparatePageSequences">
 		<xsl:for-each select="/*/*[local-name()='annex']">
 			<xsl:sort select="@displayorder" data-type="number"/>
@@ -6885,6 +6897,12 @@
 		<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']">
 			<attachment filename="{@name}"/>
 		</xsl:for-each>
+		<xsl:if test="not(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment'])">
+			<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment']]">
+				<xsl:variable name="attachment_path" select="*[local-name() = 'uri'][@type = 'attachment']"/>
+				<attachment filename="{$attachment_path}"/>
+			</xsl:for-each>
+		</xsl:if>
 	</xsl:variable>
 	<xsl:variable name="pdfAttachmentsList" select="xalan:nodeset($pdfAttachmentsList_)"/>
 
@@ -6897,7 +6915,7 @@
 					<xsl:value-of select="concat(normalize-space(@target), '.pdf')"/>
 				</xsl:when>
 				<!-- link to the PDF attachment -->
-				<xsl:when test="$pdfAttachmentsList//attachment[@filename = current()/@target]">
+				<xsl:when test="@attachment = 'true' and $pdfAttachmentsList//attachment[@filename = current()/@target]">
 					<xsl:value-of select="concat('url(embedded-file:', @target, ')')"/>
 				</xsl:when>
 				<!-- <xsl:when test="starts-with($target_normalized, '_') and contains($target_normalized, '_attachments/') and $pdfAttachmentsList//attachment[@filename = $target_attachment_name]">
@@ -7546,7 +7564,16 @@
 		</xsl:variable>
 		<xsl:variable name="img_src">
 			<xsl:choose>
-				<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
+				<xsl:when test="not(starts-with(@src, 'data:'))">
+					<xsl:choose>
+						<xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
+							<xsl:value-of select="@src"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="concat($basepath, @src)"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:when>
 				<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
@@ -7559,7 +7586,7 @@
 		<!-- <xsl:message>width_effective=<xsl:value-of select="$width_effective"/></xsl:message>
 		<xsl:message>indent_left=<xsl:value-of select="$indent_left"/></xsl:message>
 		<xsl:message>image_width_effective=<xsl:value-of select="$image_width_effective"/> for <xsl:value-of select="ancestor::ogc:p[1]/@id"/></xsl:message> -->
-		<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
+		<xsl:variable name="scale" select="java:org.metanorma.fop.utils.ImageUtils.getImageScale($img_src, $image_width_effective, $height_effective)"/>
 		<xsl:value-of select="$scale"/>
 	</xsl:template>
 
@@ -7578,7 +7605,14 @@
 				<xsl:value-of select="concat('url(file:///',$basepath, $src_png, ')')"/>
 			</xsl:when>
 			<xsl:when test="not(starts-with(@src, 'data:'))">
-				<xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
+				<xsl:choose>
+					<xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
+						<xsl:value-of select="concat('url(file:///', @src, ')')"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
+					</xsl:otherwise>
+				</xsl:choose>
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:value-of select="@src"/>
@@ -7600,7 +7634,14 @@
 			</xsl:when>
 			<xsl:when test="not(starts-with(@src, 'data:'))">
 				<xsl:variable name="src">
-					<xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
+					<xsl:choose>
+						<xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
+							<xsl:value-of select="concat('url(file:///', @src, ')')"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
+						</xsl:otherwise>
+					</xsl:choose>
 				</xsl:variable>
 				<xsl:variable name="file" select="java:java.io.File.new(@src)"/>
 				<xsl:variable name="bufferedImage" select="java:javax.imageio.ImageIO.read($file)"/>
@@ -9325,7 +9366,7 @@
 
 					<xsl:attribute name="font-weight">normal</xsl:attribute>
 					<xsl:if test="parent::*[local-name()='thead']"> <!-- and not(ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']) -->
-						<xsl:attribute name="background-color">rgb(33, 55, 92)</xsl:attribute>
+						<xsl:attribute name="background-color"><xsl:value-of select="$color_table_header_row"/></xsl:attribute>
 					</xsl:if>
 					<xsl:if test="starts-with(*[local-name()='td'][1], 'Requirement ')">
 						<xsl:attribute name="background-color">rgb(252, 246, 222)</xsl:attribute>
@@ -11257,6 +11298,12 @@
 
 					<xsl:call-template name="setBlockSpanAll"/>
 
+						<xsl:variable name="admonition_color" select="normalize-space(/ogc:ogc-standard/ogc:metanorma-extension/ogc:presentation-metadata[ogc:name = concat('color-admonition-', @type)]/ogc:value)"/>
+						<xsl:if test="$admonition_color != ''">
+							<xsl:attribute name="border">0.5pt solid <xsl:value-of select="$admonition_color"/></xsl:attribute>
+							<xsl:attribute name="color"><xsl:value-of select="$admonition_color"/></xsl:attribute>
+						</xsl:if>
+
 							<fo:block-container xsl:use-attribute-sets="admonition-container-style" role="SKIP">
 
 										<fo:block xsl:use-attribute-sets="admonition-name-style">
@@ -11532,10 +11579,12 @@
 	<xsl:template match="*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']" mode="update_xml_step1">
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
-			<xsl:variable name="name_filepath" select="concat($inputxml_basepath, @name)"/>
-			<xsl:variable name="file_exists" select="normalize-space(java:exists(java:java.io.File.new($name_filepath)))"/>
-			<xsl:if test="$file_exists = 'false'"> <!-- copy attachment content only if file on disk doesnt exist -->
-				<xsl:value-of select="."/>
+			<xsl:if test="1 = 2"> <!-- remove attachment/text(), because attachments added in the template 'addPDFUAmeta' before applying 'update_xml_step1' -->
+				<xsl:variable name="name_filepath" select="concat($inputxml_basepath, @name)"/>
+				<xsl:variable name="file_exists" select="normalize-space(java:exists(java:java.io.File.new($name_filepath)))"/>
+				<xsl:if test="$file_exists = 'false'"> <!-- copy attachment content only if file on disk doesnt exist -->
+					<xsl:value-of select="normalize-space(.)"/>
+				</xsl:if>
 			</xsl:if>
 		</xsl:copy>
 	</xsl:template>
@@ -12408,25 +12457,37 @@
 		</x:xmpmeta>
 		<!-- add attachments -->
 		<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']">
-			<xsl:choose>
-				<xsl:when test="normalize-space() != ''">
-					<pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{.}" filename="{@name}"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<!-- _{filename}_attachments -->
-					<!-- <xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath, '_', $inputxml_filename_prefix, '_attachments', '/', @name, ')')"/> -->
-					<xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath , @name, ')')"/>
-					<pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{$url}" filename="{@name}"/>
-				</xsl:otherwise>
-			</xsl:choose>
+			<xsl:variable name="description" select="normalize-space(//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment'] = current()/@name]/*[local-name() = 'formattedref'])"/>
+
+			<pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" filename="{@name}">
+				<xsl:attribute name="src">
+					<xsl:choose>
+						<xsl:when test="normalize-space() != ''">
+							<xsl:variable name="src_attachment" select="java:replaceAll(java:java.lang.String.new(.),'(&#13;&#10;|&#13;|&#10;)', '')"/> <!-- remove line breaks -->
+							<xsl:value-of select="$src_attachment"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath , @name, ')')"/>
+							<xsl:value-of select="$url"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:attribute>
+				<xsl:if test="$description != ''">
+					<xsl:attribute name="description"><xsl:value-of select="$description"/></xsl:attribute>
+				</xsl:if>
+			</pdf:embedded-file>
 		</xsl:for-each>
 		<!-- references to external attachments (no binary-encoded within the Metanorma XML file) -->
 		<xsl:if test="not(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment'])">
 			<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment']]">
 				<xsl:variable name="attachment_path" select="*[local-name() = 'uri'][@type = 'attachment']"/>
-				<xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath, $attachment_path, ')')"/>
-				<xsl:variable name="filename_embedded" select="substring-after($attachment_path, concat('_', $inputxml_filename_prefix, '_attachments', '/'))"/>
-				<pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{$url}" filename="{$filename_embedded}"/>
+				<xsl:variable name="url" select="concat('url(file:///',$basepath, $attachment_path, ')')"/>
+				<xsl:variable name="description" select="normalize-space(*[local-name() = 'formattedref'])"/>
+				<pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{$url}" filename="{$attachment_path}">
+					<xsl:if test="$description != ''">
+						<xsl:attribute name="description"><xsl:value-of select="$description"/></xsl:attribute>
+					</xsl:if>
+				</pdf:embedded-file>
 			</xsl:for-each>
 		</xsl:if>
 	</xsl:template> <!-- addPDFUAmeta -->
@@ -12804,7 +12865,14 @@
 				<xsl:value-of select="$src"/>
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:value-of select="concat('url(file:///',$basepath, $src, ')')"/>
+				<xsl:choose>
+					<xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
+						<xsl:value-of select="concat('url(file:///', @src, ')')"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:value-of select="concat('url(file:///',$basepath, $src, ')')"/>
+					</xsl:otherwise>
+				</xsl:choose>
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>

data/lib/isodoc/ogc/presentation_xml_convert.rb

@@ -12,6 +12,7 @@ module IsoDoc
 
       def convert1(docxml, filename, dir)
         info docxml, nil
+        unnumber_biblio(docxml)
         super
       end
 
@@ -179,7 +180,7 @@ module IsoDoc
       end
 
       def deprecates(elem)
-        elem << "&#xa0;<span class='AdmittedLabel'>#{@i18n.deprecated}</span>"
+        elem << "&#xa0;<span class='DeprecatedLabel'>#{@i18n.deprecated}</span>"
       end
 
       def admits(elem)
@@ -193,6 +194,19 @@ module IsoDoc
                     l10n("#{lower2cap @i18n.sourcecode} #{lbl}"), "name")
       end
 
+      def references(docxml)
+        unnumber_biblio(docxml)
+        super
+      end
+
+      # prevent Eng Rept Biblio, which appears before Annexes, being numbered
+      # needs to happen before xrefs first invoked
+      def unnumber_biblio(docxml)
+        @doctype == "engineering-report" or return
+        b = docxml.at(ns(@xrefs.klass.bibliography_xpath)) or return
+        b["unnumbered"] = true
+      end
+
       include Init
     end
   end

data/lib/isodoc/ogc/word_convert.rb

@@ -64,7 +64,7 @@ module IsoDoc
       end
 
       def header_strip(hdr)
-        hdr = hdr.to_s.gsub(/<\/?p[^>]*>/, "")
+        hdr = hdr.to_s.gsub(/<\/?p[^<>]*>/, "")
         super
       end
 

data/lib/isodoc/ogc/xref.rb

@@ -19,6 +19,26 @@ module IsoDoc
               end
       end
 
+      def clause_order_annex(_docxml)
+        if  @doctype == "engineering-report"
+          [
+            { path: @klass.bibliography_xpath },
+            { path: "//annex", multi: true },
+          ]
+        else super
+        end
+      end
+
+      def clause_order_back(_docxml)
+        if @doctype == "engineering-report"
+          [
+            { path: "//indexsect", multi: true },
+            { path: "//colophon/*", multi: true },
+          ]
+        else super
+        end
+      end
+
       def middle_section_asset_names(doc)
         middle_sections =
           "//clause[@type = 'scope' or @type = 'conformance'] | //foreword | " \

data/lib/metanorma/ogc/basicdoc.rng

@@ -1000,14 +1000,14 @@
   <define name="PureTextElement">
     <choice>
       <text/>
-      <ref name="em"/>
-      <ref name="strong"/>
+      <ref name="pure_em"/>
+      <ref name="pure_strong"/>
       <ref name="sub"/>
       <ref name="sup"/>
-      <ref name="tt"/>
-      <ref name="underline"/>
-      <ref name="strike"/>
-      <ref name="smallcap"/>
+      <ref name="pure_tt"/>
+      <ref name="pure_underline"/>
+      <ref name="pure_strike"/>
+      <ref name="pure_smallcap"/>
       <ref name="br"/>
     </choice>
   </define>
@@ -1031,6 +1031,13 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="pure_em">
+    <element name="em">
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="strong">
     <element name="strong">
       <zeroOrMore>
@@ -1046,6 +1053,13 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="pure_strong">
+    <element name="strong">
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="tt">
     <element name="tt">
       <zeroOrMore>
@@ -1060,6 +1074,13 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="pure_tt">
+    <element name="tt">
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="keyword">
     <element name="keyword">
       <zeroOrMore>
@@ -1090,13 +1111,42 @@
       <zeroOrMore>
         <choice>
           <ref name="PureTextElement"/>
+          <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
           <ref name="index"/>
           <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
   </define>
+  <define name="pure_strike">
+    <element name="strike">
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="underline">
+    <element name="underline">
+      <optional>
+        <attribute name="style"/>
+      </optional>
+      <zeroOrMore>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="pure_underline">
     <element name="underline">
       <optional>
         <attribute name="style"/>
@@ -1107,6 +1157,21 @@
     </element>
   </define>
   <define name="smallcap">
+    <element name="smallcap">
+      <zeroOrMore>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="pure_smallcap">
     <element name="smallcap">
       <zeroOrMore>
         <ref name="PureTextElement"/>

data/lib/metanorma/ogc/biblio.rng

@@ -1204,7 +1204,9 @@
       <optional>
         <ref name="formattedref"/>
       </optional>
-      <ref name="btitle"/>
+      <oneOrMore>
+        <ref name="btitle"/>
+      </oneOrMore>
       <optional>
         <ref name="bplace"/>
       </optional>

data/lib/metanorma/ogc/cleanup.rb

@@ -231,7 +231,7 @@ module Metanorma
       def symbol_key(sym)
         @c.decode(asciimath_key(sym).text)
           .gsub(/[\[\]{}<>()]/, "").gsub(/\s/m, "")
-          .gsub(/[[:punct:]]|[_^]/, ":\\0").gsub("`", "")
+          .gsub(/[[:punct:]]|[_^]/, ":\\0").delete("`")
       end
 
       def symbols_cleanup(docxml)

data/lib/metanorma/ogc/converter.rb

@@ -64,6 +64,24 @@ module Metanorma
         super
       end
 
+      def section(node)
+        override_style(node)
+        super
+      end
+
+      def override_style(node)
+        s = node.attr("style")
+        if %w(executive_summary overview future_outlook value_proposition
+              contributors).include?(s)
+          node.set_attr("style", "preface")
+          s == "executive_summary" and s = "executivesummary"
+          node.set_attr("type", s)
+        end
+        if %w(aims objectives topics outlook security).include?(s)
+          node.set_attr("type", s)
+        end
+      end
+
       def sectiontype_streamline(ret)
         case ret
         when "preface" then "foreword"
@@ -87,6 +105,10 @@ module Metanorma
       end
 
       def clause_parse(attrs, xml, node)
+        %w(executivesummary overview future_outlook value_proposition
+           contributors aims objectives topics outlook security)
+          .include?(node.attr("type")) and
+          attrs = attrs.merge(type: node.attr("type"))
         case node.attr("heading")&.downcase || node.title.downcase
         when "submitters"
           return submitters_parse(attrs, xml, node)
@@ -156,6 +178,54 @@ module Metanorma
         end
       end
 
+      OGC_COLORS = {
+        "text": "rgb(88, 89, 91)",
+        "secondary-shade-1": "rgb(237, 193, 35)",
+        "secondary-shade-2": "rgb(246, 223, 140)",
+        "background-definition-term": "rgb(215, 243, 255)",
+        "background-definition-description": "rgb(242, 251, 255)",
+        "text-title": "rgb(33, 55, 92)",
+        "background-page": "rgb(33, 55, 92)",
+        "background-text-label-legacy": "rgb(33, 60, 107)",
+        "background-term-preferred-label": "rgb(249, 235, 187)",
+        "background-term-deprecated-label": "rgb(237, 237, 238)",
+        "background-term-admitted-label": "rgb(223, 236, 249)",
+        "background-table-header": "rgb(33, 55, 92)",
+        "background-table-row-even": "rgb(252, 246, 222)",
+        "background-table-row-odd": "rgb(254, 252, 245)",
+        "admonition-note": "rgb(79, 129, 189)",
+        "admonition-tip": "rgb(79, 129, 189)",
+        "admonition-editor": "rgb(79, 129, 189)",
+        "admonition-important": "rgb(79, 129, 189)",
+        "admonition-warning": "rgb(79, 129, 189)",
+        "admonition-caution": "rgb(79, 129, 189)",
+        "admonition-todo": "rgb(79, 129, 189)",
+        "admonition-safety-precaution": "rgb(79, 129, 189)",
+      }.freeze
+
+      def metadata_attrs(node)
+        c = update_colors(node)
+        ret = super
+        c.keys.sort.each do |k|
+          ret += "<presentation-metadata><name>color-#{k}</name>" \
+            "<value>#{c[k]}</value></presentation-metadata>"
+        end
+        ret
+      end
+
+      def update_colors(node)
+        c = OGC_COLORS.dup
+        if document_scheme(node) == "2022"
+          c[:"secondary-shade-1"] = "rgb(0, 177, 255)"
+          c[:"secondary-shade-2"] = "rgb(0, 177, 255)"
+        end
+        if node.attr("doctype") == "white-paper"
+          c[:"text-title"] = "rgb(68, 84, 106)"
+          c[:"background-page"] = "rgb(68, 84, 106)"
+        end
+        c
+      end
+
       def presentation_xml_converter(node)
         IsoDoc::Ogc::PresentationXMLConvert
           .new(html_extract_attributes(node)

data/lib/metanorma/ogc/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.3.2 -->
+<!-- VERSION v1.3.3 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -331,9 +331,9 @@
       <zeroOrMore>
         <ref name="table-note"/>
       </zeroOrMore>
-      <optional>
+      <zeroOrMore>
         <ref name="source"/>
-      </optional>
+      </zeroOrMore>
     </define>
     <define name="FigureAttr">
       <optional>
@@ -380,9 +380,9 @@
       <zeroOrMore>
         <ref name="note"/>
       </zeroOrMore>
-      <optional>
+      <zeroOrMore>
         <ref name="source"/>
-      </optional>
+      </zeroOrMore>
     </define>
     <define name="source">
       <element name="source">
@@ -662,6 +662,9 @@
             <value>LatexMath</value>
           </choice>
         </attribute>
+        <optional>
+          <attribute name="number-format"/>
+        </optional>
         <attribute name="block">
           <data type="boolean"/>
         </attribute>

data/lib/metanorma/ogc/reqt.rng

@@ -66,6 +66,9 @@
         <ref name="MultilingualRenderingType"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="class"/>
+    </optional>
     <optional>
       <ref name="reqtitle"/>
     </optional>

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.5.14".freeze
+    VERSION = "2.6.1".freeze
   end
 end

data/metanorma-ogc.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
   spec.add_dependency "iso-639"
-  spec.add_dependency "metanorma-standoc", "~> 2.9.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.9.3"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"