metanorma-standoc 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3eb29c4fd8703e5cfb83ca8be2d9bf331e64ef55f79b5a0c6fbc40527aec8f6f
-  data.tar.gz: 967a36a66206d56c88152c1ee82782a27876164319b6d30d6a6be7c54a6887e6
+  metadata.gz: 337c4b9070783a56e314d0e8a1855420ddb818da4bc13e9031749cfc497702d8
+  data.tar.gz: 04fed5ceea5cc84cf1dfad226e88c38313f405e68436eca36af1b6107e6ae25f
 SHA512:
-  metadata.gz: e88f192913aca8f905983eaf547f8cacbdc6d74a7046e78c9ce7cbb0a958130d8ecf5598a5164cc1faa3e77080180dee4cc5025278b9a6ee8a0363c04e6f7cfc
-  data.tar.gz: 0c90ed2192f721f0f02302808e2be444d1f81b58e853fa0db7be4c38ae198d3774f37ca6f89c6913cc008e34ed549e2d79a14fb6b2161e667824dc6c1c9f4099
+  metadata.gz: 345e5360ec266c640719931c35aa01cf34c11098c16308b45abd2f46a6acf933b06fda91b95c770b1bd5975df403d7b09df717ebf8e3c33ae1ce54d52dc2514a
+  data.tar.gz: 3c375e4e7ab47a72a5d84b7f916b7a08a742491136b35079d05e4a6598429010c1518451e69def8c080eb3f06d5375e623689e6e15c375ac42ab62435c9281ce

data/lib/metanorma/cleanup/boilerplate.rb

@@ -4,6 +4,8 @@ require_relative "boilerplate_liquid"
 module Metanorma
   module Standoc
     module Boilerplate
+      include ::Metanorma::Core::Boilerplate
+
       def norm_ref_preface(ref, isodoc)
         ins = norm_ref_boilerplate_insert_location(ref)
         ins2 = norm_ref_process_boilerplate_note(ref)
@@ -73,7 +75,10 @@ module Metanorma
 
       def boilerplate_cleanup(xmldoc)
         isodoc = boilerplate_isodoc(xmldoc) or return
+        had_templates = ::Metanorma::Core::Boilerplate
+          .docidentifier_templates?(xmldoc)
         docidentifier_boilerplate_isodoc(xmldoc, isodoc)
+        had_templates and refresh_isodoc_bibdata(xmldoc, isodoc)
         termdef_boilerplate_cleanup(xmldoc)
         termdef_boilerplate_insert(xmldoc, isodoc)
         unwrap_boilerplate_clauses(xmldoc, self.class::TERM_CLAUSE)
@@ -84,15 +89,28 @@ module Metanorma
         initial_boilerplate(xmldoc, isodoc)
       end
 
+      # Re-seed isodoc state from the now-resolved xmldoc bibdata after
+      # docidentifier_boilerplate_isodoc has substituted any
+      # +@boilerplate="true"+ Liquid templates. Standoc default just
+      # re-runs isodoc_bibdata_parse so any cached i18n / meta state
+      # picks up the resolved docidentifier values; flavors that
+      # populate richer derived state (e.g. metanorma-generic's
+      # bibdata_hash) override to refresh that too.
+      # See https://github.com/metanorma/metanorma/issues/558.
+      def refresh_isodoc_bibdata(xmldoc, _isodoc)
+        isodoc_bibdata_parse(xmldoc)
+      end
+
+      # Standoc-side wrapper around Core::Boilerplate's iterator. The
+      # core helper owns the loop body (substitute Liquid + Asciidoc,
+      # then splice the inner <p> children back); this wrapper supplies
+      # standoc-level kwargs from instance state so existing 2-arg
+      # callers do not need to thread them through.
       def docidentifier_boilerplate_isodoc(xmldoc, isodoc)
-        xmldoc.xpath("//docidentifier[@boilerplate]").each do |d|
-          b = d["boilerplate"] == "true"
-          d.delete("boilerplate")
-          b or next
-          id = boilerplate_snippet_convert(to_xml(d.children), isodoc)
-          p = Nokogiri::XML(id).at("//p")
-          d.children = p ? to_xml(p&.children) : id
-        end
+        super(xmldoc, isodoc,
+              lang: @lang, script: @script,
+              backend: @conv.backend&.to_sym,
+              flush_caches: @flush_caches, localdir: @localdir)
       end
 
       def initial_boilerplate(xml, isodoc)
@@ -186,17 +204,32 @@ module Metanorma
       end
 
       def boilerplate_file_restructure(file)
-        ret = adoc2xml(file, @conv.backend.to_sym)
+        ret = adoc2xml(file, @conv.backend&.to_sym)
         boilerplate_xml_cleanup(ret)
         ret.name = "boilerplate"
         boilerplate_top_elements(ret)
         ret
       end
 
-      def boilerplate_snippet_convert(adoc, isodoc)
-        b = isodoc.populate_template(adoc, nil)
-        ret = boilerplate_xml_cleanup(adoc2xml(b, @conv.backend.to_sym))
-        @i18n.l10n(ret.children.to_xml, @lang, @script).strip
+      # Standoc-side wrapper around the metanorma-core helper. Existing
+      # 2-arg call sites supply no kwargs and inherit them all from
+      # instance state; core's docidentifier_boilerplate_isodoc passes
+      # kwargs through and they take precedence.
+      def boilerplate_snippet_convert(adoc, isodoc, **kwargs)
+        defaults = {
+          lang: @lang, script: @script,
+          backend: @conv.backend&.to_sym,
+          flush_caches: @flush_caches, localdir: @localdir,
+        }
+        super(adoc, isodoc, **defaults.merge(kwargs))
+      end
+
+      # Standoc override of the metanorma-core extension hook.
+      # Applies namespace cleanup and externally-sourced footnote separation
+      # to a Nokogiri node before the snippet is serialised back into the
+      # surrounding document.
+      def boilerplate_snippet_cleanup(node)
+        boilerplate_xml_cleanup(@conv.separate_numbering_footnotes(node))
       end
 
       private

data/lib/metanorma/converter/base.rb

@@ -9,7 +9,6 @@ require "metanorma-utils"
 require_relative "render"
 require_relative "localbib"
 require_relative "init"
-require_relative "isolated_converter"
 require "mn-requirements"
 
 module Asciidoctor

data/lib/metanorma/converter/front.rb

@@ -1,8 +1,8 @@
 require "date"
 require "pathname"
-require_relative "./front_contributor"
-require_relative "./front_ext"
-require_relative "./front_title"
+require_relative "front_contributor"
+require_relative "front_ext"
+require_relative "front_title"
 require "isoics"
 require "isodoc"
 
@@ -56,14 +56,15 @@ module Metanorma
         add_noko_elem(xml, "docnumber", node.attr("docnumber"))
       end
 
+      def metadata_edition(node, xml)
+        add_noko_elem(xml, "edition", node.attr("edition"))
+      end
+
       def metadata_version(node, xml)
+        metadata_edition(node, xml)
         draft = metadata_version_value(node)
-        add_noko_elem(xml, "edition", node.attr("edition"))
         draft || node.attr("revdate") or return
-        xml.version do |v|
-          add_noko_elem(v, "revision_date", node.attr("revdate"))
-          add_noko_elem(v, "draft", draft)
-        end
+        xml.version draft || node.attr("revdate")
       end
 
       def metadata_version_value(node)
@@ -112,6 +113,12 @@ module Metanorma
           type or next
           xml.date(type:) { |d| add_noko_elem(d, "on", date) }
         end
+        metadata_revdate(node, xml)
+      end
+
+      def metadata_revdate(node, xml)
+        date = node.attr("revdate") or return
+        xml.date(type: "updated") { |d| add_noko_elem(d, "on", date) }
       end
 
       def metadata_language(node, xml)
@@ -173,7 +180,7 @@ module Metanorma
 
       def metadata_classifications(node, xml)
         csv_split(node.attr("classification"), ",")&.each do |c|
-          vals = c.split(/:/, 2)
+          vals = c.split(":", 2)
           vals.size == 1 and vals = ["default", vals[0]]
           add_noko_elem(xml, "classification", vals[1], type: vals[0])
         end

data/lib/metanorma/converter/front_contributor.rb

@@ -1,5 +1,5 @@
-require_relative "./front_organisation"
-require_relative "./front_committee"
+require_relative "front_organisation"
+require_relative "front_committee"
 
 module Metanorma
   module Standoc

data/lib/metanorma/converter/macros_terms.rb

@@ -105,7 +105,7 @@ module Metanorma
     class ConceptInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
       use_dsl
       named :concept
-      match /\{\{(?<content>|.*?[^\\])\}\}/m
+      match /(?<!\{)\{\{(?!\{)(?<content>|.*?[^\\])\}\}(?!\})/m
       using_format :short
 
       def preprocess_attrs(target)

data/lib/metanorma/converter/utils.rb

@@ -7,11 +7,12 @@ require "uuidtools"
 require "metanorma-core"
 require_relative "../../nokogiri/xml/builder"
 require_relative "date_utils"
-require_relative "isolated_converter"
 
 module Metanorma
   module Standoc
     module Utils
+      include ::Metanorma::Core::Boilerplate
+
       def convert(node, transform = nil, opts = {})
         transform ||= node.node_name
         opts.empty? ? (send transform, node) : (send transform, node, opts)
@@ -142,24 +143,13 @@ module Metanorma
         SECTION_CONTAINERS
       end
 
-      # wrapped in <sections>
-      def adoc2xml(text, flavour)
-        Nokogiri::XML(text).root and return text
-        f = @flush_caches ? ":flush-caches:\n" : ""
-        doc = <<~ADOC
-          = X
-          A
-          :semantic-metadata-headless: true
-          :no-isobib:
-          #{f}:novalid:
-          :!sectids:
-
-          #{text}
-        ADOC
-        c = isolated_asciidoctor_convert(doc, backend: flavour,
-                                              header_footer: true)
-        ret = Nokogiri::XML(c).at("//xmlns:sections")
-        separate_numbering_footnotes(ret)
+      # Shadow metanorma-core's adoc2xml so the standoc converter context
+      # gets externally-sourced footnotes renumbered automatically
+      # (preserving the existing direct-caller behaviour: process_boilerplate_file
+      # in cleanup, header conversion in dochistory).
+      def adoc2xml(text, flavour, flush_caches: false, localdir: nil)
+        ret = super
+        ret.is_a?(Nokogiri::XML::Node) ? separate_numbering_footnotes(ret) : ret
       end
 
       # separate numbering of externally sourced footnotes
@@ -201,8 +191,6 @@ module Metanorma
         end
       end
 
-      module_function :adoc2xml
-
       def textcleanup(result)
         text = result.flatten.map(&:rstrip) * "\n"
         text.gsub(/(?<!\s)\s+<fn /, "<fn ")

data/lib/metanorma/converter/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "3.4.1".freeze
+    VERSION = "3.4.2".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -32,8 +32,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "crass", "~> 1.0.0"
   # spec.add_dependency "iev", "~> 0.3.5"
-  spec.add_dependency "isodoc", "~> 3.5.0"
-  spec.add_dependency "metanorma-core", "~> 0.1.2"
+  spec.add_dependency "isodoc", "~> 3.6.0"
+  spec.add_dependency "metanorma-core", "~> 0.2.0"
   spec.add_dependency "metanorma-plugin-glossarist", "~> 0.3.0"
   spec.add_dependency "metanorma-plugin-lutaml", "~> 0.7.31"
   spec.add_dependency "metanorma-plugin-plantuml", "~> 1.0.0"
@@ -41,12 +41,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ruby-jing"
   # relaton-cli not just relaton, to avoid circular reference in metanorma
   spec.add_dependency "concurrent-ruby"
-  spec.add_dependency "relaton-cli", "~> 2.0.0"
+  spec.add_dependency "png_conform", "~> 0.1.0"
+  spec.add_dependency "relaton-cli", "~> 2.1.0"
   spec.add_dependency "relaton-iev", "~> 2.0.0"
   spec.add_dependency "svg_conform", "~> 0.1.0"
-  spec.add_dependency "png_conform", "~> 0.1.0"
 
-  spec.add_development_dependency "canon", "= 0.2.3"
+  spec.add_development_dependency "canon" # , "= 0.2.3"
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
@@ -61,4 +61,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr", "~> 6.1.0"
   spec.add_development_dependency "webmock"
   # spec.metadata["rubygems_mfa_required"] = "true"
+  spec.metadata["rubygems_mfa_required"] = "true"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-27 00:00:00.000000000 Z
+date: 2026-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: metanorma-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: metanorma-plugin-glossarist
   requirement: !ruby/object:Gem::Requirement
@@ -165,49 +165,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: relaton-cli
+  name: png_conform
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: relaton-iev
+  name: relaton-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: svg_conform
+  name: relaton-iev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: png_conform
+  name: svg_conform
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -224,16 +224,16 @@ dependencies:
   name: canon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -498,7 +498,6 @@ files:
 - lib/metanorma/converter/front_title.rb
 - lib/metanorma/converter/init.rb
 - lib/metanorma/converter/inline.rb
-- lib/metanorma/converter/isolated_converter.rb
 - lib/metanorma/converter/lists.rb
 - lib/metanorma/converter/localbib.rb
 - lib/metanorma/converter/log.rb
@@ -543,7 +542,8 @@ files:
 homepage: https://github.com/metanorma/metanorma-standoc
 licenses:
 - BSD-2-Clause
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/metanorma/converter/isolated_converter.rb

@@ -1,57 +0,0 @@
-module Metanorma
-  module Standoc
-    module Utils
-      # Create an isolated Asciidoctor conversion that doesn't interfere with
-      # the current converter's instance variables
-      def isolated_asciidoctor_convert(content, options = {})
-        # Track that we're in an isolated conversion (for nested calls)
-        @isolated_conversion_stack ||= []
-        @isolated_conversion_stack << true
-
-        begin
-          preserved_options = extract_preserved_options(options)
-          # Merge with isolated options to ensure clean state and skip validation
-          isolated_options = preserved_options.merge(options).merge(
-            attributes: (preserved_options[:attributes] || {}).merge(
-              "novalid" => "", # Force no validation for isolated documents
-            ),
-          )
-          Asciidoctor.convert(content, isolated_options)
-        ensure
-          @isolated_conversion_stack.pop
-        end
-      end
-
-      private
-
-      # Extract options that should be preserved from the current conversion context
-      def extract_preserved_options(user_opt)
-        options = {}
-
-        # Preserve safe mode to maintain security context
-        options[:safe] = user_opt[:safe] if user_opt.key?(:safe)
-
-        # Preserve local directory context if not explicitly overridden
-        @localdir && !user_opt.key?(:base_dir) and
-          options[:base_dir] = @localdir
-
-        # Preserve attributes that are safe to share
-        user_opt[:attributes].nil? && respond_to?(:safe_shared_attributes) and
-          options[:attributes] = safe_shared_attributes
-
-        options
-      end
-
-      # Define attributes that are safe to share between converter instances
-      def safe_shared_attributes
-        # Only include read-only or configuration attributes
-        # Avoid any attributes that could cause state pollution
-        {
-          "source-highlighter" => "html-pipeline", # Use simple highlighter
-          "nofooter" => "",
-          "no-header-footer" => "",
-        }
-      end
-    end
-  end
-end