isodoc 3.7.4 → 3.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a9872c3dc80016910e76d8a9b3c97aa04df34a6caab0c198ba568b97a9ec17d
-  data.tar.gz: 57b6c1f42c4fbc6c4b8c5537d058779fb75ac2539c63fe9b0e1d5e5d48104dc0
+  metadata.gz: 53a0846d73af6d9b85e2ab844e73b7f136e7fdff0bed55e952f0538359dee5e8
+  data.tar.gz: d2b73567291b752c28d06228fe58cd1b1bb8dfea3df5acd727d8aa2db63cd541
 SHA512:
-  metadata.gz: fde157a47858f873f02c57a84d57f8865790154cd05260e01caa89fd0116297e66388ac98524925517b529c0c111160f1ea415f3dc5c1a6d2d06db9ece697063
-  data.tar.gz: 75fce4fdc6a222d822831284e6081f6f621df2ca3813d09514b3eeff8f36e0c43bfeef9064ac7a5b364866768646085fc6342ab1c1962e8592b594420de24ea4
+  metadata.gz: 4a0a325e3e20a885a95cdabd6bc53a90b4537be2ec20315173ec8d6f48beb7c9af89f9cea4966db4b20edfd08a22878d704ece90495cd3a8c600b37572d81c38
+  data.tar.gz: ffb5f000b1363a094e4142091eb189bdcbba7d4dc4a3f55374b2b4eb6fecff9686af7898925842246e8c33c485c1716a7bd71b269e92fc31f9979163ef32ccc2

data/isodoc.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "bigdecimal"
   spec.add_dependency "html2doc", "~> 1.12"
   # spec.add_dependency "isodoc-i18n", "~> 1.5" # already in relaton-render and mn-requirements
-  spec.add_dependency "relaton-cli", ">= 3.0.0", "< 3.1"
+  spec.add_dependency "relaton-cli", "~> 3.0"
   # std_docid_semantic parses through the pubid monogem's flavor
   # registry (Pubid.eager_load_flavors!) — 2.x API, no per-flavor gems
   spec.add_dependency "pubid", "~> 2.0"
@@ -45,7 +45,6 @@ Gem::Specification.new do |spec|
   # flavor stacks boot against it.
   # Released isodoc lines keep resolving relaton-render 1.3.0; only a
   # stack on this floor co-resolves the relaton 3.0 line.
-  spec.add_dependency "relaton-render", "~> 3.0", "< 5"
   spec.add_dependency "roman-numerals"
   spec.add_dependency "rouge", "~> 4.0"
   # lib/isodoc/css.rb requires sassc-embedded (SassC::Engine) at

data/lib/isodoc/function/footnotes.rb

@@ -12,7 +12,7 @@ module IsoDoc
       def get_table_ancestor_id(node)
         table = node.ancestors("table")
         table.empty? and table = node.ancestors("figure")
-        table.empty? and return [nil, UUIDTools::UUID.random_create.to_s]
+        table.empty? and return [nil, Metanorma::Utils.random_uuid]
         [table.last, table.last["id"]]
       end
 
@@ -20,7 +20,7 @@ module IsoDoc
       # do not output footnote text if we have already seen it for this table
 
       def table_footnote_parse(node, out)
-        fn = node["reference"] || UUIDTools::UUID.random_create.to_s
+        fn = node["reference"] || Metanorma::Utils.random_uuid
         table, tid = get_table_ancestor_id(node)
         make_table_footnote_link(out, tid + fn, node.at(ns("./fmt-fn-label")))
         # do not output footnote text if we have already seen it for this table
@@ -49,7 +49,7 @@ module IsoDoc
 
       def footnote_parse(node, out)
         table_footnote?(node) and return table_footnote_parse(node, out)
-        fn = node["target"] # || UUIDTools::UUID.random_create.to_s
+        fn = node["target"] # || Metanorma::Utils.random_uuid
         attrs = { class: "FootnoteRef", href: "#fn:#{fn}" }
         f = node.at(ns("./fmt-fn-label"))
         out.a(**attrs) do |a|

data/lib/isodoc/html_function/postprocess.rb

@@ -118,7 +118,7 @@ module IsoDoc
 
       def move_image1(img)
         suffix = image_suffix(img)
-        uuid = UUIDTools::UUID.random_create.to_s
+        uuid = Metanorma::Utils.random_uuid
         fname = "#{uuid}.#{suffix}"
         new_full_filename = File.join(tmpimagedir, fname)
         local_filename = image_localfile(img)
@@ -131,7 +131,7 @@ module IsoDoc
           docxml.xpath("//p[@class = 'TermNum'][../#{h}]").each do |p|
             p.name = "h#{h[1].to_i + 1}"
             id = p["id"]
-            p["id"] = "_#{UUIDTools::UUID.random_create}"
+            p["id"] = "_#{Metanorma::Utils.random_uuid}"
             p.wrap("<div id='#{id}'></div>")
           end
         end

data/lib/isodoc/html_function/postprocess_cover.rb

@@ -154,7 +154,7 @@ module IsoDoc
       def html_toc_entries_prep(docxml, path)
         docxml.xpath(path.join(" | "))
           .each_with_index.with_object({}) do |(h, i), m|
-            h["id"] ||= "_#{UUIDTools::UUID.random_create}"
+            h["id"] ||= "_#{Metanorma::Utils.random_uuid}"
             m[h["id"]] = i
           end
       end

data/lib/isodoc/presentation_function/autonum.rb

@@ -31,7 +31,7 @@ module IsoDoc
     end
 
     def prefix_name_labels(node)
-      id = "_#{UUIDTools::UUID.random_create}"
+      id = "_#{Metanorma::Utils.random_uuid}"
       @new_ids[id] = nil
       { elem: node["id"], name: id }
     end

data/lib/isodoc/presentation_function/ids.rb

@@ -1,14 +1,14 @@
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def add_id_text
-      id = "_#{UUIDTools::UUID.random_create}"
+      id = "_#{Metanorma::Utils.random_uuid}"
       @new_ids[id] = nil
       %(id="#{id}")
     end
 
     def add_id(elem)
       elem["id"] and return
-      id = "_#{UUIDTools::UUID.random_create}"
+      id = "_#{Metanorma::Utils.random_uuid}"
       elem["id"] = id
       @new_ids[id] = nil
     end

data/lib/isodoc/presentation_function/refs.rb

@@ -195,7 +195,7 @@ module IsoDoc
       ret = ident_fn(bib)
       date_note = bibnote_extract(bib, "Unpublished-Status")
       date_note.empty? and return ret
-      id = "_#{UUIDTools::UUID.random_create}"
+      id = "_#{Metanorma::Utils.random_uuid}"
       @new_ids[id] = nil
       <<~XML
         #{ret}<fn id='#{id}' reference='#{id}'><p>#{date_note.first.content}</p></fn>

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "3.7.4".freeze
+  VERSION = "3.7.6".freeze
 end

data/lib/isodoc/xref/xref_gen.rb

@@ -118,13 +118,25 @@ module IsoDoc
       def note_anchor_names(sections)
         sections.each do |s|
           notes = s.xpath(child_asset_path("note")) -
-            s.xpath(ns(".//figure//note | .//table//note | //permission//note | " \
-                       "//recommendation//note | //requirement//note"))
+            s.xpath(ns(".//figure//note | .//table//note")) -
+            requirement_nested_notes(s)
           note_anchor_names1(notes, Counter.new)
           note_anchor_names(s.xpath(ns(child_sections)))
         end
       end
 
+      # Notes under requirement-class blocks are excluded from per-section
+      # asset numbering everywhere. The set is document-wide and constant
+      # for the whole xref pass: an absolute // xpath evaluated on a node
+      # scans the entire document, so re-running it per visited section is
+      # quadratic on sectioned documents (vocabulary corpora carry
+      # thousands of term clauses).
+      def requirement_nested_notes(source)
+        @requirement_nested_notes ||= source.document.xpath(
+          ns("//permission//note | //recommendation//note | //requirement//note")
+        )
+      end
+
       def note_anchor_names1(notes, counter)
         notes.noblank.each do |n|
           @anchors[n["id"]] =
@@ -167,8 +179,7 @@ module IsoDoc
       def example_anchor_names(sections)
         sections.each do |s|
           notes = s.xpath(child_asset_path("example")) -
-            s.xpath(ns("//permission//note | " \
-                       "//recommendation//note | //requirement//note"))
+            requirement_nested_notes(s)
           example_anchor_names1(notes, Counter.new)
           example_anchor_names(s.xpath(ns(child_sections)))
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.7.4
+  version: 3.7.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-29 00:00:00.000000000 Z
+date: 2026-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -56,22 +56,16 @@ dependencies:
   name: relaton-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pubid
   requirement: !ruby/object:Gem::Requirement
@@ -114,26 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: relaton-render
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
 - !ruby/object:Gem::Dependency
   name: roman-numerals
   requirement: !ruby/object:Gem::Requirement