metanorma 2.5.5 → 2.5.6.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66371f7ab35ebb13e3b57cd0dbbaa3ef8a9c0c5d57e99efe4bd1c3452d4055f0
-  data.tar.gz: 6bade47b39a3b31a3f74cea3fb119196dd4bf6d87356d39af3f17a5c7dd0fb8e
+  metadata.gz: 834a924551ca15a50f160376cfcd57297d5b76a6614e2e216b23e5732895ddcf
+  data.tar.gz: 25e149845256b206fc4bd6a5d0a9aab851fcc2ed91608fad03e5c4c67540aaa6
 SHA512:
-  metadata.gz: 88a35f0eb4334353cb0ae728b82b489ed75514d037b05c66a404d15e230090d10b64dc149487dc65a6f5abb8531807e9b707ec4015de773bf63685f6ae0dc18a
-  data.tar.gz: 9ef18c46695f5789fb89e697aeeebb14ef271f411dd11ddecb4a898b3138075fb354f0ece2f1b885987b7d9a852e4627f78f9887c23ee0a605a67325204f9c65
+  metadata.gz: 5f8b1c155092bf4c25ae2ef76c66e87ba57ed38e7902f738267f74220a51a67dc246bef896ec85bc4d0f6c2100d78663a39c7b0e16611c36babd4a19436fa4cd
+  data.tar.gz: 4f6858efb8e6d7699a735f9d386c97d1a8c44d33516f366f6fb350c27ae3bf589b68442546da84eb868412140567426f8ac3b6edacfc41c97a85c06477c32214

data/Gemfile.devel

@@ -1,10 +1,20 @@
 # Local development pins (eval'd by Gemfile; not committed workflow state)
-gem "metanorma-document", github: "metanorma/metanorma-document", branch: "feat/model-validation-l1-declarations"
-gem "metanorma-standoc", github: "metanorma/metanorma-standoc", branch: "feat/move-standard-document"
-gem "metanorma-iso", github: "metanorma/metanorma-iso", branch: "feat/model-validation-migration"
+gem "metanorma-document", github: "metanorma/metanorma-document", branch: "main"
+gem "metanorma-standoc", github: "metanorma/metanorma-standoc", branch: "main"
+gem "metanorma-iso", github: "metanorma/metanorma-iso", branch: "main"
 gem "isodoc", github: "metanorma/isodoc", branch: "main"
-gem "pubid", ">= 2.0.0.pre.alpha.9"
-gem "relaton-cli", ">= 3.0.0.pre.alpha.1"
+# released metanorma-iho 1.4.0 still carries lib/relaton/render/general.rb,
+# which shadows relaton-render's iso690 autoload by load-path name; iho
+# main relocated its render files
+gem "metanorma-iho", github: "metanorma/metanorma-iho", branch: "main"
+gem "pubid", "~> 2.0.0.pre.alpha"
+# The 1.9.356/0.5.13x pin pair worked around the leptris#1733 to_xml
+# regression; retired — the fleet line is leptris 1.9.376 + moxml 0.5.149
+# (all suites green), and the exact pin now deadlocks against vectory's
+# leptris >= 1.9.361.1 floor.
+gem "leptris", "~> 1.9"
+gem "relaton-cli", "~> 3.0.0.pre.alpha"
 gem "glossarist", "~> 2.13"
-gem "lutaml-model", "~> 0.8.0", "< 0.8.20"
-gem "metanorma-plugin-glossarist", "0.3.9"
+gem "lutaml-model", "~> 0.8.107"
+gem "metanorma-plugin-glossarist", "~> 0.5"
+gem "moxml", "~> 0.5"

data/lib/metanorma/collection/document/document.rb

@@ -107,6 +107,10 @@ module Metanorma
               end
           # Relaton doesn't understand Pres XML tags
           b.xpath("//xmlns:fmt-identifier").each(&:remove)
+          # Relaton models a single <edition>; flavors emit a language-neutral
+          # edition plus localized variants (<edition language="en">first
+          # edition</edition>). Keep the language-neutral one for bibdata.
+          b.xpath("//xmlns:edition[@language != '']").each(&:remove)
           r.from_xml(b.to_xml)
         end
 

data/lib/metanorma/collection/renderer/fileparse.rb

@@ -47,7 +47,8 @@ module Metanorma
         ::Metanorma::Collection::Util::hide_refs(xml)
         # post: references containers with only hidden bibitems flagged hidden.
         sso and eref2link(xml, sso)
-        @nested || @reinflate or svgmap_resolve(xml, docid, sso)
+        # svgmap_resolve hands back the tree Vectory rebuilt; keep it.
+        xml = svgmap_resolve(xml, docid, sso) unless @nested || @reinflate
         xml.to_xml
       end
 

data/lib/metanorma/collection/renderer/svg.rb

@@ -36,11 +36,15 @@ module Metanorma
         # Stage 3: Process with Vectory
         # Pass document suffix to Vectory as id_suffix for proper SVG ID disambiguation.
         # Vectory handles both id_suffix (document-level) and index suffix internally.
+        # It parses its own copy and returns the processed document, so the
+        # result must be adopted here or none of its work reaches the tree.
         doc_suffix = @files.get(docid, :document_suffix)
-        Vectory::SvgMapping.new(docxml, "", id_suffix: doc_suffix).call
+        mapped = Vectory::SvgMapping.new(docxml, "", id_suffix: doc_suffix).call
+        docxml = Nokogiri::XML(mapped.to_xml, &:huge)
 
         # Stage 4: Extract processed SVG content
         extract_svgmap_content(docxml, isodoc)
+        docxml
       end
 
       # Prepares document and context for svgmap resolution

data/lib/metanorma/collection/util/util.rb

@@ -123,9 +123,16 @@ module Metanorma
         # not processed already by add_suffix_to_attrs
         def url_in_css_styles(doc, ids, document_suffix)
           update_ids_css(doc.root, ids, document_suffix)
-          doc.xpath("//i:svg", "i" => SVG_NS).each do |s|
+          # svgmap SVGs are owned by Vectory::SvgMapping, which applies the
+          # same suffix itself; suffixing them here would double it. Only
+          # standalone SVGs need the suffix from this pass.
+          doc.xpath("//i:svg[not(ancestor::*[local-name()='svgmap'])]",
+                    "i" => SVG_NS).each do |s|
             svg = Vectory::SvgDocument.new(s.to_xml)
             svg.suffix_ids(document_suffix)
+            # suffix_ids mutates SvgDocument's own parse; write the
+            # suffixed SVG back into the tree, or the suffix is lost
+            s.replace(svg.content)
           end
         end
 

data/lib/metanorma/collection/xrefprocess/xrefprocess.rb

@@ -210,7 +210,13 @@ module Metanorma
             # external_bibitems[x.sub(/^#{key}_/, "")]
           end.each do |x|
             ins << if b = internal_bibitems[x.sub(/^#{key}_/, "")]
-                     b.dup.tap { |m| m["id"] = x }
+                     b.dup.tap do |m|
+                       m["id"] = x
+                       # The anchor belongs to the original bibitem: the
+                       # hidden copy is referenced by its new id, and a
+                       # duplicated anchor fails id-uniqueness validation.
+                       m.delete("anchor")
+                     end
                    else new_indirect_bibitem(x, key)
                    end
           end

data/lib/metanorma/util/fontist_helper.rb

@@ -36,10 +36,27 @@ module Metanorma
           Util.log("[fontist] '#{e.font}' font is not supported. " \
                    "Please report this issue at " \
                    "https://github.com/metanorma/metanorma/issues", log_level)
+        rescue *size_limit_errors => e
+          log_level = continue ? :warning : :fatal
+          Util.log("[fontist] #{e.message}. " \
+                   "Please report this issue at " \
+                   "https://github.com/metanorma/metanorma/issues", log_level)
         rescue Fontist::Errors::FormulaIndexNotFoundError
           fontist_update_repo(manifest, agree, continue, no_progress)
         end
 
+        # fontist 3 rejects formulas above its size limit (Fontist::Errors::
+        # SizeLimitError); fontist 2.x, which metanorma still supports, does
+        # not define the class, so rescue on an empty list rather than raise
+        # the dependency floor.
+        def size_limit_errors
+          if defined?(Fontist::Errors::SizeLimitError)
+            [Fontist::Errors::SizeLimitError]
+          else
+            []
+          end
+        end
+
         def fontist_install(manifest, agree, no_progress)
           if agree then no_license_log
           else

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "2.5.5".freeze
+  VERSION = "2.5.6.pre.alpha.2".freeze
 end

data/metanorma.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "isodoc", ">= 3.5.0"
   spec.add_runtime_dependency "marcel"
   spec.add_runtime_dependency "metanorma-core"
-  spec.add_runtime_dependency "metanorma-standoc"
+  spec.add_runtime_dependency "metanorma-standoc", ">= 3.5.0"
   spec.add_runtime_dependency "mn2pdf", "~> 2"
   spec.add_runtime_dependency "nokogiri"
   spec.add_development_dependency "canon" #, "= 0.2.3"
@@ -39,5 +39,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "metanorma-iso"
 
   # relaton-cli is required by Metanorma::Collection
-  spec.add_dependency "relaton-cli"
-end
+  spec.add_dependency "relaton-cli", ">= 3.0.0.pre.alpha"end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 2.5.5
+  version: 2.5.6.pre.alpha.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-22 00:00:00.000000000 Z
+date: 2026-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: mn2pdf
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0.pre.alpha
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0.pre.alpha
 description: Library to process any Metanorma standard.
 email:
 - open.source@ribose.com