metanorma-bipm 0.0.1 → 1.0.0

data/lib/isodoc/bipm/i18n-en.yaml

@@ -1 +1,8 @@
 annex: Appendix
+appendix: Annex
+see: see
+clause: Chapter
+subclause: Section
+formula: Equation
+inequality: Inequality
+bibliography: References

data/lib/isodoc/bipm/i18n-fr.yaml

@@ -1,4 +1,20 @@
 annex: Annexe
+appendix: Appendice
+see: voir
+clause: chapître
+subclause: section
+formula: équation
+inequality: inégalité
+bibliography: Références
+note_xref: note
+termnote: note % à l’article
+list: liste
+figure: figure
+table: tableau
+requirement: exigence
+recommendation: recommandation
+permission: autorisation
+example_xref: exemple
 doctype_dict: 
   brochure: brochure
   mise-en-pratique: mise-en-pratique

data/lib/isodoc/bipm/metadata.rb

@@ -7,17 +7,34 @@ module IsoDoc
         Metanorma::BIPM.configuration
       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
+
+      def initialize(lang, script, labels)
+        super
+        here = File.join(File.dirname(__FILE__), "html", "si-aspect")
+        si_paths = []
+        SI_ASPECT.each do |s|
+          si_paths << File.expand_path(File.join(here, "#{s}.png"))
+        end
+        set(:si_aspect_index, SI_ASPECT)
+        set(:si_aspect_paths, si_paths)
+      end
+
+      TITLE = "//bibdata/title".freeze
+
       def title(isoxml, _out)
-        lang1 = @lang == "fr" ? "fr" : "en"
-        lang2 = @lang == "fr" ? "en" : "fr"
+        lang1, lang2  = @lang == "fr" ? %w(fr en) : %w(en fr)
         set(:doctitle, @c.encode(isoxml&.at(
-          ns("//bibdata/title[@type='main'][@language='#{lang1}']"))&.text || ""))
+          ns("#{TITLE}[@type='main'][@language='#{lang1}']"))&.text || ""))
         set(:docsubtitle, @c.encode(isoxml&.at(
-          ns("//bibdata/title[@type='main'][@language='#{lang2}']"))&.text || ""))
-        set(:appendixtitle, @c.encode(isoxml&.at(
-          ns("//bibdata/title[@type='appendix'][@language='#{lang1}']"))&.text || ""))
-        set(:appendixsubtitle, @c.encode(isoxml&.at(
-          ns("//bibdata/title[@type='appendix'][@language='#{lang2}']"))&.text || ""))
+          ns("#{TITLE}[@type='main'][@language='#{lang2}']"))&.text || ""))
+        %w(appendix 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(
+            ns("#{TITLE}[@type='#{e}'][@language='#{lang2}']"))&.text || ""))
+        end
       end
 
       def status_print(status)
@@ -30,11 +47,18 @@ module IsoDoc
 
       def docid(isoxml, _out)
         super
-        label1 = @lang == "fr" ? "Annexe" : "Appendix"
-        label2 = @lang == "fr" ? "Appendix" : "Annexe"
+        label1, label2 = @lang == "fr" ? %w(Annexe Appendix) : %w(Appendix Annexe)
         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(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}"))
+      end
+
+      def extract_person_names_affiliations(authors)
+        extract_person_affiliations(authors)
       end
     end
   end

data/lib/isodoc/bipm/pdf_convert.rb

@@ -10,8 +10,27 @@ module IsoDoc
         super
       end
 
+      def configuration
+        Metanorma::BIPM.configuration
+      end
+
       def pdf_stylesheet(docxml)
-        "bipm.brochure.xsl"
+        doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
+        doctype = "brochure" unless %w(guide mise-en-pratique rapport).
+          include? doctype
+        "bipm.#{doctype}.xsl"
+      end
+
+      def pdf_options(docxml)
+        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"
+        else
+          super
+        end
       end
     end
   end

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -9,19 +9,114 @@ module IsoDoc
         return if labelled_ancestor(f)
         return if f["unnumbered"] && !f.at(ns("./name"))
         n = @xrefs.anchor(f['id'], :label, false)
-        prefix_name(f, ".<tab/>", l10n("#{@i18n.table} #{n}"), "name")
+        prefix_name(f, ".<tab/>", l10n("#{@i18n.table.capitalize} #{n}"), "name")
       end
 
       def annex1(f)
-      lbl = @xrefs.anchor(f['id'], :label)
-      if t = f.at(ns("./title"))
-        t.children = "<strong>#{t.children.to_xml}</strong>"
+        return if f["unnumbered"] == "true"
+        lbl = @xrefs.anchor(f['id'], :label)
+        if t = f.at(ns("./title"))
+          t.children = "<strong>#{t.children.to_xml}</strong>"
+        end
+        prefix_name(f, ".<tab/>", lbl, "title")
+      end
+
+      def clause1(f)
+        return if f["unnumbered"] == "true"
+        return if f.at(("./ancestor::*[@unnumbered = 'true']"))
+        super
+      end
+
+      def conversions(docxml)
+        super
+        doccontrol docxml
+      end
+
+      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>
+        END
+        docxml.root << clause
+      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 }"\
+            "<td/></tr>"
+          i += 1
+        end
+        ret
+      end
+
+      def list_draft(xml, i)
+        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(" ")]
+      end
+
+      def list_authors(xml)
+        ret = list_people(
+          xml, "//bibdata/contributor[xmlns:role/@type = 'author']/person")
+        @i18n.multiple_and(ret, @i18n.get["and"])
+      end
+
+      COCHAIR = "xmlns:role[contains(text(),'co-chair')]".freeze
+      CHAIR = "[xmlns:role[contains(text(),'chair')]"\
+        "[not(contains(text(),'co-chair'))]]".freeze
+
+      def list_cochairs(xml)
+        ret = list_people(xml, "//bibdata/contributor[#{COCHAIR}]/person")
+        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"])}"
+      end
+
+      def list_chairs(xml)
+        ret = list_people(xml, "//bibdata/contributor#{CHAIR}/person")
+        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"])}"
+      end
+
+      def list_people(xml, xpath)
+        ret = []
+        xml.xpath(ns(xpath)).each do |p|
+          name = p&.at(ns("./name/completename"))&.text
+          aff = p&.at(ns("./affiliation/organization/abbreviation"))&.text ||
+            p&.at(ns("./affiliation/organization/name"))&.text
+          c = name || ""
+          aff and c += " (#{aff})"
+          ret << c
+        end
+        ret
+      end
+
+      def twitter_cldr_localiser_symbols
+        { group: "&#x202F;", fraction_group: "&#x202F;", fraction_group_digits: 3 }
+      end
+
+      def mathml1(f, locale)
+      localize_maths(f, locale)
       end
-      prefix_name(f, ".<tab/>", lbl, "title")
-    end
 
       include Init
     end
   end
 end
-

data/lib/isodoc/bipm/xref.rb

@@ -1,15 +1,150 @@
 module IsoDoc
   module BIPM
     class Xref < IsoDoc::Xref
+      def initialize(lang, script, klass, i18n, options = {})
+        super
+      end
+
+      def clause_names(docxml, sect_num)
+        sect_num = 0
+        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
+        docxml.xpath(ns("//sections/clause[@unnumbered = 'true'] | "\
+                        "//sections/terms[@unnumbered = 'true'] | "\
+                        "//sections/definitions[@unnumbered = 'true']")).
+        each do |c|
+          unnumbered_section_names(c, 1)
+        end
+      end
+
+      NUMBERED_SUBCLAUSES = "./clause[not(@unnumbered = 'true')] | "\
+        "./references[not(@unnumbered = 'true')] | "\
+        "./term[not(@unnumbered = 'true')] | "\
+        "./terms[not(@unnumbered = 'true')] | "\
+        "./definitions[not(@unnumbered = 'true')]".freeze
+
+      UNNUMBERED_SUBCLAUSES = "./clause[@unnumbered = 'true'] | "\
+        "./references[@unnumbered = 'true'] | "\
+        "./term[@unnumbered = 'true'] | "\
+        "./terms[@unnumbered = 'true'] | "\
+        "./definitions[@unnumbered = 'true']".freeze
+
+      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)
+        end
+        clause.xpath(ns(UNNUMBERED_SUBCLAUSES)).each_with_index do |c, i|
+          unnumbered_section_names1(c, lvl + 1)
+        end
+        num
+      end
+
+      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|
+          unnumbered_section_names1(c, lvl + 1)
+        end
+      end
+
+      def section_names1(clause, num, level)
+        @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)
+        end
+        clause.xpath(ns(UNNUMBERED_SUBCLAUSES)).each_with_index do |c, i|
+          unnumbered_section_names1(c, lvl + 1)
+        end
+      end
+
+      def unnumbered_section_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_section_names1(c, level + 1)
+        end
+      end
+
       def back_anchor_names(docxml)
         super
-        docxml.xpath(ns("//annex")).each_with_index do |c, i|
-          annex_names(c, (i+1).to_s)
+        @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) }
+      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 }
+        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)
+          end
+        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 }
+        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
+        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)
+        end
+      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
       end
 
       def annex_name_lbl(clause, num)
-        l10n("<strong>#{@labels["annex"]} #{num}</strong>")
+        l10n("<strong>#{@annexlbl} #{num}</strong>")
       end
     end
   end

data/lib/metanorma/bipm.rb

@@ -4,6 +4,13 @@ require "metanorma/bipm/processor"
 
 module Metanorma
   module BIPM
+    def self.fonts_used
+      {
+        html: ["Times New Roman", "STIX", "Courier New"],
+        pdf: ["Arial", "Times New Roman", "Work Sans", "STIX"]
+      }
+    end
+
     class Configuration < Metanorma::Generic::Configuration
       def initialize(*args)
         super

data/lib/metanorma/bipm/fonts_manifest.yaml

@@ -0,0 +1,7 @@
+---
+Times New Roman:
+STIX Two Math:
+Courier New:
+Arial:
+Work Sans:
+Source Han Sans:

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module BIPM
-    VERSION = "0.0.1"
+    VERSION = "1.0.0"
   end
 end

data/metanorma-bipm.gemspec

@@ -26,8 +26,7 @@ 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.7.0"
-  spec.add_dependency "isodoc", "~> 1.2.0"
+  spec.add_dependency "metanorma-generic", "~> 1.8.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "sassc", "2.4.0"

data/metanorma.yml

@@ -1,8 +1,14 @@
 metanorma_name: bipm
 organization_name_short: BIPM
-organization_name_long: Bureau International des poids et mesures
+organization_name_long: 
+  fr: Bureau international des poids et mesures
+  en: Bureau International des Poids et Mesures
 document_namespace: https://www.metanorma.org/ns/bipm
 xml_root_tag: 'bipm-standard'
+html_bodyfont: Times New Roman
+html_headerfont: Times New Roman
+html_normalfontsize: "15px"
+html_footnotefontsize: "0.9em"
 logo_path: lib/isodoc/bipm/html/logo.png
 i18nyaml: 
   en: lib/isodoc/bipm/i18n-en.yaml
@@ -39,23 +45,57 @@ doctypes:
 default_doctype: brochure
 committees:
   - CGPM
+  - General Conference on Weights and Measures
+  - Conférence générale des poids et mesures
   - CIPM
+  - International Committee for Weights and Measures
+  - Comité international des poids et mesures 
   - BIPM
+  - International Bureau of Weights and Measures
+  - Bureau International des Poids et Mesures
   - CCAUV
+  - Consultative Committee for Acoustics, Ultrasound and Vibration
+  - Comité consultatif de l'acoustique, des ultrasons et des vibrations 
   - CCEM
+  - Consultative Committee for Electricity and Magnetism
+  - Comité consultatif d'électricité et magnétisme 
   - CCL
+  - Consultative Committee for Length
+  - Comité consultatif des longueurs 
   - CCM
+  - Consultative Committee for Mass and Related Quantities
+  - Comité consultatif pour la masse et les grandeurs apparentées 
   - CCPR
+  - Consultative Committee for Photometry and Radiometry
+  - Comité consultatif de photométrie et radiométrie 
   - CCQM
+  - "Consultative Committee for Amount of Substance: Metrology in Chemistry and Biology"
+  - "Comité consultatif pour la quantité de matière : métrologie en chimie et biologie"
   - CCRI
+  - Consultative Committee for Ionizing Radiation
+  - Comité consultatif des rayonnements ionisants 
   - CCT
+  - Consultative Committee for Thermometry
+  - Comité consultatif de thermométrie 
   - CCTF
+  - Consultative Committee for Time and Frequency
+  - Comité consultatif du temps et des fréquences 
   - CCU
+  - Consultative Committee for Units
+  - Comité consultatif des unités 
   - CCL-CCT
+  - Frequency Standards Working Group
   - JCGM
+  - Joint Committee for Guides in Metrology
+  - Comité commun pour les guides en métrologie
   - JCRB
+  - Joint Committee of the Regional Metrology Organizations and the BIPM
+  - Comité mixte des organisations régionales de métrologie et du BIPM
   - JCTLM
+  - Joint Committee for Traceability in Laboratory Medicine
+  - Comité commun pour la traçabilité en médecine de laboratoire
   - INetQI
+  - International Network on Quality Infrastructure
 metadata_extensions:
   comment-period:
     comment-period-from:
@@ -63,6 +103,7 @@ metadata_extensions:
     comment-period-to:
       _output: to
   si-aspect:
+  meeting-note:
   structuredidentifier:
     docnumber:
     partnumber: