isodoc 2.10.5 → 2.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82d1c3ed71a05f100f76c7e3ff42ec7fd4fe27c2a018bb312a2639f27d69e8b1
-  data.tar.gz: b170bf5e893fb25d9506d34b7ee725c19cf7778270b724f3697a7ac56a487a98
+  metadata.gz: 8dfe3b646b2b65d551ff524de95c5960c5dc0d9e607a40b59948deb10832f659
+  data.tar.gz: 5230ba55bdba86b34080a412366c26e347f5284151d6099cee23446da6eddfd3
 SHA512:
-  metadata.gz: ca60c3933004e3b6b5ebcf1864baf52ebe1702e31dbc2aebe7762451552c4efaad660cbe166a5d4e88e0c25fc431970aa4519e94864a9e54b8c548d65c724831
-  data.tar.gz: b0b0375281dd5900fe8f328c61d4efb895b13e7965d645a1d551df1afa09144749056ea0e43424732208da5ec0e5a7f2209d685f5851cf9761d0e47662002abf
+  metadata.gz: 02e6090e1a7c726ff5024b62f42606aad5ec942e1d8ecd63d576b975d4103b6adfa0cb211d226902f4003e1ad4bec6a00a81ea92edb99c8f1626e6941db8b0fd
+  data.tar.gz: ffa9b8ee9be5501fd29cd638b1cde09287f2111a3d6d3a302484e92f2f0d5a035d3765f97d80207edd4119825ebd796f98bde1010eb072ecc16bada797bff310

data/isodoc.gemspec

@@ -44,6 +44,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "twitter_cldr", ">= 6.6.0"
   spec.add_dependency "uuidtools"
 
+  spec.add_development_dependency "bigdecimal"
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
@@ -54,5 +55,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sassc", "~> 2.4.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
+  spec.add_development_dependency "xml-c14n"
   # spec.metadata["rubygems_mfa_required"] = "true"
 end

data/lib/isodoc/css.rb

@@ -90,16 +90,14 @@ module IsoDoc
 
     # stripwordcss if HTML stylesheet, !stripwordcss if DOC stylesheet
     def generate_css(filename, stripwordcss)
-      return nil if filename.nil?
-
+      filename.nil? and return nil
       filename = precompiled_style_or_original(filename)
       stylesheet = File.read(filename, encoding: "UTF-8")
       stylesheet = populate_template(stylesheet, :word)
       stylesheet.gsub!(/(\s|\{)mso-[^:]+:[^;]+;/m, "\\1") if stripwordcss
       stylesheet.gsub!(/--/, "-DOUBLE_HYPHEN_ESCAPE-") unless stripwordcss
-      if File.extname(filename) == ".scss"
+      File.extname(filename) == ".scss" and
         stylesheet = convert_scss(filename, stylesheet, stripwordcss)
-      end
       Tempfile.open([File.basename(filename, ".*"), "css"],
                     mode: File::BINARY | File::SHARE_DELETE,
                     encoding: "utf-8") do |f|

data/lib/isodoc/function/blocks.rb

@@ -161,8 +161,7 @@ module IsoDoc
       def quote_attribution(node, out)
         author = node.at(ns("./author"))
         source = node.at(ns("./source"))
-        return if author.nil? && source.nil?
-
+        author.nil? && source.nil? and return
         out.p class: "QuoteAttribution" do |p|
           p << "&#x2014; #{author.text}" if author
           p << ", " if author && source
@@ -206,6 +205,18 @@ module IsoDoc
         end
       end
 
+      def cross_align_parse(node, out)
+        out.table do |t|
+          t.tbody do |b|
+            node.xpath(ns("./align-cell")).each do |c|
+              b.td do |td|
+                c.children.each { |n| parse(n, td) }
+              end
+            end
+          end
+        end
+      end
+
       def columnbreak_parse(node, out); end
     end
   end

data/lib/isodoc/function/references.rb

@@ -51,24 +51,31 @@ module IsoDoc
 
       # returns [metanorma, non-metanorma, DOI/ISSN/ISBN] identifiers
       def bibitem_ref_code(bib)
+        id, id1, id2, id3 = bibitem_ref_code_prep(bib)
+        id || id1 || id2 || id3 and return [id, id1, id2, id3]
+        bib["suppress_identifier"] == "true" and return [nil, nil, nil, nil]
+        [nil, no_identifier(bib), nil, nil]
+      end
+
+      def bibitem_ref_code_prep(bib)
         id = bib.at(ns("./docidentifier[@type = 'metanorma']"))
         id1 = pref_ref_code(bib)
         id2 = bib.at(ns("./docidentifier[#{SKIP_DOCID}]"))
         id3 = bib.at(ns("./docidentifier[@type = 'metanorma-ordinal']"))
-        return [id, id1, id2, id3] if id || id1 || id2 || id3
-        return [nil, nil, nil, nil] if bib["suppress_identifier"] == "true"
+        [id, id1, id2, id3]
+      end
 
+      def no_identifier(bib)
+        @i18n.no_identifier or return nil
         id = Nokogiri::XML::Node.new("docidentifier", bib.document)
-        id << "(NO ID)"
-        [nil, id, nil, nil]
+        id << @i18n.no_identifier
+        id
       end
 
       def bracket_if_num(num)
-        return nil if num.nil?
-
+        num.nil? and return nil
         num = num.text.sub(/^\[/, "").sub(/\]$/, "")
-        return "[#{num}]" if /^\d+$/.match?(num)
-
+        /^\d+$/.match?(num) and return "[#{num}]"
         num
       end
 

data/lib/isodoc/function/section_titles.rb

@@ -18,6 +18,14 @@ module IsoDoc
         end
       end
 
+      def freestanding_title(node, out)
+        parents = node.ancestors("clause, annex, terms, references, " \
+                               "definitions, acknowledgements, introduction, " \
+                               "foreword")
+        clause_parse_title(parents.empty? ? node : parents.first,
+                           out, node, out)
+      end
+
       # used for subclauses
       def clause_parse_title(node, div, title, out, header_class = {})
         return if title.nil?

data/lib/isodoc/function/to_word_html.rb

@@ -153,6 +153,12 @@ module IsoDoc
         @meta.get
       end
 
+      def cross_align(isoxml, out)
+        isoxml.xpath(ns("//cross-align")).each do |c|
+          parse(c, out)
+        end
+      end
+
       def boilerplate(node, out)
         @bare and return
         boilerplate = node.at(ns("//boilerplate")) or return
@@ -249,9 +255,11 @@ module IsoDoc
           when "option" then option_parse(node, out)
           when "textarea" then textarea_parse(node, out)
           when "toc" then toc_parse(node, out)
+          when "title" then freestanding_title(node, out) # not inside clause
           when "variant-title" then variant_title(node, out)
           when "span" then span_parse(node, out)
           when "location" then location_parse(node, out)
+          when "cross-align" then cross_align_parse(node, out)
           when "columnbreak" then columnbreak_parse(node, out)
           when "ruby" then ruby_parse(node, out)
           when "rt" then rt_parse(node, out)

data/lib/isodoc/function/utils.rb

@@ -213,10 +213,9 @@ module IsoDoc
         %w(example requirement recommendation permission
            note table figure sourcecode).freeze
 
-      def labelled_ancestor(elem)
-        #!elem.path.gsub(/\[\d+\]/, "").split(%r{/})[1..-1]
+      def labelled_ancestor(elem, exceptions = [])
         !elem.ancestors.map(&:name)
-          .intersection(LABELLED_ANCESTOR_ELEMENTS).empty?
+          .intersection(LABELLED_ANCESTOR_ELEMENTS - exceptions).empty?
       end
 
       def emf?(type)

data/lib/isodoc/metadata.rb

@@ -14,7 +14,7 @@ module IsoDoc
     end
 
     def initialize(lang, script, locale, i18n, fonts_options = {})
-      @metadata = { lang: lang, script: script }
+      @metadata = { lang:, script: }
       DATETYPES.each { |w| @metadata["#{w.gsub('-', '_')}date".to_sym] = "XXX" }
       @lang = lang
       @script = script
@@ -29,10 +29,6 @@ module IsoDoc
       @metadata
     end
 
-    def labels
-      @labels
-    end
-
     def set(key, value)
       @metadata[key] = value
     end
@@ -44,12 +40,12 @@ module IsoDoc
     end
 
     def doctype(isoxml, _out)
-      b = isoxml&.at(ns("//bibdata/ext/doctype#{NOLANG}"))&.text || return
-      set(:doctype, status_print(b))
-      b1 = isoxml&.at(ns("//bibdata/ext/doctype#{currlang}"))&.text || b
-      set(:doctype_display, status_print(b1))
-      b = isoxml&.at(ns("//bibdata/ext/subdoctype#{NOLANG}"))&.text || return
-      set(:subdoctype, status_print(b))
+      b = isoxml.at(ns("//bibdata/ext/doctype#{NOLANG}")) || return
+      set(:doctype, status_print(b.text))
+      b1 = isoxml.at(ns("//bibdata/ext/doctype#{currlang}")) || b
+      set(:doctype_display, status_print(b1.text))
+      b = isoxml.at(ns("//bibdata/ext/subdoctype#{NOLANG}")) || return
+      set(:subdoctype, status_print(b.text))
     end
 
     def docstatus(xml, _out)
@@ -59,11 +55,11 @@ module IsoDoc
       s1 = xml.at(ns("//bibdata/status/stage#{currlang}")) || s
       set(:stage, status_print(s.text))
       s1 and set(:stage_display, status_print(s1.text))
-      (i = xml&.at(ns("//bibdata/status/substage#{NOLANG}"))&.text) and
+      (i = xml.at(ns("//bibdata/status/substage#{NOLANG}"))&.text) and
         set(:substage, i)
-      (i1 = xml&.at(ns("//bibdata/status/substage#{currlang}"))&.text || i) and
+      (i1 = xml.at(ns("//bibdata/status/substage#{currlang}"))&.text || i) and
         set(:substage_display, i1)
-      (i2 = xml&.at(ns("//bibdata/status/iteration"))&.text) and
+      (i2 = xml.at(ns("//bibdata/status/iteration"))&.text) and
         set(:iteration, i2)
       set(:unpublished, unpublished(s.text))
       unpublished(s.text) && set(:stageabbr, stage_abbr(s.text))

data/lib/isodoc/metadata_contributor.rb

@@ -67,20 +67,15 @@ module IsoDoc
       publisher = []
       xml.xpath(ns("//bibdata/contributor[xmlns:role/@type = 'publisher']/" \
                    "organization")).each do |org|
-        name = extract_variant(org.at(ns("./name")))
-        agency1 = org.at(ns("./abbreviation"))&.text || name
-        publisher << name if name
+        name = org.at(ns("./name[@language = '#{@lang}']")) ||
+          org.at(ns("./name"))
+        agency1 = org.at(ns("./abbreviation"))&.text || name&.text
+        publisher << name.text if name
         agency = iso?(org) ? "ISO/#{agency}" : "#{agency}#{agency1}/"
       end
       [agency, publisher]
     end
 
-    def extract_variant(node)
-      node.nil? and return node
-      x = node.at(ns("./variant[@language = '#{@lang}']")) and node = x
-      node.text
-    end
-
     def agency(xml)
       agency, publisher = agency1(xml)
       set(:agency, agency.sub(%r{/$}, ""))

data/lib/isodoc/presentation_function/erefs.rb

@@ -38,9 +38,9 @@ module IsoDoc
       ret = resolve_eref_connectives(eref_locality_stacks(refs, target,
                                                           node))
       node.delete("droploc") unless droploc
-      eref_localities1({ target: target, number: "pl",
+      eref_localities1({ target:, number: "pl",
                          type: refs.first.at(ns("./locality/@type")).text,
-                         from: l10n(ret[1..-1].join), node: node, lang: @lang })
+                         from: l10n(ret[1..-1].join), node:, lang: @lang })
     end
 
     def can_conflate_eref_rendering?(refs)
@@ -143,9 +143,9 @@ module IsoDoc
     def eref_localities0(ref, _idx, target, node)
       if ref["type"] == "whole" then @i18n.wholeoftext
       else
-        eref_localities1({ target: target, type: ref["type"], number: "sg",
+        eref_localities1({ target:, type: ref["type"], number: "sg",
                            from: ref.at(ns("./referenceFrom"))&.text,
-                           upto: ref.at(ns("./referenceTo"))&.text, node: node,
+                           upto: ref.at(ns("./referenceTo"))&.text, node:,
                            lang: @lang })
       end
     end

data/lib/isodoc/presentation_function/image.rb

@@ -38,23 +38,26 @@ module IsoDoc
 
       svg = Base64.strict_decode64(elem["src"]
         .sub(%r{^data:image/svg\+xml;(charset=[^;]+;)?base64,}, ""))
-      x = Nokogiri::XML.fragment(svg.sub(/<\?xml[^>]*>/, "")) do |config|
-        config.huge
-      end
+      x = Nokogiri::XML.fragment(svg.sub(/<\?xml[^>]*>/, ""), &:huge)
       elem["src"] = ""
       elem.children = x
     end
 
     def figure1(elem)
-      return sourcecode1(elem) if elem["class"] == "pseudocode" ||
-        elem["type"] == "pseudocode"
-      return if elem.at(ns("./figure")) && !elem.at(ns("./name"))
-
+      elem["class"] == "pseudocode" || elem["type"] == "pseudocode" and
+        return sourcecode1(elem)
+      figure_label?(elem) or return nil
       lbl = @xrefs.anchor(elem["id"], :label, false) or return
+      # no xref, no label: this can be set in xref
       prefix_name(elem, block_delim,
                   l10n("#{figure_label(elem)} #{lbl}"), "name")
     end
 
+    def figure_label?(elem)
+      elem.at(ns("./figure")) && !elem.at(ns("./name")) and return false
+      true
+    end
+
     def figure_label(elem)
       klass = elem["class"] || "figure"
       klasslbl = @i18n.get[klass] || klass

data/lib/isodoc/presentation_function/inline.rb

@@ -64,6 +64,7 @@ module IsoDoc
       get_linkend(node)
     end
 
+    # there should be no //variant in bibdata now
     def variant(xml)
       b = xml.xpath(ns("//bibdata//variant"))
       (xml.xpath(ns("//variant")) - b).each { |f| variant1(f) }

data/lib/isodoc/presentation_function/math.rb

@@ -28,8 +28,8 @@ module IsoDoc
           else implicit_number_formatter(x, locale)
           end
       rescue ArgumentError
-      rescue Error => e
-        warn "Failure to localised MathML/mn\n#{node.parent.to_xml}\n#{e}"
+      rescue StandardError, RuntimeError => e
+        warn "Failure to localise MathML/mn\n#{node.parent.to_xml}\n#{e}"
       end
     end
 
@@ -40,10 +40,8 @@ module IsoDoc
     end
 
     def implicit_number_formatter(num, locale)
-      fmt = { digit_count: num_totaldigits(num.text) }.compact
+      fmt = { significant: num_totaldigits(num.text) }.compact
       n = normalise_number(num.text)
-      # Plurimath confused by exponent notation
-      #warn "IMPLICIT: precision: #{num_precision(num.text)} ; symbols: #{fmt}, n: #{n}; output: #{@numfmt.localized_number(n, locale:, format: fmt, precision: num_precision(num.text))}"
       @numfmt.localized_number(n, locale:, format: fmt,
                                   precision: num_precision(num.text))
     end
@@ -57,7 +55,8 @@ module IsoDoc
     end
 
     def numberformat_type(ret)
-      %i(precision digit_count group_digits fraction_group_digits).each do |i|
+      %i(precision significant digit_count group_digits fraction_group_digits)
+        .each do |i|
         ret[i] &&= ret[i].to_i
       end
       %i(notation exponent_sign locale).each do |i|
@@ -69,20 +68,20 @@ module IsoDoc
     def explicit_number_formatter(num, locale, options)
       ret = numberformat_type(numberformat_extract(options))
       l = ret[:locale] || locale
-      precision, symbols, digit_count = explicit_number_formatter_cfg(num, ret)
+      precision, symbols, significant = explicit_number_formatter_cfg(num, ret)
       n = normalise_number(num.text)
-      # Plurimath confused by exponent notation
-      #warn "EXPLICIT: precision: #{precision} ; symbols: #{symbols}, n: #{n}; output: #{Plurimath::NumberFormatter.new(l, localizer_symbols: symbols).localized_number(n, precision:, format: symbols.merge(digit_count:))}"
-      Plurimath::NumberFormatter.new(l, localizer_symbols: symbols)
+      Plurimath::NumberFormatter.new(l)
         .localized_number(n, precision:,
-                             format: symbols.merge(digit_count:))
+                             format: symbols.merge(significant:))
     end
 
     def explicit_number_formatter_cfg(num, fmt)
       symbols = twitter_cldr_localiser_symbols.dup.merge(fmt)
-      precision = symbols[:precision]&.to_i || num_precision(num.text)
-      symbols[:precision] or digit_count = num_totaldigits(num.text)
-      [precision, symbols, digit_count]
+      precision = symbols[:precision] || num_precision(num.text)
+      signif = symbols[:significant]
+      (symbols.keys & %i(precision digit_count)).empty? and
+        signif ||= num_totaldigits(num.text)
+      [precision, symbols, signif]
     end
 
     def num_precision(num)
@@ -96,8 +95,8 @@ module IsoDoc
     def num_totaldigits(num)
       totaldigits = nil
       /\.(?=\d+e)/.match?(num) and
-        totaldigits = twitter_cldr_localiser_symbols[:digit_count] ||
-          num.sub(/^.*\./, "").sub(/e.*$/, "").size
+        totaldigits = twitter_cldr_localiser_symbols[:significant] ||
+          num.sub(/^0\./, ".").sub(/^.*\./, "").sub(/e.*$/, "").size
       totaldigits
     end
 
@@ -109,6 +108,7 @@ module IsoDoc
       @suppressasciimathdup || node.parent.at(ns("./asciimath")) and return
       math = node.to_xml.gsub(/ xmlns=["'][^"']+["']/, "")
         .gsub(%r{<[^:/>]+:}, "<").gsub(%r{</[^:/>]+:}, "</")
+        .gsub(%r{ data-metanorma-numberformat="[^"]+"}, "")
       ret = Plurimath::Math.parse(math, "mathml").to_asciimath
       node.next = "<asciimath>#{@c.encode(ret, :basic)}</asciimath>"
     rescue StandardError => e
@@ -116,7 +116,8 @@ module IsoDoc
     end
 
     def maths_just_numeral(node)
-      mn = node.at(".//m:mn", MATHML).children
+      mn = node.at(".//m:mn", MATHML).children.text
+        .sub(/\^([0-9+-]+)$/, "<sup>\\1</sup>")
       if node.parent.name == "stem"
         node.parent.replace(mn)
       else
@@ -142,11 +143,24 @@ module IsoDoc
       OUTPUT
     end
 
+    # convert any Ascii superscripts to correct(ish) MathML
+    # Not bothering to match times, base of 1.0 x 10^-20, just ^-20
+    def mn_to_msup(node)
+      node.xpath(".//m:mn", MATHML).each do |n|
+        m = %r{^(.+)\^([0-9+-]+)$}.match(n.text) or next
+        n.replace("<msup><mn>#{m[1]}</mn><mn>#{m[2]}</mn></msup>")
+      end
+    end
+
     def mathml_number(node, locale)
       justnumeral = numeric_mathml?(node)
       justnumeral or asciimath_dup(node)
       localize_maths(node, locale)
-      justnumeral and maths_just_numeral(node)
+      if justnumeral
+        maths_just_numeral(node)
+      else
+        mn_to_msup(node)
+      end
     end
 
     def numeric_mathml?(node)

data/lib/isodoc/presentation_function/metadata.rb

@@ -22,7 +22,7 @@ module IsoDoc
     end
 
     def save_attachment(attachment, dir)
-      n = File.join(dir, attachment["name"])
+      n = File.join(dir, File.basename(attachment["name"]))
       c = attachment.text.sub(%r{^data:[^;]+;(?:charset=[^;]+;)?base64,}, "")
       File.open(n, "wb") { |f| f.write(Base64.strict_decode64(c)) }
     end

data/lib/isodoc/presentation_function/refs.rb

@@ -13,15 +13,21 @@ module IsoDoc
 
     def move_norm_ref_to_sections(docxml)
       docxml.at(ns(@xrefs.klass.norm_ref_xpath)) or return
-      s = docxml.at(ns("//sections")) ||
-        docxml.at(ns("//preface"))&.after("<sections/>")&.next_element ||
-        docxml.at(ns("//annex | //bibliography"))&.before("<sections/>")
-          &.previous_element or return
+      s = move_norm_ref_to_sections_insert_pt(docxml) or return
       docxml.xpath(ns(@xrefs.klass.norm_ref_xpath)).each do |r|
+        r.at("./ancestor::xmlns:bibliography") or next
         s << r.remove
       end
     end
 
+    def move_norm_ref_to_sections_insert_pt(docxml)
+      s = docxml.at(ns("//sections")) and return s
+      s = docxml.at(ns("//preface")) and
+        return s.after("<sections/>").next_element
+      docxml.at(ns("//annex | //bibliography"))&.before("<sections/>")
+        &.previous_element
+    end
+
     def hidden_items(docxml)
       docxml.xpath(ns("//references[bibitem/@hidden = 'true']")).each do |x|
         x.at(ns("./bibitem[not(@hidden = 'true')]")) and next

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.10.5".freeze
+  VERSION = "2.10.7".freeze
 end

data/lib/isodoc/xref/xref_gen.rb

@@ -137,15 +137,16 @@ module IsoDoc
         c = Counter.new(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: list_anchor, prev_label: prev_label,
+            list_item_value(li, c, depth, { list_anchor:, prev_label:,
                                             refer_list: depth == 1 ? refer_list : nil })
           li["id"] and @anchors[li["id"]] =
                          { label: bare_label, bare_xref: "#{label})",
                            xref: "#{label})",
-                           type: "listitem", refer_list: refer_list,
+                           type: "listitem", refer_list:,
                            container: list_anchor[:container] }
           (li.xpath(ns(".//ol")) - li.xpath(ns(".//ol//ol"))).each do |ol|
-            list_item_anchor_names(ol, list_anchor, depth + 1, label, refer_list)
+            list_item_anchor_names(ol, list_anchor, depth + 1, label,
+                                   refer_list)
           end
         end
       end
@@ -227,7 +228,7 @@ module IsoDoc
       def bookmark_anchor_names(xml)
         xml.xpath(ns(".//bookmark")).noblank.each do |n|
           _parent, id = id_ancestor(n)
-          #container = bookmark_container(parent)
+          # container = bookmark_container(parent)
           @anchors[n["id"]] = { type: "bookmark", label: nil, value: nil,
                                 xref: @anchors.dig(id, :xref) || "???",
                                 container: @anchors.dig(id, :container) }

data/lib/isodoc/xref/xref_gen_seq.rb

@@ -28,10 +28,11 @@ module IsoDoc
         c = Counter.new
         j = 0
         clause.xpath(ns(self.class::FIGURE_NO_CLASS)).noblank.each do |t|
+          # labelled_ancestor(t, %w(figure)) and next # disable nested figure labelling
           j = subfigure_increment(j, c, t)
-          sequential_figure_body(j, c, t, "figure", container: container)
+          sequential_figure_body(j, c, t, "figure", container:)
         end
-        sequential_figure_class_names(clause, container: container)
+        sequential_figure_class_names(clause, container:)
       end
 
       def sequential_figure_class_names(clause, container: false)
@@ -40,15 +41,16 @@ module IsoDoc
         clause.xpath(ns(".//figure[@class][not(@class = 'pseudocode')]"))
           .each do |t|
           c[t["class"]] ||= Counter.new
+          # labelled_ancestor(t, %w(figure)) and next
           j = subfigure_increment(j, c[t["class"]], t)
           sequential_figure_body(j, c[t["class"]], t, t["class"],
-                                 container: container)
+                                 container:)
         end
       end
 
       def subfigure_label(subfignum)
         subfignum.zero? and return ""
-        "-#{subfignum}"
+        "#{hierfigsep}#{subfignum}"
       end
 
       def sequential_figure_body(subfig, counter, elem, klass, container: false)
@@ -100,8 +102,8 @@ module IsoDoc
           klass, label = reqt2class_label(t, m)
           id = c.increment(label, t).print
           sequential_permission_body(id, t, label, klass, m,
-                                     container: container)
-          sequential_permission_children(t, id, container: container)
+                                     container:)
+          sequential_permission_children(t, id, container:)
         end
       end
 
@@ -112,12 +114,13 @@ module IsoDoc
           klass, label = reqt2class_nested_label(t, m)
           id = "#{lbl}#{hierfigsep}#{c.increment(label, t).print}"
           sequential_permission_body(id, t, label, klass, m,
-                                     container: container)
-          sequential_permission_children(t, id, container: container)
+                                     container:)
+          sequential_permission_children(t, id, container:)
         end
       end
 
-      def sequential_permission_body(id, elem, label, klass, model, container: false)
+      def sequential_permission_body(id, elem, label, klass, model,
+container: false)
         @anchors[elem["id"]] = model.postprocess_anchor_struct(
           elem, anchor_struct(id, elem,
                               label, klass, elem["unnumbered"])
@@ -146,17 +149,17 @@ module IsoDoc
 
       # container makes numbering be prefixed with the parent clause reference
       def sequential_asset_names(clause, container: false)
-        sequential_table_names(clause, container: container)
-        sequential_figure_names(clause, container: container)
-        sequential_formula_names(clause, container: container)
-        sequential_permission_names(clause, container: container)
+        sequential_table_names(clause, container:)
+        sequential_figure_names(clause, container:)
+        sequential_formula_names(clause, container:)
+        sequential_permission_names(clause, container:)
       end
 
       def hierarchical_figure_names(clause, num)
         c = Counter.new
         j = 0
         clause.xpath(ns(self.class::FIGURE_NO_CLASS)).noblank.each do |t|
-          # next if labelled_ancestor(t) && t.ancestors("figure").empty?
+          # labelled_ancestor(t, %w(figure)) and next
           j = subfigure_increment(j, c, t)
           hierarchical_figure_body(num, j, c, t, "figure")
         end
@@ -168,6 +171,7 @@ module IsoDoc
         j = 0
         clause.xpath(ns(".//figure[@class][not(@class = 'pseudocode')]"))
           .noblank.each do |t|
+          # labelled_ancestor(t, %w(figure)) and next
           c[t["class"]] ||= Counter.new
           j = subfigure_increment(j, c[t["class"]], t)
           hierarchical_figure_body(num, j, c[t["class"]], t, t["class"])

data/lib/isodoc/xref/xref_util.rb

@@ -19,7 +19,8 @@ module IsoDoc
 
       SECTIONS_XPATH =
         "//foreword | //introduction | //acknowledgements | " \
-        "//preface/terms | preface/definitions | preface/references | " \
+        "//preface/abstract | " \
+        "//preface/terms | //preface/definitions | //preface/references | " \
         "//preface/clause | //sections/terms | //annex | " \
         "//sections/clause | //sections/definitions | " \
         "//bibliography/references | //bibliography/clause".freeze
@@ -34,8 +35,8 @@ module IsoDoc
         "./xmlns:X".gsub("X", asset)
       end
 
-            CHILD_SECTIONS = "./clause | ./appendix | ./terms | ./definitions | " \
-                       "./references".freeze
+      CHILD_SECTIONS = "./clause | ./appendix | ./terms | ./definitions | " \
+                 "./references".freeze
     end
   end
 end

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

@@ -75,6 +75,7 @@ modified: معدلة
 adapted: تكيف
 deprecated: مهمل
 source: مصدر
+no_identifier: (لا يوجد معرف)
 and: و
 all_parts: كل الأجزاء
 edition_ordinal: "ﺎﻠﻄﺒﻋﺓ؜ {{ var1 | ordinal_word: 'edition', '' }}"

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

@@ -88,6 +88,7 @@ adapted: angepasst
 deprecated: VERALTET
 source: QUELLE
 and: und
+no_identifier: (KEIN KENNUNG)
 all_parts: Alle Teile
 edition_ordinal: "{{ var1 | ordinal_word: 'edition', '' }} Auflage"
 edition: Auflage

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

@@ -68,6 +68,7 @@ requirement: Requirement
 recommendation: Recommendation
 permission: Permission
 box: Box
+no_identifier: (NO ID)
 # Modspec
 recommendationtest: Recommendation test
 requirementtest: Requirement test

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

@@ -86,6 +86,7 @@ adapted: adaptado
 deprecated: OBSOLETO
 source: FUENTE
 and: y
+no_identifier: (SIN IDENTIFICADOR)
 all_parts: Todas las partes
 edition_ordinal: "{{ var1 | ordinal_word: 'edition', '' }} edición"
 edition: edición

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

@@ -85,6 +85,7 @@ source: SOURCE
 edition: édition
 version: version
 and: et
+no_identifier: (PAS D'IDENTIFIANT)
 all_parts: toutes les parties
 edition_ordinal: "{{ var1 | ordinal_word: 'edition', '' }} édition"
 edition: édition

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

@@ -52,28 +52,28 @@ note: 注記
 note_xref: 注記
 termnote: 注釈%
 list: リスト
-deflist: Definition List
+deflist: 定義リスト
 figure: 図
 diagram: Diagram
 formula: 式
-inequality: Formula
+inequality: 式
 table: 表
-requirement: 要求事項
-recommendation: 推奨事項
-permission: 許容事項
+requirement: 要求
+recommendation: 推奨
+permission: 許可
 box: Box
 index: 索引
 standard_no: 規格番号
 number: 番号
 # Modspec
-recommendationtest: Recommendation test
-requirementtest: Requirement test
-permissiontest: Permission test
-recommendationclass: Recommendations class
-requirementclass: Requirements class
-permissionclass: Permissions class
-abstracttest: Abstract test
-conformanceclass: Conformance class
+recommendationtest: 推奨テスト
+requirementtest: 要件テスト
+permissiontest: 許可テスト
+recommendationclass: 推奨群
+requirementclass: 要件群
+permissionclass: 許可群
+abstracttest: 抽象テスト
+conformanceclass: 適合性テスト群
 key: 記号説明
 example: 例
 example_xref: 例
@@ -88,6 +88,7 @@ adapted: 適合しました
 deprecated: 推奨しない用語
 source: 出典
 and: and
+no_identifier: (識別子なし)
 all_parts: 規格群
 edition_ordinal: "第{{ var1 }}版"
 edition: 版
@@ -109,12 +110,12 @@ month_november: November
 month_december: December
 obligation: Obligation
 admonition: {
-  danger: Danger,
+  danger: 危険です,
   warning: 警告,
-  caution: Caution,
-  important: Important,
-  safety precautions: Safety Precautions,
-  editorial: Editorial Note
+  caution: 注意,
+  important: 重要,
+  safety precautions: 安全上の注意,
+  editorial: 編集者注
 }
 locality: {
                       section: Section,

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

@@ -153,6 +153,7 @@ adapted: адаптированный
 deprecated: НЕ РЕКОМЕНДУЕТСЯ
 source: ИСТОЧНИК
 and: и
+no_identifier: (БЕЗ ИДЕНТИФИКАТОРА)
 all_parts: Все части
 edition_ordinal: "{{ var1 | ordinal_word: 'edition', '' }} издание"
 edition: издание

data/lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -77,6 +77,7 @@ adapted: 改编
 deprecated: 被取代
 source: 定义
 and: 和
+no_identifier: （无标识符）
 all_parts: 所有部分
 edition_ordinal: "第{{ var1 | ordinal_word: '', '' }}版"
 edition: 版

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.10.5
+  version: 2.10.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-08 00:00:00.000000000 Z
+date: 2024-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -304,6 +318,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: xml-c14n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   isodoc converts documents in the IsoDoc document model into
   Microsoft Word and HTML.