metanorma-bipm 2.6.10 → 2.7.0

data/lib/isodoc/bipm/metadata.rb

@@ -48,16 +48,20 @@ module IsoDoc
 
       def docid(isoxml, _out)
         super
-        docid_part(isoxml, %w(Appendix Annexe), "appendix", :appendixid)
-        docid_part(isoxml, %w(Annex Appendice), "annexid", :annexid)
-        docid_part(isoxml, %w(Part Partie), "part", :partid)
+        docid_part(isoxml, [@i18n.get["level2_ancillary"],
+                            @i18n.get["level2_ancillary_alt"]], "appendix", :appendixid)
+        docid_part(isoxml, [@i18n.get["level3_ancillary"],
+                            @i18n.get["level3_ancillary_alt"]],  "annexid", :annexid)
+        docid_part(isoxml, [@i18n.get["level4_ancillary"],
+                            @i18n.get["level4_ancillary_alt"]],  "part", :partid)
+        docid_part(isoxml, [@i18n.get["level5_ancillary"],
+                            @i18n.get["level5_ancillary_alt"]],  "subpart", :subpartid)
         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}"))

data/lib/isodoc/bipm/presentation_biblio.rb

@@ -3,10 +3,35 @@ module IsoDoc
     class PresentationXMLConvert < IsoDoc::Generic::PresentationXMLConvert
       def bibdata_i18n(bibdata)
         super
+        bibdata_id(bibdata)
         bibdata_dates(bibdata)
         bibdata_titles(bibdata)
       end
 
+      def bibdata_id(bibdata)
+        id = bibdata.at(ns("./docidentifier[@type = 'BIPM-parent-document']")) or
+          return
+        parts = %w(appendix annexid part subpart).each_with_object([]) do |w, m|
+          dn = bibdata.at(ns("./ext/structuredidentifier/#{w}"))
+          m << dn&.text
+        end
+        id.next = bibdata_id1(@lang, id.dup, parts, false)
+        id.next = bibdata_id1(@lang == "en" ? "fr" : "en", id.dup, parts, true)
+      end
+
+      def bibdata_id1(lang, id, parts, alt)
+        id["type"] = "BIPM"
+        id["language"] = lang
+        m = []
+        parts.each_with_index do |p, i|
+          p.nil? and next
+          lbl = @i18n.get["level#{i + 2}_ancillary#{alt ? '_alt' : ''}"]
+          m << "#{lbl} #{p}"
+        end
+        id.children = "#{id.text} #{m.join(' ')}"
+        id
+      end
+
       def bibdata_dates(bibdata)
         pubdate = bibdata.at(ns("./date[not(@format)][@type = 'published']"))
         pubdate or return
@@ -17,13 +42,28 @@ module IsoDoc
       end
 
       def bibdata_titles(bibdata)
-        app = bibdata.at(ns("//bibdata/ext/" \
-                            "structuredidentifier/part")) or return
+        app = bibdata.at(ns("//bibdata/ext/structuredidentifier/part")) or
+          return
+        bibdata_part_titles(bibdata, app.text.sub(/\.\d+/, ""))
+        bibdata_subpart_titles(bibdata, app.text.sub(/\d+\./, ""))
+      end
+
+      def bibdata_part_titles(bibdata, num)
         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)}",
+          alt = t["language"] == @lang ? "" : "_alt"
+          t.children = l10n("#{@i18n.get["level4_ancillary#{alt}"]} #{num}: #{to_xml(t.children)}",
+                            t["language"])
+        end
+      end
+
+      def bibdata_subpart_titles(bibdata, num)
+        bibdata.xpath(ns("//bibdata/title[@type = 'title-subpart']")).each do |t|
+          t.previous = t.dup
+          t["type"] = "title-subpart-with-numbering"
+          alt = t["language"] == @lang ? "" : "_alt"
+          t.children = l10n("#{@i18n.get["level5_ancillary#{alt}"]} #{num}: #{to_xml(t.children)}",
                             t["language"])
         end
       end

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -19,6 +19,30 @@ module IsoDoc
         super
       end
 
+      def update_i18n(i18n)
+        if %w(2019).include?(@docscheme)
+          %w(level2_ancillary level3_ancillary level2_ancillary_alt
+             level3_ancillary_alt).each do |w|
+            i18n_conditional_set(i18n, w, "#{w}_2019")
+          end
+        end
+        i18n.set("annex", i18n.get["level2_ancillary"])
+        i18n.set("appendix", i18n.get["level3_ancillary"])
+      end
+
+      def convert_i18n_init(docxml)
+        @docscheme =
+          docxml.at(ns("//presentation-metadata[name" \
+                       "[text() = 'document-scheme']]/value"))&.text || "2021"
+        super
+        update_i18n(@i18n)
+      end
+
+      def i18n_conditional_set(i18n, old, new)
+        i18n.get[new] or return
+        i18n.set(old, i18n.get[new])
+      end
+
       def iso_processor(docxml)
         iso = IsoDoc::Iso::PresentationXMLConvert
           .new({ language: @lang, script: @script })

data/lib/isodoc/bipm/xref.rb

@@ -148,6 +148,7 @@ module IsoDoc
       end
 
       def annex_names(clause, num)
+        appendix_names(clause, num)
         lbl = semx(clause, num)
         prefix = @jcgm ? "" : "A"
         lbl1 = semx(clause, "#{prefix}#{num}")

data/lib/metanorma/bipm/cleanup.rb

@@ -39,19 +39,6 @@ module Metanorma
         super
       end
 
-      ID_LABELS = {
-        "en" => {
-          "appendix" => "Appendix",
-          "annexid" => "Annex",
-          "part" => "Part",
-        },
-        "fr" => {
-          "appendix" => "Annexe",
-          "annexid" => "Appendice",
-          "part" => "Partie",
-        },
-      }.freeze
-
       def bibdata_docidentifier_cleanup(isoxml)
         bibdata_docidentifier_i18n(isoxml)
         super
@@ -62,24 +49,24 @@ module Metanorma
         parts.empty? and return
         id_alt = id.dup
         id.next = id_alt
-        bibdata_docidentifier_enhance(id, @lang, parts)
-        bibdata_docidentifier_enhance(id_alt, @lang == "en" ? "fr" : "en",
-                                      parts)
+        id_alt["type"] = "BIPM-parent-document"
+        id_alt.delete("primary")
+        bibdata_docidentifier_enhance(id, parts)
       end
 
       def bibdata_docidentifier_i18n_prep(isoxml)
         id = isoxml.at("//bibdata/docidentifier[@type = 'BIPM']")
-        parts = %w(appendix annexid part).each_with_object({}) do |w, m|
+        parts = %w(appendix annexid part subpart).each_with_object({}) do |w, m|
           dn = isoxml.at("//bibdata/ext/structuredidentifier/#{w}") and
             m[w] = dn.text
         end
         [id, parts]
       end
 
-      def bibdata_docidentifier_enhance(id, lang, parts)
-        id["language"] = lang
-        ret = %w(appendix annexid part).each_with_object([]) do |w, m|
-          p = parts[w] and m << "#{ID_LABELS[lang][w]} #{p}"
+      # not language-specific, just space-delimited
+      def bibdata_docidentifier_enhance(id, parts)
+        ret = %w(appendix annexid part subpart).each_with_object([]) do |w, m|
+          p = parts[w] and m << p
         end
         id.children = "#{id.text} #{ret.join(' ')}"
       end

data/lib/metanorma/bipm/converter.rb

@@ -77,10 +77,6 @@ module Metanorma
         super
       end
 
-      def ol_attrs(node)
-        super.merge(attr_code(start: node.attr("start")))
-      end
-
       def committee_validate(xml)
         committees = Array(configuration&.committees) || return
         committees.empty? and return

data/lib/metanorma/bipm/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-<!-- VERSION v2.0.6 -->
+<!-- VERSION v2.0.8 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -72,10 +72,51 @@ but to `@anchor`, the user-supplied cross-reference</a:documentation>
         </oneOrMore>
       </element>
     </define>
+    <define name="review">
+      <a:documentation>Generalise BasicDoc element from just review comments, to general annotations;
+the type attribute defaults to `review` for reviews</a:documentation>
+      <element name="annotation">
+        <ref name="RequiredId"/>
+        <ref name="ReviewAttributes"/>
+        <oneOrMore>
+          <ref name="paragraph">
+            <a:documentation>Reviewer comments content</a:documentation>
+          </ref>
+        </oneOrMore>
+      </element>
+    </define>
+    <define name="ruby_pronunciation">
+      <a:documentation>Ruby annotation giving pronunciation of text: change tag from BasicDoc for disambiguation</a:documentation>
+      <element name="ruby-pronunciation">
+        <attribute name="value">
+          <a:documentation>Ruby annotation value</a:documentation>
+        </attribute>
+        <ref name="LocalizedStringAttributes"/>
+      </element>
+    </define>
+    <define name="ruby_annotation">
+      <a:documentation>Ruby annotation giving information other than pronunciation of text: change tag from BasicDoc for disambiguation</a:documentation>
+      <element name="ruby-annotation">
+        <attribute name="value">
+          <a:documentation>Ruby annotation value</a:documentation>
+        </attribute>
+        <ref name="LocalizedStringAttributes"/>
+      </element>
+    </define>
+    <define name="annotation">
+      <a:documentation>Source code annotation, corresponding to a callout</a:documentation>
+      <element name="callout-annotation">
+        <ref name="RequiredId"/>
+        <oneOrMore>
+          <ref name="paragraph"/>
+        </oneOrMore>
+      </element>
+    </define>
     <define name="section-title">
       <a:documentation>Title(s) of a clause</a:documentation>
       <element name="title">
         <a:documentation>Title proper for a clause</a:documentation>
+        <ref name="RequiredId"/>
         <zeroOrMore>
           <ref name="TextElement"/>
         </zeroOrMore>
@@ -83,10 +124,19 @@ but to `@anchor`, the user-supplied cross-reference</a:documentation>
       <zeroOrMore>
         <element name="variant-title">
           <a:documentation>Alternate title for a clause</a:documentation>
+          <ref name="RequiredId"/>
           <ref name="TypedTitleString"/>
         </element>
       </zeroOrMore>
     </define>
+    <define name="tname">
+      <element name="name">
+        <ref name="RequiredId"/>
+        <oneOrMore>
+          <ref name="NestedTextElement"/>
+        </oneOrMore>
+      </element>
+    </define>
     <define name="UlBody">
       <optional>
         <ref name="tname">
@@ -475,6 +525,7 @@ normative or informative references, some split references into sections organiz
     <!-- exclude figures? -->
     <define name="dd">
       <element name="dd">
+        <ref name="OptionalId"/>
         <zeroOrMore>
           <!-- exclude figures? -->
           <ref name="BasicBlock"/>
@@ -526,9 +577,10 @@ normative or informative references, some split references into sections organiz
       </choice>
     </define>
     <define name="TrAttributes">
+      <ref name="OptionalId"/>
       <optional>
         <attribute name="style">
-          <a:documentation>CSS style: only background-color supported</a:documentation>
+          <a:documentation>CSS style: only background-color, color, border supported</a:documentation>
         </attribute>
       </optional>
     </define>
@@ -595,6 +647,7 @@ gives an explicit page orientation</a:documentation>
   </include>
   <!-- end overrides -->
   <define name="FnAttributes" combine="interleave">
+    <ref name="RequiredId"/>
     <optional>
       <attribute name="hiddenref">
         <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
@@ -604,9 +657,10 @@ This is done if the footnote reference is already presented in some other form,
     </optional>
   </define>
   <define name="TdAttributes" combine="interleave">
+    <ref name="RequiredId"/>
     <optional>
       <attribute name="style">
-        <a:documentation>CSS style: only background-color supported</a:documentation>
+        <a:documentation>CSS style: only background-color, color, border supported</a:documentation>
       </attribute>
     </optional>
   </define>
@@ -686,6 +740,11 @@ titlecase, or lowercase</a:documentation>
         <a:documentation>Width of the table block in rendering</a:documentation>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="style">
+        <a:documentation>CSS style: only background-color, color, border supported</a:documentation>
+      </attribute>
+    </optional>
     <ref name="BlockAttributes"/>
   </define>
   <define name="FigureAttributes" combine="interleave">
@@ -1403,7 +1462,7 @@ numbers</a:documentation>
       </optional>
       <ref name="DocumentBody"/>
       <optional>
-        <ref name="review-container">
+        <ref name="annotation-container">
           <a:documentation>Annotations to the document</a:documentation>
         </ref>
       </optional>
@@ -1447,8 +1506,8 @@ numbers</a:documentation>
       </oneOrMore>
     </element>
   </define>
-  <define name="review-container">
-    <element name="review-container">
+  <define name="annotation-container">
+    <element name="annotation-container">
       <oneOrMore>
         <ref name="review"/>
       </oneOrMore>
@@ -1821,7 +1880,7 @@ used in document amendments</a:documentation>
     </element>
   </define>
   <define name="TermAttributes">
-    <ref name="OptionalId"/>
+    <ref name="RequiredId"/>
     <ref name="LocalizedStringAttributes"/>
     <ref name="BlockAttributes"/>
   </define>
@@ -2164,6 +2223,7 @@ used in document amendments</a:documentation>
   <define name="termdefinition">
     <a:documentation>The definition of a term applied in the current document</a:documentation>
     <element name="definition">
+      <ref name="RequiredId"/>
       <optional>
         <attribute name="type">
           <a:documentation>Type of definition, used to differentiate it from other definitions of the same term if present</a:documentation>
@@ -2185,6 +2245,7 @@ used in document amendments</a:documentation>
   </define>
   <define name="verbaldefinition">
     <element name="verbal-definition">
+      <ref name="RequiredId"/>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the verbal representation of the term</a:documentation>
@@ -2205,6 +2266,7 @@ used in document amendments</a:documentation>
   <define name="nonverbalrep">
     <a:documentation>Non-verbal representation of the term</a:documentation>
     <element name="non-verbal-representation">
+      <ref name="RequiredId"/>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the non-verbal representation of the term</a:documentation>

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Bipm
-    VERSION = "2.6.10".freeze
+    VERSION = "2.7.0".freeze
   end
 end

data/metanorma-bipm.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
   spec.add_dependency "metanorma-generic", "~> 3.0.4"
-  spec.add_dependency "metanorma-iso", "~> 3.0.10"
+  spec.add_dependency "metanorma-iso", "~> 3.1.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.6.10
+  version: 2.7.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-06-23 00:00:00.000000000 Z
+date: 2025-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.10
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.10
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement