metanorma-bipm 2.1.0 → 2.1.3

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -165,10 +165,23 @@ module IsoDoc
         elem.children = l10n("[#{@i18n.source} #{elem.children.to_xml.strip}]")
       end
 
-      def bibliography_bibitem_number_skip(bibitem)
-        super || @xrefs.klass.standard?(bibitem)
+      def expand_citeas(text)
+        ret = super
+        if @lang == "fr" && /^(CGPM|CIPM) /.match?(ret)
+          ret.sub!(/^(CGPM|CIPM) (\S+)/) do |_m|
+            "#{$1} – #{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

@@ -22,9 +22,7 @@ module IsoDoc
       end
 
       def wrap_brackets(txt)
-        return txt if /^\[.*\]$/.match?(txt)
-
-        "[#{txt}]"
+        /^\[.*\]$/.match?(txt) ? txt : "[#{txt}]"
       end
 
       def reference_names(ref)
@@ -34,10 +32,8 @@ module IsoDoc
       end
 
       def clause_names(docxml, sect_num)
-        if @jcgm
-          clause_names_jcgm(docxml, sect_num)
-        else
-          clause_names_bipm(docxml, sect_num)
+        if @jcgm then clause_names_jcgm(docxml, sect_num)
+        else clause_names_bipm(docxml, sect_num)
         end
       end
 
@@ -48,29 +44,29 @@ module IsoDoc
         end
       end
 
+      UNNUM = "@unnumbered = 'true'".freeze
+
       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')]"))
+        docxml.xpath(ns("//sections/clause[not(#{UNNUM})] | "\
+                        "//sections/terms[not(#{UNNUM})] | "\
+                        "//sections/definitions[not(#{UNNUM})]"))
           .each { |c| section_names(c, n, 1) }
-        docxml.xpath(ns("//sections/clause[@unnumbered = 'true'] | "\
-                        "//sections/terms[@unnumbered = 'true'] | "\
-                        "//sections/definitions[@unnumbered = 'true']"))
+        docxml.xpath(ns("//sections/clause[#{UNNUM}] | "\
+                        "//sections/terms[#{UNNUM}] | "\
+                        "//sections/definitions[#{UNNUM}]"))
           .each { |c| unnumbered_section_names(c, 1) }
       end
 
-      NUMBERED_SUBCLAUSES = "./clause[not(@unnumbered = 'true')] | "\
-                            "./references[not(@unnumbered = 'true')] | "\
-                            "./term[not(@unnumbered = 'true')] | "\
-                            "./terms[not(@unnumbered = 'true')] | "\
-                            "./definitions[not(@unnumbered = 'true')]".freeze
+      NUMBERED_SUBCLAUSES =
+        "./clause[not(#{UNNUM})] | ./references[not(#{UNNUM})] | "\
+        "./term[not(#{UNNUM})] | ./terms[not(#{UNNUM})] | "\
+        "./definitions[not(#{UNNUM})]".freeze
 
-      UNNUMBERED_SUBCLAUSES = "./clause[@unnumbered = 'true'] | "\
-                              "./references[@unnumbered = 'true'] | "\
-                              "./term[@unnumbered = 'true'] | "\
-                              "./terms[@unnumbered = 'true'] | "\
-                              "./definitions[@unnumbered = 'true']".freeze
+      UNNUMBERED_SUBCLAUSES =
+        "./clause[#{UNNUM}] | ./references[#{UNNUM}] | "\
+        "./term[#{UNNUM}] | ./terms[#{UNNUM}] | "\
+        "./definitions[#{UNNUM}]".freeze
 
       def section_name_anchors(clause, num, lvl)
         lbl = @jcgm ? "clause_jcgm" : "clause"
@@ -137,11 +133,11 @@ module IsoDoc
       def back_anchor_names(docxml)
         super
         i = @jcgm ? Counter.new("@", skip_i: true) : Counter.new(0)
-        docxml.xpath(ns("//annex[not(@unnumbered = 'true')]")).each do |c|
+        docxml.xpath(ns("//annex[not(#{UNNUM})]")).each do |c|
           i.increment(c)
           annex_names(c, i.print)
         end
-        docxml.xpath(ns("//annex[@unnumbered = 'true']"))
+        docxml.xpath(ns("//annex[#{UNNUM}]"))
           .each { |c| unnumbered_annex_names(c) }
         docxml.xpath(ns("//indexsect")).each { |b| preface_names(b) }
       end
@@ -231,12 +227,10 @@ module IsoDoc
 
       def initial_anchor_names(doc)
         super
-        if @parse_settings.empty? || @parse_settings[:clauses]
-        if @jcgm
+        if (@parse_settings.empty? || @parse_settings[:clauses]) && @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

@@ -614,12 +614,103 @@
     <optional>
       <ref name="fetched"/>
     </optional>
-    <choice>
-      <oneOrMore>
-        <ref name="btitle"/>
-      </oneOrMore>
+    <optional>
       <ref name="formattedref"/>
-    </choice>
+    </optional>
+    <oneOrMore>
+      <ref name="btitle"/>
+    </oneOrMore>
+    <zeroOrMore>
+      <ref name="bsource"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="docidentifier"/>
+    </oneOrMore>
+    <optional>
+      <ref name="docnumber"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="bdate"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="contributor"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="edition"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="version"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="biblionote"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="language"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="script"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bibabstract"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="status"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="copyright"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="docrelation"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="series"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="medium"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="bplace"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bprice"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="extent"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="accesslocation"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="license"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bclassification"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bkeyword"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="validity"/>
+    </optional>
+  </define>
+  <define name="ReducedBibliographicItem">
+    <optional>
+      <attribute name="type">
+        <ref name="BibItemType"/>
+      </attribute>
+    </optional>
+    <optional>
+      <ref name="fetched"/>
+    </optional>
+    <optional>
+      <ref name="formattedref"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="btitle"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="bsource"/>
     </zeroOrMore>
@@ -638,9 +729,9 @@
     <optional>
       <ref name="edition"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="version"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="biblionote"/>
     </zeroOrMore>
@@ -833,6 +924,12 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -986,36 +1083,34 @@
           <ref name="SeriesType"/>
         </attribute>
       </optional>
-      <choice>
+      <optional>
         <ref name="formattedref"/>
-        <group>
-          <ref name="btitle"/>
-          <optional>
-            <ref name="bplace"/>
-          </optional>
-          <optional>
-            <ref name="seriesorganization"/>
-          </optional>
-          <optional>
-            <ref name="abbreviation"/>
-          </optional>
-          <optional>
-            <ref name="seriesfrom"/>
-          </optional>
-          <optional>
-            <ref name="seriesto"/>
-          </optional>
-          <optional>
-            <ref name="seriesnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriespartnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriesrun"/>
-          </optional>
-        </group>
-      </choice>
+      </optional>
+      <ref name="btitle"/>
+      <optional>
+        <ref name="bplace"/>
+      </optional>
+      <optional>
+        <ref name="seriesorganization"/>
+      </optional>
+      <optional>
+        <ref name="abbreviation"/>
+      </optional>
+      <optional>
+        <ref name="seriesfrom"/>
+      </optional>
+      <optional>
+        <ref name="seriesto"/>
+      </optional>
+      <optional>
+        <ref name="seriesnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriespartnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriesrun"/>
+      </optional>
     </element>
   </define>
   <define name="SeriesType">
@@ -1174,7 +1269,7 @@
         </element>
       </optional>
       <element name="bibitem">
-        <ref name="BibliographicItem"/>
+        <ref name="ReducedBibliographicItem"/>
       </element>
       <choice>
         <zeroOrMore>
@@ -1199,9 +1294,9 @@
       <optional>
         <ref name="revision-date"/>
       </optional>
-      <zeroOrMore>
+      <optional>
         <ref name="draft"/>
-      </zeroOrMore>
+      </optional>
     </element>
   </define>
   <define name="vedition">

data/lib/metanorma/bipm/bipm.rng

@@ -198,6 +198,9 @@
         <optional>
           <attribute name="start"/>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="li"/>
         </oneOrMore>

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,46 @@ module Metanorma
         ret
       end
 
+=begin
+      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"])
+          reference = format_ref(docid.children.to_xml, 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
+=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

@@ -282,6 +282,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="ul_li"/>
         </oneOrMore>
@@ -324,6 +327,9 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="li"/>
         </oneOrMore>
@@ -360,6 +366,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -694,6 +703,9 @@
       <optional>
         <attribute name="tag"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="multilingual-rendering">
           <ref name="MultilingualRenderingType"/>
@@ -729,6 +741,9 @@
         <optional>
           <attribute name="tag"/>
         </optional>
+        <optional>
+          <attribute name="type"/>
+        </optional>
         <optional>
           <attribute name="multilingual-rendering">
             <ref name="MultilingualRenderingType"/>
@@ -2050,6 +2065,7 @@
       <value>compare</value>
       <value>contrast</value>
       <value>see</value>
+      <value>seealso</value>
     </choice>
   </define>
   <define name="deprecates">