metanorma-bipm 1.1.7 → 1.1.11

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -18,16 +18,13 @@ module IsoDoc
       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
+        @jcgm and
+          return @iso.eref_localities1(target, type, from, to, delim, n, lang)
+        super
       end
 
       def table1(elem)
-        return if labelled_ancestor(elem)
-        return if elem["unnumbered"]
+        return if labelled_ancestor(elem) || elem["unnumbered"]
 
         n = @xrefs.anchor(elem["id"], :label, false)
         prefix_name(elem, ".<tab/>",
@@ -47,27 +44,42 @@ module IsoDoc
         return if elem["unnumbered"] == "true"
 
         lbl = @xrefs.anchor(elem["id"], :label)
-        if t = elem.at(ns("./title"))
+        t = elem.at(ns("./title")) and
           t.children = "<strong>#{t.children.to_xml}</strong>"
-        end
         prefix_name(elem, ".<tab/>", lbl, "title")
       end
 
       def clause(docxml)
+        quotedtitles(docxml)
         super
-        if @jcgm
+        @jcgm and
           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']"))
+        elem.at(("./ancestor::*[@unnumbered = 'true']")) and
+          elem["unnumbered"] = "true"
+
         super
       end
 
+      def prefix_name(node, delim, number, elem)
+        return if number.nil? || number.empty?
+
+        unless name = node.at(ns("./#{elem}[not(@type = 'quoted')]"))
+          return if node.at(ns("./#{elem}[@type = 'quoted']"))
+
+          node.children.empty? and node.add_child("<#{elem}></#{elem}>") or
+            node.children.first.previous = "<#{elem}></#{elem}>"
+          name = node.children.first
+        end
+        if name.children.empty? then name.add_child(number)
+        else (name.children.first.previous = "#{number}#{delim}")
+        end
+      end
+
       def conversions(docxml)
         super
         doccontrol docxml
@@ -111,7 +123,7 @@ module IsoDoc
         i = 3
         while list_draft(xml, i) != ["", ""]
           ret += "<tr>#{list_draft(xml, i).map { |x| "<td>#{x}</td>" }.join} "\
-            "<td/></tr>"
+                 "<td/></tr>"
           i += 1
         end
         ret
@@ -135,7 +147,7 @@ module IsoDoc
 
       COCHAIR = "xmlns:role[contains(text(),'co-chair')]".freeze
       CHAIR = "[xmlns:role[contains(text(),'chair')]"\
-        "[not(contains(text(),'co-chair'))]]".freeze
+              "[not(contains(text(),'co-chair'))]]".freeze
 
       def list_cochairs(xml)
         ret = list_people(xml, "//bibdata/contributor[#{COCHAIR}]/person")
@@ -167,11 +179,11 @@ module IsoDoc
       end
 
       def twitter_cldr_localiser_symbols
-        { group: "&#xA0;", fraction_group: "&#xA0;",
-          fraction_group_digits: 3 }
+        { group: "&#xA0;", fraction_group: "&#xA0;", fraction_group_digits: 3 }
       end
 
       def mathml1(elem, locale)
+        asciimath_dup(elem)
         localize_maths(elem, locale)
       end
 
@@ -208,9 +220,7 @@ module IsoDoc
       def jcgm_eref(docxml, xpath)
         return unless @jcgm
 
-        docxml.xpath(ns(xpath)).each do |x|
-          extract_brackets(x)
-        end
+        docxml.xpath(ns(xpath)).each { |x| extract_brackets(x) }
         # 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
@@ -233,6 +243,13 @@ module IsoDoc
         end
       end
 
+      def quotedtitles(docxml)
+        docxml.xpath(ns("//variant-title[@type = 'quoted']")).each do |t|
+          t.name = "title"
+          t.children.first.previous = "<blacksquare/>"
+        end
+      end
+
       include Init
     end
   end

data/lib/isodoc/bipm/xref.rb

@@ -61,16 +61,16 @@ module IsoDoc
       end
 
       NUMBERED_SUBCLAUSES = "./clause[not(@unnumbered = 'true')] | "\
-        "./references[not(@unnumbered = 'true')] | "\
-        "./term[not(@unnumbered = 'true')] | "\
-        "./terms[not(@unnumbered = 'true')] | "\
-        "./definitions[not(@unnumbered = 'true')]".freeze
+                            "./references[not(@unnumbered = 'true')] | "\
+                            "./term[not(@unnumbered = 'true')] | "\
+                            "./terms[not(@unnumbered = 'true')] | "\
+                            "./definitions[not(@unnumbered = 'true')]".freeze
 
       UNNUMBERED_SUBCLAUSES = "./clause[@unnumbered = 'true'] | "\
-        "./references[@unnumbered = 'true'] | "\
-        "./term[@unnumbered = 'true'] | "\
-        "./terms[@unnumbered = 'true'] | "\
-        "./definitions[@unnumbered = 'true']".freeze
+                              "./references[@unnumbered = 'true'] | "\
+                              "./term[@unnumbered = 'true'] | "\
+                              "./terms[@unnumbered = 'true'] | "\
+                              "./definitions[@unnumbered = 'true']".freeze
 
       def section_name_anchors(clause, num, lvl)
         lbl = @jcgm ? "clause_jcgm" : "clause"
@@ -157,9 +157,10 @@ module IsoDoc
           annex_names1(a, num.to_s, 1)
         else
           i = Counter.new
+          prefix = @jcgm ? "" : "A"
           clause.xpath(ns(NUMBERED_SUBCLAUSES)).each do |c|
             i.increment(c)
-            annex_names1(c, "#{num}.#{i.print}", 2)
+            annex_names1(c, "#{prefix}#{num}.#{i.print}", 2)
           end
           clause.xpath(ns(UNNUMBERED_SUBCLAUSES))
             .each { |c| unnumbered_annex_names1(c, 2) }

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module BIPM
-    VERSION = "1.1.7".freeze
+    VERSION = "1.1.11".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-bipm
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-16 00:00:00.000000000 Z
+date: 2021-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic