metanorma-bipm 2.4.0 → 2.4.3

data/lib/metanorma/bipm/cleanup.rb

@@ -0,0 +1,89 @@
+module Metanorma
+  module BIPM
+    class Converter < Metanorma::Generic::Converter
+      def boilerplate_file(_xmldoc)
+        if @jcgm
+          File.join(File.dirname(__FILE__), "boilerplate-jcgm-en.adoc")
+        else
+          File.join(File.dirname(__FILE__), "boilerplate-#{@lang}.adoc")
+        end
+      end
+
+      def sections_cleanup(xml)
+        super
+        jcgm_untitled_sections_cleanup(xml) if @jcgm
+      end
+
+      def jcgm_untitled_sections_cleanup(xml)
+        xml.xpath("//clause//clause | //annex//clause | //introduction/clause")
+          .each do |c|
+          next if !c&.at("./title")&.text&.empty?
+
+          c["inline-header"] = true
+        end
+      end
+
+      def section_names_terms_cleanup(xml); end
+
+      def section_names_refs_cleanup(xml); end
+
+      def mathml_mi_italics
+        { uppergreek: false, upperroman: false,
+          lowergreek: false, lowerroman: true }
+      end
+
+      def xref_to_eref(elem, name)
+        if elem.at("//bibitem[@id = '#{elem['target']}']/" \
+                   "docidentifier[@type = 'BIPM-long']")
+          elem["style"] = "BIPM-long"
+        end
+        super
+      end
+
+      ID_LABELS = {
+        "en" => {
+          "appendix" => "Appendix",
+          "annexid" => "Annex",
+          "part" => "Part",
+        },
+        "fr" => {
+          "appendix" => "Annexe",
+          "annexid" => "Appendice",
+          "part" => "Partie",
+        },
+      }.freeze
+
+      def bibdata_docidentifier_cleanup(isoxml)
+        bibdata_docidentifier_i18n(isoxml)
+        super
+      end
+
+      def bibdata_docidentifier_i18n(isoxml)
+        id, parts = bibdata_docidentifier_i18n_prep(isoxml)
+        parts.empty? and return
+        id_alt = id.dup
+        id.next = id_alt
+        bibdata_docidentifier_enhance(id, @lang, parts)
+        bibdata_docidentifier_enhance(id_alt, @lang == "en" ? "fr" : "en",
+                                      parts)
+      end
+
+      def bibdata_docidentifier_i18n_prep(isoxml)
+        id = isoxml.at("//bibdata/docidentifier[@type = 'BIPM']")
+        parts = %w(appendix annexid part).each_with_object({}) do |w, m|
+          dn = isoxml.at("//bibdata/ext/structuredidentifier/#{w}") and
+            m[w] = dn.text
+        end
+        [id, parts]
+      end
+
+      def bibdata_docidentifier_enhance(id, lang, parts)
+        id["language"] = lang
+        ret = %w(appendix annexid part).each_with_object([]) do |w, m|
+          p = parts[w] and m << "#{ID_LABELS[lang][w]} #{p}"
+        end
+        id.children = "#{id.text} #{ret.join(' ')}"
+      end
+    end
+  end
+end

data/lib/metanorma/bipm/converter.rb

@@ -1,6 +1,7 @@
 require "metanorma/standoc/converter"
 require "metanorma/generic/converter"
 require_relative "front"
+require_relative "cleanup"
 
 module Metanorma
   module BIPM
@@ -96,45 +97,6 @@ module Metanorma
         end
       end
 
-      def boilerplate_file(_xmldoc)
-        if @jcgm
-          File.join(File.dirname(__FILE__), "boilerplate-jcgm-en.adoc")
-        else
-          File.join(File.dirname(__FILE__), "boilerplate-#{@lang}.adoc")
-        end
-      end
-
-      def sections_cleanup(xml)
-        super
-        jcgm_untitled_sections_cleanup(xml) if @jcgm
-      end
-
-      def jcgm_untitled_sections_cleanup(xml)
-        xml.xpath("//clause//clause | //annex//clause | //introduction/clause")
-          .each do |c|
-          next if !c&.at("./title")&.text&.empty?
-
-          c["inline-header"] = true
-        end
-      end
-
-      def section_names_terms_cleanup(xml); end
-
-      def section_names_refs_cleanup(xml); end
-
-      def mathml_mi_italics
-        { uppergreek: false, upperroman: false,
-          lowergreek: false, lowerroman: true }
-      end
-
-      def xref_to_eref(elem, name)
-        if elem.at("//bibitem[@id = '#{elem['target']}']/" \
-                   "docidentifier[@type = 'BIPM-long']")
-          elem["style"] = "BIPM-long"
-        end
-        super
-      end
-
       def document(node)
         @jcgm = node.attr("committee-acronym") == "JCGM"
         super
@@ -156,12 +118,12 @@ module Metanorma
       def presentation_xml_converter(node)
         IsoDoc::BIPM::PresentationXMLConvert
           .new(html_extract_attributes(node)
-          .merge(output_formats: ::Metanorma::BIPM::Processor.new.output_formats))
+          .merge(output_formats: ::Metanorma::BIPM::Processor.new
+          .output_formats))
       end
 
       def pdf_converter(node)
-        return nil if node.attr("no-pdf")
-
+        node.attr("no-pdf") and return nil
         IsoDoc::BIPM::PdfConvert.new(pdf_extract_attributes(node))
       end
     end

data/lib/metanorma/bipm/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.12 -->
+<!-- VERSION v1.3.0 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -146,6 +146,9 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="style"/>
+        </optional>
         <oneOrMore>
           <ref name="PureTextElement"/>
         </oneOrMore>

data/lib/metanorma/bipm/relaton-bipm.rng

@@ -14,6 +14,7 @@
         <value>strategy</value>
         <value>cipm-mra</value>
         <value>resolution</value>
+        <value>policy</value>
       </choice>
     </define>
     <define name="editorialgroup">

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module BIPM
-    VERSION = "2.4.0".freeze
+    VERSION = "2.4.3".freeze
   end
 end

data/metanorma-bipm.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "metanorma-generic", "~> 2.6.0"
-  spec.add_dependency "metanorma-iso", "~> 2.7.0"
+  spec.add_dependency "metanorma-generic", "~> 2.6.2"
+  spec.add_dependency "metanorma-iso", "~> 2.7.3"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

data/metanorma.yml

@@ -43,6 +43,7 @@ doctypes:
   - strategy
   - cipm-mra
   - resolution
+  - policy
 default_doctype: brochure
 committees:
   - CGPM

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-bipm
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-03-04 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.6.0
+        version: 2.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.6.2
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.7.3
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -270,6 +270,7 @@ files:
 - lib/metanorma/bipm/boilerplate-en.adoc
 - lib/metanorma/bipm/boilerplate-fr.adoc
 - lib/metanorma/bipm/boilerplate-jcgm-en.adoc
+- lib/metanorma/bipm/cleanup.rb
 - lib/metanorma/bipm/converter.rb
 - lib/metanorma/bipm/front.rb
 - lib/metanorma/bipm/isodoc.rng