metanorma-ogc 2.8.3 → 2.8.5

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

@@ -148,6 +148,8 @@
 
 				<xsl:call-template name="cover-page"/>
 
+				<xsl:call-template name="inner-cover-page"/>
+
 				<xsl:variable name="updated_xml">
 					<xsl:call-template name="updateXML"/>
 					<!-- <xsl:copy-of select="."/> -->
@@ -232,6 +234,8 @@
 					</xsl:for-each>
 				</xsl:for-each>
 
+				<xsl:call-template name="back-page"/>
+
 			</fo:root>
 
 	</xsl:template>
@@ -314,7 +318,13 @@
 			</fo:flow>
 		</fo:page-sequence>
 		<!-- End Cover Page -->
-		</xsl:template> <!-- END: cover-page -->
+	</xsl:template> <!-- END: cover-page -->
+
+	<xsl:template name="inner-cover-page">
+	</xsl:template>
+
+	<xsl:template name="back-page">
+	</xsl:template>
 
 	<xsl:template name="processPrefaceAndMainSectionsOGC_items">
 		<xsl:variable name="updated_xml_step_move_pagebreak">
@@ -373,7 +383,9 @@
 
 	<xsl:template match="mn:preface//mn:clause[@type = 'toc']" name="toc" priority="4">
 		<fo:block break-after="page"/>
-		<fo:block-container line-height="1.08" font-family="Lato">
+		<fo:block-container xsl:use-attribute-sets="toc-style">
+
+			<xsl:call-template name="refine_toc-style"/>
 
 			<xsl:apply-templates select="mn:fmt-title"/>
 
@@ -535,7 +547,7 @@
 	</xsl:template>
 
 	<xsl:template match="mn:feedback-statement" priority="2">
-		<fo:block margin-top="12pt" margin-bottom="12pt">
+		<fo:block xsl:use-attribute-sets="feedback-statement-style">
 			<xsl:apply-templates select="mn:clause[1]"/>
 		</fo:block>
 	</xsl:template>
@@ -986,6 +998,7 @@
 	<xsl:variable name="en_dash">–</xsl:variable>
 	<xsl:variable name="em_dash">—</xsl:variable>
 	<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
+	<xsl:variable name="nonbreak_space_em_dash"> —</xsl:variable>
 	<xsl:variable name="cr">&#13;</xsl:variable>
 	<xsl:variable name="lf">
 </xsl:variable>
@@ -1528,6 +1541,7 @@
 	<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="update_xml_step1"/>
 	<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]" mode="update_xml_step1"/>
 	<xsl:template match="mn:section-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
+	<xsl:template match="mn:floating-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
 	<!-- <xsl:template match="mn:preferred[following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
 	<xsl:template match="mn:preferred" mode="update_xml_step1"/>
 	<!-- <xsl:template match="mn:admitted[following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
@@ -1542,10 +1556,10 @@
 
 	<xsl:template match="mn:term[@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
 
-	<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title]]" mode="update_xml_step1">
+	<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]]" mode="update_xml_step1">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="update_xml_step1"/>
-			<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title]/@depth"/>
+			<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]/@depth"/>
 			<xsl:apply-templates select="node()" mode="update_xml_step1"/>
 		</xsl:copy>
 	</xsl:template>
@@ -2397,6 +2411,8 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="feedback-statement-style">
+		<xsl:attribute name="margin-top">12pt</xsl:attribute>
+		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 	</xsl:attribute-set> <!-- feedback-statement-style -->
 
 	<xsl:template name="refine_feedback-statement-style">
@@ -2407,7 +2423,6 @@
 	</xsl:attribute-set> <!-- feedback-statement-title-style -->
 
 	<xsl:template name="refine_feedback-statement-title-style">
-
 	</xsl:template>
 
 	<xsl:attribute-set name="feedback-statement-p-style">
@@ -2692,6 +2707,12 @@
 	<xsl:template name="refine_sourcecode-style">
 	</xsl:template> <!-- refine_sourcecode-style -->
 
+	<xsl:attribute-set name="sourcecode-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_sourcecode-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="sourcecode-name-style">
 		<xsl:attribute name="font-size">11pt</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -4132,6 +4153,12 @@
 	<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>
+
 	<xsl:attribute-set name="preferred-block-style">
 	</xsl:attribute-set> <!-- preferred-block-style -->
 
@@ -4775,6 +4802,12 @@
 		<xsl:call-template name="setBordersTableArray"/>
 	</xsl:template> <!-- refine_table-style -->
 
+	<xsl:attribute-set name="table-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_table-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="table-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
@@ -5230,7 +5263,7 @@
 
 			</fo:block>
 
-			<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
+			<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'iec' or $namespace = 'iso'"> -->
 			<xsl:if test="$continued = 'true'">
 
 				<!-- to prevent the error 'THead element may contain only TR elements' -->
@@ -8273,16 +8306,23 @@
 	</xsl:attribute-set> <!-- quote-style -->
 
 	<xsl:template name="refine_quote-style">
-	</xsl:template>
+	</xsl:template> <!-- refine_quote-style -->
 
 	<xsl:attribute-set name="quote-source-style">
 		<xsl:attribute name="text-align">right</xsl:attribute>
 		<xsl:attribute name="margin-right">25mm</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- quote-source-style -->
 
 	<xsl:template name="refine_quote-source-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="source-style">
+	</xsl:attribute-set> <!-- source-style -->
+
+	<xsl:template name="refine_source-style">
+
+	</xsl:template> <!-- refine_source-style -->
+
 	<!-- ====== -->
 	<!-- quote -->
 	<!-- source -->
@@ -8330,7 +8370,9 @@
 		</xsl:if>
 		<xsl:choose>
 			<xsl:when test="not(parent::quote)">
-				<fo:block>
+				<fo:block xsl:use-attribute-sets="source-style">
+					<xsl:call-template name="refine_source-style"/>
+
 					<xsl:call-template name="insert_basic_link">
 						<xsl:with-param name="element">
 							<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
@@ -8377,6 +8419,12 @@
 	<xsl:template name="refine_figure-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="figure-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_figure-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="figure-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="font-size">11pt</xsl:attribute>
@@ -10425,7 +10473,7 @@
 
 	<xsl:template name="refine_fn-reference-style">
 		<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
-		<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">,</xsl:if>
+		<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">, </xsl:if><!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas'"></xsl:if> -->
 	</xsl:template> <!-- refine_fn-reference-style -->
 
 	<xsl:attribute-set name="fn-style">
@@ -10436,6 +10484,7 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="fn-num-style">
+		<xsl:attribute name="role">Reference</xsl:attribute>
 		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
 		<xsl:attribute name="font-size">65%</xsl:attribute>
 		<xsl:attribute name="vertical-align">super</xsl:attribute>
@@ -10511,33 +10560,16 @@
 		<xsl:variable name="ref_id" select="@target"/>
 
 		<xsl:variable name="footnote_inline">
-			<fo:inline role="Reference">
+			<fo:inline xsl:use-attribute-sets="fn-num-style">
 
-				<xsl:variable name="fn_styles">
-					<xsl:choose>
-						<xsl:when test="ancestor::mn:bibitem">
-							<fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
-								<xsl:call-template name="refine_bibitem-note-fn-style"/>
-							</fn_styles>
-						</xsl:when>
-						<xsl:otherwise>
-							<fn_styles xsl:use-attribute-sets="fn-num-style">
-								<xsl:call-template name="refine_fn-num-style"/>
-							</fn_styles>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:variable>
-
-				<xsl:for-each select="xalan:nodeset($fn_styles)/fn_styles/@*">
-					<xsl:copy-of select="."/>
-				</xsl:for-each>
+				<xsl:call-template name="refine_fn-num-style"/>
 
 				<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
 				<!-- <xsl:if test="following-sibling::node()[normalize-space() != ''][1][self::mn:fn]">
 					<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
 				</xsl:if> -->
 
-				<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">,</xsl:if>
+				<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">, </xsl:if>
 
 				<xsl:call-template name="insert_basic_link">
 					<xsl:with-param name="element">
@@ -10850,30 +10882,6 @@
 	<xsl:template name="refine_bibitem-non-normative-list-body-style">
 	</xsl:template>
 
-	<!-- footnote reference number for bibitem, in the text  -->
-	<xsl:attribute-set name="bibitem-note-fn-style">
-		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
-		<xsl:attribute name="font-size">65%</xsl:attribute>
-		<xsl:attribute name="vertical-align">super</xsl:attribute>
-	</xsl:attribute-set> <!-- bibitem-note-fn-style -->
-
-	<xsl:template name="refine_bibitem-note-fn-style">
-	</xsl:template>
-
-	<!-- footnote number on the page bottom -->
-	<xsl:attribute-set name="bibitem-note-fn-number-style">
-		<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
-		<xsl:attribute name="font-size">60%</xsl:attribute>
-		<xsl:attribute name="vertical-align">super</xsl:attribute>
-	</xsl:attribute-set> <!-- bibitem-note-fn-number-style -->
-
-	<!-- footnote body (text) on the page bottom -->
-	<xsl:attribute-set name="bibitem-note-fn-body-style">
-		<xsl:attribute name="font-size">10pt</xsl:attribute>
-		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-		<xsl:attribute name="start-indent">0pt</xsl:attribute>
-	</xsl:attribute-set> <!-- bibitem-note-fn-body-style -->
-
 	<xsl:attribute-set name="references-non-normative-style">
 		<xsl:attribute name="line-height">120%</xsl:attribute>
 	</xsl:attribute-set> <!-- references-non-normative-style -->
@@ -10954,7 +10962,7 @@
 
 			<fo:list-item>
 				<fo:list-item-label end-indent="label-end()">
-					<fo:block role="SKIP">
+					<fo:block role="SKIP" id="__internal_layout__bibitem_{@id}_{generate-id()}">
 						<fo:inline role="SKIP">
 							<xsl:apply-templates select="mn:biblio-tag">
 								<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
@@ -11607,6 +11615,8 @@
 	<!-- =================== -->
 
 	<xsl:attribute-set name="toc-style">
+		<xsl:attribute name="line-height">1.08</xsl:attribute>
+		<xsl:attribute name="font-family">Lato</xsl:attribute>
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_toc-style">
@@ -13198,10 +13208,28 @@
 			</xsl:choose>
 	</xsl:template>
 
+	<xsl:attribute-set name="clause-style">
+
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_clause-style">
+		<!-- commented for https://github.com/metanorma/metanorma-ribose/issues/421 -->
+		<!-- <xsl:if test="$namespace = 'rsd'">
+			<xsl:variable name="level">
+				<xsl:call-template name="getLevel">
+					<xsl:with-param name="depth" select="mn:fmt-title/@depth"/>
+				</xsl:call-template>
+			</xsl:variable>
+			<xsl:if test="$level &gt;= 4">
+				<xsl:attribute name="margin-left">13mm</xsl:attribute>
+			</xsl:if>
+		</xsl:if> -->
+	</xsl:template>
+
 	<!-- main sections -->
 	<xsl:template match="/*/mn:sections/*" name="sections_node" priority="2">
 		<xsl:call-template name="setNamedDestination"/>
-		<fo:block>
+		<fo:block role="Sect">
 			<xsl:call-template name="setId"/>
 
 			<xsl:call-template name="sections_element_style"/>
@@ -13329,6 +13357,10 @@
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
 	</xsl:template>
 
+	<!-- for case when update_xml_step1 (common.updatexml.xsl) doesn't apply when $table_if = 'true' -->
+	<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]"/>
+	<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
+
 	<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
 	<xsl:template name="insert_basic_link">
 		<xsl:param name="element"/>

data/lib/isodoc/ogc/presentation_sections.rb

@@ -139,7 +139,7 @@ module IsoDoc
       end
 
       def insert_submitting_orgs(docxml)
-        orgs = docxml.xpath(ns(submittingorgs_path))
+        orgs = docxml.xpath(submittingorgs_path)
           .each_with_object([]) { |org, m| m << org.text }
         orgs.empty? and return
         if a = submit_orgs_append_pt(docxml)

data/lib/metanorma/ogc/cleanup.rb

@@ -72,7 +72,8 @@ module Metanorma
         end
       end
 
-      def section_names_terms_cleanup(xml)
+      # KILL
+      def section_names_terms_cleanupx(xml)
         @i18n or return
         replace_title(xml, "//definitions[@type = 'symbols']", @i18n.symbols)
         replace_title(xml, "//definitions[@type = 'abbreviated_terms']",
@@ -95,6 +96,21 @@ module Metanorma
                       @i18n.termsdef, true)
       end
 
+      # as in standoc, but do not rename annex terms
+       def section_names_terms1_cleanup(xml)
+        auto_name_terms(xml) or return
+        replace_title(xml, "//sections/terms#{SYM_NO_ABBR} | //sections/clause[@type = 'terms']#{SYM_NO_ABBR}",
+                      @i18n&.termsdefsymbols, true)
+        replace_title(xml, "//sections/terms#{ABBR_NO_SYM} | //sections/clause[@type = 'terms']#{ABBR_NO_SYM}",
+                      @i18n&.termsdefabbrev, true)
+        replace_title(xml, "//sections/terms#{SYMABBR} | //sections/clause[@type = 'terms']#{SYMABBR}",
+                      @i18n&.termsdefsymbolsabbrev, true)
+        replace_title(xml, "//sections/terms#{NO_SYMABBR} | //sections/clause[@type = 'terms']#{NO_SYMABBR}",
+                      @i18n&.termsdefsymbolsabbrev, true)
+        replace_title(xml, "//sections/terms[not(.//definitions)] | //sections/clause[@type = 'terms'][not(.//definitions)]",
+                      @i18n&.termsdef, true)
+      end
+
       def termdef_cleanup(xmldoc)
         super
         termdef_subclause_cleanup(xmldoc)

data/lib/metanorma/ogc/converter.rb

@@ -1,9 +1,11 @@
 require "asciidoctor"
 require "metanorma/standoc/converter"
 require "fileutils"
+require "date"
 require_relative "front"
 require_relative "validate"
 require_relative "cleanup"
+require_relative "sections"
 
 module Metanorma
   module Ogc
@@ -17,9 +19,6 @@ module Metanorma
         @tocrecommendations = true
       end
 
-      # ignore, we generate ToC outside of asciidoctor
-      def toc(value); end
-
       def default_requirement_model
         "ogc"
       end
@@ -45,44 +44,35 @@ module Metanorma
         d
       end
 
-      def sectiontype(node, level = true)
-        ret = sectiontype_streamline(sectiontype1(node))
-        return ret if ret == "terms and definitions" &&
-          node.attr("style") == "appendix" && node.level == 1
-
-        super
-      end
-
-      def section(node)
-        override_style(node)
-        super
-      end
-
-      def override_style(node)
-        s = node.attr("style")
-        if %w(overview future_outlook value_proposition contributors).include?(s)
-          node.set_attr("style", "preface")
-          node.set_attr("type", s)
-        end
-        if %w(aims objectives topics outlook security).include?(s)
-          node.set_attr("type", s)
+      def document_scheme(node)
+        if r = node.attr("document-scheme")
+          r == "2022" ? "current" : "2021"
+        elsif r = node.attr("published-date")
+          published_date_scheme(r)
+        elsif r = node.attr("copyright-year")
+          r.to_i >= 2022 ? "current" : "2021"
+        else "current"
         end
       end
 
-      def sectiontype_streamline(ret)
-        case ret
-        when "preface" then "foreword"
-        when "foreword", "introduction" then "donotrecognise-foreword"
-        when "references" then "normative references"
-        when "glossary" then "terms and definitions"
-        else super
-        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"
+      rescue Date::Error, ArgumentError
+        nil
       end
 
-      # legacy encoding
-      def sectiontype1(node)
-        role_style(node, "executive_summary") and return "executivesummary"
-        super
+      def parse_flexible_date(date_str)
+        case date_str
+        when /^\d{4}$/
+          Date.new(date_str.to_i, 1, 1)
+        when /^\d{4}-\d{2}$/
+          year, month = date_str.split("-").map(&:to_i)
+          Date.new(year, month, 1)
+        else
+          Date.parse(date_str)
+        end
       end
 
       def outputs(node, ret)
@@ -96,75 +86,15 @@ module Metanorma
                                      false, "#{@filename}.pdf")
       end
 
-      def clause_parse(attrs, xml, node)
-        %w(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.merge(type: "submitters"), xml, node)
-        when "contributors"
-          return submitters_parse(attrs.merge(type: "contributors"), xml, node)
-        when "conformance" then attrs = attrs.merge(type: "conformance")
-        when "security considerations"
-          attrs = attrs.merge(type: "security")
-        end
-        super
-      end
-
-      def submitters_parse(attrs, xml, node)
-        title = @i18n.submitters
-        doctype(node) == "engineering-report" ||
-          attrs[:type] == "contributors" and
-          title = @i18n.contributors_clause
-        xml.clause **attr_code(attrs) do |xml_section|
-          section_title(xml_section, title)
-          xml_section << node.content
-        end
-      end
-
       def style(_node, _text)
         nil
       end
 
-      def term_def_parse(attrs, xml, node, _toplevel)
-        if node.attr("style") == "appendix" && node.level == 1
-          terms_annex_parse(attrs, xml, node)
-        else
-          super
-        end
-      end
-
       def table_cell(node, xml_tr, tblsec)
         node.set_attr("valign", "middle")
         super
       end
 
-      def terms_annex_parse(attrs, xml, node)
-        attrs1 = attrs.merge(id: "_#{UUIDTools::UUID.random_create}")
-        xml.annex **attr_code(attrs1) do |xml_section|
-          section_title(xml_section, node.title)
-          attrs.delete(:anchor)
-          xml_section.terms **attr_code(attrs) do |terms|
-            (s = node.attr("source")) && s.split(",").each do |s1|
-              terms.termdocsource(nil, **attr_code(bibitemid: s1))
-            end
-            terms << node.content
-          end
-        end
-      end
-
-      def set_obligation(attrs, node)
-        if node.attr("style") == "appendix" && node.level == 1
-          attrs[:obligation] = if node.attributes.has_key?("obligation")
-                                 node.attr("obligation")
-                               else "informative"
-                               end
-        else super
-        end
-      end
-
       OGC_COLORS = {
         "text": "rgb(88, 89, 91)",
         "secondary-shade-1": "rgb(237, 193, 35)",
@@ -202,7 +132,7 @@ module Metanorma
 
       def update_colors(node)
         c = OGC_COLORS.dup
-        if document_scheme(node) == "2022"
+        if document_scheme(node) == "current"
           c[:"secondary-shade-1"] = "rgb(0, 177, 255)"
           c[:"secondary-shade-2"] = "rgb(0, 177, 255)"
         end
@@ -236,11 +166,12 @@ module Metanorma
       # preempt subdoctype warning
       def adoc2xml(text, flavour)
         Nokogiri::XML(text).root and return text
-        c = Asciidoctor
-          .convert("= X\nA\n:semantic-metadata-headless: true\n" \
+        c = isolated_asciidoctor_convert(
+          "= X\nA\n:semantic-metadata-headless: true\n" \
                    ":novalid:\n:docsubtype: implementation\n" \
                    ":doctype: standard\n\n#{text}\n",
-                   backend: flavour, header_footer: true)
+          backend: flavour, header_footer: true,
+        )
         Nokogiri::XML(c).at("//xmlns:sections")
       end
     end

data/lib/metanorma/ogc/front.rb

@@ -86,7 +86,7 @@ module Metanorma
         { "Open Geospatial Consortium" => "OGC" }
       end
 
-      def metadata_committee_types(node)
+      def metadata_committee_types(_node)
         %w(committee subcommittee workgroup)
       end
 
@@ -184,9 +184,8 @@ module Metanorma
 
       def title(node, xml)
         super
-        at = { format: "text/plain", type: "abbrev" }
-        a = node.attr("abbrev") and
-          xml.title a, **attr_code(at)
+        content = node.attr("abbrev") and
+          add_title_xml(xml, content, @lang, "abbrev")
       end
     end
   end

data/lib/metanorma/ogc/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-<!-- VERSION v2.1.2 -->
+<!-- VERSION v2.1.3 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -455,14 +455,7 @@ normative or informative references, some split references into sections organiz
           </ref>
         </zeroOrMore>
         <zeroOrMore>
-          <ref name="doc_bibitem">
-            <a:documentation>Bibliographic item cited in the document</a:documentation>
-          </ref>
-          <zeroOrMore>
-            <ref name="note">
-              <a:documentation>Annotation of the bibliographic item</a:documentation>
-            </ref>
-          </zeroOrMore>
+          <ref name="ReferenceEntry"/>
         </zeroOrMore>
         <zeroOrMore>
           <ref name="references">
@@ -604,18 +597,21 @@ gives an explicit page orientation</a:documentation>
         </element>
       </optional>
     </define>
-  </include>
-  <!-- end overrides -->
-  <define name="FnAttributes" combine="interleave">
-    <ref name="RequiredId"/>
-    <optional>
-      <attribute name="hiddenref">
-        <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
+    <define name="FnAttributes">
+      <ref name="RequiredId"/>
+      <optional>
+        <attribute name="hiddenref">
+          <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
 This is done if the footnote reference is already presented in some other form, e.g. within a figure image.</a:documentation>
-        <data type="boolean"/>
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <attribute name="reference">
+        <a:documentation>The number of the footnote, used to identify it visually</a:documentation>
       </attribute>
-    </optional>
-  </define>
+    </define>
+  </include>
+  <!-- end overrides -->
   <define name="TdAttributes" combine="interleave">
     <ref name="RequiredId"/>
     <optional>
@@ -853,6 +849,17 @@ titlecase, or lowercase</a:documentation>
       <value>informative</value>
     </choice>
   </define>
+  <define name="ReferenceEntry">
+    <a:documentation>Entry in bibliography</a:documentation>
+    <ref name="doc_bibitem">
+      <a:documentation>Bibliographic item cited in the document</a:documentation>
+    </ref>
+    <zeroOrMore>
+      <ref name="note">
+        <a:documentation>Annotation of the bibliographic item</a:documentation>
+      </ref>
+    </zeroOrMore>
+  </define>
   <define name="doc_bibitem">
     <a:documentation>Standardisation document representation of bibliographic entry</a:documentation>
     <element name="bibitem">