metanorma-bipm 2.4.0 → 2.4.3

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 -->
@@ -2246,6 +2262,10 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_termexample-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="example-style">
 
 			<xsl:attribute name="font-size">10pt</xsl:attribute>
@@ -2735,6 +2755,10 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_figure-block-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="figure-style">
 
 	</xsl:attribute-set>
@@ -3397,6 +3421,36 @@
 		</xsl:for-each>
 	</xsl:template>
 
+	<xsl:template name="processMainSectionsDefault_flatxml">
+		<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:variable name="flatxml">
+				<xsl:apply-templates select="." mode="flatxml"/>
+			</xsl:variable>
+			<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
+			<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
+
+		</xsl:for-each>
+
+		<xsl:for-each select="/*/*[local-name()='annex']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:variable name="flatxml">
+				<xsl:apply-templates select="." mode="flatxml"/>
+			</xsl:variable>
+			<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
+			<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
+		</xsl:for-each>
+
+		<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] |          /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:variable name="flatxml">
+				<xsl:apply-templates select="." mode="flatxml"/>
+			</xsl:variable>
+			<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
+			<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
+		</xsl:for-each>
+	</xsl:template>
+
 	<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
 	<xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
 	<xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
@@ -3523,7 +3577,9 @@
 	</xsl:template> <!-- license-statement/p -->
 
 	<xsl:template match="*[local-name()='legal-statement']">
+		<xsl:param name="isLegacy">false</xsl:param>
 		<fo:block xsl:use-attribute-sets="legal-statement-style">
+
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template> <!-- legal-statement -->
@@ -3618,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"/>
@@ -3730,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"/>
@@ -5061,6 +5122,7 @@
 	<!-- ===================== -->
 	<!-- Definition List -->
 	<!-- ===================== -->
+
 	<xsl:template match="*[local-name()='dl']">
 		<xsl:variable name="isAdded" select="@added"/>
 		<xsl:variable name="isDeleted" select="@deleted"/>
@@ -5277,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>
@@ -5536,13 +5609,13 @@
 		<tr>
 			<td>
 				<xsl:attribute name="id">
-					<xsl:value-of select="concat($id,'_',$row_number,'_1')"/>
+					<xsl:value-of select="concat($id,'@',$row_number,'_1')"/>
 				</xsl:attribute>
 				<xsl:apply-templates/>
 			</td>
 			<td>
 				<xsl:attribute name="id">
-					<xsl:value-of select="concat($id,'_',$row_number,'_2')"/>
+					<xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
 				</xsl:attribute>
 
 						<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
@@ -5854,13 +5927,14 @@
 	<!-- ================= -->
 	<!-- Added,deleted text -->
 	<!-- ================= -->
-	<xsl:template match="*[local-name()='add']" name="tag_add">
+	<xsl:template match="*[local-name()='add'] | *[local-name() = 'change-open-tag'] | *[local-name() = 'change-close-tag']" name="tag_add">
 		<xsl:param name="skip">true</xsl:param>
 		<xsl:param name="block">false</xsl:param>
 		<xsl:param name="type"/>
 		<xsl:param name="text-align"/>
 		<xsl:choose>
-			<xsl:when test="starts-with(., $ace_tag)"> <!-- examples: ace-tag_A1_start, ace-tag_A2_end, C1_start, AC_start -->
+			<xsl:when test="starts-with(., $ace_tag) or local-name() = 'change-open-tag' or local-name() = 'change-close-tag'"> <!-- examples: ace-tag_A1_start, ace-tag_A2_end, C1_start, AC_start, or
+							<change-open-tag>A<sub>1</sub></change-open-tag>, <change-close-tag>A<sub>1</sub></change-close-tag> -->
 				<xsl:choose>
 					<xsl:when test="$skip = 'true' and       ((local-name(../..) = 'note' and not(preceding-sibling::node())) or       (local-name(..) = 'title' and preceding-sibling::node()[1][local-name() = 'tab']) or      local-name(..) = 'formattedref' and not(preceding-sibling::node()))      and       ../node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]"><!-- start tag displayed in template name="note" and title --></xsl:when>
 					<xsl:otherwise>
@@ -5868,12 +5942,32 @@
 							<xsl:call-template name="insertTag">
 								<xsl:with-param name="type">
 									<xsl:choose>
+										<xsl:when test="local-name() = 'change-open-tag'">start</xsl:when>
+										<xsl:when test="local-name() = 'change-close-tag'">end</xsl:when>
 										<xsl:when test="$type = ''"><xsl:value-of select="substring-after(substring-after(., $ace_tag), '_')"/> <!-- start or end --></xsl:when>
 										<xsl:otherwise><xsl:value-of select="$type"/></xsl:otherwise>
 									</xsl:choose>
 								</xsl:with-param>
-								<xsl:with-param name="kind" select="substring(substring-before(substring-after(., $ace_tag), '_'), 1, 1)"/> <!-- A or C -->
-								<xsl:with-param name="value" select="substring(substring-before(substring-after(., $ace_tag), '_'), 2)"/> <!-- 1, 2, C -->
+								<xsl:with-param name="kind">
+									<xsl:choose>
+										<xsl:when test="local-name() = 'change-open-tag' or local-name() = 'change-close-tag'">
+											<xsl:value-of select="text()"/>
+										</xsl:when>
+										<xsl:otherwise>
+											<xsl:value-of select="substring(substring-before(substring-after(., $ace_tag), '_'), 1, 1)"/> <!-- A or C -->
+										</xsl:otherwise>
+									</xsl:choose>
+								</xsl:with-param>
+								<xsl:with-param name="value">
+									<xsl:choose>
+										<xsl:when test="local-name() = 'change-open-tag' or local-name() = 'change-close-tag'">
+											<xsl:value-of select="*[local-name() = 'sub']"/>
+										</xsl:when>
+										<xsl:otherwise>
+											<xsl:value-of select="substring(substring-before(substring-after(., $ace_tag), '_'), 2)"/> <!-- 1, 2, C -->
+										</xsl:otherwise>
+									</xsl:choose>
+								</xsl:with-param>
 							</xsl:call-template>
 						</xsl:variable>
 						<xsl:choose>
@@ -6133,6 +6227,10 @@
 		<fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
+		<xsl:value-of select="."/>
+	</xsl:template>
+
 	<!-- ========================= -->
 	<!-- END Rich text formatting -->
 	<!-- ========================= -->
@@ -6763,7 +6861,7 @@
 				</xsl:choose>
 			</xsl:variable>
 			<xsl:attribute name="id">
-				<xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_',$divide)"/>
+				<xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_',$divide)"/>
 			</xsl:attribute>
 
 			<xsl:for-each select="*[local-name() = 'p']">
@@ -6771,7 +6869,7 @@
 					<xsl:copy-of select="@*"/>
 					<xsl:variable name="p_num" select="count(preceding-sibling::*[local-name() = 'p']) + 1"/>
 					<xsl:attribute name="id">
-						<xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
+						<xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
 					</xsl:attribute>
 
 					<!-- <xsl:copy-of select="node()" /> -->
@@ -6835,7 +6933,7 @@
 					<xsl:variable name="num" select="count(preceding-sibling::word) + 1"/>
 					<xsl:copy>
 						<xsl:attribute name="id">
-							<xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
+							<xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
 						</xsl:attribute>
 						<xsl:copy-of select="node()"/>
 					</xsl:copy>
@@ -7369,6 +7467,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>
@@ -7776,6 +7880,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"/>
@@ -8086,11 +8191,17 @@
 			</xsl:when>
 			<xsl:otherwise>
 
+				<xsl:variable name="image_class" select="ancestor::*[local-name() = 'image']/@class"/>
+				<xsl:variable name="ancestor_table_cell" select="normalize-space(ancestor::*[local-name() = 'td'] or ancestor::*[local-name() = 'th'])"/>
+
 				<xsl:variable name="element">
 					<xsl:choose>
 						<xsl:when test="ancestor::*[local-name() = 'tr'] and $isGenerateTableIF = 'true'">
 							<fo:inline xsl:use-attribute-sets="image-style" text-align="left"/>
 						</xsl:when>
+						<xsl:when test="not(ancestor::*[local-name() = 'figure'])">
+							<fo:inline xsl:use-attribute-sets="image-style" text-align="left"/>
+						</xsl:when>
 						<xsl:otherwise>
 							<fo:block xsl:use-attribute-sets="image-style">
 								<xsl:if test="ancestor::*[local-name() = 'dt']">
@@ -8106,10 +8217,24 @@
 						<xsl:copy-of select="@*"/>
 					<!-- <fo:block xsl:use-attribute-sets="image-style"> -->
 						<fo:instream-foreign-object fox:alt-text="{$alt-text}">
-							<xsl:if test="$isGenerateTableIF = 'false'">
-								<xsl:attribute name="width">100%</xsl:attribute>
-							</xsl:if>
-							<xsl:attribute name="content-height">100%</xsl:attribute>
+
+							<xsl:choose>
+								<xsl:when test="$image_class = 'corrigenda-tag'">
+									<xsl:attribute name="fox:alt-text">CorrigendaTag</xsl:attribute>
+									<xsl:attribute name="baseline-shift">-10%</xsl:attribute>
+									<xsl:if test="$ancestor_table_cell = 'true'">
+										<xsl:attribute name="baseline-shift">-25%</xsl:attribute>
+									</xsl:if>
+									<xsl:attribute name="height">3.5mm</xsl:attribute>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:if test="$isGenerateTableIF = 'false'">
+										<xsl:attribute name="width">100%</xsl:attribute>
+									</xsl:if>
+									<xsl:attribute name="content-height">100%</xsl:attribute>
+								</xsl:otherwise>
+							</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"/>
@@ -9624,7 +9749,7 @@
 	<!-- ====== -->
 	<xsl:template match="*[local-name() = 'termexample']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
-
+			<xsl:call-template name="refine_termexample-style"/>
 			<xsl:call-template name="setBlockSpanAll"/>
 
 			<xsl:apply-templates select="*[local-name()='name']"/>
@@ -10323,13 +10448,19 @@
 				<fo:block id="{@id}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
 			</xsl:when>
 			<!-- if there isn't element with id 'from', then create 'bookmark' here -->
-			<xsl:when test="not(ancestor::*[contains(local-name(), '-standard')]//*[@id = $id_from])">
+			<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])">
 				<fo:block id="{@from}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
 			</xsl:when>
 		</xsl:choose>
 
 	</xsl:template>
 
+	<!-- https://github.com/metanorma/mn-samples-bsi/issues/312 -->
+	<xsl:template match="*[local-name() = 'review'][@type = 'other']"/>
+
 	<xsl:template match="*[local-name() = 'name']/text()">
 		<!-- 0xA0 to space replacement -->
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
@@ -11944,6 +12075,7 @@
 	<xsl:template name="printEdition">
 		<xsl:variable name="edition_i18n" select="normalize-space((//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/>
 		<xsl:text> </xsl:text>
+
 		<xsl:choose>
 			<xsl:when test="$edition_i18n != ''">
 				<!-- Example: <edition language="fr">deuxième édition</edition> -->
@@ -12127,10 +12259,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="">
@@ -12179,6 +12311,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

@@ -22,26 +22,25 @@ module IsoDoc
         set(:si_aspect_paths, si_paths)
       end
 
-      TITLE = "//bibdata/title".freeze
+      def title1(xml, type, lang)
+        xml.at(ns("//bibdata/title[@type='title-#{type}']" \
+          "[@language='#{lang}']"))
+          &.children&.to_xml || ""
+      end
 
       def title(isoxml, _out)
         lang1, lang2 = @lang == "fr" ? %w(fr en) : %w(en fr)
-        set(:doctitle, @c.encode(isoxml.at(
-          ns("#{TITLE}[@type='title-main'][@language='#{lang1}']"))&.text || ""))
-        set(:docsubtitle, @c.encode(isoxml.at(
-          ns("#{TITLE}[@type='title-main'][@language='#{lang2}']"))&.text || ""))
+        set(:doctitle, title1(isoxml, "main", lang1))
+        set(:docsubtitle, title1(isoxml, "main", lang2))
         %w(appendix annex part subtitle provenance).each do |e|
-          set("#{e}title".to_sym, @c.encode(isoxml.at(
-            ns("#{TITLE}[@type='title-#{e}'][@language='#{lang1}']"))&.text || ""))
-          set("#{e}subtitle".to_sym, @c.encode(isoxml.at(
-            ns("#{TITLE}[@type='title-#{e}'][@language='#{lang2}']"))&.text || ""))
+          set("#{e}title".to_sym, title1(isoxml, e, lang1))
+          set("#{e}subtitle".to_sym, title1(isoxml, e, lang2))
         end
       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,31 +48,45 @@ 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
 
       def bibdate(isoxml, _out)
-        pubdate = isoxml.at(ns("//bibdata/date[not(@format)][@type = 'published']"))
+        pubdate = isoxml
+          .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/basicdoc.rng

@@ -244,6 +244,9 @@
         <data type="ID"/>
       </attribute>
       <attribute name="reviewer"/>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="date">
           <data type="dateTime"/>

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">