metanorma-bipm 2.1.8.1 → 2.1.10

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)
@@ -98,18 +104,33 @@ module IsoDoc
       def bibdata_i18n(bibdata)
         super
         bibdata_dates(bibdata)
+        bibdata_titles(bibdata)
       end
 
       def bibdata_dates(bibdata)
         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)
       end
 
+      def bibdata_titles(bibdata)
+        return unless app = bibdata.at(ns("//bibdata/ext/"\
+                                          "structuredidentifier/part"))
+
+        bibdata.xpath(ns("//bibdata/title[@type = 'part']")).each do |t|
+          t.previous = t.dup
+          t["type"] = "part-with-numbering"
+          part = t["language"] == "en" ? "Part" : "Partie"
+          # not looking up in YAML
+          t.children = l10n("#{part} #{app.text}: #{t.children.to_xml}",
+                            t["language"])
+        end
+      end
+
       def eref(docxml)
         super
         jcgm_eref(docxml, "//eref")
@@ -132,8 +153,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
@@ -142,13 +163,13 @@ module IsoDoc
       def extract_brackets(node)
         start = node.at("./text()[1]")
         finish = node.at("./text()[last()]")
-        if /^\[/.match?(start.text) && /\]$/.match?(finish.text)
-          start.replace(start.text[1..-1])
-          node.previous = "["
-          finish = node.at("./text()[last()]")
-          finish.replace(finish.text[0..-2])
-          node.next = "]"
-        end
+        (/^\[/.match?(start.text) && /\]$/.match?(finish.text)) or return
+
+        start.replace(start.text[1..-1])
+        node.previous = "["
+        finish = node.at("./text()[last()]")
+        finish.replace(finish.text[0..-2])
+        node.next = "]"
       end
 
       def quotedtitles(docxml)
@@ -158,31 +179,35 @@ module IsoDoc
         end
       end
 
+      # notes and remarques (list notes) are not numbered
+      def note1(elem)
+        return if elem.parent.name == "bibitem" || elem["notag"] == "true"
+
+        # n = @xrefs.get[elem["id"]]
+        lbl = l10n(note_label(elem))
+        # (n.nil? || n[:label].nil? || n[:label].empty?) or
+        #  lbl = l10n("#{lbl} #{n[:label]}")
+        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)
         while elem&.next_element&.name == "termsource"
           elem << "; #{elem.next_element.remove.children.to_xml}"
         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} &#x2013; #{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/isodoc.rng

@@ -205,6 +205,15 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="style">
+            <choice>
+              <value>basic</value>
+              <value>full</value>
+              <value>short</value>
+            </choice>
+          </attribute>
+        </optional>
         <ref name="XrefBody"/>
       </element>
     </define>

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module BIPM
-    VERSION = "2.1.8.1".freeze
+    VERSION = "2.1.10".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.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-07 00:00:00.000000000 Z
+date: 2022-10-10 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