isodoc 3.7.4.pre.alpha.3 → 3.7.4.pre.alpha.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 958bda381712f8b0f32a6a72d94aca6db070e09402b4b23febcf17d3ed04706f
-  data.tar.gz: eedbfd933bc474d4856d979619874f4b27002dc2756461473c765026f3a899d6
+  metadata.gz: 2ac7ddfe63cebf2580cf793bda41a563367084ed78ac621f9914bbb1c143eedf
+  data.tar.gz: 8771309031dc897df944bb3d0d38b604eca00ef7ffe5f67d0eb17104a72d1627
 SHA512:
-  metadata.gz: 8cf6ca52b75c0a2c5758c8acdf8d412f1a4fb390af7ee2453d0d9d87f55021dcd7ea5a1a90893c00a4f2139ed86b5326ab02dbbd083aeedcb3b80ff09b0cf320
-  data.tar.gz: ff08979e810bca8e30f78e3b5f28731fc47937716b2d2d42bfb67cb497d0bd463ac0879a5a16a8d16b3530ab26f1e34fbbcef519b8d5eb9169e13267a4aa10a0
+  metadata.gz: 74fd307bb5d2b69531726d7c7f05e8fbbc5532921f20e9fa8e98b61d3e292c3328a0a28daf05285f2750cd0ef15cd890a2e137b294b99bafc936b0334c1dbfbe
+  data.tar.gz: c022667c987d194c5308817b405b0cba5cdc446bd4caa7f1a046fdd8586e3799191c3a366663af99190575d37927ba09710d5b882468e9213921e053e3847f50

data/README.adoc

@@ -100,3 +100,5 @@ The runtime SCSS compilation path (`css.rb#convert_scss`, which `require`s `sass
 * a downstream project resolves isodoc from git (e.g. `gem "isodoc", github: "metanorma/isodoc"`): bundler installs the gemspec's file list, which carries only `.scss`
 
 NOTE: Downstream maintainers: if your Gemfile pins isodoc from git, your HTML renders will `require "sassc-embedded"` at runtime even though released-gem consumers never do. A downstream `gem "sassc-embedded"` line in that setup is load-bearing, not dead weight — and it becomes droppable once you revert to a released isodoc gem.
+
+Conversely, **do not declare `sassc-embedded` in this gem's gemspec** — not as a fix, not as a "missing dependency": released-gem consumers never execute that code path, and adding a compilation toolchain as a hard runtime dependency would burden every consumer for an optional path. The requirement belongs to the consumer's Gemfile precisely when the consumer's resolution pulls `.scss` sources.

data/isodoc.gemspec

@@ -32,20 +32,23 @@ 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.pre.alpha", "< 3.1.0"
+  spec.add_dependency "relaton-cli", ">= 3.0.0", "< 3.1"
   # spec.add_dependency "metanorma-utils", "~> 2.0" # already in isodoc-i18n
   spec.add_dependency "mn2pdf", ">= 2.13"
   spec.add_dependency "mn-requirements", "~> 0.5.0"
-  # Allowance for the relaton 3.0.0.pre family (mirrors the relaton-cli
-  # allowance in #824): relaton 3.0.0.pre requires relaton-render
-  # 3.0.0.pre, which joins the family's versioning and restores the 1.x
-  # leaves as deprecated shims, so flavor stacks boot against it.
+  # Allowance for the relaton 3.0 family (mirrors the relaton-cli
+  # allowance in #824): relaton-render 3.0.0 joins the family's
+  # versioning and restores the 1.x leaves as deprecated shims, so
+  # flavor stacks boot against it.
   # Released isodoc lines keep resolving relaton-render 1.3.0; only a
-  # stack that explicitly adopts the relaton prerelease co-resolves
-  # 3.0.0.pre.
-  spec.add_dependency "relaton-render", "~> 3.0.0.pre.alpha", "< 5"
+  # 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
+  # SCSS-compile time; without a declared dependency, fresh minimal
+  # bundles crash at populate_css (metanorma/isodoc#862)
+  spec.add_dependency "sassc-embedded"
   spec.add_dependency "thread_safe"
   spec.add_dependency "twitter_cldr", ">= 6.6.0"
   spec.add_dependency "uuidtools"

data/lib/isodoc/presentation_function/annex.rb

@@ -86,8 +86,12 @@ module IsoDoc
     end
 
     def annex_delim_override(elem)
+      if instance_variable_defined?(:@annex_delim_override)
+        return @annex_delim_override
+      end
+
       m = elem.document.root.at(ns("//presentation-metadata/annex-delim"))
-      m ? to_xml(m.children) : annex_delim(elem)
+      @annex_delim_override = m ? to_xml(m.children) : annex_delim(elem)
     end
 
     def annex_delim(_elem)

data/lib/isodoc/presentation_function/designations.rb

@@ -73,7 +73,18 @@ module IsoDoc
     def merge_second_preferred1(desgns, term)
       desgns[1..].each(&:remove)
       ret = l10n(desgns.map { |x| to_xml(x) }.join("; "))
-      term.ancestors("fmt-related").empty? and ret = "<p>#{ret}</p>"
+      # Node#ancestors(selector) matches via XPath per ancestor; this runs
+      # per term, so walk parents directly.
+      in_fmt_related = false
+      parent = term.parent
+      while parent.is_a?(Nokogiri::XML::Element)
+        if parent.name == "fmt-related"
+          in_fmt_related = true
+          break
+        end
+        parent = parent.parent
+      end
+      in_fmt_related or ret = "<p>#{ret}</p>"
       ret
     end
 

data/lib/isodoc/presentation_function/list.rb

@@ -78,10 +78,16 @@ module IsoDoc
       %w(—)
     end
 
+    # Presentation metadata is fixed for the duration of conversion, but
+    # this runs per list item: the whole-document XPath per <ul> is
+    # quadratic on large documents. Memoize per converter instance.
     def ul_label_list_from_metadata(docxml)
+      if instance_variable_defined?(:@ul_label_list_from_metadata)
+        return @ul_label_list_from_metadata
+      end
+
       list = docxml.xpath(ns("//presentation-metadata/ul-label-list"))
-      list.empty? and return nil
-      list.map(&:text)
+      @ul_label_list_from_metadata = list.empty? ? nil : list.map(&:text)
     end
 
     def ul_label(elem)
@@ -92,10 +98,22 @@ module IsoDoc
     end
 
     def ul_label_value(elem)
-      depth = elem.ancestors("ul, ol").size
+      depth = list_nesting_depth(elem)
       val = ul_label_list_from_metadata(elem.document.root) ||
         ul_label_list(elem)
       val[(depth - 1) % val.size]
     end
+
+    # Walk parents directly: Node#ancestors(selector) runs an XPath match
+    # per ancestor, which is quadratic on deeply nested lists.
+    def list_nesting_depth(elem)
+      depth = 0
+      node = elem.parent
+      while node.is_a?(Nokogiri::XML::Element)
+        depth += 1 if node.name == "ul" || node.name == "ol"
+        node = node.parent
+      end
+      depth
+    end
   end
 end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "3.7.4.pre.alpha.3".freeze
+  VERSION = "3.7.4.pre.alpha.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.7.4.pre.alpha.3
+  version: 3.7.4.pre.alpha.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-26 00:00:00.000000000 Z
+date: 2026-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -58,20 +58,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.pre.alpha
+        version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.pre.alpha
+        version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: mn2pdf
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.pre.alpha
+        version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
@@ -116,7 +116,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.pre.alpha
+        version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
@@ -148,6 +148,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: sassc-embedded
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thread_safe
   requirement: !ruby/object:Gem::Requirement