metanorma-bipm 1.1.1 → 1.1.5

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -25,29 +25,46 @@ module IsoDoc
         end
       end
 
-      def table1(f)
-        return if labelled_ancestor(f)
-        return if f["unnumbered"]
+      def table1(elem)
+        return if labelled_ancestor(elem)
+        return if elem["unnumbered"]
 
-        n = @xrefs.anchor(f["id"], :label, false)
-        prefix_name(f, ".<tab/>", l10n("#{@i18n.table.capitalize} #{n}"), "name")
+        n = @xrefs.anchor(elem["id"], :label, false)
+        prefix_name(elem, ".<tab/>",
+                    l10n("#{@i18n.table.capitalize} #{n}"), "name")
       end
 
-      def annex1(f)
+      def figure1(elem)
+        if @jcgm
+          @iso.xrefs = @xrefs
+          @iso.figure1(elem)
+        else super
+        end
+      end
+
+      def annex1(elem)
         return super if @jcgm
-        return if f["unnumbered"] == "true"
+        return if elem["unnumbered"] == "true"
 
-        lbl = @xrefs.anchor(f["id"], :label)
-        if t = f.at(ns("./title"))
+        lbl = @xrefs.anchor(elem["id"], :label)
+        if t = elem.at(ns("./title"))
           t.children = "<strong>#{t.children.to_xml}</strong>"
         end
-        prefix_name(f, ".<tab/>", lbl, "title")
+        prefix_name(elem, ".<tab/>", lbl, "title")
       end
 
-      def clause1(f)
-        return if f["unnumbered"] == "true"
-        return if f.at(("./ancestor::*[@unnumbered = 'true']"))
+      def clause(docxml)
+        super
+        if @jcgm
+          docxml.xpath(ns("//preface/introduction[clause]")).each do |f|
+            clause1(f)
+          end
+        end
+      end
 
+      def clause1(elem)
+        return if elem["unnumbered"] == "true"
+        return if elem.at(("./ancestor::*[@unnumbered = 'true']"))
         super
       end
 
@@ -56,31 +73,32 @@ module IsoDoc
         doccontrol docxml
       end
 
-      def doccontrol(docxml)
-        return unless docxml.at(ns("//bibdata/relation[@type = 'supersedes']"))
+      def doccontrol(doc)
+        return unless doc.at(ns("//bibdata/relation[@type = 'supersedes']"))
 
-        clause = <<~END
+        clause = <<~DOCCONTROL
           <doccontrol>
           <title>Document Control</title>
           <table unnumbered="true"><tbody>
-          <tr><th>Authors:</th><td/><td>#{list_authors(docxml)}</td></tr>
-        #{doccontrol_row1(docxml)} #{doccontrol_row2(docxml)} #{list_drafts(docxml)}
+          <tr><th>Authors:</th><td/><td>#{list_authors(doc)}</td></tr>
+          #{doccontrol_row1(doc)} #{doccontrol_row2(doc)} #{list_drafts(doc)}
           </tbody></table></doccontrol>
-        END
-        docxml.root << clause
+        DOCCONTROL
+        doc.root << clause
       end
 
-      def doccontrol_row1(docxml)
-        return "" if list_draft(docxml, 1) == ["", ""] && list_cochairs(docxml).empty?
+      def doccontrol_row1(doc)
+        return "" if list_draft(doc, 1) == ["", ""] && list_cochairs(doc).empty?
 
         <<~ROW
-          <tr>#{list_draft(docxml, 1)&.map { |x| "<td>#{x}</td>" }&.join}
-          <td>#{list_cochairs(docxml)}</td></tr>
+          <tr>#{list_draft(doc, 1)&.map { |x| "<td>#{x}</td>" }&.join}
+          <td>#{list_cochairs(doc)}</td></tr>
         ROW
       end
 
       def doccontrol_row2(docxml)
-        return "" if list_draft(docxml, 2) == ["", ""] && list_chairs(docxml).empty?
+        list_draft(docxml, 2) == ["", ""] && list_chairs(docxml).empty? and
+          return ""
 
         <<~ROW
           <tr>#{list_draft(docxml, 2)&.map { |x| "<td>#{x}</td>" }&.join}
@@ -99,15 +117,13 @@ module IsoDoc
         ret
       end
 
-      def list_draft(xml, i)
-        return ["", ""] unless d =
-          xml.at(ns("//bibdata/relation[@type = 'supersedes'][#{i}]/bibitem"))
+      def list_draft(xml, idx)
+        d = xml.at(ns("//bibdata/relation[@type = 'supersedes'][#{idx}]"\
+                      "/bibitem")) or return ["", ""]
 
         date = d&.at(ns("./date"))&.text
-        draft = d&.at(ns("./version/draft"))&.text and
-          draft = "Draft #{draft}"
-        edn = d&.at(ns("./edition"))&.text and
-          edn = "Version #{edn}"
+        draft = d&.at(ns("./version/draft"))&.text and draft = "Draft #{draft}"
+        edn = d&.at(ns("./edition"))&.text and edn = "Version #{edn}"
         [[draft, edn].join(" "), date]
       end
 
@@ -156,8 +172,8 @@ module IsoDoc
           fraction_group_digits: 3 }
       end
 
-      def mathml1(f, locale)
-        localize_maths(f, locale)
+      def mathml1(elem, locale)
+        localize_maths(elem, locale)
       end
 
       def bibdata_i18n(bibdata)
@@ -175,6 +191,49 @@ module IsoDoc
         pubdate.next.children = meta.monthyr(pubdate.text)
       end
 
+      def eref(docxml)
+        super
+        jcgm_eref(docxml, "//eref")
+      end
+
+      def origin(docxml)
+        super
+        jcgm_eref(docxml, "//origin[not(termref)]")
+      end
+
+      def quotesource(docxml)
+        super
+        jcgm_eref(docxml, "//quote/source")
+      end
+
+      def jcgm_eref(docxml, xpath)
+        return unless @jcgm
+
+        docxml.xpath(ns(xpath)).each do |x|
+          extract_brackets(x)
+        end
+        # merge adjacent text nodes
+        docxml.root.replace(Nokogiri::XML(docxml.root.to_xml).root)
+        docxml.xpath(ns(xpath)).each do |x| # rubocop: disable Style/CombinableLoops
+          if x&.next&.text? && /^\],\s+\[$/.match?(x&.next&.text) &&
+              %w(eref origin source).include?(x&.next&.next&.name)
+            x.next.replace(", ")
+          end
+        end
+      end
+
+      def extract_brackets(node)
+        start = node.at("./text()[1]")
+        finish = node.at("./text()[last()]")
+        if /^\[/.match?(start.text) && /\]$/.match?(finish.text)
+          start.replace(start.text[1..-1])
+          node.previous = "["
+          finish = node.at("./text()[last()]")
+          finish.replace(finish.text[0..-2])
+          node.next = "]"
+        end
+      end
+
       include Init
     end
   end

data/lib/isodoc/bipm/xref.rb

@@ -5,6 +5,7 @@ module IsoDoc
 
     class Xref < IsoDoc::Xref
       def initialize(lang, script, klass, i18n, options = {})
+        @iso = IsoDoc::Iso::Xref.new(lang, script, klass, i18n, options)
         super
       end
 
@@ -12,10 +13,10 @@ module IsoDoc
         @jcgm = docxml&.at(ns("//bibdata/ext/editorialgroup/committee/"\
                               "@acronym"))&.value == "JCGM"
         @annexlbl =
-          if docxml.at(ns("//bibdata/ext/structuredidentifier/appendix"))
+          if @jcgm then @labels["iso_annex"]
+          elsif docxml.at(ns("//bibdata/ext/structuredidentifier/appendix"))
             @labels["appendix"]
-          else
-            @labels["annex"]
+          else @labels["annex"]
           end
         super
       end
@@ -28,9 +29,8 @@ module IsoDoc
 
       def reference_names(ref)
         super
-        if @jcgm
+        @jcgm and
           @anchors[ref["id"]][:xref] = wrap_brackets(@anchors[ref["id"]][:xref])
-        end
       end
 
       def clause_names(docxml, sect_num)
@@ -109,8 +109,7 @@ module IsoDoc
       def section_name1_anchors(clause, num, level)
         lbl = @jcgm ? "" : "#{@labels['subclause']} "
         @anchors[clause["id"]] =
-          { label: num, level: level,
-            xref: l10n("#{lbl}#{num}"),
+          { label: num, level: level, xref: l10n("#{lbl}#{num}"),
             type: "clause" }
       end
 
@@ -226,6 +225,30 @@ module IsoDoc
           )
         end
       end
+
+      def initial_anchor_names(doc)
+        super
+        if @jcgm
+          @iso.introduction_names(doc.at(ns("//introduction")))
+          @anchors.merge!(@iso.get)
+        end
+      end
+
+      def sequential_figure_names(clause)
+        if @jcgm
+          @iso.sequential_figure_names(clause)
+          @anchors.merge!(@iso.get)
+        else super
+        end
+      end
+
+      def hierarchical_figure_names(clause, num)
+        if @jcgm
+          @iso.hierarchical_figure_names(clause, num)
+          @anchors.merge!(@iso.get)
+        else super
+        end
+      end
     end
   end
 end

data/lib/metanorma-bipm.rb

@@ -1,9 +1,9 @@
-require 'metanorma'
-require 'metanorma/bipm'
+require "metanorma"
+require "metanorma/bipm"
 require "isodoc/bipm"
 
-require 'asciidoctor' unless defined? Asciidoctor::Converter
-require 'asciidoctor/bipm'
+require "asciidoctor" unless defined? Asciidoctor::Converter
+require "asciidoctor/bipm"
 
 if defined? Metanorma
   require_relative "metanorma/bipm"

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module BIPM
-    VERSION = "1.1.1".freeze
+    VERSION = "1.1.5".freeze
   end
 end

data/metanorma-bipm.gemspec

@@ -24,9 +24,9 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "metanorma-generic", "~> 1.10.0"
+  spec.add_dependency "metanorma-generic", "~> 1.10.2"
   spec.add_dependency "metanorma-iso", "~> 1.8.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-bipm
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-26 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.10.2
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
   requirement: !ruby/object:Gem::Requirement
@@ -190,6 +190,7 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
 - ".gitignore"
+- ".hound.yml"
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -263,7 +264,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="