metanorma-bipm 0.0.2 → 0.0.3

data/lib/isodoc/bipm/html/html_bipm_titlepage.html

@@ -23,12 +23,16 @@
       <span class="docyear">{{ docyear }} {{ draftinfo }}</span>
     </div>
 
+    <div class="coverpage-logo">
+      <img src="{{ logo }}"/>
+    </div>
+
     <div class="coverpage-title">
       {% if appendixtitle %}
       <span class="title-third">{{ doctitle }}</span>
       <span class="title-third">{{ docsubtitle }}</span><br/>
-      <span class="title-first">{{ appendixid}}: {{ appendixtitle }}</span><br/>
-      <span class="title-second">{{ appendixid_alt}}: {{ appendixsubtitle }}</span>
+      <span class="title-first">{% if appendixid %}{{ appendixid}}: {% endif %}{{ appendixtitle }}</span><br/>
+      <span class="title-second">{% if appendixid_alt %}{{ appendixid_alt}}: {% endif %}{{ appendixsubtitle }}</span>
       {% else %}
       <span class="title-first">{{ doctitle }}</span><br/>
       <span class="title-second">{{ docsubtitle }}</span>
@@ -38,10 +42,24 @@
 
   <div class="coverpage-logo">
     <span>Bureau International de Poids et Mesures {{ docyear }}</span>
+    {% if metadata_extensions["si-aspect"] %}
+    <br/>
+{% for item in si_aspect_index %}
+  {% if item == metadata_extensions["si-aspect"]  %}
+  <img src="{{ si_aspect_paths[forloop.index0] }}" width="310px" height="310px"/>
+  {% endif %}
+{% endfor %}
+    {% endif %}
   </div>
 
+  {% for item in metadata_extensions["editorialgroup"]["committee"]["variant_language"] %}
+  {% if item == lang %}
+  {% assign committee = metadata_extensions["editorialgroup"]["committee"]["variant"][forloop.index0] %}
+  {% endif %}
+  {% endfor %}
+
   <div class="coverpage-tc-name">
-    <span>{{ tc }}</span>
+    <span>{{ metadata_extensions["editorialgroup"]["committee_acronym"] }}{% if metadata_extensions["editorialgroup"]["committee_acronym"] and committee %}: {% endif %}{{ committee }}</span>
   </div>
   </div>
 

data/lib/isodoc/bipm/html/htmlstyle.css

@@ -112,16 +112,20 @@ b, strong {
 div.document-stage-band, div.document-type-band {
   background-color: #333333; }
 
+a.FootnoteRef + a.FootnoteRef:before {
+  content: ", ";
+  vertical-align: super; }
+
 #brochure-band {
   background-color: #0AC442; }
 
 #brochure {
   border-bottom: solid 3px #0AC442; }
 
-#mis-en-pratique-band {
+#mise-en-pratique-band {
   background-color: #540D6E; }
 
-#mis-en-pratique {
+#mise-en-pratique {
   border-bottom: solid 3px #540D6E; }
 
 #rapport-band {

data/lib/isodoc/bipm/html/htmlstyle.scss

@@ -9,7 +9,7 @@
 
 $doctype-colors-list: (
   brochure: #0AC442,
-  mis-en-pratique: #540D6E,
+  mise-en-pratique: #540D6E,
   rapport: #D183C9,
   monographie: #65AFFF,
   guide: #3A405A,

data/lib/isodoc/bipm/html_convert.rb

@@ -7,6 +7,21 @@ module IsoDoc
   module BIPM
     class HtmlConvert < IsoDoc::Generic::HtmlConvert
 
+      def middle(isoxml, out)
+        super
+        doccontrol isoxml, out
+      end
+
+      def doccontrol(isoxml, out)
+        c = isoxml.at(ns("//doccontrol")) or return
+        out.div **attr_code(class: "doccontrol") do |div|
+          clause_parse_title(c, div, c.at(ns("./title")), out)
+          c.children.reject { |c1| c1.name == "title" }.each do |c1|
+            parse(c1, div)
+          end
+        end
+      end
+
       include BaseConvert
       include Init
     end

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

@@ -1 +1,2 @@
 annex: Appendix
+see: see

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

@@ -1,4 +1,5 @@
 annex: Annexe
+see: voir
 doctype_dict: 
   brochure: brochure
   mise-en-pratique: mise-en-pratique

data/lib/isodoc/bipm/metadata.rb

@@ -7,17 +7,33 @@ 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"
         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 || ""))
+          ns("#{TITLE}[@type='main'][@language='#{lang2}']"))&.text || ""))
         set(:appendixtitle, @c.encode(isoxml&.at(
-          ns("//bibdata/title[@type='appendix'][@language='#{lang1}']"))&.text || ""))
+          ns("#{TITLE}[@type='appendix'][@language='#{lang1}']"))&.text || ""))
         set(:appendixsubtitle, @c.encode(isoxml&.at(
-          ns("//bibdata/title[@type='appendix'][@language='#{lang2}']"))&.text || ""))
+          ns("#{TITLE}[@type='appendix'][@language='#{lang2}']"))&.text || ""))
       end
 
       def status_print(status)

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -13,15 +13,97 @@ module IsoDoc
       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
+
+      def list_cochairs(xml)
+        ret = list_people(xml, "//bibdata/contributor[xmlns:role[contains(text(),'co-chair')]]/person")
+        role = xml&.at(ns("//bibdata/contributor[xmlns:role[contains(text(),'co-chair')]]/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[xmlns:role[contains(text(),'chair')][not(contains(text(),'co-chair'))]]/person")
+        role = xml&.at(ns("//bibdata/contributor[xmlns:role[contains(text(),'chair')][not(contains(text(),'co-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
-      prefix_name(f, ".<tab/>", lbl, "title")
-    end
 
       include Init
     end
   end
 end
-

data/lib/isodoc/bipm/xref.rb

@@ -1,10 +1,139 @@
 module IsoDoc
   module BIPM
     class Xref < IsoDoc::Xref
+      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["clause"]} #{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)
+        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: "#{@labels["annex"]} #{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: "#{@labels["annex"]} #{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
 

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module BIPM
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/metanorma.yml

@@ -3,6 +3,8 @@ organization_name_short: BIPM
 organization_name_long: 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
 logo_path: lib/isodoc/bipm/html/logo.png
 i18nyaml: 
   en: lib/isodoc/bipm/i18n-en.yaml
@@ -39,23 +41,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 +99,7 @@ metadata_extensions:
     comment-period-to:
       _output: to
   si-aspect:
+  meeting-note:
   structuredidentifier:
     docnumber:
     partnumber: