metanorma-bipm 1.0.1 → 1.0.6

data/lib/isodoc/bipm/metadata.rb

@@ -29,7 +29,7 @@ module IsoDoc
           ns("#{TITLE}[@type='main'][@language='#{lang1}']"))&.text || ""))
         set(:docsubtitle, @c.encode(isoxml&.at(
           ns("#{TITLE}[@type='main'][@language='#{lang2}']"))&.text || ""))
-        %w(appendix part subtitle).each do |e|
+        %w(appendix annex part subtitle).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(
@@ -51,10 +51,16 @@ module IsoDoc
         dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/appendix"))
         dn and set(:appendixid, @i18n.l10n("#{label1} #{dn&.text}"))
         dn and set(:appendixid_alt, @i18n.l10n("#{label2} #{dn&.text}"))
+        label1, label2 = @lang == "fr" ? %w(Appendice Annex) : %w(Annex Appendice)
+        dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/annexid"))
+        dn and set(:annexid, @i18n.l10n("#{label1} #{dn&.text}"))
+        dn and set(:annexid_alt, @i18n.l10n("#{label2} #{dn&.text}"))
         label1, label2  = @lang == "fr" ? %w(Partie Part) : %w(Part Partie)
         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

data/lib/isodoc/bipm/xref.rb

@@ -1,24 +1,38 @@
 module IsoDoc
   module BIPM
+    class Counter < IsoDoc::XrefGen::Counter
+    end
+
     class Xref < IsoDoc::Xref
       def initialize(lang, script, klass, i18n, options = {})
         super
       end
 
       def clause_names(docxml, sect_num)
-        sect_num = 0
+        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_with_index do |c, i|
-          section_names(c, (i + sect_num), 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')] | "\
@@ -35,12 +49,13 @@ module IsoDoc
 
       def section_names(clause, num, lvl)
         return num if clause.nil?
-        num = num + 1
-        @anchors[clause["id"]] =
-          { label: num.to_s, xref: l10n("#{@labels["clause"]} #{num}"),
-            level: lvl, type: "clause" }
-        clause.xpath(ns(NUMBERED_SUBCLAUSES)).each_with_index do |c, i|
-          section_names1(c, "#{num}.#{i + 1}", lvl + 1)
+        num.increment(clause)
+        @anchors[clause["id"]] = { label: num.print, xref: l10n("#{@labels["clause"]} #{num.print}"),
+                                   level: lvl, type: "clause" }
+        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|
           unnumbered_section_names1(c, lvl + 1)
@@ -51,8 +66,7 @@ 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
@@ -62,8 +76,10 @@ module IsoDoc
         @anchors[clause["id"]] =
           { label: num, level: level, xref: l10n("#{@labels["subclause"]} #{num}"),
             type: "clause" }
-        clause.xpath(ns(NUMBERED_SUBCLAUSES)).each_with_index do |c, i|
-          section_names1(c, "#{num}.#{i + 1}", level + 1)
+        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|
           unnumbered_section_names1(c, lvl + 1)
@@ -83,64 +99,54 @@ module IsoDoc
         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) }
+        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) }
+        docxml.xpath(ns("//indexsect")).each { |b| preface_names(b) }
       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"]] = { label: annex_name_lbl(clause, num), type: "clause", value: num.to_s,
+                                   xref: l10n("#{@annexlbl} #{num}"), level: 1 }
         if a = single_annex_special_section(clause)
           annex_names1(a, "#{num}", 1)
         else
-          clause.xpath(ns(NUMBERED_SUBCLAUSES)).each_with_index do |c, i|
-            annex_names1(c, "#{num}.#{i + 1}", 2)
-          end
-          clause.xpath(ns(UNNUMBERED_SUBCLAUSES)).each do |c|
-            unnumbered_annex_names1(c, 2)
+          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 { |c| unnumbered_annex_names1(c, 2) }
         end
         hierarchical_asset_names(clause, num)
       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 }
+        @anchors[clause["id"]] = { label: lbl, type: "clause", value: "", xref: l10n(%{"#{lbl}"}), level: 1 }
         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
 
       def annex_names1(clause, num, level)
-        @anchors[clause["id"]] =
-          { label: num, xref: l10n("#{@annexlbl} #{num}"),
-            level: level, type: "clause" }
-        clause.xpath(ns(NUMBERED_SUBCLAUSES)).each_with_index do |c, i|
-          annex_names1(c, "#{num}.#{i + 1}", level + 1)
-        end
-        clause.xpath(ns(UNNUMBERED_SUBCLAUSES)).each do |c|
-          unnumbered_annex_names1(c, level + 1)
+        @anchors[clause["id"]] = { label: num, xref: l10n("#{@annexlbl} #{num}"),
+                                   level: level, type: "clause" }
+        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 { |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)

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module BIPM
-    VERSION = "1.0.1"
+    VERSION = "1.0.6"
   end
 end

data/metanorma-bipm.gemspec

@@ -26,14 +26,14 @@ 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.1"
+  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 "simplecov", "~> 0.15"

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"
@@ -83,8 +84,8 @@ committees:
   - CCU
   - Consultative Committee for Units
   - Comité consultatif des unités 
-  - CCL-CCT
-  - Frequency Standards Working Group
+  - CCL-CCTF-WGFS
+  - CCL-CCTF Frequency Standards Working Group
   - JCGM
   - Joint Committee for Guides in Metrology
   - Comité commun pour les guides en métrologie
@@ -110,6 +111,8 @@ metadata_extensions:
      _output: part
     appendix-id:
       _output: appendix
+    annex-id:
+      _output: annexid
 relations:
   - supersedes
   - superseded-by

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-bipm
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2021-03-16 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.1
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        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
@@ -189,6 +189,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 +224,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 +254,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.