isodoc 2.11.3 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4228f130d19273b278dcf701d27c405d37a7843b053eed057b424af2d7399b09
-  data.tar.gz: 003b627868c9e53ae1eb6baf7f9cb71a06a3e3e0c09b6102cd5e1dc7c45faee5
+  metadata.gz: f7b57ce9e119a72a5611931503d20a6a6eb525b9f07cbc06b0e8794a80db8da2
+  data.tar.gz: 51a4d399f9ab8b7730a08d15deaa52b0526efbbe27cea41e355fca92ce0768ba
 SHA512:
-  metadata.gz: 2e865cfbe5a51e7a78a1562b7d88b7930a0eacf8db22e94c0e4ed0dc12f7c76b75975c98296a0f1624c82d729fdc03a5715f01237a14b68fa8b612a17f297a49
-  data.tar.gz: 533d41c63cf5955bc60f7223716cfea1151d959d0cdec32577154159c88abe4d9c0d81b2c8256fccc3e1b02d2e59dd8dcff613dee425f64ce417e390b77e3fe2
+  metadata.gz: 280cf748d5411c671d3e9f7d6e4b949611f1567766bddcdea160b5eff1bf49d6b61df5b706092f0775812515fb78ccf4812edfb79a98f47d0bcfef9e6215fe70
+  data.tar.gz: 3af9ba5dec2db7b37542f8dab65bc90cdf19f1298110fc230aac03187814c88bffeed194d3d9de7a2e1892f82767d24cab970f780a3655985dfa7f0482d851d1

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; }

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; }

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;

data/lib/isodoc/metadata.rb

@@ -15,7 +15,7 @@ module IsoDoc
 
     def initialize(lang, script, locale, i18n, fonts_options = {})
       @metadata = { lang:, script: }
-      DATETYPES.each { |w| @metadata["#{w.gsub('-', '_')}date".to_sym] = "XXX" }
+      DATETYPES.each { |w| @metadata["#{w.tr('-', '_')}date".to_sym] = "XXX" }
       @lang = lang
       @script = script
       @locale = locale

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
@@ -61,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
@@ -78,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/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.11.3".freeze
+  VERSION = "2.12.0".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_anchor.rb

@@ -31,7 +31,7 @@ module IsoDoc
 
       def anchor_struct_label(lbl, elem)
         case elem
-        when @labels["appendix"] then l10n("#{elem} #{lbl}")
+        when @labels["appendix"] then "#{elem} #{lbl}"
         else
           lbl.to_s
         end

data/lib/isodoc/xref/xref_counter.rb

@@ -1,4 +1,5 @@
 require "roman-numerals"
+require "twitter_cldr"
 
 module IsoDoc
   module XrefGen
@@ -26,6 +27,7 @@ module IsoDoc
         @style = opts[:numerals]
         @skip_i = opts[:skip_i]
         @prefix = opts[:prefix]
+        @separator = opts[:separator] || "."
         @base = ""
         if num.is_a? String
           if /^\d+$/.match?(num)
@@ -139,7 +141,8 @@ module IsoDoc
       end
 
       def increment(node)
-        @unnumbered = node["unnumbered"] == "true" || node["hidden"] == "true" and return self
+        @unnumbered = node["unnumbered"] == "true" ||
+          node["hidden"] == "true" and return self
         reset_overrides
         if node["subsequence"] != @subseq &&
             !(blank?(node["subsequence"]) && blank?(@subseq))
@@ -150,12 +153,23 @@ module IsoDoc
         self
       end
 
+      def style_number(num)
+        num.nil? and return num
+        case @style
+        when :roman then RomanNumerals.to_roman(num)
+        when :japanese then num.localize(:ja).spellout
+        else num
+        end
+      end
+
       def print
         @unnumbered and return nil
         @prefix_override and return @prefix_override
         num = @number_override || @num
-        out = @style == :roman && !num.nil? ? RomanNumerals.to_roman(num) : num
-        "#{@prefix}#{@base}#{out}#{@letter_override || @letter}"
+        out = style_number(num)
+        prefix = @prefix
+        prefix &&= "#{prefix}#{@separator}"
+        "#{prefix}#{@base}#{out}#{@letter_override || @letter}"
       end
 
       def ol_type(list, depth)
@@ -176,6 +190,7 @@ module IsoDoc
         when :alphabet_upper then (64 + @num).chr.to_s
         when :roman then RomanNumerals.to_roman(@num).downcase
         when :roman_upper then RomanNumerals.to_roman(@num).upcase
+        when :japanese then num.localize(:ja).spellout
         end
       end
     end

data/lib/isodoc/xref/xref_counter_types.rb

@@ -0,0 +1,13 @@
+require_relative "xref_counter"
+
+module IsoDoc
+  class Xref
+    def clause_counter(num = 0, opts = { numerals: :arabic })
+      ::IsoDoc::XrefGen::Counter.new(num, opts)
+    end
+
+    def list_counter(num = 0, opts = { numerals: :arabic })
+      ::IsoDoc::XrefGen::Counter.new(num, opts)
+    end
+  end
+end

data/lib/isodoc/xref/xref_gen.rb

@@ -33,8 +33,7 @@ module IsoDoc
       end
 
       def increment_label(elems, node, counter, increment: true)
-        return "" if elems.size == 1 && !node["number"]
-
+        elems.size == 1 && !node["number"] and return ""
         counter.increment(node) if increment
         " #{counter.print}"
       end
@@ -48,7 +47,7 @@ module IsoDoc
               { label: termnote_label(c.print), type: "termnote",
                 value: c.print, elem: @labels["termnote"],
                 container: t["id"],
-                xref: l10n("#{@labels['note_xref']} #{c.print}") }
+                xref: "#{@labels['note_xref']} #{c.print}" }
           end
         end
       end
@@ -64,7 +63,7 @@ module IsoDoc
               { label: idx, type: "termexample",
                 value: idx, elem: @labels["example_xref"],
                 container: t["id"],
-                xref: l10n("#{@labels['example_xref']} #{idx}") }
+                xref: "#{@labels['example_xref']} #{idx}" }
           end
         end
       end
@@ -123,7 +122,7 @@ module IsoDoc
         sections.each do |s|
           notes = s.xpath(ns(".//ol")) - s.xpath(ns(".//clause//ol")) -
             s.xpath(ns(".//appendix//ol")) - s.xpath(ns(".//ol//ol"))
-          c = Counter.new
+          c = list_counter
           notes.noblank.each do |n|
             @anchors[n["id"]] = anchor_struct(increment_label(notes, n, c), n,
                                               @labels["list"], "list", false)
@@ -134,7 +133,7 @@ module IsoDoc
       end
 
       def list_item_anchor_names(list, list_anchor, depth, prev_label, refer_list)
-        c = Counter.new(list["start"] ? list["start"].to_i - 1 : 0)
+        c = list_counter(list["start"] ? list["start"].to_i - 1 : 0)
         list.xpath(ns("./li")).each do |li|
           bare_label, label =
             list_item_value(li, c, depth, { list_anchor:, prev_label:,
@@ -188,7 +187,7 @@ module IsoDoc
 
       def deflist_term_anchor_names(list, list_anchor)
         list.xpath(ns("./dt")).each do |li|
-          label = l10n("#{list_anchor[:xref]}: #{dt2xreflabel(li)}")
+          label = "#{list_anchor[:xref]}: #{dt2xreflabel(li)}"
           li["id"] and @anchors[li["id"]] =
                          { xref: label, type: "deflistitem",
                            container: list_anchor[:container] }

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"])

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -56,7 +56,7 @@ module IsoDoc
       end
 
       def main_anchor_names(xml)
-        n = Counter.new
+        n = clause_counter
         clause_order_main(xml).each do |a|
           xml.xpath(ns(a[:path])).each do |c|
             section_names(c, n, 1)
@@ -144,7 +144,7 @@ module IsoDoc
         num.increment(clause)
         section_name_anchors(clause, num.print, lvl)
         clause.xpath(ns(SUBCLAUSES))
-          .each_with_object(Counter.new(0, prefix: "#{num.print}.")) do |c, i|
+          .each_with_object(clause_counter(0, prefix: num.print)) do |c, i|
           section_names1(c, i.increment(c).print, lvl + 1)
         end
         num
@@ -153,7 +153,7 @@ module IsoDoc
       def section_names1(clause, num, level)
         unnumbered_section_name?(clause) and return num
         section_name_anchors(clause, num, level)
-        i = Counter.new(0, prefix: "#{num}.")
+        i = clause_counter(0, prefix: num)
         clause.xpath(ns(SUBCLAUSES)).each do |c|
           section_names1(c, i.increment(c).print, level + 1)
         end
@@ -170,18 +170,18 @@ module IsoDoc
 
       def section_name_anchors(clause, num, level)
         @anchors[clause["id"]] =
-          { label: num, xref: l10n("#{@labels['clause']} #{num}"),
+          { label: num, xref: "#{@labels['clause']} #{num}",
             title: clause_title(clause), level:, type: "clause",
             elem: @labels["clause"] }
       end
 
       def annex_name_lbl(clause, num)
-        obl = l10n("(#{@labels['inform_annex']})")
+        obl = "(#{@labels['inform_annex']})"
         clause["obligation"] == "normative" and
-          obl = l10n("(#{@labels['norm_annex']})")
+          obl = "(#{@labels['norm_annex']})"
         title = Common::case_with_markup(@labels["annex"], "capital",
                                          @script)
-        l10n("<strong>#{title} #{num}</strong><br/>#{obl}")
+        "<strong>#{title} #{num}</strong><br/>#{obl}"
       end
 
       def annex_name_anchors(clause, num, level)
@@ -203,7 +203,7 @@ module IsoDoc
                        num.to_s, 1)
         else
           clause.xpath(ns(SUBCLAUSES))
-            .each_with_object(Counter.new(0, prefix: "#{num}.")) do |c, i|
+            .each_with_object(clause_counter(0, prefix: num)) do |c, i|
             annex_names1(c, i.increment(c).print, 2)
           end
         end
@@ -212,7 +212,7 @@ module IsoDoc
 
       def annex_names1(clause, num, level)
         annex_name_anchors(clause, num, level)
-        i = Counter.new(0, prefix: "#{num}.")
+        i = clause_counter(0, prefix: num)
         clause.xpath(ns(SUBCLAUSES)).each do |c|
           annex_names1(c, i.increment(c).print, level + 1)
         end

data/lib/isodoc/xref.rb

@@ -1,5 +1,6 @@
 require_relative "xref/xref_anchor"
 require_relative "xref/xref_counter"
+require_relative "xref/xref_counter_types"
 require_relative "xref/xref_gen_seq"
 require_relative "xref/xref_gen"
 require_relative "xref/xref_sect_gen"
@@ -17,25 +18,31 @@ module IsoDoc
 
     # Note: if bibrender is no passed in, do not parse references
     def initialize(lang, script, klass, i18n, options = {})
-      @anchors = {}
+      initialize_empty
       @lang = lang
       @script = script
       @klass = klass
       @options = options
-      @i18n = i18n
-      @labels = @i18n.get
-      @klass.i18n = @i18n
+      initialize_i18n(i18n)
       @klass.bibrender ||= options[:bibrender]
-      @locale = options[:locale]
       @reqt_models = @klass.requirements_processor
-        .new({
-               default: "default", lang:, script:,
-               labels: @i18n.get
-             })
-      @i18n
+        .new({ default: "default", lang:, script:,
+               labels: @i18n.get })
+    end
+
+    def initialize_empty
+      @c = HTMLEntities.new
+      @anchors = {}
       @parse_settings = {}
     end
 
+    def initialize_i18n(i18n)
+      @i18n = i18n
+      @labels = @i18n.get
+      @klass.i18n = @i18n
+      @locale = @options[:locale]
+    end
+
     def get
       @anchors
     end
@@ -66,9 +73,18 @@ module IsoDoc
       initial_anchor_names(docxml)
       back_anchor_names(docxml)
       asset_anchor_names(docxml)
+      localise_anchors
       @parse_settings = {}
     end
 
+    def localise_anchors
+      @anchors.each_value do |v|
+        v[:label] &&= l10n(v[:label])
+        v[:value] &&= l10n(v[:value])
+        v[:xref] &&= l10n(v[:xref])
+      end
+    end
+
     def ns(xpath)
       Common::ns(xpath)
     end

data/lib/isodoc-yaml/i18n-ja.yaml

@@ -96,18 +96,18 @@ version: version
 toc_figures: List of figures
 toc_tables: List of tables
 toc_recommendations: List of recommendations
-month_january: January
-month_february: February
-month_march: March
-month_april: April
-month_may: May
-month_june: June
-month_july: July
-month_august: August
-month_september: September
-month_october: October
-month_november: November
-month_december: December
+month_january: 1月
+month_february: 2月
+month_march: 3月
+month_april: 4月
+month_may: 5月
+month_june: 6月
+month_july: 7月
+month_august: 8月
+month_september: 9月
+month_october: 10月
+month_november: 11月
+month_december: 12月
 obligation: Obligation
 admonition: {
   danger: 危険です,
@@ -118,7 +118,7 @@ admonition: {
   editorial: 編集者注
 }
 locality: {
-                      section: Section,
+                      section: セクション,
                       clause: 箇条,
                       subclause: 細分箇条,
                       part: 部,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.11.3
+  version: 2.12.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-16 00:00:00.000000000 Z
+date: 2024-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -451,6 +451,7 @@ files:
 - lib/isodoc/xref/clause_order.rb
 - lib/isodoc/xref/xref_anchor.rb
 - lib/isodoc/xref/xref_counter.rb
+- lib/isodoc/xref/xref_counter_types.rb
 - lib/isodoc/xref/xref_gen.rb
 - lib/isodoc/xref/xref_gen_seq.rb
 - lib/isodoc/xref/xref_sect_gen.rb