metanorma-standoc 3.4.0 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd7bb1c2eddf906901c649dfebebe9ed9a927acb580f801230c0ddb5ef7ccf6e
-  data.tar.gz: 851c87886924185eb0923d596c68004339b61bc853c523f29d8d56817941798c
+  metadata.gz: 337c4b9070783a56e314d0e8a1855420ddb818da4bc13e9031749cfc497702d8
+  data.tar.gz: 04fed5ceea5cc84cf1dfad226e88c38313f405e68436eca36af1b6107e6ae25f
 SHA512:
-  metadata.gz: 9149dd7dcef66682f4577dd4fbca61d45ca47b982f69f04917b7302647472db77fc3ea20d95cfeaa7c8ca97cc94a71f4d447bf7bd34ab8bfcbbede32f6c44127
-  data.tar.gz: a1a8ebe497caf7e545865d232d2f5bff903d687845bc4de9dd584cea7fa8ea4764d1ef4e7cd0cb4fb88d83405fc30cdc60335ce38a63af8b5549c6b2e95eef75
+  metadata.gz: 345e5360ec266c640719931c35aa01cf34c11098c16308b45abd2f46a6acf933b06fda91b95c770b1bd5975df403d7b09df717ebf8e3c33ae1ce54d52dc2514a
+  data.tar.gz: 3c375e4e7ab47a72a5d84b7f916b7a08a742491136b35079d05e4a6598429010c1518451e69def8c080eb3f06d5375e623689e6e15c375ac42ab62435c9281ce

data/.rubocop.yml

@@ -1,7 +1,7 @@
 # Auto-generated by Cimas: Do not edit it manually!
 # See https://github.com/metanorma/cimas
 inherit_from:
-  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
+  - https://raw.githubusercontent.com/riboseinc/oss-guides/main/ci/rubocop.yml
 
 # local repo-specific modifications
 # ...

data/RELATON_2_MIGRATION.md

@@ -1840,20 +1840,33 @@ def from_xml(xml)
   # <bibitem> elements are always flavor-independent: use the base
   # Relaton::Bib::Bibitem regardless of collection flavor.
   # <bibdata> elements carry flavor-specific metadata (<ext> etc.) and
-  # must be parsed with the appropriate flavor Bibdata class.
+  # must be parsed with the appropriate flavor Item class.
   r = if b.name == "bibitem"
         ::Relaton::Bib::Bibitem
       else
-        mn2relaton_parser(xml.root["flavor"], bibdata: true)
+        mn2relaton_parser(xml.root["flavor"])
       end
   b.xpath("//xmlns:fmt-identifier").each(&:remove)
   r.from_xml(b.to_xml)
 end
 ```
 
-The `mn2relaton_parser` method is unchanged — the `bibdata:` keyword parameter is
-retained for future use. The `bibdata: false` / Bibitem-returning branches in
-`mn2relaton_parser` are now unreachable from `from_xml` but remain in place.
+The `mn2relaton_parser` method now returns the flavor's `Item` class (e.g.
+`Relaton::Iso::Item`) instead of `Bibdata`/`Bibitem`. The `bibdata:` keyword
+parameter has been removed.
+
+This is necessary because in Relaton 2.x, `BibdataShared` (defined in
+`Relaton::Bib`) sets `model ItemData` inside `class_eval`, and Ruby constant
+lookup resolves `ItemData` in the **definer's** scope (`Relaton::Bib`), not the
+includer's scope. So `Relaton::Iso::Bibdata.from_xml` produces a generic
+`Relaton::Bib::ItemData` instance. When `to_xml(bibdata: true)` is called, the
+generic instance delegates to `Relaton::Bib::Bibdata.to_xml`, which does not know
+about flavor-specific `ext` attributes, causing a crash.
+
+By contrast, `Relaton::Iso::Item` explicitly declares `model ItemData` in its own
+class body within `Relaton::Iso`, correctly resolving to `Relaton::Iso::ItemData`.
+The resulting `ItemData` instance's `to_xml(bibdata: true)` correctly delegates to
+`Relaton::Iso::Bibdata.to_xml(self)` via the `namespace` helper.
 
 **Impact on round-trip fidelity:**
 

data/lib/isodoc/standoc/presentation_xml_convert.rb

@@ -0,0 +1,8 @@
+require "isodoc"
+
+module IsoDoc
+  module Standoc
+    class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+    end
+  end
+end

data/lib/metanorma/cleanup/asciibib.rb

@@ -1,4 +1,5 @@
 require "relaton/bib"
+require "relaton/bib/hash_parser_v1"
 
 module Metanorma
   module Standoc

data/lib/metanorma/cleanup/bibdata.rb

@@ -225,6 +225,7 @@ module Metanorma
         end
       end
 
+      # (e.g. in ISO, reformatting identifier)
       def docidentifier_cleanup(xmldoc); end
     end
   end

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/cleanup/cleanup.rb

@@ -143,7 +143,7 @@ module Metanorma
         unnumbered_blocks_cleanup(xmldoc)
         termdocsource_cleanup(xmldoc) # feeds: metadata_cleanup
         metadata_cleanup(xmldoc) # feeds: boilerplate_cleanup, bibdata_cleanup,
-        # docidentifier_cleanup (in generic: template)
+        # docidentifier_cleanup
         misccontainer_cleanup(xmldoc)
         sections_cleanup(xmldoc) # feeds: obligations_cleanup, toc_cleanup,
         # floatingtitle_cleanup

data/lib/metanorma/cleanup/reqt.rb

@@ -3,7 +3,8 @@ module Metanorma
     module Reqt
       def requirement_cleanup(xmldoc)
         @reqt_models ||=
-          @conv.requirements_processor.new({ default: @default_requirement_model })
+          @conv.requirements_processor.new({ conv: @conv.presentation_xml_converter(Metanorma::Standoc::EmptyAttr.new),
+                                             default: @default_requirement_model })
         @reqt_models.requirement_cleanup(xmldoc)
       end
     end

data/lib/metanorma/cleanup/section_names.rb

@@ -52,9 +52,9 @@ module Metanorma
       SYMABBR = "[.//definitions[@type = 'symbols']]" \
                 "[.//definitions[@type = 'abbreviated_terms']]".freeze
       SYM_NO_ABBR = "[.//definitions[@type = 'symbols']]" \
-                  "[not(.//definitions[@type = 'abbreviated_terms'])]".freeze
+                    "[not(.//definitions[@type = 'abbreviated_terms'])]".freeze
       ABBR_NO_SYM = "[.//definitions[@type = 'abbreviated_terms']]" \
-                  "[not(.//definitions[@type = 'symbols'])]".freeze
+                    "[not(.//definitions[@type = 'symbols'])]".freeze
 
       def section_names_terms_cleanup(xml)
         section_names_definitions(xml)

data/lib/metanorma/cleanup/text.rb

@@ -30,13 +30,10 @@ module Metanorma
       end
 
       def lines_strip_textspan(span, nextspan)
-        #AAA
         lines = []
         span[:text] and
           lines = span[:text].lines[0..-2].map(&:rstrip) <<
             span[:text].lines[-1]&.sub(/\n$/, "")
-        #lines = span[:text].lines[0..-2].map(&:rstrip) <<
-  #span[:text].lines[-1]&.sub(/\n$/, "")
         # no final line rstrip: can be space linking to next line
         span[:last] or lines << nextspan[:text].lines.first # next token context
         lines
@@ -57,9 +54,9 @@ module Metanorma
 
       def gather_text_for_linebreak_cleanup1(block)
         block.xpath(".//text() | .//eref[not(text())] |  " \
-                        ".//xref[not(text())] | .//termref[not(text())] | " \
-                        ".//link[not(text())] ").map do |e|
-                          #x = block.xpath(".//text()").map do |e|
+                    ".//xref[not(text())] | .//termref[not(text())] | " \
+                    ".//link[not(text())] ").map do |e|
+          # x = block.xpath(".//text()").map do |e|
           { elem: e, text: e.text, stem: ancestor_include?(e, %w(stem)),
             skip: ancestor_include?(e, PRESERVE_LINEBREAK_ELEMENTS) }
         end
@@ -91,17 +88,6 @@ module Metanorma
         end
       end
 
-#AAA
-# "abc<tag/>", def => "abc",<tag/> def
-# TODO?
-#def uninterrupt_quotes_around_xml1(xmldoc)
-  #xmldoc.xpath("//text()[preceding-sibling::*[1]]").each do |n|
-    #uninterrupt_quotes_around_xml_skip(n) and next
-    #uninterrupt_quotes_around_xml1(n.previous)
-  #end
-#end
-
-
       IGNORE_QUOTES_ELEMENTS =
         %w(pre tt sourcecode stem asciimath figure bibdata passthrough
            identifier metanorma-extension boilerplate).freeze

data/lib/metanorma/cleanup/xref.rb

@@ -87,7 +87,8 @@ module Metanorma
 
       def xref_compound_cleanup(xmldoc)
         xmldoc.xpath("//xref").each do |x|
-          x["target"].include?(";") or next
+          next unless x["target"]&.include?(";")
+          
           locations = x["target"].split(";")
           x["target"] = locations.first.sub(/^[^!]*!/, "")
           xref_compound_cleanup1(x, locations)

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/init.rb

@@ -109,8 +109,10 @@ module Metanorma
       def init_reqt(node)
         @default_requirement_model = node.attr("requirements-model") ||
           default_requirement_model
+        @default_requirement_render = node.attr("requirements-render")
+        conv = presentation_xml_converter(EmptyAttr.new)
         @reqt_models = requirements_processor
-          .new({ default: @default_requirement_model })
+          .new({ default: @default_requirement_model, conv: conv })
       end
 
       def init_toc(node)

data/lib/metanorma/converter/log.rb

@@ -3,213 +3,213 @@ module Metanorma
     class Converter
       # rubocop:disable Naming/VariableNumber
       STANDOC_LOG_MESSAGES = {
-        "STANDOC_1": { category: "Include",
-                       error: "Specified boilerplate file does not exist: %s",
-                       severity: 0 },
-        "STANDOC_2": { category: "Table", error: "Empty table",
-                       severity: 0 },
-        "STANDOC_3": { category: "Crossreferences",
-                       error: "invalid index \"%s\" cross-reference: " \
-                       "wrong number of attributes in `index:%s[%s]`",
-                       severity: 0 },
-        "STANDOC_4": { category: "Table",
-                       error: "Table rows in table %s: check rowspan",
-                       severity: 0 },
-        "STANDOC_5": { category: "Table",
-                       error: "Table exceeds maximum number of columns defined (%s)",
-                       severity: 0 },
-        "STANDOC_6": { category: "Maths",
-                       error: "Malformed MathML: %s\n%s",
-                       severity: 0 },
-        "STANDOC_7": { category: "Metanorma XML Syntax", error: "%s",
-                       severity: 2 },
-        "STANDOC_8": { category: "Anchors", error: "Malformed URI: %s",
-                       severity: 0 },
-        "STANDOC_9": { category: "Bibliography",
-                       error: "Attachment %s does not exist",
-                       severity: 0 },
-        "STANDOC_10": { category: "Anchors",
-                        error: "The following reference is missing an anchor:\n%s",
-                        severity: 1 },
-        "STANDOC_11": { category: "Bibliography",
-                        error: "Reference %s is missing a title",
-                        severity: 1 },
-        "STANDOC_12": { category: "Bibliography",
-                        error: "Reference %s is missing a document identifier (docid)",
-                        severity: 1 },
-        "STANDOC_13": { category: "AsciiDoc Input",
-                        error: "term reference not in expected format:%s",
-                        severity: 1 },
-        "STANDOC_14": { category: "Style",
-                        error: "Style override set for ordered list",
-                        severity: 2 },
-        "STANDOC_15": { category: "Crossreferences",
-                        error: "Could not resolve footnoteblock:[%s]",
-                        severity: 1 },
-        "STANDOC_16": { category: "AsciiDoc Input",
-                        error: "Section not marked up as [bibliography]!",
-                        severity: 2 },
-        "STANDOC_17": { category: "Bibliography",
-                        error: "ERROR: No document identifier retrieved for %s",
-                        severity: 2 },
-        "STANDOC_18": { category: "Bibliography",
-                        error: "ERROR: No title retrieved for %s", severity: 2 },
-        "STANDOC_19": { category: "Bibliography",
-                        error: "Cannot find reference %s for local Relaton " \
-                                "data source %s", severity: 0 },
-        "STANDOC_20": { category: "AsciiDoc Input",
-                        error: "Metadata definition list does not follow a term designation",
-                        severity: 2 },
-        "STANDOC_21": { category: "Terms",
-                        error: "Removed duplicate designation %s",
-                        severity: 2 },
-        "STANDOC_22": { category: "Bibliography",
-                        error: "Term \"%s\" does not match IEV %s \"%s\"",
-                        severity: 1 },
-        "STANDOC_23": { category: "Anchors",
-                        error: "Concept cross-reference error: %s",
-                        severity: 0 },
-        "STANDOC_24": { category: "Terms",
-                        error: "Term %s occurs twice as preferred designation: %s",
-                        severity: 1 },
-        "STANDOC_25": { category: "Terms", severity: 0,
-                        error: <<~ERROR.freeze },
-                          Clause not recognised as a term clause, but contains designation markup
-                           (<code>preferred:[], admitted:[], alt:[], deprecated:[]</code>):<br/>
-                          %s</br>
-                          Ensure the parent clause is recognised as a terms clause by inserting <code>[heading=terms and definitions]</code> above the title,
-                          in case the heading is not automatically recognised. See also <a href="https://www.metanorma.org/author/topics/sections/concepts/#clause-title">Metanorma documentation</a>.
-                        ERROR
-        "STANDOC_26": { category: "AsciiDoc Input",
-                        error: "Error: Symbol reference in `symbol[%s]` missing: \"%s\" is not defined in document",
-                        severity: 1 },
-        "STANDOC_27": { category: "AsciiDoc Input",
-                        error: "Error: Term reference to `%s` missing: \"%s\" is not defined in document%s",
-                        severity: 1 },
-        "STANDOC_28": { category: "Crossreferences",
-                        error: "term source %s not referenced",
-                        severity: 1 },
-        "STANDOC_29": { category: "AsciiDoc Input",
-                        error: "converter missing for %s node in Metanorma backend",
-                        severity: 1 },
-        "STANDOC_30": { category: "Crossreferences",
-                        error: "%s does not have a corresponding anchor ID in the bibliography!",
-                        severity: 2 },
-        "STANDOC_31": { category: "Crossreferences",
-                        error: "Illegal cross-reference connective: %s",
-                        severity: 0 },
-        "STANDOC_32": { category: "Crossreferences",
-                        error: "%s does not have a corresponding anchor ID in the bibliography!",
-                        severity: 2 },
-        "STANDOC_33": { category: "Maths",
-                        error: "Invalid MathML: %s\n %s%s",
-                        severity: 0 },
-        "STANDOC_34": { category: "Style",
-                        error: "There is an instance of %s nested within %s",
-                        severity: 2 },
-        "STANDOC_35": { category: "Style",
-                        error: "There is a crossreference to an instance of %s nested within %s: %s",
-                        severity: 2 },
-        "STANDOC_36": { category: "Anchors",
-                        error: "ID %s has already been used at line %s",
-                        severity: 0 },
-        "STANDOC_37": { category: "Bibliography",
-                        error: "Cannot process format %s for local Relaton data source %s",
-                        severity: 0 },
-        "STANDOC_38": { category: "Anchors",
-                        error: "Crossreference target %s is undefined",
-                        severity: 1 },
-        "STANDOC_39": { category: "Blocks",
-                        error: "%s is empty",
-                        severity: 1 },
-        "STANDOC_40": { category: "Bibliography",
-                        error: "Could not retrieve %s: no access to online site",
-                        severity: 1 },
-        "STANDOC_41": { category: "Include",
-                        error: "Unresolved directive %s",
-                        severity: 0 },
-        "STANDOC_42": { category: "Metanorma XML Syntax",
-                        error: "Invalid passthrough content: %s\n" \
-                      "This is not valid Metanorma XML. If you intended a different format, such as HTML, you need to specify `format=` on the pass markup;\n" \
-                      "refer to https://www.metanorma.org/author/topics/blocks/passthroughs/",
-                        severity: 0 },
-        "STANDOC_43": { category: "AsciiDoc Input",
-                        error: <<~REF.freeze, severity: 1 },
-                          no anchor on reference, markup may be malformed: see
-                          https://www.metanorma.org/author/topics/sections/bibliography/ ,
-                          https://www.metanorma.org/author/iso/topics/markup/#bibliographies : %s
-                        REF
-        "STANDOC_44": { category: "Images", error: "Image not found: %s",
-                        severity: 0 },
-        "STANDOC_45": { category: "Images",
-                        error: "Corrupt PNG image detected: %s",
-                        severity: 2 },
-        "STANDOC_46": { category: "Images",
-                        error: "Image too large for Data URI encoding: disable Data URI encoding (`:data-uri-image: false`), or set `:data-uri-maxsize: 0`",
-                        severity: 0 },
-        "STANDOC_47": { category: "Crossreferences",
-                        error: "mismatch of callouts (%s) and annotations (%s)",
-                        severity: 0 },
-        "STANDOC_48": { category: "Style", error: "(generic warning) %s",
-                        severity: 2 },
-        "STANDOC_49": { category: "Bibliography",
-                        error: "Numeric reference in normative references",
-                        severity: 1 },
-        "STANDOC_50": { category: "Fatal Error", error: "%s", severity: 0 },
-        "STANDOC_51": { category: "Maths",
-                        error: "latexmlmath failed to process equation:\n%s",
-                        severity: 1 },
-        "STANDOC_52": { category: "Bibliography",
-                        error: "Bibliographic spans: %s",
-                        severity: 0 },
-        "STANDOC_53": { category: "Bibliography",
-                        error: "Bibliographic spans: %s",
-                        severity: 1 },
-        "STANDOC_54": { category: "Bibliography",
-                        error: "Cannot process file %s for local Relaton data source %s",
-                        severity: 0 },
-        "STANDOC_55": { category: "Images",
-                        error: "Corrupt SVG image detected, error found: %s %s%s%s",
-                        severity: 2 },
-        "STANDOC_56": { category: "Images",
-                        error: "Corrupt SVG image detected, could not be fixed: %s %s%s%s",
-                        severity: 1 },
-        "STANDOC_57": { category: "Images",
-                        error: "SVG image warning: %s %s%s%s",
-                        severity: 3 },
-        "STANDOC_58": { category: "Images",
-                        error: "Corrupt SVG image detected, fix attempted: %s %s: %s %s, Node: %s",
-                        severity: 2 },
-        "STANDOC_59": { category: "Images",
-                        error: "SVG unresolved internal reference: %s line %s",
-                        severity: 3 },
-        "STANDOC_60": { category: "Bibliography",
-                        error: "Unrecognised bibliographic style: %s",
-                        severity: 1 },
-        "STANDOC_61": { category: "AsciiDoc Input",
-                        error: "Improperly nested sourcecode markup: %s",
-                        severity: 0 },
-        "STANDOC_62": { category: "Crossreferences",
-                        error: "Sourcecode with callout markup but no annotations",
-                        severity: 1 },
-        "STANDOC_63": { category: "Images",
-                        error: "Warning on PNG image: %s",
-                        severity: 3 },
-        "RELATON_1": { category: "Relaton",
-                       error: "(Error from Relaton) %s",
-                       severity: 0 },
-        "RELATON_2": { category: "Relaton",
-                       error: "(Error from Relaton) %s",
-                       severity: 1 },
-        "RELATON_3": { category: "Relaton",
-                       error: "(Error from Relaton) %s",
-                       severity: 2 },
-        "RELATON_4": { category: "Relaton",
-                       error: "(Error from Relaton) %s",
-                       severity: 3 },
-        "RELATON_5": { category: "Relaton",
-                       error: "(Error from Relaton IEV) %s",
-                       severity: 0 },
+        STANDOC_1: { category: "Include",
+                     error: "Specified boilerplate file does not exist: %s",
+                     severity: 0 },
+        STANDOC_2: { category: "Table", error: "Empty table",
+                     severity: 0 },
+        STANDOC_3: { category: "Crossreferences",
+                     error: "invalid index \"%s\" cross-reference: " \
+                            "wrong number of attributes in `index:%s[%s]`",
+                     severity: 0 },
+        STANDOC_4: { category: "Table",
+                     error: "Table rows in table %s: check rowspan",
+                     severity: 0 },
+        STANDOC_5: { category: "Table",
+                     error: "Table exceeds maximum number of columns defined (%s)",
+                     severity: 0 },
+        STANDOC_6: { category: "Maths",
+                     error: "Malformed MathML: %s\n%s",
+                     severity: 0 },
+        STANDOC_7: { category: "Metanorma XML Syntax", error: "%s",
+                     severity: 2 },
+        STANDOC_8: { category: "Anchors", error: "Malformed URI: %s",
+                     severity: 0 },
+        STANDOC_9: { category: "Bibliography",
+                     error: "Attachment %s does not exist",
+                     severity: 0 },
+        STANDOC_10: { category: "Anchors",
+                      error: "The following reference is missing an anchor:\n%s",
+                      severity: 1 },
+        STANDOC_11: { category: "Bibliography",
+                      error: "Reference %s is missing a title",
+                      severity: 1 },
+        STANDOC_12: { category: "Bibliography",
+                      error: "Reference %s is missing a document identifier (docid)",
+                      severity: 1 },
+        STANDOC_13: { category: "AsciiDoc Input",
+                      error: "term reference not in expected format:%s",
+                      severity: 1 },
+        STANDOC_14: { category: "Style",
+                      error: "Style override set for ordered list",
+                      severity: 2 },
+        STANDOC_15: { category: "Crossreferences",
+                      error: "Could not resolve footnoteblock:[%s]",
+                      severity: 1 },
+        STANDOC_16: { category: "AsciiDoc Input",
+                      error: "Section not marked up as [bibliography]!",
+                      severity: 2 },
+        STANDOC_17: { category: "Bibliography",
+                      error: "ERROR: No document identifier retrieved for %s",
+                      severity: 2 },
+        STANDOC_18: { category: "Bibliography",
+                      error: "ERROR: No title retrieved for %s", severity: 2 },
+        STANDOC_19: { category: "Bibliography",
+                      error: "Cannot find reference %s for local Relaton " \
+                             "data source %s", severity: 0 },
+        STANDOC_20: { category: "AsciiDoc Input",
+                      error: "Metadata definition list does not follow a term designation",
+                      severity: 2 },
+        STANDOC_21: { category: "Terms",
+                      error: "Removed duplicate designation %s",
+                      severity: 2 },
+        STANDOC_22: { category: "Bibliography",
+                      error: "Term \"%s\" does not match IEV %s \"%s\"",
+                      severity: 1 },
+        STANDOC_23: { category: "Anchors",
+                      error: "Concept cross-reference error: %s",
+                      severity: 0 },
+        STANDOC_24: { category: "Terms",
+                      error: "Term %s occurs twice as preferred designation: %s",
+                      severity: 1 },
+        STANDOC_25: { category: "Terms", severity: 0,
+                      error: <<~ERROR.freeze },
+                        Clause not recognised as a term clause, but contains designation markup
+                         (<code>preferred:[], admitted:[], alt:[], deprecated:[]</code>):<br/>
+                        %s</br>
+                        Ensure the parent clause is recognised as a terms clause by inserting <code>[heading=terms and definitions]</code> above the title,
+                        in case the heading is not automatically recognised. See also <a href="https://www.metanorma.org/author/topics/sections/concepts/#clause-title">Metanorma documentation</a>.
+                      ERROR
+        STANDOC_26: { category: "AsciiDoc Input",
+                      error: "Error: Symbol reference in `symbol[%s]` missing: \"%s\" is not defined in document",
+                      severity: 1 },
+        STANDOC_27: { category: "AsciiDoc Input",
+                      error: "Error: Term reference to `%s` missing: \"%s\" is not defined in document%s",
+                      severity: 1 },
+        STANDOC_28: { category: "Crossreferences",
+                      error: "term source %s not referenced",
+                      severity: 1 },
+        STANDOC_29: { category: "AsciiDoc Input",
+                      error: "converter missing for %s node in Metanorma backend",
+                      severity: 1 },
+        STANDOC_30: { category: "Crossreferences",
+                      error: "%s does not have a corresponding anchor ID in the bibliography!",
+                      severity: 2 },
+        STANDOC_31: { category: "Crossreferences",
+                      error: "Illegal cross-reference connective: %s",
+                      severity: 0 },
+        STANDOC_32: { category: "Crossreferences",
+                      error: "%s does not have a corresponding anchor ID in the bibliography!",
+                      severity: 2 },
+        STANDOC_33: { category: "Maths",
+                      error: "Invalid MathML: %s\n %s%s",
+                      severity: 0 },
+        STANDOC_34: { category: "Style",
+                      error: "There is an instance of %s nested within %s",
+                      severity: 2 },
+        STANDOC_35: { category: "Style",
+                      error: "There is a crossreference to an instance of %s nested within %s: %s",
+                      severity: 2 },
+        STANDOC_36: { category: "Anchors",
+                      error: "ID %s has already been used at line %s",
+                      severity: 0 },
+        STANDOC_37: { category: "Bibliography",
+                      error: "Cannot process format %s for local Relaton data source %s",
+                      severity: 0 },
+        STANDOC_38: { category: "Anchors",
+                      error: "Crossreference target %s is undefined",
+                      severity: 1 },
+        STANDOC_39: { category: "Blocks",
+                      error: "%s is empty",
+                      severity: 1 },
+        STANDOC_40: { category: "Bibliography",
+                      error: "Could not retrieve %s: no access to online site",
+                      severity: 1 },
+        STANDOC_41: { category: "Include",
+                      error: "Unresolved directive %s",
+                      severity: 0 },
+        STANDOC_42: { category: "Metanorma XML Syntax",
+                      error: "Invalid passthrough content: %s\n" \
+                             "This is not valid Metanorma XML. If you intended a different format, such as HTML, you need to specify `format=` on the pass markup;\n" \
+                             "refer to https://www.metanorma.org/author/topics/blocks/passthroughs/",
+                      severity: 0 },
+        STANDOC_43: { category: "AsciiDoc Input",
+                      error: <<~REF.freeze, severity: 1 },
+                        no anchor on reference, markup may be malformed: see
+                        https://www.metanorma.org/author/topics/sections/bibliography/ ,
+                        https://www.metanorma.org/author/iso/topics/markup/#bibliographies : %s
+                      REF
+        STANDOC_44: { category: "Images", error: "Image not found: %s",
+                      severity: 0 },
+        STANDOC_45: { category: "Images",
+                      error: "Corrupt PNG image detected: %s",
+                      severity: 2 },
+        STANDOC_46: { category: "Images",
+                      error: "Image too large for Data URI encoding: disable Data URI encoding (`:data-uri-image: false`), or set `:data-uri-maxsize: 0`",
+                      severity: 0 },
+        STANDOC_47: { category: "Crossreferences",
+                      error: "mismatch of callouts (%s) and annotations (%s)",
+                      severity: 0 },
+        STANDOC_48: { category: "Style", error: "(generic warning) %s",
+                      severity: 2 },
+        STANDOC_49: { category: "Bibliography",
+                      error: "Numeric reference in normative references",
+                      severity: 1 },
+        STANDOC_50: { category: "Fatal Error", error: "%s", severity: 0 },
+        STANDOC_51: { category: "Maths",
+                      error: "latexmlmath failed to process equation:\n%s",
+                      severity: 1 },
+        STANDOC_52: { category: "Bibliography",
+                      error: "Bibliographic spans: %s",
+                      severity: 0 },
+        STANDOC_53: { category: "Bibliography",
+                      error: "Bibliographic spans: %s",
+                      severity: 1 },
+        STANDOC_54: { category: "Bibliography",
+                      error: "Cannot process file %s for local Relaton data source %s",
+                      severity: 0 },
+        STANDOC_55: { category: "Images",
+                      error: "Corrupt SVG image detected, error found: %s %s%s%s",
+                      severity: 2 },
+        STANDOC_56: { category: "Images",
+                      error: "Corrupt SVG image detected, could not be fixed: %s %s%s%s",
+                      severity: 1 },
+        STANDOC_57: { category: "Images",
+                      error: "SVG image warning: %s %s%s%s",
+                      severity: 3 },
+        STANDOC_58: { category: "Images",
+                      error: "Corrupt SVG image detected, fix attempted: %s %s: %s %s, Node: %s",
+                      severity: 2 },
+        STANDOC_59: { category: "Images",
+                      error: "SVG unresolved internal reference: %s line %s",
+                      severity: 3 },
+        STANDOC_60: { category: "Bibliography",
+                      error: "Unrecognised bibliographic style: %s",
+                      severity: 1 },
+        STANDOC_61: { category: "AsciiDoc Input",
+                      error: "Improperly nested sourcecode markup: %s",
+                      severity: 0 },
+        STANDOC_62: { category: "Crossreferences",
+                      error: "Sourcecode with callout markup but no annotations",
+                      severity: 1 },
+        STANDOC_63: { category: "Images",
+                      error: "Warning on PNG image: %s",
+                      severity: 3 },
+        RELATON_1: { category: "Relaton",
+                     error: "(Error from Relaton) %s",
+                     severity: 0 },
+        RELATON_2: { category: "Relaton",
+                     error: "(Error from Relaton) %s",
+                     severity: 1 },
+        RELATON_3: { category: "Relaton",
+                     error: "(Error from Relaton) %s",
+                     severity: 2 },
+        RELATON_4: { category: "Relaton",
+                     error: "(Error from Relaton) %s",
+                     severity: 3 },
+        RELATON_5: { category: "Relaton",
+                     error: "(Error from Relaton IEV) %s",
+                     severity: 0 },
 
       }.freeze
       # rubocop:enable Naming/VariableNumber

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/reqt.rb

@@ -25,13 +25,18 @@ module Metanorma
         !node.attr("type") &&
           !%w(requirement recommendation permission).include?(type) and
           node.set_attr("type", type)
-        attrs = keep_attrs(node).merge(id_unnum_attrs(node))
-          .merge(model: @reqt_model_name)
-        ret = @reqt_model.requirement(node, obligation, attrs)
+        ret = @reqt_model.requirement(node, obligation, requirement_attrs(node))
         @reqt_model = nil unless nested
         ret
       end
 
+      def requirement_attrs(node)
+        keep_attrs(node).merge(id_unnum_attrs(node))
+          .merge({ model: @reqt_model_name,
+                   render: node.attr("render") || @default_requirement_render }
+          .compact)
+      end
+
       def requirement_validate(docxml)
         docxml.xpath("//requirement | //recommendation | //permission")
           .each do |r|

data/lib/metanorma/converter/utils.rb

@@ -4,13 +4,15 @@ require "htmlentities"
 require "json"
 require "pathname"
 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)
@@ -91,14 +93,9 @@ module Metanorma
 
       def isodoc(lang, script, locale, i18nyaml = nil)
         conv = presentation_xml_converter(EmptyAttr.new)
-        conv.init_i18n({ i18nyaml:, language: lang, script:, locale: })
-        i18n = conv.i18n_init(lang, script, locale, i18nyaml)
-        conv.metadata_init(lang, script, locale, i18n)
-        conv.meta.localdir = @localdir
-        conv.xref_init(lang, script, nil, i18n, {})
-        conv.xrefs.klass.meta = conv.meta
-        conv.xrefs.klass.localdir = @localdir
-        conv
+        Metanorma::Core::Isodoc.init(conv, lang: lang, script: script,
+                                           locale: locale, i18nyaml: i18nyaml,
+                                           localdir: @localdir)
       end
 
       def dl_to_attrs(elem, dlist, name)
@@ -146,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
@@ -199,28 +185,18 @@ module Metanorma
       end
 
       def add_noko_elem(node, name, val, attrs = {})
-        val and !val.empty? or return
+        (val and !val.empty?) or return
         node.send name, **attr_code(attrs) do |n|
           n << val
         end
       end
 
-      module_function :adoc2xml
-
       def textcleanup(result)
         text = result.flatten.map(&:rstrip) * "\n"
         text.gsub(/(?<!\s)\s+<fn /, "<fn ")
       end
-
-      class EmptyAttr
-        def attr(_any_attribute)
-          nil
-        end
-
-        def attributes
-          {}
-        end
-      end
     end
+
+    EmptyAttr = Metanorma::Core::Isodoc::EmptyNode
   end
 end

data/lib/metanorma/converter/version.rb

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

data/lib/metanorma-standoc.rb

@@ -1,9 +1,10 @@
 require "asciidoctor" unless defined? Asciidoctor::Converter
+require_relative "isodoc/standoc/presentation_xml_convert"
 require_relative "isodoc/standoc/pdf_convert"
 require_relative "metanorma/converter/converter"
 require_relative "metanorma/converter/version"
 require "asciidoctor/extensions"
-require "metanorma"
+require "metanorma-core"
 require "vectory"
 
 if defined? Metanorma::Registry

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", ">= 1.6.0"
+  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.1.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.0
+  version: 3.4.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-13 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
+  name: metanorma-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        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.1.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -444,6 +444,7 @@ files:
 - lib/isodoc/html/htmlstyle.scss
 - lib/isodoc/html/scripts.html
 - lib/isodoc/standoc/pdf_convert.rb
+- lib/isodoc/standoc/presentation_xml_convert.rb
 - lib/metanorma-standoc.rb
 - lib/metanorma/cleanup/amend.rb
 - lib/metanorma/cleanup/asciibib.rb
@@ -497,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
@@ -542,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