isodoc 3.4.7 → 3.4.9

data/lib/isodoc/xref/xref_counter.rb

@@ -18,6 +18,7 @@ module IsoDoc
 
     class Counter
       include OlTypeProvider
+
       attr_accessor :prefix_override
 
       def initialize(num = 0, opts = { numerals: :arabic })
@@ -57,7 +58,7 @@ module IsoDoc
       end
 
       def new_subseq_increment1(node)
-        /^(?<b>.*?)(?<n>\d*)(?<a>[a-zA-Z]*)$/ =~ node["number"]
+        b, n, a = parse_number_suffix(node["number"])
         if !n.empty? || !a.empty?
           @letter_override = @letter = a unless a.empty?
           @number_override = @num = n.to_i unless n.empty?
@@ -73,7 +74,10 @@ module IsoDoc
           @prefix_override = node["branch-number"]
         elsif node["number"]
           @base = @letter_override = @number_override = ""
-          /^(?<b>.*?)(?<n>\d+)$/ =~ node["number"]
+          b, n, a = parse_number_suffix(node["number"])
+          # Original required digits at the absolute end (no trailing letters).
+          # If there are trailing letters, treat as a no-digit-at-end match.
+          n = "" unless a.empty?
           if blank?(n)
             @num = nil
             @base = node["number"][0..-2]
@@ -92,7 +96,16 @@ module IsoDoc
 
         @base = ""
         @letter_override = node["number"]
-        /^(?<b>.*?)(?<n>\d*)(?<a>[a-zA-Z])$/ =~ node["number"]
+        # Replace polynomial /^(?<b>.*?)(?<n>\d*)(?<a>[a-zA-Z])$/ with
+        # sequential parsing from the right: last char must be a single letter;
+        # before it are optional digits; before that is the base prefix b.
+        a = /[a-zA-Z]/.match?(node["number"][-1]) ? node["number"][-1] : nil
+        if a
+          rest = node["number"][..-2]
+          j = rest.rindex(/[^\d]/)
+          n = j.nil? ? rest : rest[(j + 1)..]
+          b = j.nil? ? "" : rest[..j]
+        end
         if blank?(a) then subsequence_increment_no_letter(node)
         else
           @letter_override = @letter = a
@@ -174,6 +187,26 @@ module IsoDoc
         "#{prefix}#{@base}#{out}#{@letter_override || @letter}"
       end
 
+      # Decompose a counter number string into [prefix, digits, letters]
+      # by scanning from the right. Examples:
+      #   "A1b"      => ["A",       "1",  "b"  ]
+      #   "prefix-3" => ["prefix-", "3",  ""   ]
+      #   "ABC"      => ["",        "",   "ABC" ]
+      #   "42"       => ["",        "42", ""   ]
+      # Replaces polynomial regexes like /^(?<b>.*?)(?<n>\d*)(?<a>[a-zA-Z]*)$/
+      # with O(n) rindex operations that cannot backtrack.
+      def parse_number_suffix(str)
+        # Step 1: split off all trailing letters
+        i = str.rindex(/[^a-zA-Z]/) # index of last non-letter char
+        a = i.nil? ? str : str[(i + 1)..]
+        rest = i.nil? ? "" : str[..i]
+        # Step 2: split off all trailing digits from the remaining prefix
+        j = rest.rindex(/[^\d]/) # index of last non-digit char
+        n = j.nil? ? rest : rest[(j + 1)..]
+        b = j.nil? ? "" : rest[..j]
+        [b, n, a]
+      end
+
       def listlabel(list, depth)
         case ol_type(list, depth)
         when :arabic then @num.to_s

data/lib/isodoc/xref/xref_gen.rb

@@ -11,34 +11,43 @@ module IsoDoc
         end
       end
 
-      def amend_preprocess1(amend, subclause: false)
-        autonum = amend_autonums(amend)
+      def amend_preprocess1(amend, subclause: false, autonum: {})
+        newautonum = amend_autonums(amend).merge(autonum)
         NUMBERED_BLOCKS.each do |b|
-          amend_blocks(amend, autonum, b, subclause)
+          amend_blocks(amend, newautonum, autonum, b, subclause)
         end
-        amend.xpath(ns(".#{amend_newcontent(subclause)}/clause")).each do |c|
-          amend_preprocess1(c, subclause: true)
+        amend.xpath(ns(".#{amend_newcontent(subclause)}/clause"))
+          .each_with_index do |c, i|
+          amend_autonumber(c, "clause", newautonum, autonum, i)
+          amend_preprocess1(c, subclause: true, autonum: newautonum)
         end
       end
 
       def amend_autonums(amend)
-        autonum = {}
-        amend.xpath(ns("./autonumber")).each do |n|
-          autonum[n["type"]] = n.text
+        amend.xpath(ns("./autonumber")).each_with_object({}) do |n, m|
+          m[n["type"]] = n.text
         end
-        autonum
       end
 
-      def amend_blocks(amend, autonum, blocktype, subclause)
+      def amend_blocks(amend, autonum, old_autonum, blocktype, subclause)
         newc = amend_newcontent(subclause)
         (amend.xpath(ns(".#{newc}//#{blocktype}")) -
          amend.xpath(ns(".#{newc}/clause//#{blocktype}")))
           .each_with_index do |e, i|
-            autonum[blocktype] && i.zero? and e["number"] = autonum[blocktype]
-            !autonum[blocktype] and e["unnumbered"] = "true"
+          amend_autonumber(e, blocktype, autonum, old_autonum, i)
         end
       end
 
+      # only autonumber first instance of an asset in a subclause,
+      # if the autonumbering for that asset isn't a continuation of
+      # its ancestor clause
+      def amend_autonumber(node, blocktype, autonum, old_autonum, idx)
+        autonum[blocktype] && idx.zero? &&
+          autonum[blocktype] != old_autonum[blocktype] and
+          node["number"] = autonum[blocktype]
+        !autonum[blocktype] and node["unnumbered"] = "true"
+      end
+
       def amend_newcontent(subclause)
         subclause ? "" : "/newcontent"
       end
@@ -110,7 +119,7 @@ module IsoDoc
         sections.each do |s|
           notes = s.xpath(child_asset_path("note")) -
             s.xpath(ns(".//figure//note | .//table//note | //permission//note | " \
-              "//recommendation//note | //requirement//note"))
+                       "//recommendation//note | //requirement//note"))
           note_anchor_names1(notes, Counter.new)
           note_anchor_names(s.xpath(ns(child_sections)))
         end
@@ -159,7 +168,7 @@ module IsoDoc
         sections.each do |s|
           notes = s.xpath(child_asset_path("example")) -
             s.xpath(ns("//permission//note | " \
-              "//recommendation//note | //requirement//note"))
+                       "//recommendation//note | //requirement//note"))
           example_anchor_names1(notes, Counter.new)
           example_anchor_names(s.xpath(ns(child_sections)))
         end

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -37,6 +37,7 @@ module IsoDoc
         if @parse_settings.empty? || @parse_settings[:clauses]
           preface_anchor_names(xml)
           main_anchor_names(xml)
+          amend_subclause_names(xml)
         end
       end
 
@@ -81,6 +82,16 @@ module IsoDoc
         )
       end
 
+      def amend_subclause_names(xml)
+        n = clause_counter
+        xml.xpath(ns("//amend/newcontent/clause")).each do |c|
+          if c["type"] == "annex"
+            annex_names(c, n.increment(c).print)
+          else section_names(c, n, 1)
+          end
+        end
+      end
+
       def unnumbered_names(clause)
         clause.nil? and return
         title = clause_title(clause, use_elem_name: true)
@@ -88,7 +99,7 @@ module IsoDoc
         clause.xpath(ns(subclauses)).each_with_index do |c, i|
           t = c.at(ns("./title"))
           tt = "#{semx(clause, title, clause.name)}" \
-            "<span class='fmt-comma'>,</span> #{semx(c, i + 1)}"
+               "<span class='fmt-comma'>,</span> #{semx(c, i + 1)}"
           preface_names1(c, t ? semx(c, t.text, c.name) : nil, tt, 2)
         end
       end
@@ -99,14 +110,12 @@ module IsoDoc
         clause.xpath(ns(subclauses)).each_with_index do |c, i|
           t = c.at(ns("./title"))
           preface_names1(c, t ? semx(c, t.text, c.name) : nil,
-                         "#{label} #{semx(c, i + 1)}",
-                         level + 1)
+                         "#{label} #{semx(c, i + 1)}", level + 1)
         end
       end
 
       def preface_name_anchors(clause, level, title)
         xref = semx(clause, title, clause.name)
-        #clause["id"] ||= "_#{UUIDTools::UUID.random_create}"
         @anchors[clause["id"]] =
           { label: nil, level:,
             xref:, title: nil,
@@ -171,7 +180,7 @@ module IsoDoc
         obl = "(#{@labels['inform_annex']})"
         clause["obligation"] == "normative" and
           obl = "(#{@labels['norm_annex']})"
-        obl = "<span class='fmt-obligation'>#{l10n obl}</fmt>"
+        obl = "<span class='fmt-obligation'>#{l10n obl}</span>"
         title = Common::case_with_markup(@labels["annex"], "capital",
                                          @script)
         s = labelled_autonum(title, num)
@@ -180,7 +189,8 @@ module IsoDoc
 
       def annex_name_anchors(clause, num, level)
         label = num
-        level == 1 && clause.name == "annex" and
+        (level == 1 && clause.name == "annex") ||
+          clause["type"] == "annex" and
           label = annex_name_lbl(clause, label)
         c = clause_title(clause) and title = semx(clause, c, "title")
         @anchors[clause["id"]] =
@@ -193,6 +203,11 @@ module IsoDoc
         appendix_names(clause, num)
         label = semx(clause, num)
         annex_name_anchors(clause, label, 1)
+        annex_name_recurse(clause, label, num)
+        hierarchical_asset_names(clause, label)
+      end
+
+      def annex_name_recurse(clause, label, num)
         if @klass.single_term_clause?(clause)
           annex_names1(clause.at(ns("./references | ./terms | ./definitions")),
                        nil, num.to_s, 1)
@@ -202,7 +217,6 @@ module IsoDoc
             annex_names1(c, label, i.increment(c).print, 2)
           end
         end
-        hierarchical_asset_names(clause, label)
       end
 
       def annex_names1(clause, parentnum, num, level)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.4.7
+  version: 3.4.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-16 00:00:00.000000000 Z
+date: 2026-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: relaton-render
   requirement: !ruby/object:Gem::Requirement
@@ -234,20 +248,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -435,6 +435,7 @@ files:
 - lib/isodoc/function/terms.rb
 - lib/isodoc/function/to_word_html.rb
 - lib/isodoc/function/utils.rb
+- lib/isodoc/function/utils_img.rb
 - lib/isodoc/gem_tasks.rb
 - lib/isodoc/headlesshtml_convert.rb
 - lib/isodoc/html_convert.rb
@@ -451,6 +452,7 @@ files:
 - lib/isodoc/metadata_contributor.rb
 - lib/isodoc/metadata_date.rb
 - lib/isodoc/pdf_convert.rb
+- lib/isodoc/presentation_function/annex.rb
 - lib/isodoc/presentation_function/autonum.rb
 - lib/isodoc/presentation_function/bibdata.rb
 - lib/isodoc/presentation_function/block.rb
@@ -466,6 +468,7 @@ files:
 - lib/isodoc/presentation_function/index.rb
 - lib/isodoc/presentation_function/inline.rb
 - lib/isodoc/presentation_function/list.rb
+- lib/isodoc/presentation_function/list_to_table.rb
 - lib/isodoc/presentation_function/math.rb
 - lib/isodoc/presentation_function/metadata.rb
 - lib/isodoc/presentation_function/refs.rb