metanorma-bipm 2.1.0 → 2.1.1

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -169,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} – #{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/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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-bipm
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-09 00:00:00.000000000 Z
+date: 2022-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -274,6 +274,7 @@ files:
 - lib/metanorma/bipm/boilerplate-fr.xml
 - lib/metanorma/bipm/boilerplate-jcgm-en.xml
 - lib/metanorma/bipm/converter.rb
+- lib/metanorma/bipm/front.rb
 - lib/metanorma/bipm/isodoc.rng
 - lib/metanorma/bipm/processor.rb
 - lib/metanorma/bipm/reqt.rng