isodoc 2.11.2 → 2.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 806dd6df2ad1f9acfbebcc324d1c2b88b035c3242b9655ee1c82c7a7eb3d40cc
-  data.tar.gz: 1bc15cb526e0bbd4f8151facf0c20567ee2776046a325bb4dac96ce9e7eee40b
+  metadata.gz: 9890e0801befbe1a13b4138f01f702537e46d4cc482ac99f03f1faf1e7ac532b
+  data.tar.gz: 69ba3b17b78d0a464cae75213d0eadca3047d0cb7c55a148db7d014b25f2bbd0
 SHA512:
-  metadata.gz: 356559fad5bb12c0bc7e8cfec04f2c7bb625be430f702a21d825d7fc5c03e0ac037e5d7490f7712d1294b9151997fac54125ff751f88a9cd8ae51412ce36e2bc
-  data.tar.gz: a8579583084ad8ca0956a927ddd4e4ef1b386bc4979676ee8edd8f866b4031e6411764e5f49f62e2c293f0eadf83f04caccfcfcd0a0d70360bbd31a27999d215
+  metadata.gz: 1db6e8c07945fb2ad57b19094279d0e26f8638e1e6fefaa261ec9230438dfaf0cea0c7ec6b49276f4108332d41d875c23fd8aa57295bdbbaaee88846f1375ce2
+  data.tar.gz: 0e127ca60d5841b344d0e3b399475fb5adfb9b72b4df6ae5a2943df95b39f40ab56f486f3eae669b26b2fd239e13d02503e97834fea758575324af7795ca2584

data/lib/isodoc/base_style/all.css

@@ -75,6 +75,9 @@ p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
 p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
   font-size: {{monospacefontsize}}; }
 
+sub, sup {
+  font-size: 0.75em; }
+
 article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
   display: block; }
@@ -232,7 +235,7 @@ h6:hover > a.anchor,
   background-color: #777;
   color: white;
   cursor: pointer;
-  padding: 12px 0;
+  padding: 3px 0;
   margin: 0;
   width: 100%;
   border: none;

data/lib/isodoc/base_style/reset.css

@@ -75,6 +75,9 @@ p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
 p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
   font-size: {{monospacefontsize}}; }
 
+sub, sup {
+  font-size: 0.75em; }
+
 article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
   display: block; }
@@ -232,7 +235,7 @@ h6:hover > a.anchor,
   background-color: #777;
   color: white;
   cursor: pointer;
-  padding: 12px 0;
+  padding: 3px 0;
   margin: 0;
   width: 100%;
   border: none;

data/lib/isodoc/base_style/reset.scss

@@ -81,6 +81,10 @@ p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td sam
   font-size: $monospacefontsize;
 }
 
+sub, sup {
+  font-size: 0.75em;
+}
+
 article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
   display: block;
@@ -235,7 +239,7 @@ visibility:visible;
   background-color: #777;
   color: white;
   cursor: pointer;
-  padding: 12px 0;
+  padding: 3px 0;
   margin: 0;
   width: 100%;
   border: none;

data/lib/isodoc/presentation_function/bibdata.rb

@@ -29,11 +29,10 @@ module IsoDoc
 
     def bibdata_current(docxml)
       a = docxml.at(ns("//bibdata")) or return
-      a.xpath(ns("./language")).each do |l|
-        l.text == @lang and l["current"] = "true"
-      end
-      a.xpath(ns("./script")).each do |l|
-        l.text == @script and l["current"] = "true"
+      { language: @lang, script: @script, locale: @locale }.each do |k, v|
+        a.xpath(ns("./#{k}")).each do |l|
+          l.text == v and l["current"] = "true"
+        end
       end
       a
     end

data/lib/isodoc/presentation_function/block.rb

@@ -119,7 +119,8 @@ module IsoDoc
     end
 
     def amend1(elem)
-      elem.xpath(ns("./autonumber")).each(&:remove)
+      elem.xpath(ns("./locality | ./localityStack | ./autonumber | " \
+                    "./classification | ./contributor")).each(&:remove)
       elem.xpath(ns("./newcontent")).each { |a| a.name = "quote" }
       elem.xpath(ns("./description")).each { |a| a.replace(a.children) }
       elem.replace(elem.children)

data/lib/isodoc/presentation_function/inline.rb

@@ -85,7 +85,10 @@ module IsoDoc
     end
 
     def identifier(docxml)
-      docxml.xpath(ns("//identifier")).each do |n|
+      (docxml.xpath(ns("//identifier")) -
+        docxml.xpath(ns("//bibdata/identifier")) -
+        docxml.xpath(ns("//bibitema/identifier")))
+        .each do |n|
         n.name = "tt"
       end
     end

data/lib/isodoc/presentation_function/math.rb

@@ -21,9 +21,10 @@ module IsoDoc
     # TwitterCldr::DataReaders::NumberDataReader.new(locale).symbols
     def localize_maths(node, locale)
       node.xpath(".//m:mn", MATHML).each do |x|
+        fmt = x["data-metanorma-numberformat"]
+        x.delete("data-metanorma-numberformat")
         x.children =
-          if fmt = x["data-metanorma-numberformat"]
-            x.delete("data-metanorma-numberformat")
+          if !fmt.nil? && !fmt.empty?
             explicit_number_formatter(x, locale, fmt)
           else implicit_number_formatter(x, locale)
           end
@@ -40,6 +41,8 @@ module IsoDoc
     end
 
     def implicit_number_formatter(num, locale)
+      num.ancestors("formula").empty? or return
+      ## by default, no formatting in formulas
       fmt = { significant: num_totaldigits(num.text) }.compact
       n = normalise_number(num.text)
       @numfmt.localized_number(n, locale:, format: fmt,
@@ -59,7 +62,7 @@ module IsoDoc
         .each do |i|
         ret[i] &&= ret[i].to_i
       end
-      %i(notation exponent_sign locale).each do |i|
+      %i(notation exponent_sign number_sign locale).each do |i|
         ret[i] &&= ret[i].to_sym
       end
       ret
@@ -76,12 +79,39 @@ module IsoDoc
     end
 
     def explicit_number_formatter_cfg(num, fmt)
-      symbols = twitter_cldr_localiser_symbols.dup.merge(fmt)
-      precision = symbols[:precision] || num_precision(num.text)
+      symbols = twitter_cldr_localiser_symbols.dup.transform_values do |v|
+        v.is_a?(String) ? HTMLEntities.new.decode(v) : v
+      end.merge(fmt)
+      symbols = large_notation_fmt(symbols, num.text)
+      [symbols[:precision] || num_precision(num.text), symbols,
+       explicit_number_formatter_signif(num, symbols)]
+    end
+
+    def explicit_number_formatter_signif(num, symbols)
       signif = symbols[:significant]
       (symbols.keys & %i(precision digit_count)).empty? and
         signif ||= num_totaldigits(num.text)
-      [precision, symbols, signif]
+      signif
+    end
+
+    def large_notation_fmt(symbols, num)
+      n = symbols[:large_notation]
+      min = BigDecimal(symbols[:large_notation_min] || "1e-6")
+      max = BigDecimal(symbols[:large_notation_max] || "1e6")
+      n1 = large_notation_fmt1(num, n, min, max) and symbols[:notation] = n1
+      symbols.delete(:large_notation)
+      symbols.delete(:large_notation_min)
+      symbols.delete(:large_notation_max)
+      symbols
+    end
+
+    def large_notation_fmt1(num, notation, min, max)
+      notation.nil? || notation == "nil" and return nil
+      val = BigDecimal(num).abs
+      val.zero? and return nil
+      val < min and return notation
+      val > max and return notation
+      nil
     end
 
     def num_precision(num)

data/lib/isodoc/presentation_function/metadata.rb

@@ -5,6 +5,12 @@ module IsoDoc
       fonts_metadata(docxml)
       attachments_extract(docxml)
       preprocess_xslt_insert(docxml)
+      localized_strings(docxml)
+      a = docxml.at(ns("//metanorma-extension")) or return
+      a.elements.empty? and a.remove
+    end
+
+    def localized_strings(docxml)
       a = docxml.at(ns("//bibdata")) or return
       a.next =
         "<localized-strings>#{i8n_name(trim_hash(@i18n.get), '').join}" \
@@ -37,9 +43,11 @@ module IsoDoc
 
     def extension_insert_pt(xml)
       xml.at(ns("//metanorma-extension")) ||
-        xml.at(ns("//bibdata"))&.after("<metanorma-extension/>")
+        xml.at(ns("//bibdata"))
+          &.after("<metanorma-extension> </metanorma-extension>")
           &.next_element ||
-        xml.root.elements.first.before("<metanorma-extension/>")
+        xml.root.elements.first
+          .before("<metanorma-extension> </metanorma-extension>")
           .previous_element
     end
 
@@ -58,7 +66,7 @@ module IsoDoc
     def fonts_metadata(xmldoc)
       ins = presmeta_insert_pt(xmldoc)
       @fontist_fonts and CSV.parse_line(@fontist_fonts, col_sep: ";")
-        .map(&:strip).reverse.each do |f|
+        .map(&:strip).reverse_each do |f|
         ins.next = presmeta("fonts", f)
       end
       @fontlicenseagreement and
@@ -67,7 +75,7 @@ module IsoDoc
 
     def presmeta_insert_pt(xmldoc)
       xmldoc.at(ns("//presentation-metadata")) ||
-        xmldoc.at(ns("//metanorma-extension")) || xmldoc.at(ns("//bibdata"))
+        extension_insert_pt(xmldoc).children.last
     end
 
     def presmeta(name, value)

data/lib/isodoc/presentation_function/section.rb

@@ -6,7 +6,6 @@ module IsoDoc
       s = docxml.at(ns("//sections")) or return
       t = @meta.get[:doctitle]
       t.nil? || t.empty? and return
-      #s.children.first.previous =
       s.add_first_child "<p class='zzSTDTitle1'>#{t}</p>"
     end
 
@@ -16,7 +15,6 @@ module IsoDoc
         .each do |f|
         f.parent.name == "annex" &&
           @xrefs.klass.single_term_clause?(f.parent) and next
-
         clause1(f)
       end
     end
@@ -41,14 +39,13 @@ module IsoDoc
       p = "//clause | //annex | //appendix | //introduction | //foreword | " \
           "//preface/abstract | //acknowledgements | //terms | " \
           "//definitions | //references | //colophon | //indexsect"
-      docxml.xpath(ns(p)).each do |f|
-        floattitle1(f)
-      end
+      docxml.xpath(ns(p)).each { |f| floattitle1(f) }
       # top-level
       docxml.xpath(ns("//sections | //preface | //colophon"))
         .each { |f| floattitle1(f) }
     end
 
+    # TODO not currently doing anything with the @depth attribute of floating-title
     def floattitle1(elem)
       elem.xpath(ns(".//floating-title")).each do |p|
         p.name = "p"
@@ -67,9 +64,8 @@ module IsoDoc
 
     def annex1(elem)
       lbl = @xrefs.anchor(elem["id"], :label)
-      if t = elem.at(ns("./title"))
+      t = elem.at(ns("./title")) and
         t.children = "<strong>#{to_xml(t.children)}</strong>"
-      end
       unnumbered_clause?(elem) and return
       prefix_name(elem, "<br/><br/>", lbl, "title")
     end
@@ -129,7 +125,7 @@ module IsoDoc
         %w(note admonition p).include?(p.name) or break m
         m << p
       end
-      out.reject { |c| c["displayorder"] }.reverse.each do |c|
+      out.reject { |c| c["displayorder"] }.reverse_each do |c|
         c["displayorder"] = idx
         idx += 1
       end
@@ -195,7 +191,6 @@ module IsoDoc
       preface.elements.each do |x|
         ((x.name == "floating-title" || x.at(xpath)) &&
         xpath != "./self::*[not(following-sibling::*)]") or prev = x
-        # after.include?(x.name) or next
         x.at(xpath) or next
         clause == prev and break
         prev ||= preface.children.first
@@ -248,7 +243,6 @@ module IsoDoc
     def toc_refs(docxml)
       docxml.xpath(ns("//toc//xref[text()]")).each do |x|
         lbl = @xrefs.anchor(x["target"], :label) or next
-        #x.children.first.previous = "#{lbl}<tab/>"
         x.add_first_child "#{lbl}<tab/>"
       end
     end

data/lib/isodoc/presentation_function/terms.rb

@@ -9,7 +9,6 @@ module IsoDoc
     end
 
     def deprecates(elem)
-      #elem.children.first.previous = @i18n.l10n("#{@i18n.deprecated}: ")
       elem.add_first_child @i18n.l10n("#{@i18n.deprecated}: ")
     end
 

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.11.2".freeze
+  VERSION = "2.11.4".freeze
 end

data/lib/isodoc/word_function/comments.rb

@@ -64,7 +64,6 @@ module IsoDoc
         'span[@style="MsoCommentReference"]'.freeze
 
       def embed_comment_in_comment_list(docxml)
-        # docxml.xpath(COMMENT_IN_COMMENT_LIST).each do |x|
         docxml.xpath(COMMENT_IN_COMMENT_LIST1).each do |x|
           n = x.next_element
           n&.children&.first&.add_previous_sibling(x.remove)

data/lib/isodoc/xref/xref_gen_seq.rb

@@ -66,7 +66,7 @@ module IsoDoc
       def sequential_table_names(clause, container: false)
         c = Counter.new
         clause.xpath(ns(".//table")).noblank.each do |t|
-          labelled_ancestor(t) and next
+          # labelled_ancestor(t) and next
           @anchors[t["id"]] = anchor_struct(
             c.increment(t).print, container ? t : nil,
             @labels["table"], "table", t["unnumbered"]
@@ -190,7 +190,7 @@ container: false)
       def hierarchical_table_names(clause, num)
         c = Counter.new
         clause.xpath(ns(".//table")).noblank.each do |t|
-          labelled_ancestor(t) and next
+          # labelled_ancestor(t) and next
           @anchors[t["id"]] =
             anchor_struct("#{num}#{hiersep}#{c.increment(t).print}",
                           nil, @labels["table"], "table", t["unnumbered"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.11.2
+  version: 2.11.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-02 00:00:00.000000000 Z
+date: 2024-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64