metanorma-ogc 2.8.5 → 2.8.7

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

@@ -179,6 +179,8 @@
 									<xsl:call-template name="getPageSequenceOrientation"/>
 								</xsl:attribute>
 
+								<xsl:call-template name="insertFootnoteSeparatorCommon"/>
+
 								<xsl:call-template name="insertHeaderFooter"/>
 								<fo:flow flow-name="xsl-region-body">
 
@@ -216,6 +218,8 @@
 									<xsl:attribute name="initial-page-number">1</xsl:attribute>
 								</xsl:if>
 
+								<xsl:call-template name="insertFootnoteSeparatorCommon"/>
+
 								<xsl:call-template name="insertHeaderFooter"/>
 
 								<fo:flow flow-name="xsl-region-body">
@@ -242,81 +246,92 @@
 
 	<xsl:template name="cover-page">
 		<!-- Cover Page -->
-		<fo:page-sequence master-reference="document" force-page-count="no-force">
-			<xsl:call-template name="insertHeaderFooter"/>
-			<fo:flow flow-name="xsl-region-body">
+		<xsl:choose>
+			<xsl:when test="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata[mn:name = 'coverpage-image']/mn:value/mn:image and         normalize-space(/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:full-coverpage-replacement) = 'true'">
+				<xsl:call-template name="insertCoverPageFullImage"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:page-sequence master-reference="document" force-page-count="no-force">
 
-				<fo:block-container margin-left="-12mm" margin-right="-9mm">
-					<fo:block-container margin-left="0mm" margin-right="0mm">
-						<fo:block font-size="36pt" background-color="{$color}" color="white" margin-left="2.5mm" padding-top="1mm" padding-left="1mm" role="H1">
-							<xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:title/node()"/>
-						</fo:block>
-					</fo:block-container>
-				</fo:block-container>
+					<xsl:call-template name="insertFootnoteSeparatorCommon"/>
 
-				<!-- <fo:block font-family="Lato" font-weight="300" font-size="14pt" font-style="italic" margin-top="6pt" color="rgb(21, 43, 77)">
-					<xsl:text>Additional context, inspirational quote, etc. fits into this subheading area</xsl:text>
-				</fo:block> -->
+					<xsl:call-template name="insertHeaderFooter"/>
 
-				<fo:block text-align="right" font-size="10pt" margin-top="12pt" margin-bottom="24pt">
-					<fo:block margin-top="6pt">Submission Date: <xsl:value-of select="/mn:metanorma/mn:bibdata/mn:date[@type = 'received']/mn:on"/></fo:block>
-					<fo:block margin-top="6pt">Approval Date: <xsl:value-of select="/mn:metanorma/mn:bibdata/mn:date[@type = 'issued']/mn:on"/></fo:block>
-					<fo:block margin-top="6pt">Publication Date: <xsl:value-of select="/mn:metanorma/mn:bibdata/mn:date[@type = 'published']/mn:on"/></fo:block>
-					<fo:block margin-top="6pt">External identifier of this OGC® document: <xsl:value-of select="/mn:metanorma/mn:bibdata/mn:docidentifier[@type = 'ogc-external']"/></fo:block>
-					<fo:block margin-top="6pt">Internal reference number of this OGC® document: <xsl:value-of select="/mn:metanorma/mn:bibdata/mn:docnumber"/></fo:block>
+					<fo:flow flow-name="xsl-region-body">
 
-					<xsl:variable name="url" select="/mn:metanorma/mn:bibdata/mn:uri"/>
-					<xsl:if test="normalize-space($url) != ''">
-						<fo:block margin-top="6pt">URL for this OGC® document: <xsl:value-of select="$url"/></fo:block>
-					</xsl:if>
+						<fo:block-container margin-left="-12mm" margin-right="-9mm">
+							<fo:block-container margin-left="0mm" margin-right="0mm">
+								<fo:block font-size="36pt" background-color="{$color}" color="white" margin-left="2.5mm" padding-top="1mm" padding-left="1mm" role="H1">
+									<xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:title/node()"/>
+								</fo:block>
+							</fo:block-container>
+						</fo:block-container>
 
-					<xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:edition[normalize-space(@language) = '']"/>
+						<!-- <fo:block font-family="Lato" font-weight="300" font-size="14pt" font-style="italic" margin-top="6pt" color="rgb(21, 43, 77)">
+							<xsl:text>Additional context, inspirational quote, etc. fits into this subheading area</xsl:text>
+						</fo:block> -->
 
-					<fo:block margin-top="6pt"><xsl:text>Category: </xsl:text>
-						<xsl:call-template name="capitalizeWords">
-							<xsl:with-param name="str" select="/mn:metanorma/mn:bibdata/mn:ext/mn:doctype"/>
-						</xsl:call-template>
-					</fo:block>
+						<fo:block text-align="right" font-size="10pt" margin-top="12pt" margin-bottom="24pt">
+							<fo:block margin-top="6pt">Submission Date: <xsl:value-of select="/mn:metanorma/mn:bibdata/mn:date[@type = 'received']/mn:on"/></fo:block>
+							<fo:block margin-top="6pt">Approval Date: <xsl:value-of select="/mn:metanorma/mn:bibdata/mn:date[@type = 'issued']/mn:on"/></fo:block>
+							<fo:block margin-top="6pt">Publication Date: <xsl:value-of select="/mn:metanorma/mn:bibdata/mn:date[@type = 'published']/mn:on"/></fo:block>
+							<fo:block margin-top="6pt">External identifier of this OGC® document: <xsl:value-of select="/mn:metanorma/mn:bibdata/mn:docidentifier[@type = 'ogc-external']"/></fo:block>
+							<fo:block margin-top="6pt">Internal reference number of this OGC® document: <xsl:value-of select="/mn:metanorma/mn:bibdata/mn:docnumber"/></fo:block>
 
-					<xsl:variable name="editors">
-						<xsl:for-each select="/mn:metanorma/mn:bibdata/mn:contributor[mn:role/@type='editor']/mn:person/mn:name/mn:completename">
-							<xsl:value-of select="."/>
-							<xsl:if test="position() != last()">, </xsl:if>
-						</xsl:for-each>
-					</xsl:variable>
-					<xsl:if test="normalize-space($editors) != ''">
-						<fo:block margin-top="6pt">
-							<!-- Editor: -->
-							<xsl:call-template name="getLocalizedString">
-								<xsl:with-param name="key">editor_full</xsl:with-param>
-							</xsl:call-template><xsl:text>: </xsl:text><xsl:value-of select="$editors"/>
-						</fo:block>
-					</xsl:if>
-				</fo:block>
+							<xsl:variable name="url" select="/mn:metanorma/mn:bibdata/mn:uri"/>
+							<xsl:if test="normalize-space($url) != ''">
+								<fo:block margin-top="6pt">URL for this OGC® document: <xsl:value-of select="$url"/></fo:block>
+							</xsl:if>
 
-				<!-- absolute-position="fixed" left="20mm" top="91mm" width="175mm" -->
-				<fo:block-container font-size="9pt" margin-left="-5mm" margin-right="-5mm">
-					<fo:block-container margin-left="0mm" margin-right="0mm">
-						<fo:block margin-top="8pt">
-							<xsl:variable name="copyright_statement">
-								<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:copyright-statement" mode="update_xml_step1"/>
-							</xsl:variable>
-							<xsl:apply-templates select="xalan:nodeset($copyright_statement)/*"/>
-						</fo:block>
-						<fo:block margin-top="8pt"> </fo:block>
-						<fo:block margin-top="8pt">
-							<xsl:variable name="legal_statement">
-								<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:legal-statement" mode="update_xml_step1"/>
+							<xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:edition[normalize-space(@language) = '']"/>
+
+							<fo:block margin-top="6pt"><xsl:text>Category: </xsl:text>
+								<xsl:call-template name="capitalizeWords">
+									<xsl:with-param name="str" select="/mn:metanorma/mn:bibdata/mn:ext/mn:doctype"/>
+								</xsl:call-template>
+							</fo:block>
+
+							<xsl:variable name="editors">
+								<xsl:for-each select="/mn:metanorma/mn:bibdata/mn:contributor[mn:role/@type='editor']/mn:person/mn:name/mn:completename">
+									<xsl:value-of select="."/>
+									<xsl:if test="position() != last()">, </xsl:if>
+								</xsl:for-each>
 							</xsl:variable>
-							<xsl:apply-templates select="xalan:nodeset($legal_statement)/*"/>
+							<xsl:if test="normalize-space($editors) != ''">
+								<fo:block margin-top="6pt">
+									<!-- Editor: -->
+									<xsl:call-template name="getLocalizedString">
+										<xsl:with-param name="key">editor_full</xsl:with-param>
+									</xsl:call-template><xsl:text>: </xsl:text><xsl:value-of select="$editors"/>
+								</fo:block>
+							</xsl:if>
 						</fo:block>
-					</fo:block-container>
-				</fo:block-container>
 
-				<xsl:call-template name="insertLogo"/>
+						<!-- absolute-position="fixed" left="20mm" top="91mm" width="175mm" -->
+						<fo:block-container font-size="9pt" margin-left="-5mm" margin-right="-5mm">
+							<fo:block-container margin-left="0mm" margin-right="0mm">
+								<fo:block margin-top="8pt">
+									<xsl:variable name="copyright_statement">
+										<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:copyright-statement" mode="update_xml_step1"/>
+									</xsl:variable>
+									<xsl:apply-templates select="xalan:nodeset($copyright_statement)/*"/>
+								</fo:block>
+								<fo:block margin-top="8pt"> </fo:block>
+								<fo:block margin-top="8pt">
+									<xsl:variable name="legal_statement">
+										<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:legal-statement" mode="update_xml_step1"/>
+									</xsl:variable>
+									<xsl:apply-templates select="xalan:nodeset($legal_statement)/*"/>
+								</fo:block>
+							</fo:block-container>
+						</fo:block-container>
+
+						<xsl:call-template name="insertLogo"/>
 
-			</fo:flow>
-		</fo:page-sequence>
+					</fo:flow>
+				</fo:page-sequence>
+			</xsl:otherwise>
+		</xsl:choose>
 		<!-- End Cover Page -->
 	</xsl:template> <!-- END: cover-page -->
 
@@ -717,15 +732,19 @@
 	</xsl:template>
 
 	<xsl:template name="insertHeaderFooter">
+		<xsl:call-template name="insertHeader"/>
+		<xsl:call-template name="insertFooter"/>
+	</xsl:template>
 
-		<xsl:call-template name="insertFootnoteSeparatorCommon"/>
-
+	<xsl:template name="insertHeader">
 		<fo:static-content flow-name="header" role="artifact">
 			<fo:block-container height="16.5mm" background-color="{$color}">
 				<fo:block> </fo:block>
 			</fo:block-container>
 		</fo:static-content>
+	</xsl:template>
 
+	<xsl:template name="insertFooter">
 		<fo:static-content flow-name="footer" role="artifact">
 			<fo:block-container height="100%" display-align="after">
 				<fo:block-container height="23.5mm" background-color="{$color}" color="rgb(231, 230, 230)" display-align="after">
@@ -753,7 +772,6 @@
 				</fo:block-container>
 			</fo:block-container>
 		</fo:static-content>
-
 	</xsl:template>
 
 	<xsl:template name="insertLogo">
@@ -4145,90 +4163,84 @@
 	<xsl:template name="refine_term-style">
 	</xsl:template>
 
-	<xsl:attribute-set name="term-name-style">
+	<xsl:attribute-set name="term-number-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 	</xsl:attribute-set> <!-- term-name-style -->
 
-	<xsl:template name="refine_term-name-style">
-	</xsl:template>
-
-	<xsl:attribute-set name="preferred-style">
-	</xsl:attribute-set> <!-- preferred-style -->
-
-	<xsl:template name="refine_preferred-style">
+	<xsl:template name="refine_term-number-style">
 	</xsl:template>
 
-	<xsl:attribute-set name="preferred-block-style">
+	<xsl:attribute-set name="term-preferred-block-style">
 	</xsl:attribute-set> <!-- preferred-block-style -->
 
-	<xsl:template name="refine_preferred-block-style">
+	<xsl:template name="refine_term-preferred-block-style">
 	</xsl:template>
 
-	<xsl:attribute-set name="preferred-term-style">
+	<xsl:attribute-set name="term-preferred-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="line-height">1</xsl:attribute>
 	</xsl:attribute-set> <!-- preferred-term-style -->
 
-	<xsl:template name="refine_preferred-term-style">
+	<xsl:template name="refine_term-preferred-style">
 		<xsl:if test="mn:strong">
 			<xsl:attribute name="font-weight">normal</xsl:attribute>
 		</xsl:if>
 	</xsl:template>
 
-	<xsl:attribute-set name="domain-style">
-	</xsl:attribute-set> <!-- domain-style -->
+	<xsl:attribute-set name="term-domain-style">
+	</xsl:attribute-set> <!-- term-domain-style -->
 
-	<xsl:template name="refine_domain-style">
+	<xsl:template name="refine_term-domain-style">
 	</xsl:template>
 
-	<xsl:attribute-set name="admitted-style">
+	<xsl:attribute-set name="term-admitted-style">
 		<xsl:attribute name="font-size">11pt</xsl:attribute>
-	</xsl:attribute-set> <!-- admitted-style -->
+	</xsl:attribute-set> <!-- term-admitted-style -->
 
-	<xsl:template name="refine_admitted-style">
+	<xsl:template name="refine_term-admitted-style">
 	</xsl:template>
 
-	<xsl:attribute-set name="deprecates-style">
-	</xsl:attribute-set> <!-- deprecates-style -->
+	<xsl:attribute-set name="term-deprecates-style">
+	</xsl:attribute-set> <!-- term-deprecates-style -->
 
-	<xsl:template name="refine_deprecates-style">
+	<xsl:template name="refine_term-deprecates-style">
 	</xsl:template>
 
-	<xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
+	<xsl:attribute-set name="term-related-block-style" use-attribute-sets="term-preferred-block-style">
 	</xsl:attribute-set>
 
-	<xsl:template name="refine_related-block-style">
+	<xsl:template name="refine_term-related-block-style">
 	</xsl:template>
 
-	<xsl:attribute-set name="definition-style">
+	<xsl:attribute-set name="term-definition-style">
 		<xsl:attribute name="space-after">6pt</xsl:attribute>
-	</xsl:attribute-set> <!-- definition-style -->
+	</xsl:attribute-set> <!-- term-definition-style -->
 
-	<xsl:template name="refine_definition-style">
+	<xsl:template name="refine_term-definition-style">
 	</xsl:template>
 
-	<xsl:attribute-set name="termsource-style">
+	<xsl:attribute-set name="term-termsource-style">
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 		<xsl:attribute name="keep-with-previous">always</xsl:attribute>
-	</xsl:attribute-set> <!-- termsource-style -->
+	</xsl:attribute-set> <!-- term-termsource-style -->
 
-	<xsl:template name="refine_termsource-style">
-	</xsl:template> <!-- refine_termsource-style -->
+	<xsl:template name="refine_term-termsource-style">
+	</xsl:template> <!-- refine_term-termsource-style -->
 
-	<xsl:attribute-set name="termsource-text-style">
-	</xsl:attribute-set> <!-- termsource-text-style -->
+	<xsl:attribute-set name="term-termsource-text-style">
+	</xsl:attribute-set> <!-- term-termsource-text-style -->
 
-	<xsl:template name="refine_termsource-text-style">
+	<xsl:template name="refine_term-termsource-text-style">
 	</xsl:template>
 
-	<xsl:attribute-set name="origin-style">
+	<xsl:attribute-set name="term-origin-style">
 		<xsl:attribute name="color">blue</xsl:attribute>
 		<xsl:attribute name="text-decoration">underline</xsl:attribute>
-	</xsl:attribute-set> <!-- origin-style -->
+	</xsl:attribute-set> <!-- term-origin-style -->
 
-	<xsl:template name="refine_origin-style">
+	<xsl:template name="refine_term-origin-style">
 	</xsl:template>
 
 	<!-- ====== -->
@@ -4272,9 +4284,9 @@
 	<!-- modification -->
 	<!-- ====== -->
 	<xsl:template match="mn:fmt-termsource" name="termsource">
-		<fo:block xsl:use-attribute-sets="termsource-style">
+		<fo:block xsl:use-attribute-sets="term-termsource-style">
 
-			<xsl:call-template name="refine_termsource-style"/>
+			<xsl:call-template name="refine_term-termsource-style"/>
 
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
 			<xsl:variable name="termsource_text">
@@ -4322,8 +4334,8 @@
 
 	<!-- text SOURCE: -->
 	<xsl:template match="mn:fmt-termsource/mn:strong[1][following-sibling::*[1][self::mn:fmt-origin]]/text()">
-		<fo:inline xsl:use-attribute-sets="termsource-text-style">
-			<xsl:call-template name="refine_termsource-text-style"/>
+		<fo:inline xsl:use-attribute-sets="term-termsource-text-style">
+			<xsl:call-template name="refine_term-termsource-text-style"/>
 			<xsl:value-of select="."/>
 		</fo:inline>
 	</xsl:template>
@@ -4335,8 +4347,8 @@
 					<xsl:if test="normalize-space(@citeas) = ''">
 						<xsl:attribute name="fox:alt-text"><xsl:value-of select="@bibitemid"/></xsl:attribute>
 					</xsl:if>
-					<fo:inline xsl:use-attribute-sets="origin-style">
-						<xsl:call-template name="refine_origin-style"/>
+					<fo:inline xsl:use-attribute-sets="term-origin-style">
+						<xsl:call-template name="refine_term-origin-style"/>
 						<xsl:apply-templates/>
 					</fo:inline>
 				</fo:basic-link>
@@ -4389,14 +4401,14 @@
 		<xsl:variable name="levelTerm">
 			<xsl:call-template name="getLevelTermName"/>
 		</xsl:variable>
-		<fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="preferred-block-style">
+		<fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="term-preferred-block-style">
 
-			<xsl:call-template name="refine_preferred-block-style"/>
+			<xsl:call-template name="refine_term-preferred-block-style"/>
 
 			<xsl:if test="parent::mn:term and not(preceding-sibling::mn:fmt-preferred)"> <!-- if first preffered in term, then display term's name -->
 
-				<fo:block xsl:use-attribute-sets="term-name-style" role="SKIP">
-					<xsl:call-template name="refine_term-name-style"/>
+				<fo:block xsl:use-attribute-sets="term-number-style" role="SKIP">
+					<xsl:call-template name="refine_term-number-style"/>
 
 					<xsl:for-each select="ancestor::mn:term[1]/mn:fmt-name"><!-- change context -->
 						<xsl:call-template name="setIDforNamedDestination"/>
@@ -4406,8 +4418,8 @@
 				</fo:block>
 			</xsl:if>
 
-			<fo:block xsl:use-attribute-sets="preferred-term-style" role="SKIP">
-				<xsl:call-template name="refine_preferred-term-style"/>
+			<fo:block xsl:use-attribute-sets="term-preferred-style" role="SKIP">
+				<xsl:call-template name="refine_term-preferred-style"/>
 
 				<xsl:apply-templates/>
 			</fo:block>
@@ -4427,15 +4439,15 @@
 	<xsl:template match="mn:domain"/>
 
 	<xsl:template match="mn:fmt-admitted">
-		<fo:block xsl:use-attribute-sets="admitted-style">
-			<xsl:call-template name="refine_admitted-style"/>
+		<fo:block xsl:use-attribute-sets="term-admitted-style">
+			<xsl:call-template name="refine_term-admitted-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 
 	<xsl:template match="mn:fmt-deprecates">
-		<fo:block xsl:use-attribute-sets="deprecates-style">
-			<xsl:call-template name="refine_deprecates-style"/>
+		<fo:block xsl:use-attribute-sets="term-deprecates-style">
+			<xsl:call-template name="refine_term-deprecates-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -4448,8 +4460,8 @@
 	<!--  End Preferred, admitted, deprecated -->
 
 	<xsl:template match="mn:fmt-related">
-		<fo:block role="SKIP" xsl:use-attribute-sets="related-block-style">
-			<xsl:call-template name="refine_related-block-style"/>
+		<fo:block role="SKIP" xsl:use-attribute-sets="term-related-block-style">
+			<xsl:call-template name="refine_term-related-block-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -4463,8 +4475,8 @@
 	<!-- definition -->
 	<!-- ========== -->
 	<xsl:template match="mn:fmt-definition">
-		<fo:block xsl:use-attribute-sets="definition-style" role="SKIP">
-			<xsl:call-template name="refine_definition-style"/>
+		<fo:block xsl:use-attribute-sets="term-definition-style" role="SKIP">
+			<xsl:call-template name="refine_term-definition-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -14286,6 +14298,20 @@
 		</fo:block-container>
 	</xsl:template>
 
+	<!-- for https://github.com/metanorma/mn-native-pdf/issues/845 -->
+	<xsl:template name="insertCoverPageFullImage">
+		<xsl:param name="name">coverpage-image</xsl:param>
+		<xsl:for-each select="//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata[mn:name = $name][1]/mn:value/mn:image">
+			<fo:page-sequence master-reference="cover-page" force-page-count="no-force">
+				<fo:flow flow-name="xsl-region-body">
+					<xsl:call-template name="insertBackgroundPageImage">
+						<xsl:with-param name="number" select="position()"/>
+					</xsl:call-template>
+				</fo:flow>
+			</fo:page-sequence>
+		</xsl:for-each>
+	</xsl:template>
+
 	<xsl:template name="insertPageImage">
 		<xsl:param name="svg_content_height" select="$pageHeight"/>
 		<xsl:param name="bitmap_width" select="$pageWidth"/>

data/lib/metanorma/ogc/biblio.rng

@@ -869,7 +869,7 @@ depending on whether the items exist as independent documents, or are parts of a
       </zeroOrMore>
     </element>
   </define>
-  <define name="BibItemType" combine="choice">
+  <define name="BibItemType">
     <a:documentation>Type of bibliographic item.
 The value list complies with the types provided in ISO 690:2021.
 NOTE: These values represent a strict superset to BibTeX

data/lib/metanorma/ogc/converter.rb

@@ -46,19 +46,19 @@ module Metanorma
 
       def document_scheme(node)
         if r = node.attr("document-scheme")
-          r == "2022" ? "current" : "2021"
+          r == "2022" ? "2022" : "2018"
         elsif r = node.attr("published-date")
           published_date_scheme(r)
         elsif r = node.attr("copyright-year")
-          r.to_i >= 2022 ? "current" : "2021"
-        else "current"
+          r.to_i >= 2022 ? "2022" : "2018"
+        else "2022"
         end
       end
 
       def published_date_scheme(date_str)
         published_date = parse_flexible_date(date_str) or return nil
         cutoff_date = Date.new(2021, 11, 8)
-        published_date >= cutoff_date ? "current" : "2021"
+        published_date >= cutoff_date ? "2022" : "2018"
       rescue Date::Error, ArgumentError
         nil
       end
@@ -132,7 +132,7 @@ module Metanorma
 
       def update_colors(node)
         c = OGC_COLORS.dup
-        if document_scheme(node) == "current"
+        if document_scheme(node) == "2022"
           c[:"secondary-shade-1"] = "rgb(0, 177, 255)"
           c[:"secondary-shade-2"] = "rgb(0, 177, 255)"
         end

data/lib/metanorma/ogc/isodoc.rng

@@ -311,17 +311,28 @@ and is intended to be referenced by a callout within the source code</a:document
         </ref>
       </optional>
       <choice>
-        <a:documentation>Content of the figure</a:documentation>
-        <ref name="image"/>
+        <a:documentation>Content of the figure     </a:documentation>
+        <ref name="image">
+          <a:documentation>by default the content of a figure is a media file</a:documentation>
+        </ref>
         <ref name="video"/>
         <ref name="audio"/>
-        <ref name="pre"/>
+        <ref name="pre">
+          <a:documentation>figures can contain ASCII art</a:documentation>
+        </ref>
         <oneOrMore>
-          <ref name="paragraph-with-footnote"/>
+          <ref name="paragraph-with-footnote">
+            <a:documentation>figures can contain discursive art</a:documentation>
+          </ref>
         </oneOrMore>
         <zeroOrMore>
-          <ref name="figure"/>
+          <ref name="figure">
+            <a:documentation>subfigures, nested directly within a figure</a:documentation>
+          </ref>
         </zeroOrMore>
+        <ref name="table">
+          <a:documentation>Table is understood in this context to be a tabular arrangement of subfigures</a:documentation>
+        </ref>
       </choice>
       <zeroOrMore>
         <ref name="fn">
@@ -354,17 +365,28 @@ and is intended to be referenced by a callout within the source code</a:document
         </ref>
       </optional>
       <choice>
-        <a:documentation>Content of the figure</a:documentation>
-        <ref name="image-no-id"/>
+        <a:documentation>Content of the figure     </a:documentation>
+        <ref name="image-no-id">
+          <a:documentation>by default the content of a figure is a media file</a:documentation>
+        </ref>
         <ref name="video-no-id"/>
         <ref name="audio-no-id"/>
-        <ref name="pre-no-id"/>
+        <ref name="pre-no-id">
+          <a:documentation>figures can contain ASCII art</a:documentation>
+        </ref>
         <oneOrMore>
-          <ref name="paragraph-with-footnote-no-id"/>
+          <ref name="paragraph-with-footnote-no-id">
+            <a:documentation>figures can contain discursive art</a:documentation>
+          </ref>
         </oneOrMore>
         <zeroOrMore>
-          <ref name="figure-no-id"/>
+          <ref name="figure-no-id">
+            <a:documentation>subfigures, nested directly within a figure</a:documentation>
+          </ref>
         </zeroOrMore>
+        <ref name="table-no-id">
+          <a:documentation>Table is understood in this context to be a tabular arrangement of subfigures</a:documentation>
+        </ref>
       </choice>
       <zeroOrMore>
         <ref name="fn">
@@ -876,6 +898,9 @@ titlecase, or lowercase</a:documentation>
           <data type="boolean"/>
         </attribute>
       </optional>
+      <ref name="LocalizedStringAttributes">
+        <a:documentation>Specify language of bibitem, can be used to render it with language-specific bibliographic style</a:documentation>
+      </ref>
       <ref name="ReducedBibliographicItem"/>
     </element>
   </define>

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.8.5".freeze
+    VERSION = "2.8.7".freeze
   end
 end

data/metanorma-ogc.gemspec

@@ -40,5 +40,5 @@ spec.add_development_dependency "rubocop-performance"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "webmock"
-  spec.add_development_dependency "canon"
+  spec.add_development_dependency "canon", "= 0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 2.8.5
+  version: 2.8.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-29 00:00:00.000000000 Z
+date: 2025-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639
@@ -210,16 +210,16 @@ dependencies:
   name: canon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
 description: 'Metanorma for the Open Geospatial Consortium.
 
   '