metanorma-bipm 2.0.8 → 2.1.0

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

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

@@ -851,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"/>

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.8".freeze
+    VERSION = "2.1.0".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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-bipm
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.1.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 2022-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +234,7 @@ files:
 - lib/isodoc/bipm/bipm.guide.xsl
 - lib/isodoc/bipm/bipm.mise-en-pratique.xsl
 - lib/isodoc/bipm/bipm.rapport.xsl
+- lib/isodoc/bipm/doccontrol.rb
 - lib/isodoc/bipm/html/html_bipm_intro.html
 - lib/isodoc/bipm/html/html_bipm_titlepage.html
 - lib/isodoc/bipm/html/htmlstyle.css