metanorma-standoc 3.5.2 → 3.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b54f086d63d7b8347f096a85f3fbeb80d3f8ac020361e5a76a24021477a19bb
-  data.tar.gz: c692f65b9e5502326a88df11aeec4ff2f9a472252f58066d0895c71ed735c26b
+  metadata.gz: 226aa50e55b47cc5c2b1951a1ab7846b9d66beed7feed9ff508d482b499252d9
+  data.tar.gz: fb3b3cd3fa7e5e2c33d424a965a2f79dbc6f107ae02b728437d886e4592e7c86
 SHA512:
-  metadata.gz: 8bddb1e65d7ee8f3fd9a45743893bab9d0aed3fe3f86037d7b3bd78372d9e393b41c1872e1a31d69c593c255c4e5f94caa61f66abe4c8eb34291ec58c6202791
-  data.tar.gz: be777df6d608783776b699bbe53567d076197c04a5d217df3e2fe2bc7322c54627700e5d5618e2bedc3e7a0fa82138af0b121fcbd52313f312d3b94659ff3b27
+  metadata.gz: ae524cce75bd115159a547b56b134f21b1b2c46617a70b23a3dda2edd6dc0570ea1e59b5585540bef1835bafa727208707c311d71de8fd397e08ef167bd00825
+  data.tar.gz: 307205bf7fc9c09fd6eb662fc3d73215572ea9aa382d3f200593984ea14f49cd9f32c4fb4ae358e7af2c0ecd49cea45c995fd6b922dc5b09ed8b435e7c883191

data/lib/metanorma/cleanup/attachment.rb

@@ -26,7 +26,7 @@ module Metanorma
         init_attachments
         f = File.basename(path)
         File.exist?(File.join(@attachmentsdir, f)) and
-          f += "_#{UUIDTools::UUID.random_create}"
+          f += "_#{Metanorma::Utils.random_uuid}"
         out_fld = File.join(@attachmentsdir, f)
         FileUtils.cp(path, out_fld)
         datauri_attachment(out_fld, bib.document)

data/lib/metanorma/converter/base.rb

@@ -46,6 +46,7 @@ module Metanorma
       def document1(node)
         init(node)
         ret = to_xml(makexml(node))
+        release_lutaml_caches
         outputs(node, ret) unless node.attr("nodoc") || !node.attr("docfile")
         ret
       end
@@ -66,6 +67,15 @@ module Metanorma
       OPEN_TITLE_NAME = %r{(<(title|name))}.freeze
       SOURCECODE_NAME = %r{(<sourcecode[^<>]*+>)\s++(<name[^<>]*+>(?>.*?</name>))\s++}m.freeze
 
+      # The lutaml plugin's macro caches hold fully parsed multi-GB XMI
+      # trees that serve only macro rendering during conversion; release
+      # them before the output phases stack their own document DOMs.
+      def release_lutaml_caches
+        return unless defined?(Metanorma::Plugin::Lutaml::CacheRegistry)
+
+        Metanorma::Plugin::Lutaml::CacheRegistry.clear_all
+      end
+
       def insert_xml_cr(doc)
         doc.gsub!(CLOSE_TAG, "\\1\n")
         doc.gsub!(OPEN_TITLE_NAME, "\n\\1")

data/lib/metanorma/converter/blocks.rb

@@ -8,7 +8,7 @@ module Metanorma
     module Blocks
       def id_attr(node = nil)
         anchor = node&.id
-        { id: "_#{UUIDTools::UUID.random_create}",
+        { id: "_#{Metanorma::Utils.random_uuid}",
           anchor: anchor && !anchor.empty? ? anchor : nil,
           tag: node&.attr("tag"), columns: node&.attr("columns"),
           "multilingual-rendering": node&.attr("multilingual-rendering") }

data/lib/metanorma/converter/macros_form.rb

@@ -12,7 +12,7 @@ module Metanorma
         m = %w(id name value disabled readonly checked maxlength minlength)
           .map { |a| attr[a] ? " #{map_attr_name(a)}='#{attr[a]}'" : nil }
           .compact
-        m << " id='_#{UUIDTools::UUID.random_create}'"
+        m << " id='_#{Metanorma::Utils.random_uuid}'"
         %{<input type='#{target}' #{m.join}/>}
       end
     end
@@ -41,7 +41,7 @@ module Metanorma
         m = %w(id name rows cols value)
           .map { |a| attr[a] ? " #{map_attr_name(a)}='#{attr[a]}'" : nil }
           .compact
-        m << " id='_#{UUIDTools::UUID.random_create}'"
+        m << " id='_#{Metanorma::Utils.random_uuid}'"
         %{<textarea #{m.join}/>}
       end
     end
@@ -59,7 +59,7 @@ module Metanorma
         m = %w(id name size disabled multiple value)
           .map { |a| attr[a] ? " #{map_attr_name(a)}='#{attr[a]}'" : nil }
           .compact
-        m << " id='_#{UUIDTools::UUID.random_create}'"
+        m << " id='_#{Metanorma::Utils.random_uuid}'"
         out = Asciidoctor::Inline.new(parent, :quoted, attr["text"]).convert
         %{<select #{m.join}>#{out}</select>}
       end

data/lib/metanorma/converter/macros_inline.rb

@@ -65,7 +65,7 @@ module Metanorma
 
       def process(parent, target, attrs)
         out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
-        id = "_#{UUIDTools::UUID.random_create}"
+        id = "_#{Metanorma::Utils.random_uuid}"
         %{<span id='#{id}' anchor='#{target}'>#{out}</span>}
       end
     end
@@ -77,7 +77,7 @@ module Metanorma
 
       def process(parent, target, attrs)
         out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
-        id = "_#{UUIDTools::UUID.random_create}"
+        id = "_#{Metanorma::Utils.random_uuid}"
         %{<span id='#{id}' source='#{target}'>#{out}</span>}
       end
     end

data/lib/metanorma/converter/ref.rb

@@ -145,7 +145,7 @@ module Metanorma
       def refitem_render_attrs(match, code)
         attr_code(anchor: match[:anchor], suppress_identifier: code[:dropid],
                   amend: code[:amend], hidden: code[:hidden],
-                  id: "_#{UUIDTools::UUID.random_create}")
+                  id: "_#{Metanorma::Utils.random_uuid}")
       end
 
       def refitem_render_formattedref(bibitem, title)

data/lib/metanorma/converter/ref_utility.rb

@@ -198,7 +198,7 @@ module Metanorma
 
       def ref_attributes(match)
         code = analyse_ref_code(match[:code])
-        { anchor: match[:anchor], id: "_#{UUIDTools::UUID.random_create}",
+        { anchor: match[:anchor], id: "_#{Metanorma::Utils.random_uuid}",
           type: "standard",
           suppress_identifier: code[:dropid] || nil }
       end

data/lib/metanorma/converter/utils.rb

@@ -41,11 +41,11 @@ module Metanorma
       end
 
       def add_id(node)
-        node["id"] = "_#{UUIDTools::UUID.random_create}"
+        node["id"] = "_#{Metanorma::Utils.random_uuid}"
       end
 
       def add_id_text
-        %(id = "_#{UUIDTools::UUID.random_create}")
+        %(id = "_#{Metanorma::Utils.random_uuid}")
       end
 
       def csv_split(text, delim = ";", encode: true)
@@ -162,7 +162,7 @@ module Metanorma
       # from that of current doc
       def separate_numbering_footnotes(docxml)
         docxml.xpath("//xmlns:fn").each do |f|
-          f["reference"] = "_#{UUIDTools::UUID.random_create}_#{f['reference']}"
+          f["reference"] = "_#{Metanorma::Utils.random_uuid}_#{f['reference']}"
         end
         docxml
       end

data/lib/metanorma/standoc/document/metadata/structured_identifier_type.rb

@@ -8,7 +8,7 @@ module Metanorma
       class StructuredIdentifierType < Lutaml::Model::Serializable
         attribute :type, :string
         attribute :agency, :string, collection: true
-        attribute :class, :string
+        attribute :identifier_class, :string
         attribute :docnumber, :string
         attribute :partnumber, :string
         attribute :edition, :string
@@ -27,7 +27,7 @@ module Metanorma
           element "structuredidentifier"
           map_attribute "type", to: :type
           map_element "agency", to: :agency
-          map_attribute "class", to: :class
+          map_attribute "class", to: :identifier_class
           map_attribute "docnumber", to: :docnumber
           map_attribute "partnumber", to: :partnumber
           map_attribute "edition", to: :edition

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "3.5.2".freeze
+    VERSION = "3.5.4".freeze
   end
 end

data/lib/metanorma/validate/term.rb

@@ -92,7 +92,7 @@ module Metanorma
           ret = doc.xpath("//term").each_with_object({}) do |t, m|
             prefix = t.at("./domain")&.text
             t.xpath("./preferred//name").each do |n|
-              ret = n.text
+              ret = designation_text(n)
               prefix and ret = "<#{prefix}> #{ret}"
               m[ret] ||= []
               m[ret] << t
@@ -101,6 +101,16 @@ module Metanorma
           preferred_validate_report(ret)
         end
 
+        # The designation text excludes nested index entries: <name> carries
+        # an <index><primary> duplicate of its own text, and counting that
+        # text doubled every designation ("Term abstract test methodabstract
+        # test method occurs twice...", metanorma-iso#1681).
+        def designation_text(name)
+          name = name.dup
+          name.xpath("./index").each(&:remove)
+          name.text
+        end
+
         def preferred_validate_report(terms)
           terms.each do |k, v|
             v.size > 1 or next

data/metanorma-standoc.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "metanorma-plugin-glossarist", "~> 0.5"
   spec.add_dependency "metanorma-plugin-lutaml", "~> 0.7.55" # LutamlDataPreprocessor shipped in 0.7.55
   spec.add_dependency "metanorma-plugin-plantuml", "~> 1.0.0"
-  spec.add_dependency "metanorma-utils", "~> 2.0.1"
+  spec.add_dependency "metanorma-utils", "~> 2.0.10"
   spec.add_dependency "moxml", "~> 0.5.84"
   spec.add_dependency "leptris", "~> 1.9"
   spec.add_dependency "concurrent-ruby"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 3.5.2
+  version: 3.5.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-30 00:00:00.000000000 Z
+date: 2026-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.10
 - !ruby/object:Gem::Dependency
   name: moxml
   requirement: !ruby/object:Gem::Requirement