metanorma-iso 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9ebdf7fb2219640ce408b74a41160519e4acad19d5140935c0d2f9446a50731
-  data.tar.gz: 428f1918880a76ba9919b66e6f710d9325eb1dcf0f8e1b0d7135d9ef40a5aec3
+  metadata.gz: 8e84e2085d6343fd60bd793e41db41da5a8cdbeec698c43b87f27f607091dd59
+  data.tar.gz: 4a8ccb3f84e9f60a932aee916cfb160d2d96c3f9266d86c5160b3db7299ed169
 SHA512:
-  metadata.gz: 52d472026038f5df1df1be69125db80726cc0659e427a68611c32ea7891e06ce4e53327d5aa5603632b524d2b92a02e36a47582d1ed46d79a478c6a42509dc6b
-  data.tar.gz: 7752a342b66a659d6c9e855c0acdba9b7a41d737dd54e98e8814420c400f146ab35dce930c1e1b404d874ef64179dce5004d49f2cf928a1e76babdf5bf2c03f7
+  metadata.gz: 66b8a34284ee31e3c496b0682750306566be09c7e8fa93f5d347e04b815830cfc854ffd618f537d211610f084451881efd94ddd74d42e0309efa5eed8be3f8d7
+  data.tar.gz: 2929a8cd66d14ecf35f93abff89b59160a343ffefc2e45cab566ff6353f210a674045f360ae4cf7b3e49e288cba6ab269d7b948dbd5345f54e62978ceaf1718d

data/lib/isodoc/iso/iso.amendment.xsl

@@ -4115,38 +4115,6 @@
 	<!-- title      -->
 	<!-- ====== -->
 
-	<xsl:template match="mn:annex/mn:fmt-title">
-		<xsl:choose>
-			<xsl:when test="$doctype = 'amendment'">
-				<xsl:call-template name="titleAmendment"/>
-			</xsl:when>
-			<xsl:otherwise>
-				<fo:block xsl:use-attribute-sets="annex-title-style">
-					<xsl:call-template name="refine_annex-title-style"/>
-
-					<xsl:apply-templates/>
-					<xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
-				</fo:block>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-
-	<!-- Bibliography -->
-	<xsl:template match="mn:references[not(@normative='true')]/mn:fmt-title">
-		<xsl:choose>
-			<xsl:when test="$doctype = 'amendment'">
-				<xsl:call-template name="titleAmendment"/>
-			</xsl:when>
-			<xsl:otherwise>
-				<fo:block xsl:use-attribute-sets="references-non-normative-title-style">
-					<xsl:call-template name="refine_references-non-normative-title-style"/>
-
-					<xsl:apply-templates/>
-				</fo:block>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-
 	<xsl:template match="mn:fmt-title" name="title">
 		<xsl:param name="without_number">false</xsl:param>
 
@@ -4309,19 +4277,6 @@
 		</xsl:choose>
 	</xsl:template>
 
-	<xsl:template name="titleAmendment">
-		<!-- <xsl:variable name="id">
-			<xsl:call-template name="getId"/>
-		</xsl:variable> id="{$id}"  -->
-		<fo:block font-size="11pt" font-style="italic" margin-bottom="12pt" keep-with-next="always">
-			<xsl:call-template name="setIDforNamedDestination"/>
-			<!-- <xsl:if test="$layoutVersion = '2024'">
-				<xsl:attribute name="font-size">10.5pt</xsl:attribute>
-			</xsl:if> -->
-			<xsl:apply-templates/>
-		</fo:block>
-	</xsl:template>
-
 	<!-- ====== -->
 	<!-- ====== -->
 
@@ -16249,17 +16204,18 @@
 	<!-- END Admonition -->
 	<!-- ================ -->
 
-	<xsl:attribute-set name="references-non-normative-title-style">
+	<xsl:attribute-set name="bibliography-title-style">
 		<xsl:attribute name="font-size">16pt</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="text-align">center</xsl:attribute>
+		<xsl:attribute name="space-before">0pt</xsl:attribute>
 		<xsl:attribute name="margin-top">0pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">30pt</xsl:attribute>
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="role">H1</xsl:attribute>
 	</xsl:attribute-set>
 
-	<xsl:template name="refine_references-non-normative-title-style">
+	<xsl:template name="refine_bibliography-title-style">
 		<xsl:if test="$layoutVersion = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or $layoutVersion = '1989'">
 			<xsl:attribute name="font-size">14pt</xsl:attribute>
 			<xsl:attribute name="span">all</xsl:attribute>
@@ -18366,15 +18322,17 @@
 	<!-- ===================================== -->
 
 	<xsl:attribute-set name="annex-title-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="font-size">16pt</xsl:attribute>
+		<xsl:attribute name="font-weight">normal</xsl:attribute>
 		<xsl:attribute name="text-align">center</xsl:attribute>
+		<xsl:attribute name="space-before">0pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">48pt</xsl:attribute>
-		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="role">H1</xsl:attribute>
 	</xsl:attribute-set> <!-- annex-title-style -->
 
 	<xsl:template name="refine_annex-title-style">
-		<xsl:call-template name="setIDforNamedDestination"/>
+		<!-- <xsl:call-template name="setIDforNamedDestination"/> -->
 		<xsl:if test="$layoutVersion = '2024'">
 			<xsl:attribute name="line-height">1.1</xsl:attribute>
 			<!-- <xsl:attribute name="margin-bottom">52pt</xsl:attribute> -->
@@ -18652,6 +18610,20 @@
 				<xsl:otherwise>12pt</xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>
+
+		<xsl:if test="parent::mn:annex"><!-- Annex title -->
+			<xsl:variable name="annex_title_styles">
+				<styles xsl:use-attribute-sets="annex-title-style"><xsl:call-template name="refine_annex-title-style"/></styles>
+			</xsl:variable>
+			<xsl:copy-of select="xalan:nodeset($annex_title_styles)/styles/@*"/>
+		</xsl:if>
+
+		<xsl:if test="parent::mn:references[not(@normative='true')]"><!-- Bibliography section title -->
+			<xsl:variable name="bibliography_title_styles">
+				<styles xsl:use-attribute-sets="bibliography-title-style"><xsl:call-template name="refine_bibliography-title-style"/></styles>
+			</xsl:variable>
+			<xsl:copy-of select="xalan:nodeset($bibliography_title_styles)/styles/@*"/>
+		</xsl:if>
 		<!-- $namespace = 'iso' -->
 		<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
 	</xsl:template> <!-- refine_title-style -->

data/lib/isodoc/iso/iso.international-standard.xsl

@@ -4115,38 +4115,6 @@
 	<!-- title      -->
 	<!-- ====== -->
 
-	<xsl:template match="mn:annex/mn:fmt-title">
-		<xsl:choose>
-			<xsl:when test="$doctype = 'amendment'">
-				<xsl:call-template name="titleAmendment"/>
-			</xsl:when>
-			<xsl:otherwise>
-				<fo:block xsl:use-attribute-sets="annex-title-style">
-					<xsl:call-template name="refine_annex-title-style"/>
-
-					<xsl:apply-templates/>
-					<xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
-				</fo:block>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-
-	<!-- Bibliography -->
-	<xsl:template match="mn:references[not(@normative='true')]/mn:fmt-title">
-		<xsl:choose>
-			<xsl:when test="$doctype = 'amendment'">
-				<xsl:call-template name="titleAmendment"/>
-			</xsl:when>
-			<xsl:otherwise>
-				<fo:block xsl:use-attribute-sets="references-non-normative-title-style">
-					<xsl:call-template name="refine_references-non-normative-title-style"/>
-
-					<xsl:apply-templates/>
-				</fo:block>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-
 	<xsl:template match="mn:fmt-title" name="title">
 		<xsl:param name="without_number">false</xsl:param>
 
@@ -4309,19 +4277,6 @@
 		</xsl:choose>
 	</xsl:template>
 
-	<xsl:template name="titleAmendment">
-		<!-- <xsl:variable name="id">
-			<xsl:call-template name="getId"/>
-		</xsl:variable> id="{$id}"  -->
-		<fo:block font-size="11pt" font-style="italic" margin-bottom="12pt" keep-with-next="always">
-			<xsl:call-template name="setIDforNamedDestination"/>
-			<!-- <xsl:if test="$layoutVersion = '2024'">
-				<xsl:attribute name="font-size">10.5pt</xsl:attribute>
-			</xsl:if> -->
-			<xsl:apply-templates/>
-		</fo:block>
-	</xsl:template>
-
 	<!-- ====== -->
 	<!-- ====== -->
 
@@ -16249,17 +16204,18 @@
 	<!-- END Admonition -->
 	<!-- ================ -->
 
-	<xsl:attribute-set name="references-non-normative-title-style">
+	<xsl:attribute-set name="bibliography-title-style">
 		<xsl:attribute name="font-size">16pt</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="text-align">center</xsl:attribute>
+		<xsl:attribute name="space-before">0pt</xsl:attribute>
 		<xsl:attribute name="margin-top">0pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">30pt</xsl:attribute>
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="role">H1</xsl:attribute>
 	</xsl:attribute-set>
 
-	<xsl:template name="refine_references-non-normative-title-style">
+	<xsl:template name="refine_bibliography-title-style">
 		<xsl:if test="$layoutVersion = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or $layoutVersion = '1989'">
 			<xsl:attribute name="font-size">14pt</xsl:attribute>
 			<xsl:attribute name="span">all</xsl:attribute>
@@ -18366,15 +18322,17 @@
 	<!-- ===================================== -->
 
 	<xsl:attribute-set name="annex-title-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="font-size">16pt</xsl:attribute>
+		<xsl:attribute name="font-weight">normal</xsl:attribute>
 		<xsl:attribute name="text-align">center</xsl:attribute>
+		<xsl:attribute name="space-before">0pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">48pt</xsl:attribute>
-		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="role">H1</xsl:attribute>
 	</xsl:attribute-set> <!-- annex-title-style -->
 
 	<xsl:template name="refine_annex-title-style">
-		<xsl:call-template name="setIDforNamedDestination"/>
+		<!-- <xsl:call-template name="setIDforNamedDestination"/> -->
 		<xsl:if test="$layoutVersion = '2024'">
 			<xsl:attribute name="line-height">1.1</xsl:attribute>
 			<!-- <xsl:attribute name="margin-bottom">52pt</xsl:attribute> -->
@@ -18652,6 +18610,20 @@
 				<xsl:otherwise>12pt</xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>
+
+		<xsl:if test="parent::mn:annex"><!-- Annex title -->
+			<xsl:variable name="annex_title_styles">
+				<styles xsl:use-attribute-sets="annex-title-style"><xsl:call-template name="refine_annex-title-style"/></styles>
+			</xsl:variable>
+			<xsl:copy-of select="xalan:nodeset($annex_title_styles)/styles/@*"/>
+		</xsl:if>
+
+		<xsl:if test="parent::mn:references[not(@normative='true')]"><!-- Bibliography section title -->
+			<xsl:variable name="bibliography_title_styles">
+				<styles xsl:use-attribute-sets="bibliography-title-style"><xsl:call-template name="refine_bibliography-title-style"/></styles>
+			</xsl:variable>
+			<xsl:copy-of select="xalan:nodeset($bibliography_title_styles)/styles/@*"/>
+		</xsl:if>
 		<!-- $namespace = 'iso' -->
 		<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
 	</xsl:template> <!-- refine_title-style -->

data/lib/isodoc/iso/presentation_origin.rb

@@ -0,0 +1,119 @@
+module IsoDoc
+  module Iso
+    class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+      def origin(docxml)
+        short_style_origin(docxml)
+        super
+        bracketed_refs_processing(docxml)
+      end
+
+      def short_style_origin(docxml)
+        docxml.xpath(ns("//fmt-origin")).each do |o|
+          xref_empty?(o) or next
+          fmt_origin_cite_full?(o) and o["style"] ||= "short"
+        end
+      end
+
+      def fmt_origin_cite_full?(elem)
+        sem_xml_descendant?(elem) and return
+        id = elem["bibitemid"] or return
+        b = @bibitem_lookup[id] or return
+        b["type"] != "standard" ||
+          !b.at(ns("./docidentifier[not(@type = 'metanorma' or @type = 'metanorma-ordinal')]"))
+      end
+
+      # style [1] references as [Reference 1], eref or origin
+      def bracketed_refs_processing(docxml)
+        (docxml.xpath(ns("//semx[@element = 'eref']")) -
+        docxml.xpath(ns("//semx[@element = 'erefstack']//semx[@element = 'eref']")))
+          .each { |n| bracket_eref_style(n) }
+        docxml.xpath(ns("//semx[@element = 'erefstack']")).each do |n|
+          bracket_erefstack_style(n)
+        end
+        docxml.xpath(ns("//semx[@element = 'origin']")).each do |n|
+          bracket_origin_style(n)
+        end
+      end
+
+      def bracket_eref_style(elem)
+        semx = bracket_eref_original(elem) or return
+        if semx["style"] == "superscript"
+          elem.children.wrap("<sup></sup>")
+          remove_preceding_space(elem)
+        else
+          r = @i18n.reference
+          elem.add_first_child l10n("#{r} ")
+        end
+      end
+
+      # is the eref corresponding to this semx a simple [n] reference?
+      def bracket_eref_original(elem)
+        semx = elem.document.at("//*[@id = '#{elem['source']}']") or return
+        dup = elem.at(ns(".//fmt-eref | .//fmt-xref | .//fmt-origin"))
+        non_locality_elems(semx).empty? or return
+        /^\[\d+\]$/.match?(semx["citeas"]) or return
+        %w(full short).include?(dup["style"]) and return
+        semx
+      end
+
+      def bracket_erefstack_style(elem)
+        semx, erefstack_orig = bracket_erefstack_style_prep(elem)
+        semx.empty? and return
+        if erefstack_orig && erefstack_orig["style"]
+          elem.children.each do |e|
+            e.name == "span" and e.remove
+            e.text.strip.empty? and e.remove
+          end
+          elem.children.wrap("<sup></sup>")
+          remove_preceding_space(elem)
+        else
+          r = @i18n.inflect(@i18n.reference, number: "pl")
+          elem.add_first_child l10n("#{r} ")
+        end
+      end
+
+      def bracket_erefstack_style_prep(elem)
+        semx = elem.xpath(ns(".//semx[@element = 'eref']"))
+          .map { |e| bracket_eref_original(e) }.compact
+        erefstack_orig = elem.document.at("//*[@id = '#{elem['source']}']")
+        [semx, erefstack_orig]
+      end
+
+      def bracket_origin_style(elem)
+        bracket_eref_style(elem)
+        insert_biblio_callout(elem)
+      end
+
+      # TODO share with metanorma dir
+      ISO_PUBLISHER_XPATH = <<~XPATH.freeze
+        ./contributor[role/@type = 'publisher']/organization[abbreviation = 'ISO' or abbreviation = 'IEC' or name = 'International Organization for Standardization' or name = 'International Electrotechnical Commission']
+      XPATH
+
+      def insert_biblio_callout(elem)
+        semx = elem.document.at("//*[@id = '#{elem['source']}']") or return
+        if ref = @bibitem_lookup[semx["bibitemid"]]
+          ref.at(ns(ISO_PUBLISHER_XPATH)) and return
+          # is this reference cited with a [n],
+          # even if it has its own SDO identifier?
+          citeas = ref.at(ns("./docidentifier[@type = 'metanorma-ordinal']")) ||
+            ref.at(ns("./docidentifier[@type = 'metanorma']")) ||
+            ref.at(ns("./docidentifier[@scope = 'biblio-tag']"))
+          citeas = citeas.text
+        else
+          citeas = semx["citeas"]
+        end
+        /^\[\d+\]$/.match?(citeas) or return
+        elem << <<~XML
+          <fmt-xref target='#{semx['bibitemid']}'><sup>#{citeas}</sup></fmt-xref>
+        XML
+      end
+
+      def remove_preceding_space(elem)
+        # Find the preceding text node that has actual content
+        prec = elem.at("./preceding-sibling::text()" \
+          "[normalize-space(.) != ''][1]") or return
+        prec.content.end_with?(" ") and prec.content = prec.content.rstrip
+      end
+    end
+  end
+end

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -4,6 +4,7 @@ require_relative "presentation_xref"
 require_relative "presentation_bibdata"
 require_relative "presentation_section"
 require_relative "presentation_terms"
+require_relative "presentation_origin"
 require_relative "../../relaton/render/general"
 
 module IsoDoc

data/lib/isodoc/iso/presentation_xref.rb

@@ -147,77 +147,6 @@ module IsoDoc
         locality_span_wrap(super, @xrefs.anchor(node["target"], :subtype) ||
                            @xrefs.anchor(node["target"], :type))
       end
-
-      def origin(docxml)
-        super
-        bracketed_refs_processing(docxml)
-      end
-
-      # style [1] references as [Reference 1], eref or origin
-      def bracketed_refs_processing(docxml)
-        (docxml.xpath(ns("//semx[@element = 'eref']")) -
-        docxml.xpath(ns("//semx[@element = 'erefstack']//semx[@element = 'eref']")))
-          .each { |n| bracket_eref_style(n) }
-        docxml.xpath(ns("//semx[@element = 'erefstack']")).each do |n|
-          bracket_erefstack_style(n)
-        end
-        docxml.xpath(ns("//semx[@element = 'origin']")).each do |n|
-          bracket_origin_style(n)
-        end
-      end
-
-      def bracket_eref_style(elem)
-        semx = bracket_eref_original(elem) or return
-        if semx["style"] == "superscript"
-          elem.children.wrap("<sup></sup>")
-          remove_preceding_space(elem)
-        else
-          r = @i18n.reference
-          elem.add_first_child l10n("#{r} ")
-        end
-      end
-
-      # is the eref corresponding to this semx a simple [n] reference?
-      def bracket_eref_original(elem)
-        semx = elem.document.at("//*[@id = '#{elem['source']}']") or return
-        non_locality_elems(semx).empty? or return
-        /^\[\d+\]$/.match?(semx["citeas"]) or return
-        semx
-      end
-
-      def bracket_erefstack_style(elem)
-        semx, erefstack_orig = bracket_erefstack_style_prep(elem)
-        semx.empty? and return
-        if erefstack_orig && erefstack_orig["style"]
-          elem.children.each do |e|
-            e.name == "span" and e.remove
-            e.text.strip.empty? and e.remove
-          end
-          elem.children.wrap("<sup></sup>")
-          remove_preceding_space(elem)
-        else
-          r = @i18n.inflect(@i18n.reference, number: "pl")
-          elem.add_first_child l10n("#{r} ")
-        end
-      end
-
-      def bracket_erefstack_style_prep(elem)
-        semx = elem.xpath(ns(".//semx[@element = 'eref']"))
-          .map { |e| bracket_eref_original(e) }.compact
-        erefstack_orig = elem.document.at("//*[@id = '#{elem['source']}']")
-        [semx, erefstack_orig]
-      end
-
-      def bracket_origin_style(elem)
-        bracket_eref_style(elem)
-      end
-
-      def remove_preceding_space(elem)
-        # Find the preceding text node that has actual content
-        prec = elem.at("./preceding-sibling::text()" \
-          "[normalize-space(.) != ''][1]") or return
-        prec.content.end_with?(" ") and prec.content = prec.content.rstrip
-      end
     end
   end
 end

data/lib/isodoc/iso/xref.rb

@@ -8,29 +8,6 @@ module IsoDoc
     class Xref < IsoDoc::Xref
       attr_accessor :anchors_previous, :anchors
 
-      def clause_order_main(docxml)
-        if @klass.amd?(docxml)
-          [{ path: "//sections/clause", multi: true }]
-        else
-          [{ path: "//sections/clause[@type = 'scope']" },
-           { path: @klass.norm_ref_xpath },
-           { path:
-             "#{@klass.middle_clause(docxml)} | //sections/terms | " \
-             "//sections/clause[descendant::terms or descendant::definitions] | " \
-             "//sections/definitions | //sections/clause[@type = 'section']", multi: true }]
-        end
-      end
-
-      def clause_order_back(docxml)
-        if @klass.amd?(docxml)
-          [{ path: @klass.norm_ref_xpath },
-           { path: @klass.bibliography_xpath },
-           { path: "//indexsect", multi: true },
-           { path: "//colophon/*", multi: true }]
-        else super
-        end
-      end
-
       def initial_anchor_names(doc)
         super
         if @parse_settings.empty? || @parse_settings[:clauses]

data/lib/isodoc/iso/xref_section.rb

@@ -1,6 +1,29 @@
 module IsoDoc
   module Iso
     class Xref < IsoDoc::Xref
+      def clause_order_main(docxml)
+        if @klass.amd?(docxml)
+          [{ path: "//sections/clause", multi: true }]
+        else
+          [{ path: "//sections/clause[@type = 'scope']" },
+           { path: @klass.norm_ref_xpath },
+           { path:
+             "#{@klass.middle_clause(docxml)} | //sections/terms | " \
+             "//sections/clause[descendant::terms or descendant::definitions] | " \
+             "//sections/definitions | //sections/clause[@type = 'section']", multi: true }]
+        end
+      end
+
+      def clause_order_back(docxml)
+        if @klass.amd?(docxml)
+          [{ path: @klass.norm_ref_xpath },
+           { path: @klass.bibliography_xpath },
+           { path: "//indexsect", multi: true },
+           { path: "//colophon/*", multi: true }]
+        else super
+        end
+      end
+
       # we can reference 0-number clauses in introduction
       def introduction_names(clause)
         clause.nil? and return
@@ -25,7 +48,8 @@ module IsoDoc
         elsif level > 1
           @anchors[clause["id"]] =
             { label: num, level: level, xref: num, subtype: "clause" }
-        else super end
+        else super
+        end
       end
 
       def annex_name_anchors1(clause, num, level)

data/lib/metanorma/iso/biblio.rng

@@ -690,7 +690,7 @@ Examples include GRID, LEI, CrossRef, and Ringgold</a:documentation>
   <define name="CitationType">
     <attribute name="bibitemid">
       <a:documentation>Bibliographic item that the citation applies to, referenced as the anchor of a bibliographic description</a:documentation>
-      <data type="IDREF"/>
+      <ref name="IdRefType"/>
     </attribute>
     <choice>
       <zeroOrMore>
@@ -1296,17 +1296,17 @@ for which this claim of validity is made, if applicable</a:documentation>
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="TypedTitleString">

data/lib/metanorma/iso/front.rb

@@ -16,12 +16,13 @@ module Metanorma
       end
 
       def metadata_ext_iso(node, xml)
-        a = node.attr("horizontal") and xml.horizontal a
+        add_noko_elem(xml, "horizontal", node.attr("horizontal"))
         metadata_stage(node, xml)
-        @amd && a = node.attr("updates-document-type") and
-          xml.updates_document_type a
+        @amd and
+          add_noko_elem(xml, "updates_document_type",
+                        node.attr("updates-document-type"))
         a = node.attr("fast-track") and xml.send "fast-track", a != "false"
-        a = node.attr("price-code") and xml.price_code a
+        add_noko_elem(xml, "price_code", node.attr("price-code"))
         node.attr("iso-cen-parallel") and xml.iso_cen_parallel true
       end
 
@@ -58,9 +59,9 @@ module Metanorma
         substage = get_substage(node)
         abbrev = iso_id_default(iso_id_params(node)).stage&.abbr&.upcase
         xml.status do |s|
-          s.stage stage, **attr_code(abbreviation: abbrev)
-          s.substage substage
-          i = node.attr("iteration") and s.iteration i
+          add_noko_elem(s, "stage", stage, **attr_code(abbreviation: abbrev))
+          add_noko_elem(s, "substage", substage)
+          add_noko_elem(s, "iteration", node.attr("iteration"))
         end
       rescue *STAGE_ERROR
         report_illegal_stage(stage, substage)

data/lib/metanorma/iso/front_contributor.rb

@@ -85,8 +85,8 @@ module Metanorma
 
       def contributors_committees_filter_empty?(committee)
         committee[:name].empty? &&
-          (committee[:ident].nil? || %w(WG TC
-                                        SC).include?(committee[:ident]))
+          (committee[:ident].nil? ||
+          %w(WG TC SC).include?(committee[:ident]))
       end
 
       def metadata_publisher(node, xml)

data/lib/metanorma/iso/front_id.rb

@@ -9,11 +9,11 @@ module Metanorma
     class Converter < Standoc::Converter
       def metadata_id(node, xml)
         if id = node.attr("docidentifier")
-          xml.docidentifier id, **attr_code(type: "ISO", primary: "true")
+          add_noko_elem(xml, "docidentifier", id, type: "ISO", primary: "true")
         else iso_id(node, xml)
         end
         node.attr("tc-docnumber")&.split(/,\s*/)&.each do |n|
-          xml.docidentifier(n, **attr_code(type: "iso-tc"))
+          add_noko_elem(xml, "docidentifier", n, type: "iso-tc")
         end
       end
 
@@ -164,25 +164,29 @@ module Metanorma
       end
 
       def cen_id_out(xml, params)
-        xml.docidentifier iso_id_default(params).to_s,
-                          **attr_code(type: "CEN", primary: "true")
+        add_noko_elem(xml, "docidentifier",
+                      iso_id_default(params).to_s,
+                      **attr_code(type: "CEN", primary: "true"))
       end
 
       def iso_id_out_common(xml, params, with_prf)
-        xml.docidentifier iso_id_default(params).to_s(with_prf:),
-                          **attr_code(type: "ISO", primary: "true")
-        xml.docidentifier iso_id_reference(params)
-          .to_s(format: :ref_num_short, with_prf:),
-                          **attr_code(type: "iso-reference")
-        xml.docidentifier iso_id_reference(params).urn, **attr_code(type: "URN")
+        add_noko_elem(xml, "docidentifier",
+                      iso_id_default(params).to_s(with_prf:),
+                      **attr_code(type: "ISO", primary: "true"))
+        add_noko_elem(xml, "docidentifier", iso_id_reference(params)
+                      .to_s(format: :ref_num_short, with_prf:),
+                      **attr_code(type: "iso-reference"))
+        add_noko_elem(xml, "docidentifier", iso_id_reference(params).urn,
+                      **attr_code(type: "URN"))
       end
 
       def iso_id_out_non_amd(xml, params, with_prf)
-        xml.docidentifier iso_id_undated(params).to_s(with_prf:),
-                          **attr_code(type: "iso-undated")
-        xml.docidentifier iso_id_with_lang(params)
-          .to_s(format: :ref_num_long, with_prf:),
-                          **attr_code(type: "iso-with-lang")
+        add_noko_elem(xml, "docidentifier",
+                      iso_id_undated(params).to_s(with_prf:),
+                      **attr_code(type: "iso-undated"))
+        add_noko_elem(xml, "docidentifier",
+                      iso_id_with_lang(params).to_s(format: :ref_num_long, with_prf:),
+                      **attr_code(type: "iso-with-lang"))
       end
 
       def iso_id_default(params)
@@ -216,7 +220,7 @@ module Metanorma
         node.attr("docnumber") or return
         part, subpart = node.attr("partnumber")&.split("-")
         xml.structuredidentifier do |i|
-          i.project_number(node.attr("docnumber"), **attr_code(
+          add_noko_elem(i, "project-number", node.attr("docnumber"), **attr_code(
             part:, subpart:,
             amendment: node.attr("amendment-number"),
             corrigendum: node.attr("corrigendum-number"),

data/lib/metanorma/iso/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.3 -->
+<!-- VERSION v2.1.4 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -905,15 +905,32 @@ titlecase, or lowercase</a:documentation>
     </element>
   </define>
   <define name="image" combine="choice">
-    <element name="svg">
-      <a:documentation>Add svg mark up to image</a:documentation>
-      <oneOrMore>
-        <choice>
-          <text/>
-          <ref name="AnyElement"/>
-        </choice>
-      </oneOrMore>
-    </element>
+    <choice>
+      <element name="image">
+        <ref name="RequiredId"/>
+        <ref name="ImageAttributes"/>
+        <optional>
+          <element name="svg">
+            <a:documentation>Allow svg in image/svg, for consistency</a:documentation>
+            <oneOrMore>
+              <choice>
+                <text/>
+                <ref name="AnyElement"/>
+              </choice>
+            </oneOrMore>
+          </element>
+        </optional>
+      </element>
+      <element name="svg">
+        <a:documentation>Add svg mark up to image</a:documentation>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </choice>
   </define>
   <define name="ParagraphFnBody" combine="interleave">
     <ref name="BlockSource">

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iso
-    VERSION = "3.2.0".freeze
+    VERSION = "3.2.1".freeze
   end
 end

data/lib/relaton/render/config.yml

@@ -16,6 +16,46 @@ nametemplate:
 # etal_count: 5
 seriestemplate: "{% if series_formatted %}{{ series_formatted }}{%else%}{% if series_abbr %}{{series_abbr}}{% else %}{{series_title}}{% endif %} ({{series_run}}) {{series_num}}|({{series_partnumber}}){%endif%}"
 journaltemplate: "<em>{% if series_abbr %}{{series_abbr}}{% else %}{{series_title}}{% endif %}</em> ({{series_run}}) {{ labels['volume'] }}_{{series_num}} {{ labels['part'] }}_{{series_partnumber}}"
+
+citetemplate:
+  short:
+    standard: "{% if home_standard %}<em><span_class='stddocTitle'>{{ title }}</span></em> ,_{{ extent }}{% else %}{{ creatornames | selective_upcase }}$$$ <em><span_class='stddocTitle'>{{ title }}</span></em> ,_{{ extent }} $$$  {{ labels['version'] | capitalize }}_{{ edition_raw }}$$$ {{labels['updated'] | capitalize }}_{{date_updated}}$$$ {{status | capitalize}}$$$ {{ authorizer }}{% endif %}"
+    website: "{{ creatornames | selective_upcase }}$$$ ({{ role }}) <em><span_class='stddocTitle'>{{ title }}</span></em> [{{ labels['website'] }}]$$$ {{ labels['version'] | capitalize }}_{{ edition_raw }}$$$ {{place}}: {{ publisher }}$$$ {{date}}"
+    book: "{{ creatornames | selective_upcase }}$$$ ({{role}}) <em>{{ title }}</em> $$$ {{ edition | capitalize_first }}$$$ ({{ series }})$$$ {% if place %}{{place}}:{%endif%} {{publisher}}$$$ {{date}}$$$ {{size}}$$$ {{extent}}"
+    booklet: book
+    manual: book
+    techreport: book
+    proceedings: book
+    inbook: "{{ creatornames | selective_upcase }}$$$ ({{role}}) {{ title }} $$$ <em>{{host_title}}</em> ({{host_role}} {{ host_creatornames | replace: '+++', ''}}) $$$ {{ edition | capitalize_first }}$$$ ({{ series }})$$$ {% if place %}{{place}}:{%endif%} {{publisher}}$$$ {{date}}$$$ {{size}}$$$ {{extent}}"
+    inproceedings: inbook
+    incollection: inbook
+    journal: "<em>{{ title}}</em> $$$ {{ edition | capitalize_first }}$$$ {{place}}: {{publisher}}$$$ {{date}}$$$ {{size}}$$$ {{extent}}"
+    article: "{{ creatornames | selective_upcase }}$$$ ({{role}}) {{ title }}$$$ {{ series }} $$$ {{date}}, {{ extent }}$$$ {{ labels['updated'] | capitalize }}:_{{date_updated}}"
+    software: "{{ creatornames | selective_upcase }}$$$ ({{ role}}) <em>{{ title }}</em> $$$ {{ labels['version'] | capitalize }}_{{ edition_raw }}$$$ {{medium | capitalize}}$$$ {{place}}: {{publisher}}$$$ {{date}}$$$ {{size}}$$$ {{extent}}"
+    electronic resource:  software
+    dataset: "{{ creatornames | selective_upcase }}$$$ ({{ role }}) <em>{{ title }}</em> $$$ {{ labels['version'] | capitalize }}_{{ edition_raw }}$$$ {{medium | capitalize }}$$$ {{ labels['in'] | capitalize }}:_{{series}}$$$ {{date}}$$$ {{ labels['updated'] | capitalize }}:_{{date_updated}}$$$ {{ authoritative_identifier | join '$$$ ' }}$$$ {{ other_identifier | join '$$$ ' }}"
+    webresource: website
+    unpublished: "{{ creatornames | selective_upcase }}$$$ ({{ role }}) <em>{{ title }}</em> $$$ {{ medium | capitalize }}$$$ {{ date }}$$$ {{ labels['at'] | capitalize}}:_{{ access_location }}"
+    presentation: unpublished
+    thesis: "{{ creatornames | selective_upcase }}$$$ ({{ role }}) <em>{{ title }}</em> $$$ {{ medium | capitalize }}$$$ {{place}}: {{ publisher }}$$$ {{ date }}"
+    misc:  "{{ creatornames | selective_upcase }}$$$ ({{ role }}) <em>{{ title }}</em> $$$ {{ date }}$$$"
+    # following are # unsupported types:
+    map: misc
+    audiovisual: misc
+    film: misc
+    video: misc
+    broadcast: misc
+    graphic_work: misc
+    music: misc
+    performance: misc
+    patent: misc
+    archival: misc
+    social_media: misc
+    alert: misc
+    message: misc
+    conversation: misc
+    internal: misc
+
 template:
   # skip standardidentifier, it is inserted in front of formattedref within metanorma
   standard: "{% if home_standard %}<em><span_class='stddocTitle'>{{ title }}</span></em> ,_{{ extent }}{% else %}{{ creatornames | selective_upcase }}$$$ <em><span_class='stddocTitle'>{{ title }}</span></em> ,_{{ extent }} $$$  {{ labels['version'] | capitalize }}_{{ edition_raw }}$$$ {{labels['updated'] | capitalize }}_{{date_updated}}$$$ {{status | capitalize}}$$$ {{ authorizer }}$$$ {{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>$$${% endif %}" 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-03 00:00:00.000000000 Z
+date: 2025-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -352,6 +352,7 @@ files:
 - lib/isodoc/iso/metadata.rb
 - lib/isodoc/iso/pdf_convert.rb
 - lib/isodoc/iso/presentation_bibdata.rb
+- lib/isodoc/iso/presentation_origin.rb
 - lib/isodoc/iso/presentation_section.rb
 - lib/isodoc/iso/presentation_terms.rb
 - lib/isodoc/iso/presentation_xml_convert.rb