metanorma-bipm 2.0.7 → 2.1.1

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -3,6 +3,7 @@ require "metanorma-generic"
 require "metanorma-iso"
 require_relative "init"
 require_relative "index"
+require_relative "doccontrol"
 
 module IsoDoc
   module BIPM
@@ -85,99 +86,6 @@ module IsoDoc
         doccontrol docxml
       end
 
-      def doccontrol(doc)
-        return unless doc.at(ns("//bibdata/relation[@type = 'supersedes']"))
-
-        clause = <<~DOCCONTROL
-          <doccontrol>
-          <title>Document Control</title>
-          <table unnumbered="true"><tbody>
-          <tr><th>Authors:</th><td/><td>#{list_authors(doc)}</td></tr>
-          #{doccontrol_row1(doc)} #{doccontrol_row2(doc)} #{list_drafts(doc)}
-          </tbody></table></doccontrol>
-        DOCCONTROL
-        doc.root << clause
-      end
-
-      def doccontrol_row1(doc)
-        return "" if list_draft(doc, 1) == ["", ""] && list_cochairs(doc).empty?
-
-        <<~ROW
-          <tr>#{list_draft(doc, 1)&.map { |x| "<td>#{x}</td>" }&.join}
-          <td>#{list_cochairs(doc)}</td></tr>
-        ROW
-      end
-
-      def doccontrol_row2(docxml)
-        list_draft(docxml, 2) == ["", ""] && list_chairs(docxml).empty? and
-          return ""
-
-        <<~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 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, idx)
-        d = xml.at(ns("//bibdata/relation[@type = 'supersedes'][#{idx}]"\
-                      "/bibitem")) or return ["", ""]
-
-        draft = d&.at(ns("./version/draft"))&.text and draft = "Draft #{draft}"
-        edn = d&.at(ns("./edition"))&.text and edn = "Version #{edn}"
-        [[draft, edn].join(" "), d&.at(ns("./date"))&.text]
-      end
-
-      def list_authors(xml)
-        ret = list_people(
-          xml, "//bibdata/contributor[xmlns:role/@type = 'author']/person"
-        )
-        @i18n.boolean_conj(ret, "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")
-        ret.empty? and return ""
-        role = xml&.at(ns("//bibdata/contributor[#{COCHAIR}]/role"))&.text
-        label = ret.size > 1 && role ? "#{role}s" : role
-        "#{label}: #{@i18n.boolean_conj(ret, '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.boolean_conj(ret, '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: "&#xA0;", fraction_group: "&#xA0;", fraction_group_digits: 3 }
       end
@@ -261,6 +169,23 @@ module IsoDoc
         super || @xrefs.klass.standard?(bibitem)
       end
 
+      def expand_citeas(text)
+        ret = super
+        if @lang == "fr" && /^(CGPM|CIPM) /.match?(ret)
+          ret.sub!(/^(CGPM|CIPM) (\S+)/) do |_m|
+            "#{$1} &#x2013; #{FR_OUTCOME_TYPE[$2.to_sym] || $2}"
+          end
+        end
+        ret
+      end
+
+      FR_OUTCOME_TYPE = {
+        Resolution: "Résolution",
+        Decision: "Décision",
+        Recommendation: "Recommandation",
+        Declaration: "Déclaration",
+      }.freeze
+
       include Init
     end
   end

data/lib/isodoc/bipm/xref.rb

@@ -153,8 +153,9 @@ module IsoDoc
 
       def annex_names(clause, num)
         @anchors[clause["id"]] = annex_name_anchors(clause, num)
-        if a = single_annex_special_section(clause)
-          annex_names1(a, num.to_s, 1)
+        if @klass.single_term_clause?(clause)
+          annex_names1(clause.at(ns("./references | ./terms | ./definitions")),
+                       num.to_s, 1)
         else
           i = Counter.new
           prefix = @jcgm ? "" : "A"
@@ -176,8 +177,9 @@ module IsoDoc
       def unnumbered_annex_names(clause)
         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.to_s, 1)
+        if @klass.single_term_clause?(clause)
+          annex_names1(clause.at(ns("./references | ./terms | ./definitions")),
+                       num.to_s, 1)
         else
           clause.xpath(ns(SUBCLAUSES))
             .each { |c| unnumbered_annex_names1(c, 2) }
@@ -229,10 +231,12 @@ module IsoDoc
 
       def initial_anchor_names(doc)
         super
+        if @parse_settings.empty? || @parse_settings[:clauses]
         if @jcgm
           @iso.introduction_names(doc.at(ns("//introduction")))
           @anchors.merge!(@iso.get)
         end
+        end
       end
 
       def sequential_figure_names(clause)

data/lib/metanorma/bipm/biblio.rng

@@ -527,7 +527,7 @@
   </define>
   <define name="LocalityType">
     <data type="string">
-      <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
+      <param name="pattern">section|clause|part|paragraph|chapter|page|title|line|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
     </data>
   </define>
   <define name="referenceFrom">
@@ -677,6 +677,9 @@
     <zeroOrMore>
       <ref name="extent"/>
     </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
     <zeroOrMore>
       <ref name="accesslocation"/>
     </zeroOrMore>
@@ -848,17 +851,46 @@
   </define>
   <define name="bplace">
     <element name="place">
-      <optional>
-        <attribute name="uri">
-          <data type="anyURI"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="region"/>
-      </optional>
+      <choice>
+        <text/>
+        <group>
+          <ref name="bibliocity"/>
+          <zeroOrMore>
+            <ref name="biblioregion"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="bibliocountry"/>
+          </zeroOrMore>
+        </group>
+      </choice>
+    </element>
+  </define>
+  <define name="bibliocity">
+    <element name="city">
       <text/>
     </element>
   </define>
+  <define name="biblioregion">
+    <element name="region">
+      <ref name="RegionType"/>
+    </element>
+  </define>
+  <define name="bibliocountry">
+    <element name="country">
+      <ref name="RegionType"/>
+    </element>
+  </define>
+  <define name="RegionType">
+    <optional>
+      <attribute name="iso"/>
+    </optional>
+    <optional>
+      <attribute name="recommended">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <text/>
+  </define>
   <define name="bprice">
     <element name="price">
       <attribute name="currency"/>
@@ -922,9 +954,29 @@
       <text/>
     </element>
   </define>
+  <define name="sizevalue">
+    <element name="value">
+      <attribute name="type"/>
+      <text/>
+    </element>
+  </define>
+  <define name="bibliographic_size">
+    <element name="size">
+      <oneOrMore>
+        <ref name="sizevalue"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="extent">
     <element name="extent">
-      <ref name="BibItemLocality"/>
+      <choice>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="localityStack"/>
+        </zeroOrMore>
+      </choice>
     </element>
   </define>
   <define name="series">

data/lib/metanorma/bipm/converter.rb

@@ -1,5 +1,6 @@
 require "metanorma/standoc/converter"
 require "metanorma/generic/converter"
+require_relative "front"
 
 module Metanorma
   module BIPM
@@ -22,114 +23,6 @@ module Metanorma
         { org_name_long => configuration.organization_name_short }
       end
 
-      def metadata_committee(node, xml)
-        return unless node.attr("committee-en") || node.attr("committee-fr")
-
-        xml.editorialgroup do |a|
-          metadata_committee1(node, a)
-          i = 2
-          while node.attr("committee-en_#{i}") || node.attr("committee-fr_#{i}")
-            metadata_committee2(node, a, i)
-            i += 1
-          end
-          metadata_workgroup(node, a)
-        end
-      end
-
-      def metadata_committee1(node, xml)
-        xml.committee **attr_code(acronym:
-                                  node.attr("committee-acronym")) do |c|
-          e = node.attr("committee-en") and
-            c.variant e, language: "en", script: "Latn"
-          e = node.attr("committee-fr") and
-            c.variant e, language: "fr", script: "Latn"
-        end
-      end
-
-      def metadata_committee2(node, xml, num)
-        xml.committee **attr_code(acronym:
-                                  node.attr("committee-acronym_#{num}")) do |c|
-          %w(en fr).each do |lg|
-            e = node.attr("committee-#{lg}_#{num}") and
-              c.variant e, language: lg, script: "Latn"
-          end
-        end
-      end
-
-      def metadata_workgroup(node, xml)
-        xml.workgroup(node.attr("workgroup"),
-                      **attr_code(acronym: node.attr("workgroup-acronym")))
-        i = 2
-        while node.attr("workgroup_#{i}")
-          xml.workgroup(
-            node.attr("workgroup_#{i}"),
-            **attr_code(acronym: node.attr("workgroup-acronym_#{i}"))
-          )
-          i += 1
-        end
-      end
-
-      def metadata_relations(node, xml)
-        super
-        relation_supersedes_self(node, xml, "")
-        i = 2
-        while relation_supersedes_self(node, xml, "_#{i}")
-          i += 1
-        end
-      end
-
-      def relation_supersedes_self(node, xml, suffix)
-        d = node.attr("supersedes-date#{suffix}")
-        draft = node.attr("supersedes-draft#{suffix}")
-        edition = node.attr("supersedes-edition#{suffix}")
-        return false unless d || draft || edition
-
-        relation_supersedes_self1(xml, d, edition, draft)
-      end
-
-      def relation_supersedes_self1(xml, date, edition, draft)
-        xml.relation **{ type: "supersedes" } do |r|
-          r.bibitem do |b|
-            date and b.date(date,
-                            **{ type: edition ? "published" : "circulated" })
-            edition and b.edition edition
-            draft and b.version do |v|
-              v.draft draft
-            end
-          end
-        end
-      end
-
-      def personal_role(node, xml, suffix)
-        role = node.attr("role#{suffix}") || "author"
-        unless %w(author editor).include?(role.downcase)
-          desc = role
-          role = "editor"
-        end
-        xml.role desc, **{ type: role.downcase }
-      end
-
-      def title(node, xml)
-        ["en", "fr"].each do |lang|
-          at = { language: lang, format: "text/plain" }
-          xml.title **attr_code(at.merge(type: "main")) do |t1|
-            t1 << Metanorma::Utils::asciidoc_sub(node.attr("title-#{lang}"))
-          end
-          %w(cover appendix annex part subpart provenance).each do |w|
-            typed_title(node, xml, lang, w)
-          end
-        end
-      end
-
-      def typed_title(node, xml, lang, type)
-        at = { language: lang, format: "text/plain" }
-        return unless title = node.attr("title-#{type}-#{lang}")
-
-        xml.title **attr_code(at.merge(type: type)) do |t1|
-          t1 << Metanorma::Utils::asciidoc_sub(title)
-        end
-      end
-
       def sectiontype_streamline(ret)
         case ret
         when "introduction" then @jcgm ? "introduction" : "clause"
@@ -157,6 +50,43 @@ module Metanorma
         ret
       end
 
+      def reference_names(xmldoc)
+        xmldoc.xpath("//bibitem[not(ancestor::bibitem)]").each do |ref|
+          docid = ref.at("./docidentifier[@type = 'metanorma']") ||
+            ref.at("./docidentifier[not(@type = 'DOI')]") or next
+          date = ref.at("./date[@type = 'published']")
+          reference = format_ref(reference_names1(docid, date, docid["type"]),
+                                 docid["type"])
+          @anchors[ref["id"]] = { xref: reference }
+        end
+      end
+
+      def reference_names1(docid, date, type)
+        ret = docid.children.to_xml
+        if type == "BIPM" && date &&
+            /(CIPM|CGPM) (Decision|Resolution)/.match?(docid)
+          ret += " (#{date_range(date)})"
+        end
+        ret
+      end
+
+      def date_range(date)
+        from = date.at(("./from"))
+        to = date.at(("./to"))
+        on = date.at(("./on"))
+        return date.text unless from || on || to
+        return on.text.sub(/-.*$/, "") if on
+
+        ret = "#{from.text.sub(/-.*$/, '')}&#x2013;"
+        ret += to.text.sub(/-.*$/, "") if to
+        ret
+      end
+
+      def format_ref(ref, type)
+        ref = ref.sub(/^BIPM /, "") if type == "BIPM"
+        super
+      end
+
       def clause_parse(attrs, xml, node)
         node.option?("unnumbered") and attrs[:unnumbered] = true
         super

data/lib/metanorma/bipm/front.rb

@@ -0,0 +1,113 @@
+module Metanorma
+  module BIPM
+    class Converter < Metanorma::Generic::Converter
+      def metadata_committee(node, xml)
+        return unless node.attr("committee-en") || node.attr("committee-fr")
+
+        xml.editorialgroup do |a|
+          metadata_committee1(node, a)
+          i = 2
+          while node.attr("committee-en_#{i}") || node.attr("committee-fr_#{i}")
+            metadata_committee2(node, a, i)
+            i += 1
+          end
+          metadata_workgroup(node, a)
+        end
+      end
+
+      def metadata_committee1(node, xml)
+        xml.committee **attr_code(acronym:
+                                  node.attr("committee-acronym")) do |c|
+          e = node.attr("committee-en") and
+            c.variant e, language: "en", script: "Latn"
+          e = node.attr("committee-fr") and
+            c.variant e, language: "fr", script: "Latn"
+        end
+      end
+
+      def metadata_committee2(node, xml, num)
+        xml.committee **attr_code(acronym:
+                                  node.attr("committee-acronym_#{num}")) do |c|
+          %w(en fr).each do |lg|
+            e = node.attr("committee-#{lg}_#{num}") and
+              c.variant e, language: lg, script: "Latn"
+          end
+        end
+      end
+
+      def metadata_workgroup(node, xml)
+        xml.workgroup(node.attr("workgroup"),
+                      **attr_code(acronym: node.attr("workgroup-acronym")))
+        i = 2
+        while node.attr("workgroup_#{i}")
+          xml.workgroup(
+            node.attr("workgroup_#{i}"),
+            **attr_code(acronym: node.attr("workgroup-acronym_#{i}")),
+          )
+          i += 1
+        end
+      end
+
+      def metadata_relations(node, xml)
+        super
+        relation_supersedes_self(node, xml, "")
+        i = 2
+        while relation_supersedes_self(node, xml, "_#{i}")
+          i += 1
+        end
+      end
+
+      def relation_supersedes_self(node, xml, suffix)
+        d = node.attr("supersedes-date#{suffix}")
+        draft = node.attr("supersedes-draft#{suffix}")
+        edition = node.attr("supersedes-edition#{suffix}")
+        return false unless d || draft || edition
+
+        relation_supersedes_self1(xml, d, edition, draft)
+      end
+
+      def relation_supersedes_self1(xml, date, edition, draft)
+        xml.relation **{ type: "supersedes" } do |r|
+          r.bibitem do |b|
+            date and b.date(date,
+                            **{ type: edition ? "published" : "circulated" })
+            edition and b.edition edition
+            draft and b.version do |v|
+              v.draft draft
+            end
+          end
+        end
+      end
+
+      def personal_role(node, xml, suffix)
+        role = node.attr("role#{suffix}") || "author"
+        unless %w(author editor).include?(role.downcase)
+          desc = role
+          role = "editor"
+        end
+        xml.role desc, **{ type: role.downcase }
+      end
+
+      def title(node, xml)
+        ["en", "fr"].each do |lang|
+          at = { language: lang, format: "text/plain" }
+          xml.title **attr_code(at.merge(type: "main")) do |t1|
+            t1 << Metanorma::Utils::asciidoc_sub(node.attr("title-#{lang}"))
+          end
+          %w(cover appendix annex part subpart provenance).each do |w|
+            typed_title(node, xml, lang, w)
+          end
+        end
+      end
+
+      def typed_title(node, xml, lang, type)
+        at = { language: lang, format: "text/plain" }
+        return unless title = node.attr("title-#{type}-#{lang}")
+
+        xml.title **attr_code(at.merge(type: type)) do |t1|
+          t1 << Metanorma::Utils::asciidoc_sub(title)
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/bipm/isodoc.rng

@@ -32,6 +32,43 @@
         <ref name="DocumentType"/>
       </element>
     </define>
+    <define name="admonition">
+      <element name="admonition">
+        <attribute name="type">
+          <ref name="AdmonitionType"/>
+        </attribute>
+        <optional>
+          <attribute name="class"/>
+        </optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="uri">
+            <data type="anyURI"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="coverpage">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="notag">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
+        <zeroOrMore>
+          <ref name="paragraph-with-footnote"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="index">
       <element name="index">
         <optional>
@@ -851,6 +888,16 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="coverpage">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="notag">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <choice>
             <ref name="paragraph"/>
@@ -1178,6 +1225,7 @@
       <ref name="concept"/>
       <ref name="add"/>
       <ref name="del"/>
+      <ref name="span"/>
     </choice>
   </define>
   <define name="add">
@@ -1204,6 +1252,14 @@
       </choice>
     </element>
   </define>
+  <define name="span">
+    <element name="span">
+      <attribute name="class"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module BIPM
-    VERSION = "2.0.7".freeze
+    VERSION = "2.1.1".freeze
   end
 end

data/metanorma-bipm.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "metanorma-generic", "~> 2.0.0"
-  spec.add_dependency "metanorma-iso", "~> 2.0.0"
+  spec.add_dependency "metanorma-generic", "~> 2.1.0"
+  spec.add_dependency "metanorma-iso", "~> 2.1.0"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"