metanorma-bipm 1.0.4 → 1.1.1

data/lib/isodoc/bipm/metadata.rb

@@ -8,7 +8,8 @@ module IsoDoc
       end
 
       SI_ASPECT = %w(A_e_deltanu A_e cd_Kcd_h_deltanu cd_Kcd full K_k_deltanu
-      K_k kg_h_c_deltanu kg_h m_c_deltanu m_c mol_NA s_deltanu).freeze
+                     K_k kg_h_c_deltanu kg_h m_c_deltanu m_c mol_NA
+                     s_deltanu).freeze
 
       def initialize(lang, script, labels)
         super
@@ -24,12 +25,12 @@ module IsoDoc
       TITLE = "//bibdata/title".freeze
 
       def title(isoxml, _out)
-        lang1, lang2  = @lang == "fr" ? %w(fr en) : %w(en fr)
+        lang1, lang2 = @lang == "fr" ? %w(fr en) : %w(en fr)
         set(:doctitle, @c.encode(isoxml&.at(
           ns("#{TITLE}[@type='main'][@language='#{lang1}']"))&.text || ""))
         set(:docsubtitle, @c.encode(isoxml&.at(
           ns("#{TITLE}[@type='main'][@language='#{lang2}']"))&.text || ""))
-        %w(appendix annex part subtitle).each do |e|
+        %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 || ""))
           set("#{e}subtitle".to_sym, @c.encode(isoxml&.at(
@@ -40,9 +41,10 @@ module IsoDoc
       def status_print(status)
         return "Procès-Verbal" if status == "procès-verbal"
         return "CIPM-MRA" if status == "cipm-mra"
+
         status.split(/[- ]/).map.with_index do |s, i|
-          (%w(en de).include?(s) && i > 0) ? s : s.capitalize
-        end.join(' ')
+          %w(en de).include?(s) && i.positive? ? s : s.capitalize
+        end.join(" ")
       end
 
       def docid(isoxml, _out)
@@ -59,11 +61,19 @@ module IsoDoc
         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}"))
+        set(:org_abbrev,
+            isoxml.at(ns("//bibdata/ext/editorialgroup/committee"\
+                         "[@acronym = 'JCGM']")) ? "JCGM" : "BIPM")
       end
 
       def extract_person_names_affiliations(authors)
         extract_person_affiliations(authors)
       end
+
+      def bibdate(isoxml, _out)
+        pubdate = isoxml.at(ns("//bibdata/date[not(@format)][@type = 'published']"))
+        pubdate and set(:pubdate_monthyear, monthyr(pubdate.text))
+      end
     end
   end
 end

data/lib/isodoc/bipm/pdf_convert.rb

@@ -4,7 +4,7 @@ module IsoDoc
   module BIPM
     # A {Converter} implementation that generates PDF HTML output, and a
     # document schema encapsulation of the document for validation
-    class PdfConvert <  IsoDoc::XslfoPdfConvert
+    class PdfConvert < IsoDoc::XslfoPdfConvert
       def initialize(options)
         @libdir = File.dirname(__FILE__)
         super
@@ -15,20 +15,23 @@ module IsoDoc
       end
 
       def pdf_stylesheet(docxml)
-        return "jcgm.standard.xsl" if docxml&.at(ns("//bibdata/ext/editorialgroup/committee/@acronym"))&.value == "JCGM"
+        docxml&.at(ns("//bibdata/ext/editorialgroup/committee/@acronym"))
+        &.value == "JCGM" and
+          return "jcgm.standard.xsl"
+
         doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
-        doctype = "brochure" unless %w(guide mise-en-pratique rapport).
-          include? doctype
+        doctype = "brochure" unless %w(guide mise-en-pratique rapport)
+          .include? doctype
         "bipm.#{doctype}.xsl"
       end
 
       def pdf_options(docxml)
+        n = configuration.document_namespace
+        q = "//m:bipm-standard/m:bibdata/m:language[@current = 'true']"
         if docxml.root.name == "metanorma-collection" &&
-            docxml.at("//m:bipm-standard/m:bibdata/m:language[@current = 'true'][. = 'fr']",
-                      "m" => configuration.document_namespace) &&
-            docxml.at("//m:bipm-standard/m:bibdata/m:language[@current = 'true'][. = 'en']",
-                      "m" => configuration.document_namespace)
-          "--split-by-language"
+            docxml.at("#{q}[. = 'fr']", "m" => n) &&
+            docxml.at("#{q}[. = 'en']", "m" => n)
+          "#{super} --split-by-language"
         else
           super
         end

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -1,21 +1,43 @@
 require "isodoc"
 require "metanorma-generic"
+require "metanorma-iso"
 require_relative "init"
 require_relative "index"
 
 module IsoDoc
   module BIPM
     class PresentationXMLConvert < IsoDoc::Generic::PresentationXMLConvert
+      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, nil)
+        @iso.metadata_init(@lang, @script, i18n)
+        super
+      end
+
+      def eref_localities1(target, type, from, to, delim, n, lang = "en")
+        if @jcgm
+          @iso.eref_localities1(target, type, from, to, delim, n, lang)
+        else
+          super
+        end
+      end
+
       def table1(f)
         return if labelled_ancestor(f)
-        return if f["unnumbered"] && !f.at(ns("./name"))
-        n = @xrefs.anchor(f['id'], :label, false)
+        return if f["unnumbered"]
+
+        n = @xrefs.anchor(f["id"], :label, false)
         prefix_name(f, ".<tab/>", l10n("#{@i18n.table.capitalize} #{n}"), "name")
       end
 
       def annex1(f)
+        return super if @jcgm
         return if f["unnumbered"] == "true"
-        lbl = @xrefs.anchor(f['id'], :label)
+
+        lbl = @xrefs.anchor(f["id"], :label)
         if t = f.at(ns("./title"))
           t.children = "<strong>#{t.children.to_xml}</strong>"
         end
@@ -25,6 +47,7 @@ module IsoDoc
       def clause1(f)
         return if f["unnumbered"] == "true"
         return if f.at(("./ancestor::*[@unnumbered = 'true']"))
+
         super
       end
 
@@ -33,28 +56,43 @@ module IsoDoc
         doccontrol docxml
       end
 
-      def doccontrol docxml
+      def doccontrol(docxml)
         return unless docxml.at(ns("//bibdata/relation[@type = 'supersedes']"))
+
         clause = <<~END
-        <doccontrol>
-        <title>Document Control</title>
-        <table unnumbered="true"><tbody>
-        <tr><td>Authors:</td><td/><td>#{list_authors(docxml)}</td></tr>
-        <tr>#{list_draft(docxml, 1)&.map { |x| "<td>#{x}</td>" }&.join }
-        <td>#{list_cochairs(docxml)}</td></tr>
-        <tr>#{list_draft(docxml, 2)&.map { |x| "<td>#{x}</td>" }&.join }
-        <td>#{list_chairs(docxml)}</td></tr>
-        #{list_drafts(docxml)}
-        </tbody></table></doccontrol>
+          <doccontrol>
+          <title>Document Control</title>
+          <table unnumbered="true"><tbody>
+          <tr><th>Authors:</th><td/><td>#{list_authors(docxml)}</td></tr>
+        #{doccontrol_row1(docxml)} #{doccontrol_row2(docxml)} #{list_drafts(docxml)}
+          </tbody></table></doccontrol>
         END
         docxml.root << clause
       end
 
+      def doccontrol_row1(docxml)
+        return "" if list_draft(docxml, 1) == ["", ""] && list_cochairs(docxml).empty?
+
+        <<~ROW
+          <tr>#{list_draft(docxml, 1)&.map { |x| "<td>#{x}</td>" }&.join}
+          <td>#{list_cochairs(docxml)}</td></tr>
+        ROW
+      end
+
+      def doccontrol_row2(docxml)
+        return "" if list_draft(docxml, 2) == ["", ""] && list_chairs(docxml).empty?
+
+        <<~ROW
+          <tr>#{list_draft(docxml, 2)&.map { |x| "<td>#{x}</td>" }&.join}
+          <td>#{list_chairs(docxml)}</td></tr>
+        ROW
+      end
+
       def list_drafts(xml)
         ret = ""
         i = 3
-        while a = list_draft(xml, i)
-          ret += "<tr>#{list_draft(xml, i).map { |x| "<td>#{x}</td>" }.join }"\
+        while list_draft(xml, i) != ["", ""]
+          ret += "<tr>#{list_draft(xml, i).map { |x| "<td>#{x}</td>" }.join} "\
             "<td/></tr>"
           i += 1
         end
@@ -62,19 +100,21 @@ module IsoDoc
       end
 
       def list_draft(xml, i)
-        return unless d =
+        return ["", ""] unless d =
           xml.at(ns("//bibdata/relation[@type = 'supersedes'][#{i}]/bibitem"))
+
         date = d&.at(ns("./date"))&.text
         draft = d&.at(ns("./version/draft"))&.text and
           draft = "Draft #{draft}"
         edn = d&.at(ns("./edition"))&.text and
-          edn = "Edition #{edn}"
-        [date, [draft, edn].join(" ")]
+          edn = "Version #{edn}"
+        [[draft, edn].join(" "), date]
       end
 
       def list_authors(xml)
         ret = list_people(
-          xml, "//bibdata/contributor[xmlns:role/@type = 'author']/person")
+          xml, "//bibdata/contributor[xmlns:role/@type = 'author']/person"
+        )
         @i18n.multiple_and(ret, @i18n.get["and"])
       end
 
@@ -84,16 +124,18 @@ module IsoDoc
 
       def list_cochairs(xml)
         ret = list_people(xml, "//bibdata/contributor[#{COCHAIR}]/person")
+        ret.empty? and return ""
         role = xml&.at(ns("//bibdata/contributor[#{COCHAIR}]/role"))&.text
         label = ret.size > 1 && role ? "#{role}s" : role
-        "#{label}: #{@i18n.multiple_and(ret, @i18n.get["and"])}"
+        "#{label}: #{@i18n.multiple_and(ret, @i18n.get['and'])}"
       end
 
       def list_chairs(xml)
         ret = list_people(xml, "//bibdata/contributor#{CHAIR}/person")
+        ret.empty? and return ""
         role = xml&.at(ns("//bibdata/contributor#{CHAIR}/role"))&.text
         label = ret.size > 1 && role ? "#{role}s" : role
-        "#{label}: #{@i18n.multiple_and(ret, @i18n.get["and"])}"
+        "#{label}: #{@i18n.multiple_and(ret, @i18n.get['and'])}"
       end
 
       def list_people(xml, xpath)
@@ -110,13 +152,29 @@ module IsoDoc
       end
 
       def twitter_cldr_localiser_symbols
-        { group: "&#x202F;", fraction_group: "&#x202F;", fraction_group_digits: 3 }
+        { group: "&#x202F;", fraction_group: "&#x202F;",
+          fraction_group_digits: 3 }
       end
 
       def mathml1(f, locale)
         localize_maths(f, locale)
       end
 
+      def bibdata_i18n(bibdata)
+        super
+        bibdata_dates(bibdata)
+      end
+
+      def bibdata_dates(bibdata)
+        pubdate = bibdata.at(ns("./date[not(@format)][@type = 'published']"))
+        return unless pubdate
+
+        meta = metadata_init(@lang, @script, @i18n)
+        pubdate.next = pubdate.dup
+        pubdate.next["format"] = "ddMMMyyyy"
+        pubdate.next.children = meta.monthyr(pubdate.text)
+      end
+
       include Init
     end
   end

data/lib/isodoc/bipm/xref.rb

@@ -8,20 +8,56 @@ module IsoDoc
         super
       end
 
+      def parse(docxml)
+        @jcgm = docxml&.at(ns("//bibdata/ext/editorialgroup/committee/"\
+                              "@acronym"))&.value == "JCGM"
+        @annexlbl =
+          if docxml.at(ns("//bibdata/ext/structuredidentifier/appendix"))
+            @labels["appendix"]
+          else
+            @labels["annex"]
+          end
+        super
+      end
+
+      def wrap_brackets(txt)
+        return txt if /^\[.*\]$/.match?(txt)
+
+        "[#{txt}]"
+      end
+
+      def reference_names(ref)
+        super
+        if @jcgm
+          @anchors[ref["id"]][:xref] = wrap_brackets(@anchors[ref["id"]][:xref])
+        end
+      end
+
       def clause_names(docxml, sect_num)
+        if @jcgm
+          clause_names_jcgm(docxml, sect_num)
+        else
+          clause_names_bipm(docxml, sect_num)
+        end
+      end
+
+      def clause_names_jcgm(docxml, sect_num)
+        docxml.xpath(ns("//clause[parent::sections][not(@type = 'scope')]"\
+                        "[not(descendant::terms)]")).each do |c|
+          section_names(c, sect_num, 1)
+        end
+      end
+
+      def clause_names_bipm(docxml, _sect_num)
         n = Counter.new
         docxml.xpath(ns("//sections/clause[not(@unnumbered = 'true')] | "\
                         "//sections/terms[not(@unnumbered = 'true')] | "\
-                        "//sections/definitions[not(@unnumbered = 'true')]")).
-        each do |c|
-          section_names(c, n, 1)
-        end
+                        "//sections/definitions[not(@unnumbered = 'true')]"))
+          .each { |c| section_names(c, n, 1) }
         docxml.xpath(ns("//sections/clause[@unnumbered = 'true'] | "\
                         "//sections/terms[@unnumbered = 'true'] | "\
-                        "//sections/definitions[@unnumbered = 'true']")).
-        each do |c|
-          unnumbered_section_names(c, 1)
-        end
+                        "//sections/definitions[@unnumbered = 'true']"))
+          .each { |c| unnumbered_section_names(c, 1) }
       end
 
       NUMBERED_SUBCLAUSES = "./clause[not(@unnumbered = 'true')] | "\
@@ -36,18 +72,24 @@ module IsoDoc
         "./terms[@unnumbered = 'true'] | "\
         "./definitions[@unnumbered = 'true']".freeze
 
+      def section_name_anchors(clause, num, lvl)
+        lbl = @jcgm ? "clause_jcgm" : "clause"
+        @anchors[clause["id"]] =
+          { label: num.print, xref: l10n("#{@labels[lbl]} #{num.print}"),
+            level: lvl, type: "clause" }
+      end
+
       def section_names(clause, num, lvl)
         return num if clause.nil?
+
         num.increment(clause)
-        @anchors[clause["id"]] =
-          { label: num.print, xref: l10n("#{@labels["clause"]} #{num.print}"),
-            level: lvl, type: "clause" }
+        @anchors[clause["id"]] = section_name_anchors(clause, num, lvl)
         i = Counter.new
         clause.xpath(ns(NUMBERED_SUBCLAUSES)).each do |c|
           i.increment(c)
           section_names1(c, "#{num.print}.#{i.print}", lvl + 1)
         end
-        clause.xpath(ns(UNNUMBERED_SUBCLAUSES)).each_with_index do |c, i|
+        clause.xpath(ns(UNNUMBERED_SUBCLAUSES)).each do |c|
           unnumbered_section_names1(c, lvl + 1)
         end
         num
@@ -55,30 +97,37 @@ module IsoDoc
 
       def unnumbered_section_names(clause, lvl)
         return if clause.nil?
-        lbl = clause&.at(ns("./title"))&.text || "[#{clause["id"]}]"
-        @anchors[clause["id"]] =
-          { label: lbl, xref: l10n(%{"#{lbl}"}), level: lvl, type: "clause" }
-        clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
+
+        lbl = clause&.at(ns("./title"))&.text || "[#{clause['id']}]"
+        @anchors[clause["id"]] = { label: lbl, xref: l10n(%{"#{lbl}"}),
+                                   level: lvl, type: "clause" }
+        clause.xpath(ns(SUBCLAUSES)).each do |c|
           unnumbered_section_names1(c, lvl + 1)
         end
       end
 
-      def section_names1(clause, num, level)
+      def section_name1_anchors(clause, num, level)
+        lbl = @jcgm ? "" : "#{@labels['subclause']} "
         @anchors[clause["id"]] =
-          { label: num, level: level, xref: l10n("#{@labels["subclause"]} #{num}"),
+          { label: num, level: level,
+            xref: l10n("#{lbl}#{num}"),
             type: "clause" }
+      end
+
+      def section_names1(clause, num, level)
+        @anchors[clause["id"]] = section_name1_anchors(clause, num, level)
         i = Counter.new
         clause.xpath(ns(NUMBERED_SUBCLAUSES)).each do |c|
           i.increment(c)
           section_names1(c, "#{num}.#{i.print}", level + 1)
         end
-        clause.xpath(ns(UNNUMBERED_SUBCLAUSES)).each_with_index do |c, i|
+        clause.xpath(ns(UNNUMBERED_SUBCLAUSES)).each do |c|
           unnumbered_section_names1(c, lvl + 1)
         end
       end
 
       def unnumbered_section_names1(clause, level)
-        lbl = clause&.at(ns("./title"))&.text || "[#{clause["id"]}]"
+        lbl = clause&.at(ns("./title"))&.text || "[#{clause['id']}]"
         @anchors[clause["id"]] =
           { label: lbl, xref: l10n(%{"#{lbl}"}), level: level, type: "clause" }
         clause.xpath(ns(SUBCLAUSES)).each do |c|
@@ -88,75 +137,95 @@ module IsoDoc
 
       def back_anchor_names(docxml)
         super
-        @annexlbl = docxml.at(ns("//bibdata/ext/structuredidentifier/appendix")) ?
-          @labels["appendix"] : @labels["annex"]
-        docxml.xpath(ns("//annex[not(@unnumbered = 'true')]")).
-          each_with_index { |c, i| annex_names(c, (i+1).to_s) }
-        docxml.xpath(ns("//annex[@unnumbered = 'true']")).
-          each { |c| unnumbered_annex_names(c) }
+        i = @jcgm ? Counter.new("@", skip_i: true) : Counter.new(0)
+        docxml.xpath(ns("//annex[not(@unnumbered = 'true')]")).each do |c|
+          i.increment(c)
+          annex_names(c, i.print)
+        end
+        docxml.xpath(ns("//annex[@unnumbered = 'true']"))
+          .each { |c| unnumbered_annex_names(c) }
+        docxml.xpath(ns("//indexsect")).each { |b| preface_names(b) }
+      end
+
+      def annex_name_anchors(clause, num)
+        { label: annex_name_lbl(clause, num), type: "clause", value: num.to_s,
+          xref: l10n("#{@annexlbl} #{num}"), level: 1 }
       end
 
       def annex_names(clause, num)
-        @anchors[clause["id"]] =
-          { label: annex_name_lbl(clause, num), type: "clause", value: num.to_s,
-            xref: l10n("#{@annexlbl} #{num}"), level: 1 }
+        @anchors[clause["id"]] = annex_name_anchors(clause, num)
         if a = single_annex_special_section(clause)
-          annex_names1(a, "#{num}", 1)
+          annex_names1(a, num.to_s, 1)
         else
           i = Counter.new
           clause.xpath(ns(NUMBERED_SUBCLAUSES)).each do |c|
             i.increment(c)
             annex_names1(c, "#{num}.#{i.print}", 2)
           end
-          clause.xpath(ns(UNNUMBERED_SUBCLAUSES)).each do |c|
-            unnumbered_annex_names1(c, 2)
-          end
+          clause.xpath(ns(UNNUMBERED_SUBCLAUSES))
+            .each { |c| unnumbered_annex_names1(c, 2) }
         end
         hierarchical_asset_names(clause, num)
       end
 
+      def unnumbered_annex_anchors(lbl)
+        { label: lbl, type: "clause", value: "",
+          xref: l10n(%{"#{lbl}"}), level: 1 }
+      end
+
       def unnumbered_annex_names(clause)
-        lbl = clause&.at(ns("./title"))&.text || "[#{clause["id"]}]"
-        @anchors[clause["id"]] =
-          { label: lbl, type: "clause", value: "",
-            xref: l10n(%{"#{lbl}"}), level: 1 }
+        lbl = clause&.at(ns("./title"))&.text || "[#{clause['id']}]"
+        @anchors[clause["id"]] = unnumbered_annex_anchors(lbl)
         if a = single_annex_special_section(clause)
-          annex_names1(a, "#{num}", 1)
+          annex_names1(a, num.to_s, 1)
         else
-          clause.xpath(ns(SUBCLAUSES)).each do |c|
-            unnumbered_annex_names1(c, 2)
-          end
+          clause.xpath(ns(SUBCLAUSES))
+            .each { |c| unnumbered_annex_names1(c, 2) }
         end
         hierarchical_asset_names(clause, lbl)
       end
 
+      def annex_names1_anchors(num, level)
+        lbl = @jcgm ? "" : "#{@annexlbl} "
+        { label: num, xref: l10n("#{lbl}#{num}"),
+          level: level, type: "clause" }
+      end
+
       def annex_names1(clause, num, level)
-        @anchors[clause["id"]] =
-          { label: num, xref: l10n("#{@annexlbl} #{num}"),
-            level: level, type: "clause" }
+        @anchors[clause["id"]] = annex_names1_anchors(num, level)
         i = Counter.new
         clause.xpath(ns(NUMBERED_SUBCLAUSES)).each do |c|
           i.increment(c)
           annex_names1(c, "#{num}.#{i.print}", level + 1)
         end
-        clause.xpath(ns(UNNUMBERED_SUBCLAUSES)).each do |c|
-          unnumbered_annex_names1(c, level + 1)
-        end
+        clause.xpath(ns(UNNUMBERED_SUBCLAUSES))
+          .each { |c| unnumbered_annex_names1(c, level + 1) }
       end
 
       def unnumbered_annex_names1(clause, level)
-        lbl = clause&.at(ns("./title"))&.text || "[#{clause["id"]}]"
-        @anchors[clause["id"]] =
-          { label: lbl, xref: l10n(%{"#{lbl}"}),
-            level: level, type: "clause" }
-        clause.xpath(ns(SUBCLAUSES)).each do |c|
-          unnumbered_annex_names1(c, level + 1)
-        end
+        lbl = clause&.at(ns("./title"))&.text || "[#{clause['id']}]"
+        @anchors[clause["id"]] = { label: lbl, xref: l10n(%{"#{lbl}"}),
+                                   level: level, type: "clause" }
+        clause.xpath(ns(SUBCLAUSES))
+          .each { |c| unnumbered_annex_names1(c, level + 1) }
       end
 
-      def annex_name_lbl(clause, num)
+      def annex_name_lbl(_clause, num)
         l10n("<strong>#{@annexlbl} #{num}</strong>")
       end
+
+      def sequential_formula_names(clause)
+        c = Counter.new
+        clause.xpath(ns(".//formula")).each do |t|
+          next if t["id"].nil? || t["id"].empty?
+
+          @anchors[t["id"]] = anchor_struct(
+            c.increment(t).print, nil,
+            t["inequality"] ? @labels["inequality"] : @labels["formula"],
+            "formula", t["unnumbered"]
+          )
+        end
+      end
     end
   end
 end