metanorma-bipm 1.1.0 → 1.1.1

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -1,5 +1,6 @@
 require "isodoc"
 require "metanorma-generic"
+require "metanorma-iso"
 require_relative "init"
 require_relative "index"
 
@@ -9,14 +10,26 @@ module IsoDoc
       def convert1(docxml, filename, dir)
         @jcgm = docxml&.at(ns("//bibdata/ext/editorialgroup/committee/"\
                               "@acronym"))&.value == "JCGM"
+        @iso = IsoDoc::Iso::PresentationXMLConvert
+          .new({ language: @lang, script: @script })
+        i18n = @iso.i18n_init(@lang, @script, nil)
+        @iso.metadata_init(@lang, @script, i18n)
         super
       end
 
+      def eref_localities1(target, type, from, to, delim, n, lang = "en")
+        if @jcgm
+          @iso.eref_localities1(target, type, from, to, delim, n, lang)
+        else
+          super
+        end
+      end
+
       def table1(f)
         return if labelled_ancestor(f)
         return if f["unnumbered"]
 
-        n = @xrefs.anchor(f['id'], :label, false)
+        n = @xrefs.anchor(f["id"], :label, false)
         prefix_name(f, ".<tab/>", l10n("#{@i18n.table.capitalize} #{n}"), "name")
       end
 
@@ -51,7 +64,7 @@ module IsoDoc
           <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)}
+        #{doccontrol_row1(docxml)} #{doccontrol_row2(docxml)} #{list_drafts(docxml)}
           </tbody></table></doccontrol>
         END
         docxml.root << clause
@@ -61,8 +74,8 @@ module IsoDoc
         return "" if list_draft(docxml, 1) == ["", ""] && list_cochairs(docxml).empty?
 
         <<~ROW
-        <tr>#{list_draft(docxml, 1)&.map { |x| "<td>#{x}</td>" }&.join }
-        <td>#{list_cochairs(docxml)}</td></tr>
+          <tr>#{list_draft(docxml, 1)&.map { |x| "<td>#{x}</td>" }&.join}
+          <td>#{list_cochairs(docxml)}</td></tr>
         ROW
       end
 
@@ -70,8 +83,8 @@ module IsoDoc
         return "" if list_draft(docxml, 2) == ["", ""] && list_chairs(docxml).empty?
 
         <<~ROW
-        <tr>#{list_draft(docxml, 2)&.map { |x| "<td>#{x}</td>" }&.join }
-        <td>#{list_chairs(docxml)}</td></tr>
+          <tr>#{list_draft(docxml, 2)&.map { |x| "<td>#{x}</td>" }&.join}
+          <td>#{list_chairs(docxml)}</td></tr>
         ROW
       end
 
@@ -100,7 +113,8 @@ module IsoDoc
 
       def list_authors(xml)
         ret = list_people(
-          xml, "//bibdata/contributor[xmlns:role/@type = 'author']/person")
+          xml, "//bibdata/contributor[xmlns:role/@type = 'author']/person"
+        )
         @i18n.multiple_and(ret, @i18n.get["and"])
       end
 

data/lib/isodoc/bipm/xref.rb

@@ -20,6 +20,19 @@ module IsoDoc
         super
       end
 
+      def wrap_brackets(txt)
+        return txt if /^\[.*\]$/.match?(txt)
+
+        "[#{txt}]"
+      end
+
+      def reference_names(ref)
+        super
+        if @jcgm
+          @anchors[ref["id"]][:xref] = wrap_brackets(@anchors[ref["id"]][:xref])
+        end
+      end
+
       def clause_names(docxml, sect_num)
         if @jcgm
           clause_names_jcgm(docxml, sect_num)
@@ -124,7 +137,7 @@ module IsoDoc
 
       def back_anchor_names(docxml)
         super
-        i = @jcgm ? Counter.new("@") : Counter.new(0)
+        i = @jcgm ? Counter.new("@", skip_i: true) : Counter.new(0)
         docxml.xpath(ns("//annex[not(@unnumbered = 'true')]")).each do |c|
           i.increment(c)
           annex_names(c, i.print)

data/lib/metanorma/bipm/version.rb

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

data/metanorma-bipm.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.add_dependency "metanorma-generic", "~> 1.10.0"
+  spec.add_dependency "metanorma-iso", "~> 1.8.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"
   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: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-12 00:00:00.000000000 Z
+date: 2021-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.10.0
+- !ruby/object:Gem::Dependency
+  name: metanorma-iso
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement