metanorma-bipm 1.0.2 → 1.0.7

data/lib/isodoc/bipm/metadata.rb

@@ -59,6 +59,8 @@ 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)

data/lib/isodoc/bipm/pdf_convert.rb

@@ -15,6 +15,7 @@ module IsoDoc
       end
 
       def pdf_stylesheet(docxml)
+        return "jcgm.standard.xsl" if docxml&.at(ns("//bibdata/ext/editorialgroup/committee/@acronym"))&.value == "JCGM"
         doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
         doctype = "brochure" unless %w(guide mise-en-pratique rapport).
           include? doctype

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -8,7 +8,7 @@ module IsoDoc
     class PresentationXMLConvert < IsoDoc::Generic::PresentationXMLConvert
       def table1(f)
         return if labelled_ancestor(f)
-        return if f["unnumbered"] && !f.at(ns("./name"))
+        return if f["unnumbered"]
         n = @xrefs.anchor(f['id'], :label, false)
         prefix_name(f, ".<tab/>", l10n("#{@i18n.table.capitalize} #{n}"), "name")
       end
@@ -33,27 +33,41 @@ 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>
+        <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)
+        while a = list_draft(xml, i) != ["", ""]
           ret += "<tr>#{list_draft(xml, i).map { |x| "<td>#{x}</td>" }.join }"\
             "<td/></tr>"
           i += 1
@@ -62,14 +76,14 @@ 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)
@@ -84,6 +98,7 @@ 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"])}"
@@ -91,6 +106,7 @@ module IsoDoc
 
       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"])}"

data/lib/isodoc/bipm/xref.rb

@@ -9,19 +9,31 @@ module IsoDoc
       end
 
       def clause_names(docxml, sect_num)
+        if docxml&.at(ns("//bibdata/ext/editorialgroup/committee/@acronym"))&.
+            value == "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_with_index do |c, i|
+          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
+        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
+        each { |c| unnumbered_section_names(c, 1) }
       end
 
       NUMBERED_SUBCLAUSES = "./clause[not(@unnumbered = 'true')] | "\
@@ -56,8 +68,8 @@ 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" }
+        @anchors[clause["id"]] = { label: lbl, xref: l10n(%{"#{lbl}"}),
+                                   level: lvl, type: "clause" }
         clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
           unnumbered_section_names1(c, lvl + 1)
         end
@@ -65,7 +77,8 @@ module IsoDoc
 
       def section_names1(clause, num, level)
         @anchors[clause["id"]] =
-          { label: num, level: level, xref: l10n("#{@labels["subclause"]} #{num}"),
+          { label: num, level: level,
+            xref: l10n("#{@labels["subclause"]} #{num}"),
             type: "clause" }
         i = Counter.new
         clause.xpath(ns(NUMBERED_SUBCLAUSES)).each do |c|
@@ -94,6 +107,7 @@ module IsoDoc
           each_with_index { |c, i| annex_names(c, (i+1).to_s) }
         docxml.xpath(ns("//annex[@unnumbered = 'true']")).
           each { |c| unnumbered_annex_names(c) }
+        docxml.xpath(ns("//indexsect")).each { |b| preface_names(b) }
       end
 
       def annex_names(clause, num)
@@ -108,9 +122,8 @@ module IsoDoc
             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
@@ -123,9 +136,8 @@ module IsoDoc
         if a = single_annex_special_section(clause)
           annex_names1(a, "#{num}", 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
@@ -139,24 +151,33 @@ module IsoDoc
           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
+        @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)
         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

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module BIPM
-    VERSION = "1.0.2"
+    VERSION = "1.0.7"
   end
 end

data/metanorma-bipm.gemspec

@@ -26,16 +26,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  spec.add_dependency "metanorma-generic", "~> 1.8.2"
+  spec.add_dependency "metanorma-generic", "~> 1.9.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
-  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
-  spec.add_development_dependency "rubocop", "~> 0.50"
+  spec.add_development_dependency "rubocop", "~> 1.5.2"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
 end

data/metanorma.yml

@@ -5,6 +5,7 @@ organization_name_long:
   en: Bureau International des Poids et Mesures
 document_namespace: https://www.metanorma.org/ns/bipm
 xml_root_tag: 'bipm-standard'
+docid_template: "{{ org_abbrev }} {{ docnumeric }}"
 html_bodyfont: Times New Roman
 html_headerfont: Times New Roman
 html_normalfontsize: "15px"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-bipm
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2021-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.50'
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.50'
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -175,6 +175,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
+- ".gitignore"
+- ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
@@ -189,6 +191,7 @@ files:
 - lib/asciidoctor/bipm/bipm.rng
 - lib/asciidoctor/bipm/boilerplate-en.xml
 - lib/asciidoctor/bipm/boilerplate-fr.xml
+- lib/asciidoctor/bipm/boilerplate-jcgm-en.xml
 - lib/asciidoctor/bipm/converter.rb
 - lib/asciidoctor/bipm/isodoc.rng
 - lib/asciidoctor/bipm/reqt.rng
@@ -223,6 +226,7 @@ files:
 - lib/isodoc/bipm/i18n.rb
 - lib/isodoc/bipm/index.rb
 - lib/isodoc/bipm/init.rb
+- lib/isodoc/bipm/jcgm.standard.xsl
 - lib/isodoc/bipm/metadata.rb
 - lib/isodoc/bipm/pdf_convert.rb
 - lib/isodoc/bipm/presentation_xml_convert.rb
@@ -252,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: metanorma-bipm lets you write BIPM standards in Metanorma.