metanorma-bipm 2.2.14 → 2.3.1

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

@@ -243,13 +243,13 @@
 							<xsl:value-of select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:copyright/jcgm:from"/>
 						</fo:block>
 						<fo:block font-size="13pt" font-weight="normal" space-after="19.5mm">
-							<xsl:value-of select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@type = 'provenance']"/>
+							<xsl:value-of select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@type = 'title-provenance']"/>
 						</fo:block>
 						<fo:block border-bottom="1pt solid black"> </fo:block>
 						<fo:block font-size="16.5pt" margin-left="-0.5mm" padding-top="3.5mm" space-after="7mm" margin-right="7mm" line-height="105%" role="H1">
-							<xsl:apply-templates select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@language = $lang and @type = 'main']" mode="title"/>
+							<xsl:apply-templates select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@language = $lang and @type = 'title-main']" mode="title"/>
 							<xsl:variable name="title_part">
-								<xsl:apply-templates select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@language = $lang and @type = 'part']" mode="title"/>
+								<xsl:apply-templates select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@language = $lang and @type = 'title-part']" mode="title"/>
 							</xsl:variable>
 							<xsl:if test="normalize-space($title_part) != ''">
 								<xsl:text> — </xsl:text>
@@ -258,9 +258,9 @@
 						</fo:block>
 						<fo:block font-size="12pt" font-style="italic" line-height="140%" role="H1">
 							<xsl:variable name="secondLang" select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title/@language[. != $lang]"/>
-							<xsl:apply-templates select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@language = $secondLang and @type = 'main']" mode="title"/>
+							<xsl:apply-templates select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@language = $secondLang and @type = 'title-main']" mode="title"/>
 							<xsl:variable name="title_part">
-								<xsl:apply-templates select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@language = $secondLang and @type = 'part']" mode="title"/>
+								<xsl:apply-templates select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@language = $secondLang and @type = 'title-part']" mode="title"/>
 							</xsl:variable>
 							<xsl:if test="normalize-space($title_part) != ''">
 								<xsl:text> — </xsl:text>
@@ -297,9 +297,9 @@
 						</fo:table-body>
 					</fo:table>
 					<fo:block font-size="18pt" space-before="70mm" role="H1">
-						<xsl:apply-templates select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@language = $lang and @type = 'main']" mode="title"/>
+						<xsl:apply-templates select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@language = $lang and @type = 'title-main']" mode="title"/>
 						<xsl:variable name="title_part">
-							<xsl:apply-templates select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@language = $lang and @type = 'part']" mode="title"/>
+							<xsl:apply-templates select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@language = $lang and @type = 'title-part']" mode="title"/>
 						</xsl:variable>
 						<xsl:if test="normalize-space($title_part) != ''">
 							<xsl:text> — </xsl:text>
@@ -308,9 +308,9 @@
 					</fo:block>
 					<fo:block font-size="13pt" space-before="35mm" role="H1">
 						<xsl:variable name="secondLang" select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title/@language[. != $lang]"/>
-						<xsl:apply-templates select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@language = $secondLang and @type = 'main']" mode="title"/>
+						<xsl:apply-templates select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@language = $secondLang and @type = 'title-main']" mode="title"/>
 						<xsl:variable name="title_part">
-							<xsl:apply-templates select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@language = $secondLang and @type = 'part']" mode="title"/>
+							<xsl:apply-templates select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:title[@language = $secondLang and @type = 'title-part']" mode="title"/>
 						</xsl:variable>
 						<xsl:if test="normalize-space($title_part) != ''">
 							<xsl:text> — </xsl:text>
@@ -397,14 +397,16 @@
 
 				<fo:flow flow-name="xsl-region-body" line-height="115%">
 
-					<fo:block-container>
+					<xsl:if test="count(//*[local-name() = 'bipm-standard']) != 1 ">
+						<!-- <fo:block-container> -->
 						<!-- Show title -->
 						<!-- Example: Evaluation of measurement data — An introduction to the `Guide to the expression of uncertainty in measurement' and related documents -->
 
 						<xsl:for-each select="//*[local-name() = 'bipm-standard']">
-							<fo:block font-size="20pt" font-weight="bold" margin-bottom="20pt" space-before="36pt" line-height="1.1">
-								<xsl:variable name="curr_lang" select="*[local-name()='bibdata']/*[local-name()='language'][@current = 'true']"/>
 
+							<!-- <fo:block font-size="20pt" font-weight="bold" margin-bottom="20pt" space-before="36pt" line-height="1.1">
+								<xsl:variable name="curr_lang" select="*[local-name()='bibdata']/*[local-name()='language'][@current = 'true']"/>
+								
 								<xsl:variable name="title-main">
 									<xsl:apply-templates select="./*[local-name() = 'bibdata']/*[local-name() = 'title'][@language = $curr_lang and @type = 'main']" mode="title"/>
 								</xsl:variable>
@@ -412,7 +414,7 @@
 								<xsl:variable name="title-part">
 									<xsl:apply-templates select="./*[local-name() = 'bibdata']/*[local-name() = 'title'][@language = $curr_lang and @type = 'part']" mode="title"/>
 								</xsl:variable>
-
+								
 								<fo:block role="H1">
 									<xsl:copy-of select="$title-main"/>
 									<xsl:if test="normalize-space($title-main) != '' and normalize-space($title-part) != ''">
@@ -420,7 +422,7 @@
 									</xsl:if>
 									<xsl:copy-of select="$title-part"/>
 								</fo:block>
-
+								
 								<xsl:variable name="edition">
 									<xsl:apply-templates select="./*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) = '']">
 										<xsl:with-param name="curr_lang" select="$curr_lang"/>
@@ -429,11 +431,14 @@
 								<xsl:if test="normalize-space($edition) != ''">
 									<fo:block margin-top="12pt"><xsl:copy-of select="$edition"/></fo:block>
 								</xsl:if>
+								
+							</fo:block> -->
 
-							</fo:block>
-						</xsl:for-each>
+							<xsl:apply-templates select="jcgmsections/jcgm:p[starts-with(@class, 'zzSTDTitle')]"/>
 
-					</fo:block-container>
+						</xsl:for-each>
+						<!-- </fo:block-container> -->
+					</xsl:if>
 					<!-- Clause(s) -->
 					<fo:block>
 						<xsl:choose>
@@ -581,6 +586,32 @@
 		</fo:block>
 	</xsl:template>
 
+	<xsl:template match="jcgm:sections/jcgm:p[@class = 'zzSTDTitle1']" priority="4">
+		<fo:block font-size="20pt" font-weight="bold" margin-bottom="20pt" space-before="36pt" line-height="1.1" role="H1">
+			<xsl:if test="following-sibling::*[1][self::jcgm:p][starts-with(@class, 'zzSTDTitle')]">
+				<xsl:attribute name="margin-bottom">0</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates/>
+		</fo:block>
+		<xsl:variable name="curr_lang" select="ancestor::jcgm:bipm-standard/*[local-name()='bibdata']/*[local-name()='language'][@current = 'true']"/>
+		<xsl:variable name="edition">
+			<xsl:apply-templates select="ancestor::jcgm:bipm-standard/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) = '']">
+				<xsl:with-param name="curr_lang" select="$curr_lang"/>
+			</xsl:apply-templates>
+		</xsl:variable>
+		<xsl:if test="normalize-space($edition) != ''">
+			<fo:block font-size="20pt" font-weight="bold" margin-top="12pt" margin-bottom="20pt" line-height="1.1">
+				<xsl:copy-of select="$edition"/>
+			</fo:block>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="jcgm:sections/jcgm:p[@class = 'zzSTDTitle2']" priority="4">
+		<fo:block font-size="20pt" font-weight="bold" margin-top="12pt" margin-bottom="20pt" line-height="1.1">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
 	<xsl:template match="node()">
 		<xsl:apply-templates/>
 	</xsl:template>
@@ -2014,11 +2045,26 @@
 							<xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
 						</xsl:if>
 
-						<xsl:value-of select="."/>
+						<xsl:variable name="font_family" select="."/>
 
-						<xsl:if test="$additional_fonts != ''">
-							<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
-						</xsl:if>
+						<xsl:choose>
+							<xsl:when test="$additional_fonts = ''">
+								<xsl:value-of select="$font_family"/>
+							</xsl:when>
+							<xsl:otherwise> <!-- $additional_fonts != '' -->
+								<xsl:choose>
+									<xsl:when test="contains($font_family, ',')">
+										<xsl:value-of select="substring-before($font_family, ',')"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="substring-after($font_family, ',')"/>
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:value-of select="$font_family"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
+									</xsl:otherwise>
+								</xsl:choose>
+							</xsl:otherwise>
+						</xsl:choose>
 					</xsl:attribute>
 				</xsl:when>
 				<xsl:otherwise>
@@ -4615,21 +4661,21 @@
 
 	<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
 
-		<fo:block xsl:use-attribute-sets="table-note-style">
+				<fo:block xsl:use-attribute-sets="table-note-style">
 
-			<xsl:call-template name="refine_table-note-style"/>
+					<xsl:call-template name="refine_table-note-style"/>
 
-			<!-- Table's note/example name (NOTE, for example) -->
-			<fo:inline xsl:use-attribute-sets="table-note-name-style">
+					<!-- Table's note/example name (NOTE, for example) -->
+					<fo:inline xsl:use-attribute-sets="table-note-name-style">
 
-				<xsl:call-template name="refine_table-note-name-style"/>
+						<xsl:call-template name="refine_table-note-name-style"/>
 
-				<xsl:apply-templates select="*[local-name() = 'name']"/>
+						<xsl:apply-templates select="*[local-name() = 'name']"/>
 
-			</fo:inline>
+					</fo:inline>
 
-			<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
-		</fo:block>
+					<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
+				</fo:block>
 
 	</xsl:template> <!-- table/note -->
 
@@ -5708,6 +5754,9 @@
 	<!-- END Definition List -->
 	<!-- ===================== -->
 
+	<!-- default: ignore title in sections/p -->
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
+
 	<!-- ========================= -->
 	<!-- Rich text formatting -->
 	<!-- ========================= -->
@@ -7764,8 +7813,12 @@
 		<xsl:variable name="isAdded" select="../@added"/>
 		<xsl:variable name="isDeleted" select="../@deleted"/>
 		<xsl:choose>
-			<xsl:when test="ancestor::*[local-name() = 'title']">
+			<xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
 				<fo:inline padding-left="1mm" padding-right="1mm">
+					<xsl:if test="not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
+						<xsl:attribute name="padding-left">0mm</xsl:attribute>
+						<xsl:attribute name="padding-right">0mm</xsl:attribute>
+					</xsl:if>
 					<xsl:variable name="src">
 						<xsl:call-template name="image_src"/>
 					</xsl:variable>
@@ -7798,25 +7851,45 @@
 							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
 								<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
 
-									<xsl:variable name="img_src">
-										<xsl:choose>
-											<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
-											<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
-										</xsl:choose>
-									</xsl:variable>
+									<xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
+										<xsl:attribute name="width">
+											<xsl:value-of select="@width"/>
+										</xsl:attribute>
+									</xsl:if>
 
-									<xsl:variable name="image_width_effective">
+									<xsl:if test="@height != '' and @height != 'auto'">
+										<xsl:attribute name="height">
+											<xsl:value-of select="@height"/>
+										</xsl:attribute>
+									</xsl:if>
 
-												<xsl:value-of select="$width_effective"/>
+									<xsl:choose>
+										<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
+											<xsl:attribute name="scaling">non-uniform</xsl:attribute>
+										</xsl:when>
+										<xsl:otherwise>
 
-									</xsl:variable>
+											<xsl:variable name="img_src">
+												<xsl:choose>
+													<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
+													<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
+												</xsl:choose>
+											</xsl:variable>
 
-									<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
-									<xsl:if test="number($scale) &lt; 100">
+											<xsl:variable name="image_width_effective">
 
-												<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+														<xsl:value-of select="$width_effective"/>
 
-									</xsl:if>
+											</xsl:variable>
+
+											<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
+											<xsl:if test="number($scale) &lt; 100">
+
+														<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+
+											</xsl:if>
+										</xsl:otherwise>
+									</xsl:choose>
 
 								</xsl:if>
 
@@ -11488,7 +11561,7 @@
 	<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
-	<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]/*[local-name() = 'span'][@class] | *[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<xsl:apply-templates mode="update_xml_step1"/>
@@ -12054,7 +12127,7 @@
 						<xsl:variable name="title">
 							<xsl:for-each select="(//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']">
 
-										<xsl:value-of select="*[local-name() = 'title'][@language = $lang and @type = 'part']"/>
+										<xsl:value-of select="*[local-name() = 'title'][@language = $lang and @type = 'title-part']"/>
 
 							</xsl:for-each>
 						</xsl:variable>
@@ -12077,7 +12150,7 @@
 					<dc:description>
 						<xsl:variable name="abstract">
 
-									<xsl:value-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']/*[local-name() = 'title'][@language = $lang and @type = 'main']"/>
+									<xsl:value-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']/*[local-name() = 'title'][@language = $lang and @type = 'title-main']"/>
 
 						</xsl:variable>
 						<xsl:value-of select="normalize-space($abstract)"/>

data/lib/isodoc/bipm/metadata.rb

@@ -27,14 +27,14 @@ module IsoDoc
       def title(isoxml, _out)
         lang1, lang2 = @lang == "fr" ? %w(fr en) : %w(en fr)
         set(:doctitle, @c.encode(isoxml.at(
-          ns("#{TITLE}[@type='main'][@language='#{lang1}']"))&.text || ""))
+          ns("#{TITLE}[@type='title-main'][@language='#{lang1}']"))&.text || ""))
         set(:docsubtitle, @c.encode(isoxml.at(
-          ns("#{TITLE}[@type='main'][@language='#{lang2}']"))&.text || ""))
+          ns("#{TITLE}[@type='title-main'][@language='#{lang2}']"))&.text || ""))
         %w(appendix annex part subtitle provenance).each do |e|
           set("#{e}title".to_sym, @c.encode(isoxml.at(
-            ns("#{TITLE}[@type='#{e}'][@language='#{lang1}']"))&.text || ""))
+            ns("#{TITLE}[@type='title-#{e}'][@language='#{lang1}']"))&.text || ""))
           set("#{e}subtitle".to_sym, @c.encode(isoxml.at(
-            ns("#{TITLE}[@type='#{e}'][@language='#{lang2}']"))&.text || ""))
+            ns("#{TITLE}[@type='title-#{e}'][@language='#{lang2}']"))&.text || ""))
         end
       end
 

data/lib/isodoc/bipm/presentation_blocks.rb

@@ -0,0 +1,41 @@
+module IsoDoc
+  module BIPM
+    class PresentationXMLConvert < IsoDoc::Generic::PresentationXMLConvert
+      def middle_title(docxml)
+        @jcgm or return nil
+        @iso.middle_title(docxml)
+      end
+
+      def table1(elem)
+        labelled_ancestor(elem) || elem["unnumbered"] and return
+        n = @xrefs.anchor(elem["id"], :label, false)
+        prefix_name(elem, ".<tab/>",
+                    l10n("#{@i18n.table.capitalize} #{n}"), "name")
+      end
+
+      def figure1(elem)
+        if @jcgm
+          @iso.xrefs = @xrefs
+          @iso.figure1(elem)
+        else super
+        end
+      end
+
+      # notes and remarques (list notes) are not numbered
+      def note1(elem)
+        elem.parent.name == "bibitem" || elem["notag"] == "true" and return
+        lbl = l10n(note_label(elem))
+        prefix_name(elem, "", lbl, "name")
+      end
+
+      def note_label(elem)
+        if elem.ancestors("preface").empty?
+          if elem.ancestors("ul, ol, dl").empty?
+            @i18n.note
+          else @i18n.listnote end
+        else @i18n.prefacenote
+        end
+      end
+    end
+  end
+end

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -5,6 +5,7 @@ require_relative "init"
 require_relative "index"
 require_relative "doccontrol"
 require_relative "../../relaton/render/general"
+require_relative "presentation_blocks"
 
 module IsoDoc
   module BIPM
@@ -12,33 +13,25 @@ module IsoDoc
       def convert1(docxml, filename, dir)
         @jcgm = docxml&.at(ns("//bibdata/ext/editorialgroup/committee/" \
                               "@acronym"))&.value == "JCGM"
-        @iso = IsoDoc::Iso::PresentationXMLConvert
-          .new({ language: @lang, script: @script })
-        i18n = @iso.i18n_init(@lang, @script, @locale, nil)
-        @iso.metadata_init(@lang, @script, @locale, i18n)
+        @xrefs.klass.jcgm = @jcgm
+        @jcgm and @iso = iso_processor(docxml)
         super
       end
 
+      def iso_processor(docxml)
+        iso = IsoDoc::Iso::PresentationXMLConvert
+          .new({ language: @lang, script: @script })
+        i18n = iso.i18n_init(@lang, @script, @locale, nil)
+        iso.metadata_init(@lang, @script, @locale, i18n)
+        iso.info(docxml, nil)
+        iso
+      end
+
       def eref_localities1(opt)
         @jcgm and return @iso.eref_localities1(opt)
         super
       end
 
-      def table1(elem)
-        labelled_ancestor(elem) || elem["unnumbered"] and return
-        n = @xrefs.anchor(elem["id"], :label, false)
-        prefix_name(elem, ".<tab/>",
-                    l10n("#{@i18n.table.capitalize} #{n}"), "name")
-      end
-
-      def figure1(elem)
-        if @jcgm
-          @iso.xrefs = @xrefs
-          @iso.figure1(elem)
-        else super
-        end
-      end
-
       def annex1(elem)
         @jcgm and return super
         elem["unnumbered"] == "true" and return
@@ -77,8 +70,8 @@ module IsoDoc
       end
 
       def conversions(docxml)
-        super
         doccontrol docxml
+        super
       end
 
       def twitter_cldr_localiser_symbols
@@ -115,9 +108,9 @@ module IsoDoc
       def bibdata_titles(bibdata)
         app = bibdata.at(ns("//bibdata/ext/" \
                             "structuredidentifier/part")) or return
-        bibdata.xpath(ns("//bibdata/title[@type = 'part']")).each do |t|
+        bibdata.xpath(ns("//bibdata/title[@type = 'title-part']")).each do |t|
           t.previous = t.dup
-          t["type"] = "part-with-numbering"
+          t["type"] = "title-part-with-numbering"
           part = t["language"] == "en" ? "Part" : "Partie" # not looking up in YAML
           t.children = l10n("#{part} #{app.text}: #{to_xml(t.children)}",
                             t["language"])
@@ -170,22 +163,6 @@ module IsoDoc
         end
       end
 
-      # notes and remarques (list notes) are not numbered
-      def note1(elem)
-        elem.parent.name == "bibitem" || elem["notag"] == "true" and return
-        lbl = l10n(note_label(elem))
-        prefix_name(elem, "", lbl, "name")
-      end
-
-      def note_label(elem)
-        if elem.ancestors("preface").empty?
-          if elem.ancestors("ul, ol, dl").empty?
-            @i18n.note
-          else @i18n.listnote end
-        else @i18n.prefacenote
-        end
-      end
-
       def termsource1(elem)
         # elem["status"] == "modified" and return super
         while elem&.next_element&.name == "termsource"