metanorma-bipm 2.5.4 → 2.5.6

data/lib/isodoc/bipm/presentation_biblio.rb

@@ -0,0 +1,82 @@
+module IsoDoc
+  module Bipm
+    class PresentationXMLConvert < IsoDoc::Generic::PresentationXMLConvert
+      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']"))
+        pubdate or return
+        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)
+        app = bibdata.at(ns("//bibdata/ext/" \
+                            "structuredidentifier/part")) or return
+        bibdata.xpath(ns("//bibdata/title[@type = 'title-part']")).each do |t|
+          t.previous = t.dup
+          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"])
+        end
+      end
+
+      def norm_ref_entry_code(_ordinal, identifiers, _ids, _standard, datefn,
+_bib)
+        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}]"
+        if ids[:sdo]
+          ret = prefix_bracketed_ref(ret)
+          ret += "#{ids[:sdo]}#{datefn} "
+        else
+          ret = prefix_bracketed_ref("#{ret}#{datefn}")
+        end
+        ret
+      end
+
+      def implicit_reference(bib)
+        b = bib.at(ns("./docidentifier[@primary = 'true'][@type = 'BIPM']"))
+        return true if @doctype == "brochure" && /^(CGPM|CIPM|CCDS|CCTF)[  ]
+        (Resolution|Recommendation|Declaration|Decision|Recommendation|Meeting)/x
+          .match?(b&.text)
+
+        super
+      end
+
+      def omit_docid_prefix(prefix)
+        %w(BIPM BIPM-long).include? prefix and return true
+        super
+      end
+
+      def render_identifier(ident)
+        ret = super
+        ret[:sdo] = ret[:sdo]&.sub(/^(BIPM)([  ])(PV|CR)([  ])(\d.*)$/,
+                                   "\\1\\2<strong>\\3</strong>,\\4\\5")
+        ret
+      end
+
+      def wrap_brackets(txt)
+        /^\[.*\]$/.match?(txt) ? txt : "[#{txt}]"
+      end
+
+      def reference_name(ref)
+        super
+        @jcgm and
+          @xrefs.get[ref["id"]][:xref] = wrap_brackets(@xrefs.get[ref["id"]][:xref])
+      end
+    end
+  end
+end

data/lib/isodoc/bipm/presentation_blocks.rb

@@ -7,6 +7,7 @@ module IsoDoc
       end
 
       def table1(elem)
+        table_fn(elem)
         labelled_ancestor(elem) || elem["unnumbered"] and return
         n = @xrefs.anchor(elem["id"], :label, false)
         prefix_name(elem, ".<tab/>",

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -6,6 +6,7 @@ require_relative "index"
 require_relative "doccontrol"
 require_relative "../../relaton/render/general"
 require_relative "presentation_blocks"
+require_relative "presentation_biblio"
 
 module IsoDoc
   module Bipm
@@ -60,8 +61,7 @@ module IsoDoc
         number.nil? || number.empty? and return
         unless name = node.at(ns("./#{elem}[not(@type = 'quoted')]"))
           node.at(ns("./#{elem}[@type = 'quoted']")) and return
-          (node.children.empty? and node.add_child("<#{elem}></#{elem}>")) or
-            node.children.first.previous = "<#{elem}></#{elem}>"
+          node.add_first_child "<#{elem}></#{elem}>"
           name = node.children.first
         end
         if name.children.empty? then name.add_child(cleanup_entities(number))
@@ -103,33 +103,6 @@ module IsoDoc
         super
       end
 
-      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']"))
-        pubdate or return
-        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)
-        app = bibdata.at(ns("//bibdata/ext/" \
-                            "structuredidentifier/part")) or return
-        bibdata.xpath(ns("//bibdata/title[@type = 'title-part']")).each do |t|
-          t.previous = t.dup
-          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"])
-        end
-      end
-
       def eref(docxml)
         super
         jcgm_eref(docxml, "//eref")
@@ -142,7 +115,7 @@ module IsoDoc
 
       def quotesource(docxml)
         super
-        jcgm_eref(docxml, "//quote/source")
+        jcgm_eref(docxml, "//quote//source")
       end
 
       def jcgm_eref(docxml, xpath)
@@ -213,25 +186,6 @@ module IsoDoc
         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[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}]"
-        if ids[:sdo]
-          ret = prefix_bracketed_ref(ret)
-          ret += "#{ids[:sdo]}#{datefn} "
-        else
-          ret = prefix_bracketed_ref("#{ret}#{datefn}")
-        end
-        ret
-      end
-
       include Init
     end
   end

data/lib/isodoc/bipm/xref.rb

@@ -23,16 +23,6 @@ module IsoDoc
         super
       end
 
-      def wrap_brackets(txt)
-        /^\[.*\]$/.match?(txt) ? txt : "[#{txt}]"
-      end
-
-      def reference_names(ref)
-        super
-        @jcgm and
-          @anchors[ref["id"]][:xref] = wrap_brackets(@anchors[ref["id"]][:xref])
-      end
-
       UNNUM = "@unnumbered = 'true'".freeze
 
       def clause_order_main(docxml)
@@ -80,7 +70,7 @@ module IsoDoc
         clause.nil? and return num
         num.increment(clause)
         @anchors[clause["id"]] = section_name_anchors(clause, num, lvl)
-        i = Counter.new(0, prefix: "#{num.print}.")
+        i = Counter.new(0, prefix: num.print)
         clause.xpath(ns(NUMBERED_SUBCLAUSES)).each do |c|
           section_names1(c, i.increment(c).print, lvl + 1)
         end
@@ -109,7 +99,7 @@ module IsoDoc
 
       def section_names1(clause, num, level)
         @anchors[clause["id"]] = section_name1_anchors(clause, num, level)
-        i = Counter.new(0, prefix: "#{num}.")
+        i = Counter.new(0, prefix: num)
         clause.xpath(ns(NUMBERED_SUBCLAUSES)).each do |c|
           section_names1(c, i.increment(c).print, level + 1)
         end
@@ -157,7 +147,7 @@ module IsoDoc
                        num.to_s, 1)
         else
           prefix = @jcgm ? "" : "A"
-          i = Counter.new(0, prefix: "#{prefix}#{num}.")
+          i = Counter.new(0, prefix: "#{prefix}#{num}")
           clause.xpath(ns(NUMBERED_SUBCLAUSES)).each do |c|
             annex_names1(c, i.increment(c).print, 2)
           end
@@ -193,7 +183,7 @@ module IsoDoc
 
       def annex_names1(clause, num, level)
         @anchors[clause["id"]] = annex_names1_anchors(num, level)
-        i = Counter.new(0, prefix: "#{num}.")
+        i = Counter.new(0, prefix: num)
         clause.xpath(ns(NUMBERED_SUBCLAUSES)).each do |c|
           annex_names1(c, i.increment(c).print, level + 1)
         end

data/lib/metanorma/bipm/biblio.rng

@@ -1783,9 +1783,21 @@ that the `number` given for the series applies to the second iteration of number
 May be used to differentiate rendering of notes in bibliographies</a:documentation>
         </attribute>
       </optional>
-      <ref name="LocalizedMarkedUpString">
+      <ref name="LocalizedStringAttributes">
         <a:documentation>The content of the note</a:documentation>
       </ref>
+      <choice>
+        <oneOrMore>
+          <ref name="BasicBlockNoId">
+            <a:documentation>Multiple blocks of content</a:documentation>
+          </ref>
+        </oneOrMore>
+        <oneOrMore>
+          <ref name="TextElement">
+            <a:documentation>Single block of content</a:documentation>
+          </ref>
+        </oneOrMore>
+      </choice>
     </element>
   </define>
   <define name="bibabstract">

data/lib/metanorma/bipm/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.3.4 -->
+<!-- VERSION v1.4.0 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -326,7 +326,7 @@ normative or informative references, some split references into sections organiz
       <a:documentation>Content of note</a:documentation>
       <oneOrMore>
         <choice>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="ul"/>
           <ref name="ol"/>
           <ref name="dl"/>
@@ -412,7 +412,7 @@ normative or informative references, some split references into sections organiz
       <element name="note">
         <ref name="OptionalId"/>
         <oneOrMore>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
         </oneOrMore>
       </element>
     </define>
@@ -1977,7 +1977,7 @@ used in document amendments</a:documentation>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the verbal representation of the term</a:documentation>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="dl"/>
           <ref name="ol"/>
           <ref name="ul"/>
@@ -2015,7 +2015,7 @@ used in document amendments</a:documentation>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the term note</a:documentation>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="ul"/>
           <ref name="ol"/>
           <ref name="dl"/>
@@ -2037,7 +2037,7 @@ used in document amendments</a:documentation>
           <ref name="dl"/>
           <ref name="quote"/>
           <ref name="sourcecode"/>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="figure"/>
         </choice>
       </oneOrMore>

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Bipm
-    VERSION = "2.5.4".freeze
+    VERSION = "2.5.6".freeze
   end
 end

data/metanorma-bipm.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-generic", "~> 2.7.0"
-  spec.add_dependency "metanorma-iso", "~> 2.8.0"
+  spec.add_dependency "metanorma-generic", "~> 2.7.2"
+  spec.add_dependency "metanorma-iso", "~> 2.9.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.5.4
+  version: 2.5.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-14 00:00:00.000000000 Z
+date: 2024-11-11 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.7.0
+        version: 2.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.7.2
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -271,6 +271,7 @@ files:
 - lib/isodoc/bipm/jcgm.standard.xsl
 - lib/isodoc/bipm/metadata.rb
 - lib/isodoc/bipm/pdf_convert.rb
+- lib/isodoc/bipm/presentation_biblio.rb
 - lib/isodoc/bipm/presentation_blocks.rb
 - lib/isodoc/bipm/presentation_xml_convert.rb
 - lib/isodoc/bipm/xref.rb