metanorma-bipm 2.4.2 → 2.4.4

data/lib/isodoc/bipm/jcgm.standard.xsl

@@ -1737,6 +1737,8 @@
 	<xsl:param name="svg_images"/> <!-- svg images array -->
 	<xsl:variable name="images" select="document($svg_images)"/>
 	<xsl:param name="basepath"/> <!-- base path for images -->
+	<xsl:param name="inputxml_basepath"/> <!-- input xml file path -->
+	<xsl:param name="inputxml_filename"/> <!-- input xml file name -->
 	<xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
 	<xsl:param name="syntax-highlight">false</xsl:param> <!-- syntax highlighting feature, default - off -->
 	<xsl:param name="add_math_as_text">true</xsl:param> <!-- add math in text behind svg formula, to copy-paste formula from PDF as text -->
@@ -1789,6 +1791,20 @@
 		<xsl:call-template name="getLang"/>
 	</xsl:variable>
 
+	<xsl:variable name="inputxml_filename_prefix">
+		<xsl:choose>
+			<xsl:when test="contains($inputxml_filename, '.presentation.xml')">
+				<xsl:value-of select="substring-before($inputxml_filename, '.presentation.xml')"/>
+			</xsl:when>
+			<xsl:when test="contains($inputxml_filename, '.xml')">
+				<xsl:value-of select="substring-before($inputxml_filename, '.xml')"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="$inputxml_filename"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:variable>
+
 	<!-- Note 1: Each xslt has declated variable `namespace` that allows to set some properties, processing logic, etc. for concrete xslt.
 	You can put such conditions by using xslt construction `xsl:if test="..."` or <xsl:choose><xsl:when test=""></xsl:when><xsl:otherwiste></xsl:otherwiste></xsl:choose>,
 	BUT DON'T put any another conditions together with $namespace = '...' (such conditions will be ignored). For another conditions, please use nested xsl:if or xsl:choose -->
@@ -2739,6 +2755,10 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_figure-block-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="figure-style">
 
 	</xsl:attribute-set>
@@ -3654,7 +3674,7 @@
 			<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)/*/tr[1]/td)"/>
 
 			<xsl:variable name="colwidths">
-				<xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
+				<xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col']) and not(@class = 'dl')">
 					<xsl:call-template name="calculate-column-widths">
 						<xsl:with-param name="cols-count" select="$cols-count"/>
 						<xsl:with-param name="table" select="$simple-table"/>
@@ -3766,6 +3786,11 @@
 										<fo:table-column column-width="{@width}"/>
 									</xsl:for-each>
 								</xsl:when>
+								<xsl:when test="@class = 'dl'">
+									<xsl:for-each select=".//*[local-name()='tr'][1]/*">
+										<fo:table-column column-width="{@width}"/>
+									</xsl:for-each>
+								</xsl:when>
 								<xsl:otherwise>
 									<xsl:call-template name="insertTableColumnWidth">
 										<xsl:with-param name="colwidths" select="$colwidths"/>
@@ -5097,6 +5122,7 @@
 	<!-- ===================== -->
 	<!-- Definition List -->
 	<!-- ===================== -->
+
 	<xsl:template match="*[local-name()='dl']">
 		<xsl:variable name="isAdded" select="@added"/>
 		<xsl:variable name="isDeleted" select="@deleted"/>
@@ -5313,10 +5339,21 @@
 										</xsl:variable>
 
 										<xsl:variable name="colwidths">
-											<xsl:call-template name="calculate-column-widths">
-												<xsl:with-param name="cols-count" select="2"/>
-												<xsl:with-param name="table" select="$simple-table"/>
-											</xsl:call-template>
+											<xsl:choose>
+												<!-- dl from table[@class='dl'] -->
+												<xsl:when test="*[local-name() = 'colgroup']">
+													<autolayout/>
+													<xsl:for-each select="*[local-name() = 'colgroup']/*[local-name() = 'col']">
+														<column><xsl:value-of select="translate(@width,'%m','')"/></column>
+													</xsl:for-each>
+												</xsl:when>
+												<xsl:otherwise>
+													<xsl:call-template name="calculate-column-widths">
+														<xsl:with-param name="cols-count" select="2"/>
+														<xsl:with-param name="table" select="$simple-table"/>
+													</xsl:call-template>
+												</xsl:otherwise>
+											</xsl:choose>
 										</xsl:variable>
 
 										<!-- <xsl:text disable-output-escaping="yes">&lt;!- -</xsl:text>
@@ -6055,7 +6092,8 @@
 	</xsl:template>
 
 	<xsl:template match="text()[ancestor::*[local-name()='smallcap']]">
-		<xsl:variable name="text" select="normalize-space(.)"/>
+		<!-- <xsl:variable name="text" select="normalize-space(.)"/> --> <!-- https://github.com/metanorma/metanorma-iso/issues/1115 -->
+		<xsl:variable name="text" select="."/>
 		<fo:inline font-size="75%" role="SKIP">
 				<xsl:if test="string-length($text) &gt; 0">
 					<xsl:variable name="smallCapsText">
@@ -7430,6 +7468,12 @@
 				<xsl:when test="@updatetype = 'true'">
 					<xsl:value-of select="concat(normalize-space(@target), '.pdf')"/>
 				</xsl:when>
+				<xsl:when test="contains(@target, concat('_', $inputxml_filename_prefix, '_attachments'))">
+					<!-- link to the PDF attachment -->
+					<xsl:variable name="target_" select="translate(@target, '\', '/')"/>
+					<xsl:variable name="target__" select="substring-after($target_, concat('_', $inputxml_filename_prefix, '_attachments', '/'))"/>
+					<xsl:value-of select="concat('url(embedded-file:', $target__, ')')"/>
+				</xsl:when>
 				<xsl:otherwise>
 					<xsl:value-of select="normalize-space(@target)"/>
 				</xsl:otherwise>
@@ -7837,6 +7881,7 @@
 		<xsl:variable name="isAdded" select="@added"/>
 		<xsl:variable name="isDeleted" select="@deleted"/>
 		<fo:block-container id="{@id}" xsl:use-attribute-sets="figure-block-style">
+			<xsl:call-template name="refine_figure-block-style"/>
 
 			<xsl:call-template name="setTrackChangesStyles">
 				<xsl:with-param name="isAdded" select="$isAdded"/>
@@ -8192,16 +8237,44 @@
 							</xsl:choose>
 
 							<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
-							<xsl:variable name="svg_width" select="xalan:nodeset($svg_content)/*/@width"/>
-							<xsl:variable name="svg_height" select="xalan:nodeset($svg_content)/*/@height"/>
+							<xsl:variable name="svg_width_" select="xalan:nodeset($svg_content)/*/@width"/>
+							<xsl:variable name="svg_width" select="number(translate($svg_width_, 'px', ''))"/>
+							<xsl:variable name="svg_height_" select="xalan:nodeset($svg_content)/*/@height"/>
+							<xsl:variable name="svg_height" select="number(translate($svg_height_, 'px', ''))"/>
+
+							<!-- Example: -->
 							<!-- effective height 297 - 27.4 - 13 =  256.6 -->
 							<!-- effective width 210 - 12.5 - 25 = 172.5 -->
 							<!-- effective height / width = 1.48, 1.4 - with title -->
-							<xsl:if test="$svg_height &gt; ($svg_width * 1.4)"> <!-- for images with big height -->
+
+							<xsl:variable name="scale_x">
+								<xsl:choose>
+									<xsl:when test="$svg_width &gt; $width_effective_px">
+										<xsl:value-of select="$width_effective_px div $svg_width"/>
+									</xsl:when>
+									<xsl:otherwise>1</xsl:otherwise>
+								</xsl:choose>
+							</xsl:variable>
+							<xsl:variable name="scale_y">
+								<xsl:choose>
+									<xsl:when test="$svg_height * $scale_x &gt; $height_effective_px">
+										<xsl:value-of select="$height_effective_px div ($svg_height * $scale_x)"/>
+									</xsl:when>
+									<xsl:otherwise>1</xsl:otherwise>
+								</xsl:choose>
+							</xsl:variable>
+
+							 <!-- for images with big height -->
+							<!-- <xsl:if test="$svg_height &gt; ($svg_width * 1.4)">
 								<xsl:variable name="width" select="(($svg_width * 1.4) div $svg_height) * 100"/>
 								<xsl:attribute name="width"><xsl:value-of select="$width"/>%</xsl:attribute>
-							</xsl:if>
+							</xsl:if> -->
 							<xsl:attribute name="scaling">uniform</xsl:attribute>
+
+							<xsl:if test="$scale_y != 1">
+								<xsl:attribute name="content-height"><xsl:value-of select="round($scale_x * $scale_y * 100)"/>%</xsl:attribute>
+							</xsl:if>
+
 							<xsl:copy-of select="$svg_content"/>
 						</fo:instream-foreign-object>
 					<!-- </fo:block> -->
@@ -8239,8 +8312,12 @@
 			<xsl:variable name="width" select="normalize-space($viewbox//item[3])"/>
 			<xsl:variable name="height" select="normalize-space($viewbox//item[4])"/>
 
+			<xsl:variable name="parent_image_width" select="normalize-space(ancestor::*[1][local-name() = 'image']/@width)"/>
+			<xsl:variable name="parent_image_height" select="normalize-space(ancestor::*[1][local-name() = 'image']/@height)"/>
+
 			<xsl:attribute name="width">
 				<xsl:choose>
+					<xsl:when test="$parent_image_width != '' and $parent_image_width != 'auto'"><xsl:value-of select="$parent_image_width"/></xsl:when>
 					<xsl:when test="$width != ''">
 						<xsl:value-of select="round($width)"/>
 					</xsl:when>
@@ -8249,6 +8326,7 @@
 			</xsl:attribute>
 			<xsl:attribute name="height">
 				<xsl:choose>
+					<xsl:when test="$parent_image_height != '' and $parent_image_height != 'auto'"><xsl:value-of select="$parent_image_height"/></xsl:when>
 					<xsl:when test="$height != ''">
 						<xsl:value-of select="round($height)"/>
 					</xsl:when>
@@ -8260,6 +8338,28 @@
 		</xsl:copy>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'svg']/@width" mode="svg_update">
+		<!-- image[@width]/svg -->
+		<xsl:variable name="parent_image_width" select="normalize-space(ancestor::*[2][local-name() = 'image']/@width)"/>
+		<xsl:attribute name="width">
+			<xsl:choose>
+				<xsl:when test="$parent_image_width != '' and $parent_image_width != 'auto'"><xsl:value-of select="$parent_image_width"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:attribute>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'svg']/@height" mode="svg_update">
+		<!-- image[@height]/svg -->
+		<xsl:variable name="parent_image_height" select="normalize-space(ancestor::*[2][local-name() = 'image']/@height)"/>
+		<xsl:attribute name="height">
+			<xsl:choose>
+				<xsl:when test="$parent_image_height != '' and $parent_image_height != 'auto'"><xsl:value-of select="$parent_image_height"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:attribute>
+	</xsl:template>
+
 	<!-- regex for 'display: inline-block;' -->
 	<xsl:variable name="regex_svg_style_notsupported">display(\s|\h)*:(\s|\h)*inline-block(\s|\h)*;</xsl:variable>
 	<xsl:template match="*[local-name() = 'svg']//*[local-name() = 'style']/text()" mode="svg_update">
@@ -10336,7 +10436,9 @@
 	</xsl:template> <!-- sections_element_style -->
 
 	<xsl:template match="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*" priority="2"> <!-- /*/*[local-name() = 'preface']/* -->
-		<fo:block break-after="page"/>
+
+				<fo:block break-after="page"/>
+
 		<fo:block>
 			<xsl:call-template name="setId"/>
 			<xsl:apply-templates/>
@@ -10407,7 +10509,7 @@
 			<xsl:when test="ancestor::*[contains(local-name(), '-standard')] and not(ancestor::*[contains(local-name(), '-standard')]//*[@id = $id_from])">
 				<fo:block id="{@from}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
 			</xsl:when>
-			<xsl:when test="not(//*[@id = $id_from]) and not(preceding-sibling::*[@id = $id_from])">
+			<xsl:when test="not(/*[@id = $id_from]) and not(/*//*[@id = $id_from]) and not(preceding-sibling::*[@id = $id_from])">
 				<fo:block id="{@from}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
 			</xsl:when>
 		</xsl:choose>
@@ -12215,10 +12317,10 @@
 
 	<xsl:template name="addPDFUAmeta">
 		<pdf:catalog xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf">
-				<pdf:dictionary type="normal" key="ViewerPreferences">
-					<pdf:boolean key="DisplayDocTitle">true</pdf:boolean>
-				</pdf:dictionary>
-			</pdf:catalog>
+			<pdf:dictionary type="normal" key="ViewerPreferences">
+				<pdf:boolean key="DisplayDocTitle">true</pdf:boolean>
+			</pdf:dictionary>
+		</pdf:catalog>
 		<x:xmpmeta xmlns:x="adobe:ns:meta/">
 			<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 				<rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:pdf="http://ns.adobe.com/pdf/1.3/" rdf:about="">
@@ -12267,6 +12369,19 @@
 				</rdf:Description>
 			</rdf:RDF>
 		</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, ')')"/>
+					<pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{$url}" filename="{@name}"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:for-each>
 	</xsl:template> <!-- addPDFUAmeta -->
 
 	<xsl:template name="getId">

data/lib/isodoc/bipm/metadata.rb

@@ -39,9 +39,8 @@ module IsoDoc
       end
 
       def status_print(status)
-        return "Procès-Verbal" if status == "procès-verbal"
-        return "CIPM-MRA" if status == "cipm-mra"
-
+        status == "procès-verbal" and return "Procès-Verbal"
+        status == "cipm-mra" and return "CIPM-MRA"
         status.split(/[- ]/).map.with_index do |s, i|
           %w(en de).include?(s) && i.positive? ? s : s.capitalize
         end.join(" ")
@@ -49,23 +48,22 @@ module IsoDoc
 
       def docid(isoxml, _out)
         super
-        label1, label2 = @lang == "fr" ? %w(Annexe Appendix) : %w(Appendix Annexe)
-        dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/appendix"))
-        dn and set(:appendixid, @i18n.l10n("#{label1} #{dn.text}"))
-        dn and set(:appendixid_alt, @i18n.l10n("#{label2} #{dn.text}"))
-        label1, label2 = @lang == "fr" ? %w(Appendice Annex) : %w(Annex Appendice)
-        dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/annexid"))
-        dn and set(:annexid, @i18n.l10n("#{label1} #{dn.text}"))
-        dn and set(:annexid_alt, @i18n.l10n("#{label2} #{dn.text}"))
-        label1, label2 = @lang == "fr" ? %w(Partie Part) : %w(Part Partie)
-        dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/part"))
-        dn and set(:partid, @i18n.l10n("#{label1} #{dn.text}"))
-        dn and set(:partid_alt, @i18n.l10n("#{label2} #{dn.text}"))
+        docid_part(isoxml, %w(Appendix Annexe), "appendix", :appendixid)
+        docid_part(isoxml, %w(Annex Appendice), "annexid", :annexid)
+        docid_part(isoxml, %w(Part Partie), "part", :partid)
         set(:org_abbrev,
             isoxml.at(ns("//bibdata/ext/editorialgroup/committee"\
                          "[@acronym = 'JCGM']")) ? "JCGM" : "BIPM")
       end
 
+      def docid_part(isoxml, labels, elem, key)
+        @lang == "fr" and labels.reverse!
+        label1, label2 = labels
+        dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/#{elem}"))
+        dn and set(key, @i18n.l10n("#{label1} #{dn.text}"))
+        dn and set("#{key}_alt".to_sym, @i18n.l10n("#{label2} #{dn.text}"))
+      end
+
       def extract_person_names_affiliations(authors)
         extract_person_affiliations(authors)
       end
@@ -75,6 +73,20 @@ module IsoDoc
           .at(ns("//bibdata/date[not(@format)][@type = 'published']"))
         pubdate and set(:pubdate_monthyear, monthyr(pubdate.text))
       end
+
+      def author(xml, _out)
+        super
+        authorizer(xml)
+      end
+
+      def authorizer(xml)
+        ret = xml.xpath(ns("//bibdata/contributor[xmlns:role/@type = " \
+                           "'authorizer']/organization"))
+          .each_with_object([]) do |org, m|
+          m << extract_variant(org.at(ns("./name")))
+        end
+        ret.empty? or set(:authorizer, ret)
+      end
     end
   end
 end

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -75,13 +75,16 @@ module IsoDoc
       end
 
       def twitter_cldr_localiser_symbols
-        { group: " ", fraction_group: " ", fraction_group_digits: 3 }
+        { group: " ", fraction_group: " ",
+          fraction_group_digits: 3 }
       end
 
       def localized_number(num, locale, precision)
-        g = Regexp.quote(twitter_cldr_localiser_symbols[:group])
-        f = Regexp.quote(twitter_cldr_localiser_symbols[:fraction_group])
-        super.sub(/^(\d)#{g}(\d)/, "\\1\\2").sub(/(\d)#{f}(\d)$/, "\\1\\2")
+        g = Regexp.quote(@twitter_cldr_reader[:group])
+        f = Regexp.quote(@twitter_cldr_reader[:fraction_group])
+        d = Regexp.quote(@twitter_cldr_reader[:decimal])
+        super.sub(/^(\d)#{g}(\d) (?= \d\d$ | \d\d#{d} )/x, "\\1\\2")
+          .sub(/(?<= ^\d\d | #{d}\d\d ) (\d)#{f}(\d) $/x, "\\1\\2")
       end
 
       def mathml1(elem, locale)
@@ -97,8 +100,7 @@ module IsoDoc
 
       def bibdata_dates(bibdata)
         pubdate = bibdata.at(ns("./date[not(@format)][@type = 'published']"))
-        return unless pubdate
-
+        pubdate or return
         meta = metadata_init(@lang, @script, @locale, @i18n)
         pubdate.next = pubdate.dup
         pubdate.next["format"] = "ddMMMyyyy"
@@ -193,23 +195,23 @@ module IsoDoc
       end
 
       def termsource_modification(elem)
-        if elem["status"] == "modified"
-          origin = elem.at(ns("./origin"))
-          # s = termsource_status(elem["status"]) and origin.next = l10n(", #{s}")
-        end
+        # if elem["status"] == "modified"
+        # origin = elem.at(ns("./origin"))
+        # s = termsource_status(elem["status"]) and origin.next = l10n(", #{s}")
+        # end
         termsource_add_modification_text(elem.at(ns("./modification")))
       end
 
       def norm_ref_entry_code(_ordinal, identifiers, _ids, _standard, datefn,
 _bib)
-        ret = (identifiers[0] || identifiers[1])
+        ret = identifiers[0] || identifiers[1]
         ret += " #{identifiers[1]}" if identifiers[0] && identifiers[1]
         "#{ret}#{datefn} "
       end
 
       def biblio_ref_entry_code(ordinal, ids, _id, _standard, datefn, _bib)
         # standard and id = nil
-        ret = (ids[:ordinal] || ids[:metanorma] || "[#{ordinal}]")
+        ret = ids[:ordinal] || ids[:metanorma] || "[#{ordinal}]"
         if ids[:sdo]
           ret = prefix_bracketed_ref(ret)
           ret += "#{ids[:sdo]}#{datefn} "
@@ -219,10 +221,6 @@ _bib)
         ret
       end
 
-      def bibrenderer
-        ::Relaton::Render::BIPM::General.new(language: @lang)
-      end
-
       include Init
     end
   end

data/lib/metanorma/bipm/biblio.rng

@@ -338,29 +338,32 @@
   </define>
   <define name="organization">
     <element name="organization">
-      <oneOrMore>
-        <ref name="orgname"/>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="subdivision"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="abbreviation"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="org-identifier"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="contact"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="logo"/>
-      </optional>
+      <ref name="OrganizationType"/>
     </element>
   </define>
+  <define name="OrganizationType">
+    <oneOrMore>
+      <ref name="orgname"/>
+    </oneOrMore>
+    <zeroOrMore>
+      <ref name="subdivision"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="abbreviation"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="uri"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="org-identifier"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="contact"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="logo"/>
+    </optional>
+  </define>
   <define name="orgname">
     <element name="name">
       <choice>
@@ -371,10 +374,10 @@
   </define>
   <define name="subdivision">
     <element name="subdivision">
-      <choice>
-        <ref name="LocalizedString"/>
-        <ref name="NameWithVariants"/>
-      </choice>
+      <optional>
+        <attribute name="type"/>
+      </optional>
+      <ref name="OrganizationType"/>
     </element>
   </define>
   <define name="logo">

data/lib/metanorma/bipm/cleanup.rb

@@ -0,0 +1,89 @@
+module Metanorma
+  module BIPM
+    class Converter < Metanorma::Generic::Converter
+      def boilerplate_file(_xmldoc)
+        if @jcgm
+          File.join(File.dirname(__FILE__), "boilerplate-jcgm-en.adoc")
+        else
+          File.join(File.dirname(__FILE__), "boilerplate-#{@lang}.adoc")
+        end
+      end
+
+      def sections_cleanup(xml)
+        super
+        jcgm_untitled_sections_cleanup(xml) if @jcgm
+      end
+
+      def jcgm_untitled_sections_cleanup(xml)
+        xml.xpath("//clause//clause | //annex//clause | //introduction/clause")
+          .each do |c|
+          next if !c&.at("./title")&.text&.empty?
+
+          c["inline-header"] = true
+        end
+      end
+
+      def section_names_terms_cleanup(xml); end
+
+      def section_names_refs_cleanup(xml); end
+
+      def mathml_mi_italics
+        { uppergreek: false, upperroman: false,
+          lowergreek: false, lowerroman: true }
+      end
+
+      def xref_to_eref(elem, name)
+        if elem.at("//bibitem[@id = '#{elem['target']}']/" \
+                   "docidentifier[@type = 'BIPM-long']")
+          elem["style"] = "BIPM-long"
+        end
+        super
+      end
+
+      ID_LABELS = {
+        "en" => {
+          "appendix" => "Appendix",
+          "annexid" => "Annex",
+          "part" => "Part",
+        },
+        "fr" => {
+          "appendix" => "Annexe",
+          "annexid" => "Appendice",
+          "part" => "Partie",
+        },
+      }.freeze
+
+      def bibdata_docidentifier_cleanup(isoxml)
+        bibdata_docidentifier_i18n(isoxml)
+        super
+      end
+
+      def bibdata_docidentifier_i18n(isoxml)
+        id, parts = bibdata_docidentifier_i18n_prep(isoxml)
+        parts.empty? and return
+        id_alt = id.dup
+        id.next = id_alt
+        bibdata_docidentifier_enhance(id, @lang, parts)
+        bibdata_docidentifier_enhance(id_alt, @lang == "en" ? "fr" : "en",
+                                      parts)
+      end
+
+      def bibdata_docidentifier_i18n_prep(isoxml)
+        id = isoxml.at("//bibdata/docidentifier[@type = 'BIPM']")
+        parts = %w(appendix annexid part).each_with_object({}) do |w, m|
+          dn = isoxml.at("//bibdata/ext/structuredidentifier/#{w}") and
+            m[w] = dn.text
+        end
+        [id, parts]
+      end
+
+      def bibdata_docidentifier_enhance(id, lang, parts)
+        id["language"] = lang
+        ret = %w(appendix annexid part).each_with_object([]) do |w, m|
+          p = parts[w] and m << "#{ID_LABELS[lang][w]} #{p}"
+        end
+        id.children = "#{id.text} #{ret.join(' ')}"
+      end
+    end
+  end
+end

data/lib/metanorma/bipm/converter.rb

@@ -1,6 +1,7 @@
 require "metanorma/standoc/converter"
 require "metanorma/generic/converter"
 require_relative "front"
+require_relative "cleanup"
 
 module Metanorma
   module BIPM
@@ -96,45 +97,6 @@ module Metanorma
         end
       end
 
-      def boilerplate_file(_xmldoc)
-        if @jcgm
-          File.join(File.dirname(__FILE__), "boilerplate-jcgm-en.adoc")
-        else
-          File.join(File.dirname(__FILE__), "boilerplate-#{@lang}.adoc")
-        end
-      end
-
-      def sections_cleanup(xml)
-        super
-        jcgm_untitled_sections_cleanup(xml) if @jcgm
-      end
-
-      def jcgm_untitled_sections_cleanup(xml)
-        xml.xpath("//clause//clause | //annex//clause | //introduction/clause")
-          .each do |c|
-          next if !c&.at("./title")&.text&.empty?
-
-          c["inline-header"] = true
-        end
-      end
-
-      def section_names_terms_cleanup(xml); end
-
-      def section_names_refs_cleanup(xml); end
-
-      def mathml_mi_italics
-        { uppergreek: false, upperroman: false,
-          lowergreek: false, lowerroman: true }
-      end
-
-      def xref_to_eref(elem, name)
-        if elem.at("//bibitem[@id = '#{elem['target']}']/" \
-                   "docidentifier[@type = 'BIPM-long']")
-          elem["style"] = "BIPM-long"
-        end
-        super
-      end
-
       def document(node)
         @jcgm = node.attr("committee-acronym") == "JCGM"
         super
@@ -156,12 +118,12 @@ module Metanorma
       def presentation_xml_converter(node)
         IsoDoc::BIPM::PresentationXMLConvert
           .new(html_extract_attributes(node)
-          .merge(output_formats: ::Metanorma::BIPM::Processor.new.output_formats))
+          .merge(output_formats: ::Metanorma::BIPM::Processor.new
+          .output_formats))
       end
 
       def pdf_converter(node)
-        return nil if node.attr("no-pdf")
-
+        node.attr("no-pdf") and return nil
         IsoDoc::BIPM::PdfConvert.new(pdf_extract_attributes(node))
       end
     end

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

@@ -14,6 +14,7 @@
         <value>strategy</value>
         <value>cipm-mra</value>
         <value>resolution</value>
+        <value>policy</value>
       </choice>
     </define>
     <define name="editorialgroup">

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module BIPM
-    VERSION = "2.4.2".freeze
+    VERSION = "2.4.4".freeze
   end
 end