metanorma-bipm 2.1.8.1 → 2.1.9

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

@@ -7602,6 +7602,18 @@
 		</xsl:copy>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'sub']" mode="contents_item">
+		<xsl:copy>
+			<xsl:apply-templates mode="contents_item"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'sup']" mode="contents_item">
+		<xsl:copy>
+			<xsl:apply-templates mode="contents_item"/>
+		</xsl:copy>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'stem']" mode="contents_item">
 		<xsl:copy-of select="."/>
 	</xsl:template>
@@ -9062,21 +9074,29 @@
 	</xsl:variable>
 
 	<xsl:template match="@*|node()" mode="index_add_id">
+		<xsl:param name="docid"/>
 		<xsl:copy>
-				<xsl:apply-templates select="@*|node()" mode="index_add_id"/>
+			<xsl:apply-templates select="@*|node()" mode="index_add_id">
+				<xsl:with-param name="docid" select="$docid"/>
+			</xsl:apply-templates>
 		</xsl:copy>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'xref']" mode="index_add_id">
+		<xsl:param name="docid"/>
 		<xsl:variable name="id">
-			<xsl:call-template name="generateIndexXrefId"/>
+			<xsl:call-template name="generateIndexXrefId">
+				<xsl:with-param name="docid" select="$docid"/>
+			</xsl:call-template>
 		</xsl:variable>
 		<xsl:copy> <!-- add id to xref -->
 			<xsl:apply-templates select="@*" mode="index_add_id"/>
 			<xsl:attribute name="id">
 				<xsl:value-of select="$id"/>
 			</xsl:attribute>
-			<xsl:apply-templates mode="index_add_id"/>
+			<xsl:apply-templates mode="index_add_id">
+				<xsl:with-param name="docid" select="$docid"/>
+			</xsl:apply-templates>
 		</xsl:copy>
 		<!-- split <xref target="bm1" to="End" pagenumber="true"> to two xref:
 		<xref target="bm1" pagenumber="true"> and <xref target="End" pagenumber="true"> -->
@@ -9088,7 +9108,9 @@
 				<xsl:attribute name="id">
 					<xsl:value-of select="$id"/><xsl:text>_to</xsl:text>
 				</xsl:attribute>
-				<xsl:apply-templates mode="index_add_id"/>
+				<xsl:apply-templates mode="index_add_id">
+					<xsl:with-param name="docid" select="$docid"/>
+				</xsl:apply-templates>
 			</xsl:copy>
 		</xsl:if>
 	</xsl:template>
@@ -9125,12 +9147,33 @@
 			</xsl:when>
 			<xsl:when test="self::* and local-name(.) = 'xref'">
 				<xsl:variable name="id" select="@id"/>
-				<xsl:variable name="page" select="$index//item[@id = $id]"/>
-				<xsl:variable name="id_next" select="following-sibling::*[local-name() = 'xref'][1]/@id"/>
-				<xsl:variable name="page_next" select="$index//item[@id = $id_next]"/>
 
+				<xsl:variable name="id_next" select="following-sibling::*[local-name() = 'xref'][1]/@id"/>
 				<xsl:variable name="id_prev" select="preceding-sibling::*[local-name() = 'xref'][1]/@id"/>
-				<xsl:variable name="page_prev" select="$index//item[@id = $id_prev]"/>
+
+				<xsl:variable name="pages_">
+					<xsl:for-each select="$index/index/item[@id = $id or @id = $id_next or @id = $id_prev]">
+						<xsl:choose>
+							<xsl:when test="@id = $id">
+								<page><xsl:value-of select="."/></page>
+							</xsl:when>
+							<xsl:when test="@id = $id_next">
+								<page_next><xsl:value-of select="."/></page_next>
+							</xsl:when>
+							<xsl:when test="@id = $id_prev">
+								<page_prev><xsl:value-of select="."/></page_prev>
+							</xsl:when>
+						</xsl:choose>
+					</xsl:for-each>
+				</xsl:variable>
+				<xsl:variable name="pages" select="xalan:nodeset($pages_)"/>
+
+				<!-- <xsl:variable name="page" select="$index/index/item[@id = $id]"/> -->
+				<xsl:variable name="page" select="$pages/page"/>
+				<!-- <xsl:variable name="page_next" select="$index/index/item[@id = $id_next]"/> -->
+				<xsl:variable name="page_next" select="$pages/page_next"/>
+				<!-- <xsl:variable name="page_prev" select="$index/index/item[@id = $id_prev]"/> -->
+				<xsl:variable name="page_prev" select="$pages/page_prev"/>
 
 				<xsl:choose>
 					<!-- 2nd pass -->
@@ -9190,16 +9233,20 @@
 	</xsl:template>
 
 	<xsl:template name="generateIndexXrefId">
+		<xsl:param name="docid"/>
+
 		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
 
-		<xsl:variable name="docid">
-			<xsl:call-template name="getDocumentId"/>
+		<xsl:variable name="docid_curr">
+			<xsl:value-of select="$docid"/>
+			<xsl:if test="normalize-space($docid) = ''"><xsl:call-template name="getDocumentId"/></xsl:if>
 		</xsl:variable>
+
 		<xsl:variable name="item_number">
 			<xsl:number count="*[local-name() = 'li'][ancestor::*[local-name() = 'indexsect']]" level="any"/>
 		</xsl:variable>
 		<xsl:variable name="xref_number"><xsl:number count="*[local-name() = 'xref']"/></xsl:variable>
-		<xsl:value-of select="concat($docid, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_',  -->
+		<xsl:value-of select="concat($docid_curr, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_',  -->
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'indexsect']/*[local-name() = 'title']" priority="4">

data/lib/isodoc/bipm/metadata.rb

@@ -11,7 +11,7 @@ module IsoDoc
                      K_k kg_h_c_deltanu kg_h m_c_deltanu m_c mol_NA
                      s_deltanu).freeze
 
-      def initialize(lang, script, labels)
+      def initialize(lang, script, locale, labels)
         super
         here = File.join(File.dirname(__FILE__), "html", "si-aspect")
         si_paths = []
@@ -26,14 +26,14 @@ module IsoDoc
 
       def title(isoxml, _out)
         lang1, lang2 = @lang == "fr" ? %w(fr en) : %w(en fr)
-        set(:doctitle, @c.encode(isoxml&.at(
+        set(:doctitle, @c.encode(isoxml.at(
           ns("#{TITLE}[@type='main'][@language='#{lang1}']"))&.text || ""))
-        set(:docsubtitle, @c.encode(isoxml&.at(
+        set(:docsubtitle, @c.encode(isoxml.at(
           ns("#{TITLE}[@type='main'][@language='#{lang2}']"))&.text || ""))
         %w(appendix annex part subtitle provenance).each do |e|
-          set("#{e}title".to_sym, @c.encode(isoxml&.at(
+          set("#{e}title".to_sym, @c.encode(isoxml.at(
             ns("#{TITLE}[@type='#{e}'][@language='#{lang1}']"))&.text || ""))
-          set("#{e}subtitle".to_sym, @c.encode(isoxml&.at(
+          set("#{e}subtitle".to_sym, @c.encode(isoxml.at(
             ns("#{TITLE}[@type='#{e}'][@language='#{lang2}']"))&.text || ""))
         end
       end
@@ -51,16 +51,16 @@ module IsoDoc
         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}"))
+        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}"))
+        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}"))
+        dn and set(:partid, @i18n.l10n("#{label1} #{dn.text}"))
+        dn and set(:partid_alt, @i18n.l10n("#{label2} #{dn.text}"))
         set(:org_abbrev,
             isoxml.at(ns("//bibdata/ext/editorialgroup/committee"\
                          "[@acronym = 'JCGM']")) ? "JCGM" : "BIPM")

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -13,8 +13,8 @@ module IsoDoc
                               "@acronym"))&.value == "JCGM"
         @iso = IsoDoc::Iso::PresentationXMLConvert
           .new({ language: @lang, script: @script })
-        i18n = @iso.i18n_init(@lang, @script, nil)
-        @iso.metadata_init(@lang, @script, i18n)
+        i18n = @iso.i18n_init(@lang, @script, @locale, nil)
+        @iso.metadata_init(@lang, @script, @locale, i18n)
         super
       end
 
@@ -90,6 +90,12 @@ module IsoDoc
         { 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")
+      end
+
       def mathml1(elem, locale)
         asciimath_dup(elem)
         localize_maths(elem, locale)
@@ -104,7 +110,7 @@ module IsoDoc
         pubdate = bibdata.at(ns("./date[not(@format)][@type = 'published']"))
         return unless pubdate
 
-        meta = metadata_init(@lang, @script, @i18n)
+        meta = metadata_init(@lang, @script, @locale, @i18n)
         pubdate.next = pubdate.dup
         pubdate.next["format"] = "ddMMMyyyy"
         pubdate.next.children = meta.monthyr(pubdate.text)
@@ -132,8 +138,8 @@ module IsoDoc
         # merge adjacent text nodes
         docxml.root.replace(Nokogiri::XML(docxml.root.to_xml).root)
         docxml.xpath(ns(xpath)).each do |x| # rubocop: disable Style/CombinableLoops
-          if x&.next&.text? && /^\],\s+\[$/.match?(x&.next&.text) &&
-              %w(eref origin source).include?(x&.next&.next&.name)
+          if x.next&.text? && /^\],\s+\[$/.match?(x.next.text) &&
+              %w(eref origin source).include?(x.next.next&.name)
             x.next.replace(", ")
           end
         end
@@ -164,25 +170,6 @@ module IsoDoc
         end
         elem.children = l10n("[#{@i18n.source} #{elem.children.to_xml.strip}]")
       end
-=begin
-      def expand_citeas(text)
-        ret = super
-        if @lang == "fr" && /^(CGPM|CIPM) /.match?(ret)
-          ret.sub!(/^(CGPM|CIPM) (\S+)/) do |_m|
-            "#{$1} – #{FR_OUTCOME_TYPE[$2.to_sym] || $2}"
-          end
-        end
-        ret
-      end
-
-      FR_OUTCOME_TYPE = {
-        Resolution: "Résolution",
-        Decision: "Décision",
-        Recommendation: "Recommandation",
-        Declaration: "Déclaration",
-        Meeting: "Réunion",
-      }.freeze
-=end
 
       include Init
     end

data/lib/metanorma/bipm/biblio.rng

@@ -73,8 +73,14 @@
       <text/>
     </element>
   </define>
-  <define name="script">
+  <define name="locale">
     <a:documentation>ISO-639</a:documentation>
+    <element name="locale">
+      <text/>
+    </element>
+  </define>
+  <define name="script">
+    <a:documentation>ISO-3166</a:documentation>
     <element name="script">
       <text/>
     </element>
@@ -93,6 +99,9 @@
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
     </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
     <optional>
       <attribute name="script"/>
     </optional>
@@ -136,6 +145,9 @@
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
     </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
     <optional>
       <attribute name="script"/>
     </optional>
@@ -650,6 +662,9 @@
     <zeroOrMore>
       <ref name="language"/>
     </zeroOrMore>
+    <zeroOrMore>
+      <ref name="locale"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="script"/>
     </zeroOrMore>
@@ -741,6 +756,9 @@
     <zeroOrMore>
       <ref name="language"/>
     </zeroOrMore>
+    <zeroOrMore>
+      <ref name="locale"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="script"/>
     </zeroOrMore>
@@ -854,6 +872,15 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="language"/>
+    </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
+    <optional>
+      <attribute name="script"/>
+    </optional>
     <data type="anyURI"/>
   </define>
   <define name="DateType">
@@ -882,6 +909,7 @@
       <value>vote-started</value>
       <value>vote-ended</value>
       <value>announced</value>
+      <value>stable-until</value>
     </choice>
   </define>
   <define name="bdate">
@@ -930,6 +958,9 @@
       <optional>
         <attribute name="language"/>
       </optional>
+      <optional>
+        <attribute name="locale"/>
+      </optional>
       <optional>
         <attribute name="script"/>
       </optional>

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module BIPM
-    VERSION = "2.1.8.1".freeze
+    VERSION = "2.1.9".freeze
   end
 end

data/metanorma-bipm.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "metanorma-generic", "~> 2.2.0"
-  spec.add_dependency "metanorma-iso", "~> 2.1.8"
+  spec.add_dependency "metanorma-generic", "~> 2.2.2"
+  spec.add_dependency "metanorma-iso", "~> 2.2.0"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-bipm
 version: !ruby/object:Gem::Version
-  version: 2.1.8.1
+  version: 2.1.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-07 00:00:00.000000000 Z
+date: 2022-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.8
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.8
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement