metanorma 2.3.8 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '097d46fb29b83f41c643c4985cf3083ef2f49c53c46cbcb5586b2497b502b81b'
-  data.tar.gz: e020ab24c572c384ae47965fe1b84a71951d20745ff2385a4eec3aa4fb66c80a
+  metadata.gz: 2229a91588cc69992f7f3cba97a5856f84f9d6c4a6f5b97ef4ea031d6b4a279b
+  data.tar.gz: 9c4a785518d8ebbfe8246e8fca7dad9db726ea789f334cd6f13a3d985f2ca426
 SHA512:
-  metadata.gz: e2447f50b14b180ec78b8e6ec17b4a5de8f059b0a9091aa6cdb2a5c43e0792a836afa283143ad26fb7caf60fe27212e7e939bf0cacb3b3d3f9bd263ec7787ea0
-  data.tar.gz: 68ad569a5c042a89cc9caf4645a44d5f6e5c8511449eb60bce1563915535c639d7dc59fa737b1839bb9e6a9f85a156e8a9bccd8a91115bd192d6e2137c11c8fd
+  metadata.gz: 3631bba7d4064614b4a6926619bc5542d22b871fad3d10a9dd4e701d9d45433837fd4b2b43107fc32838f53f6d0a5e3181c81ab81b5ddbfed96381f973af2a21
+  data.tar.gz: d4877d254fb6182e6c24c71f20f89163ff72b5aa57b1df9b1acf0c419b665e727594bf7ea8f98d897e35812b0de6e4b99f379271c578da5301e2956e8612ced2

data/lib/metanorma/collection/collection.rb

@@ -89,10 +89,41 @@ module Metanorma
     def to_xml
       c = ::Metanorma::Collection::Config::Config
         .new(directive: @directives, bibdata: @bibdata,
-             manifest: @manifest.config, documents: @documents,
+             manifest: @manifest.config, documents: doc_containers,
              prefatory_content: @prefatory, final_content: @final)
       c.collection = self
-      c.to_xml # .sub("<metanorma-collection", "<metanorma-collection xmlns='http://metanorma.org'")
+      c.to_xml
+    end
+
+    # Populate the Config#documents collection with DocContainer wrappers.
+    # Only emit them when the `documents-inline` directive is set; otherwise
+    # the manifest's <entry fileref=…> already references them externally.
+    def doc_containers
+      @directives.detect { |d| d.key == "documents-inline" } or return []
+      @documents.each_with_index.map do |(_, d), idx|
+        ::Metanorma::Collection::Config::DocContainer.new(
+          id: format("doc%<index>09d", index: idx),
+          content: doccontainer1_inner(d),
+        )
+      end
+    end
+
+    # Inner XML of a single <doc-container> as a string. The body is either
+    # the document's <metanorma> presentation root (with its own xmlns) or
+    # an attachment payload.
+    def doccontainer1_inner(doc)
+      b = Nokogiri::XML::Builder.new do |xml|
+        xml.send(:wrapper) do |w|
+          if doc.attachment
+            doc.bibitem and w << doc.bibitem.root.to_xml
+            w.attachment Vectory::Utils::datauri(doc.file)
+          else
+            doc.to_xml w
+            w.parent.children.first["flavor"] = Util::taste2flavor(flavor)
+          end
+        end
+      end
+      b.parent.elements.first.children.map(&:to_xml).join
     end
 
     def render(opts)
@@ -117,10 +148,40 @@ module Metanorma
     def content_to_xml(elm, builder)
       (cnt = send(elm)) or return
       @compile.load_flavor(Util::taste2flavor(flavor))
-      out = prefatory_parse(Util::asciidoc_dummy_header + cnt.strip)
+      out = prefatory_parse(
+        Util::asciidoc_dummy_header(
+          docidentifier: dummy_header_docidentifier,
+        ) + cnt.strip,
+      )
       builder.send("#{elm}-content") { |b| b << out }
     end
 
+    # Pick a real docidentifier value for the prefatory dummy header so
+    # the flavor's metadata_id has something pubid-parseable to put into
+    # the bibdata, instead of falling back to its (Liquid-templated)
+    # docid_template (issue #558). Prefer the first manifest document's
+    # docidentifier (concrete, e.g. "IHO S-97"); fall back to the
+    # collection's own (which may carry suffixes like "(all parts)" that
+    # pubid won't parse). Both candidates are wrapped because the
+    # bibitem field may be a parsed Relaton BibliographicItem in some
+    # phases and a Nokogiri::XML::Document in others.
+    def dummy_header_docidentifier
+      first_doc_docid || @bibdata&.docidentifier&.first&.content
+    end
+
+    def first_doc_docid
+      bib = documents.values.first&.bibitem or return nil
+      if bib.respond_to?(:docidentifier)
+        bib.docidentifier&.first&.content
+      elsif bib.respond_to?(:at) # Nokogiri (rendering-phase shape)
+        # Use local-name() so the match works regardless of whether the
+        # rendering-phase document carries a default namespace, without
+        # tripping Nokogiri's "undefined namespace prefix" error when
+        # it doesn't.
+        bib.at("//*[local-name()='docidentifier']")&.text
+      end
+    end
+
     # @param cnt [String] prefatory/final content
     # @return [String] XML
     def prefatory_parse(cnt)
@@ -163,27 +224,6 @@ module Metanorma
       bibdata
     end
 
-    # @param builder [Nokogiri::XML::Builder]
-    def doccontainer(builder)
-      @directives.detect { |d| d.key == "documents-inline" } or return
-      documents.each_with_index do |(_, d), i|
-        doccontainer1(builder, d, i)
-      end
-    end
-
-    def doccontainer1(builder, doc, idx)
-      id = format("doc%<index>09d", index: idx)
-      builder.send(:"doc-container", id: id) do |b|
-        if doc.attachment
-          doc.bibitem and b << doc.bibitem.root.to_xml
-          b.attachment Vectory::Utils::datauri(doc.file)
-        else
-          doc.to_xml b
-          b.parent.children.first["flavor"] = Util::taste2flavor(flavor)
-        end
-      end
-    end
-
     def flavor
       @flavor ||= fetch_flavor || "standoc"
     end

data/lib/metanorma/collection/config/config.rb

@@ -5,12 +5,14 @@ require_relative "converters"
 require_relative "bibdata"
 require_relative "directive"
 require_relative "manifest"
+require_relative "namespaces"
+require_relative "doc_container"
 
 module Metanorma
   class Collection
     module Config
       Lutaml::Model::Config.configure do |config|
-        config.xml_adapter = Lutaml::Model::XmlAdapter::NokogiriAdapter
+        config.xml_adapter_type = :nokogiri
       end
 
       class Config < ::Lutaml::Model::Serializable
@@ -26,7 +28,7 @@ module Metanorma
         attribute :compile, CompileOptions
         attribute :prefatory_content, :string, raw: true
         attribute :final_content, :string, raw: true
-        attribute :documents, Bibdata, collection: true
+        attribute :documents, DocContainer, collection: true
         attribute :xmlns, :string, default: -> { "http://metanorma.org" }
 
         yaml do
@@ -48,9 +50,8 @@ module Metanorma
         end
 
         xml do
-          root "metanorma-collection"
-          # namespace "http://metanorma.org", "m"
-          # map_attribute "xmlns", to: :xmlns
+          element "metanorma-collection"
+          namespace MetanormaCollectionNamespace
           map_element "bibdata", to: :bibdata, with: { from: :bibdata_from_xml,
                                                        to: :bibdata_to_xml }
           map_element "directive", to: :directive
@@ -66,10 +67,7 @@ module Metanorma
                       to: :prefatory_content,
                       with: { from: :prefatory_from_xml,
                               to: :prefatory_to_xml }
-          map_element "doc-container",
-                      to: :documents,
-                      with: { from: :documents_from_xml,
-                              to: :documents_to_xml }
+          map_element "doc-container", to: :documents
           map_element "final-content",
                       to: :final_content,
                       with: { from: :final_from_xml,
@@ -80,9 +78,9 @@ module Metanorma
           model.manifest = Manifest.from_xml(node.to_xml)
         end
 
-        def manifest_to_xml(model, parent, doc)
+        def manifest_to_xml(model, _parent, doc)
           model.collection&.manifest&.clean_manifest(model.manifest)
-          doc.add_element(parent, model.manifest.to_xml)
+          add_raw_xml_element(doc, model.manifest.to_xml)
         end
 
         def prefatory_from_xml(model, node)
@@ -97,17 +95,17 @@ module Metanorma
           content_to_xml(model, parent, doc, "final")
         end
 
-        def content_to_xml(model, parent, doc, type)
+        def content_to_xml(model, _parent, doc, type)
           x = model.send("#{type}_content") or return
           n = Nokogiri::XML(x)
-          elem = if n.elements.size == 1
-                   "<#{type}-content>#{x}</#{type}-content>" # n.root
-                 else
-                   b = Nokogiri::XML::Builder.new
-                   model.collection.content_to_xml(type, b)
-                   b.parent.elements.first
-                 end
-          doc.add_element(parent, elem)
+          raw = if n.elements.size == 1
+                  "<#{type}-content>#{x}</#{type}-content>"
+                else
+                  b = Nokogiri::XML::Builder.new
+                  model.collection.content_to_xml(type, b)
+                  b.parent.elements.first.to_xml
+                end
+          add_raw_xml_element(doc, raw)
         end
 
         def final_from_xml(model, node)

data/lib/metanorma/collection/config/converters.rb

@@ -1,5 +1,6 @@
 require "relaton/bib"
 require "relaton/bib/hash_parser_v1"
+require_relative "namespaces"
 
 module Metanorma
   class Collection
@@ -66,8 +67,8 @@ module Metanorma
 
         def bibdata_from_xml(model, node)
           node or return
-          force_primary_docidentifier_xml(node.adapter_node)
-          model.bibdata = Relaton::Cli.parse_xml(node.adapter_node)
+          force_primary_docidentifier_xml(node.adapter_node.native)
+          model.bibdata = Relaton::Cli.parse_xml(node.adapter_node.native)
         end
 
         def force_primary_docidentifier_xml(node)
@@ -76,38 +77,36 @@ module Metanorma
           d["primary"] = "true"
         end
 
-        def bibdata_to_xml(model, parent, doc)
+        def bibdata_to_xml(model, _parent, doc)
           b = model.bibdata or return
-          elem = b.to_xml(bibdata: true, date_format: :full)
-          doc.add_element(parent, elem)
+          add_raw_xml_element(doc, b.to_xml(bibdata: true, date_format: :full))
         end
 
         def nop_to_yaml(model, doc); end
         def nop_to_xml(model, parent, doc); end
 
-        def documents_from_xml(model, value)
-          model.documents = value
-            .each_with_object([]) do |b, m|
-            m << b
+        # Add a single-element XML string as a child of the wrapper's current
+        # context, preserving inline namespace declarations.
+        #
+        # The custom-method `doc.add_element(parent, str)` path under
+        # lutaml-model 0.8 routes through Moxml fragment parsing, whose graft
+        # (`CustomMethodWrapper#add_fragment_children_to_parent`) discards
+        # xmlns declarations on grafted DataModel children. The
+        # `create_and_add_element` + `raw_content` path goes through the XML
+        # adapter's raw-content handler, which uses Nokogiri's native fragment
+        # parser and keeps xmlns intact. Tag the new element with
+        # MetanormaCollectionNamespace so it inherits cleanly from the
+        # metanorma-collection root rather than emitting `xmlns=""`.
+        def add_raw_xml_element(doc, raw)
+          parsed = Nokogiri::XML.fragment(raw)
+          src = parsed.elements.first or return
+          el = doc.create_and_add_element(src.name)
+          el.namespace_class = MetanormaCollectionNamespace
+          src.attribute_nodes.each do |a|
+            doc.add_attribute(el, a.name, a.value)
           end
-        end
-
-        def documents_to_xml(model, parent, doc)
-          documents_to_xml?(doc) or return
-          b = Nokogiri::XML::Builder.new do |xml|
-            xml.document do |m|
-              model.collection.doccontainer(m) or return
-            end
-          end
-          b.parent.elements.first.elements
-            .each { |x| doc.add_element(parent, x) }
-        end
-
-        def documents_to_xml?(doc)
-          ret = doc.parent.elements.detect do |x|
-            x.name == "doc-container"
-          end
-          !ret
+          el.raw_content = src.children.map(&:to_xml).join
+          el
         end
       end
     end

data/lib/metanorma/collection/config/doc_container.rb

@@ -0,0 +1,28 @@
+require "lutaml/model"
+require_relative "namespaces"
+
+module Metanorma
+  class Collection
+    module Config
+      # Serializable wrapper for a single <doc-container> element.
+      #
+      # The body of a doc-container is the inline presentation XML of an
+      # individual document, in a flavour-specific namespace (e.g. bipm,
+      # iso, ietf). We round-trip it as an opaque string via `map_all`
+      # so the underlying XML adapter (Nokogiri) preserves the inner xmlns
+      # declaration; if we let lutaml-model parse the body into typed
+      # children it would lose the inner namespace.
+      class DocContainer < ::Lutaml::Model::Serializable
+        attribute :id, :string
+        attribute :content, :string
+
+        xml do
+          element "doc-container"
+          namespace MetanormaCollectionNamespace
+          map_attribute "id", to: :id
+          map_all to: :content
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/collection/config/manifest.rb

@@ -1,5 +1,4 @@
 require "lutaml/model"
-require "lutaml/model/xml_adapter/nokogiri_adapter"
 require_relative "../../array_monkeypatch"
 require_relative "converters"
 require_relative "bibdata"
@@ -8,7 +7,7 @@ module Metanorma
   class Collection
     module Config
       Lutaml::Model::Config.configure do |config|
-        config.xml_adapter = Lutaml::Model::XmlAdapter::NokogiriAdapter
+        config.xml_adapter_type = :nokogiri
       end
 
       class Manifest < ::Lutaml::Model::Serializable
@@ -86,10 +85,9 @@ module Metanorma
           model.entry = Manifest.from_xml(node.node.to_xml)
         end
 
-        def entry_to_xml(model, parent, doc)
+        def entry_to_xml(model, _parent, doc)
           Array(model.entry).each do |e|
-            elem = e.to_xml
-            doc.add_element(parent, elem)
+            add_raw_xml_element(doc, e.to_xml)
           end
         end
 

data/lib/metanorma/collection/config/namespaces.rb

@@ -0,0 +1,12 @@
+require "lutaml/xml"
+
+module Metanorma
+  class Collection
+    module Config
+      class MetanormaCollectionNamespace < ::Lutaml::Xml::Namespace
+        uri "http://metanorma.org"
+        element_form_default :qualified
+      end
+    end
+  end
+end

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

@@ -36,7 +36,6 @@ module Metanorma
       def initialize(collection, folder, options = {}) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         check_options options
         @xml = Nokogiri::XML collection.to_xml # @xml is the collection manifest
-        @xml.root.default_namespace = "http://metanorma.org"
         @lang = Array(collection.bibdata.language).first || "en"
         @script = Array(collection.bibdata.script).first || "Latn"
         @locale = @xml.at("//xmlns:bibdata/xmlns:locale")&.text
@@ -190,8 +189,6 @@ module Metanorma
       end
 
       def concatenate_presentation(xml)
-        xml.sub!("<metanorma-collection>", "<metanorma-collection xmlns='http://metanorma.org'>")
-        # TODO BEING FORCED TO DO THAT BECAUSE SHALE IS NOT DEALING WITH DEFAULT NAMESPACES
         @directives.detect { |d| d.key == "bilingual" } and
           xml = Metanorma::Collection::Multilingual
             .new({ align_cross_elements: %w(p note) }).to_bilingual(xml)

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

@@ -212,8 +212,8 @@ module Metanorma
           bibdata: YAML.safe_load(@bibdata.to_yaml,
                                   permitted_classes: [Date, Symbol]),
           docrefs: liquid_docrefs(@manifest),
-          "prefatory-content": isodoc_builder(@xml.at("//prefatory-content")),
-          "final-content": isodoc_builder(@xml.at("//final-content")),
+          "prefatory-content": isodoc_builder(@xml.at("//xmlns:prefatory-content")),
+          "final-content": isodoc_builder(@xml.at("//xmlns:final-content")),
           doctitle: Array(@bibdata.title).first&.content,
           docnumber: Array(@bibdata.docidentifier).first&.content }.each do |k, v|
           v and @isodoc.meta.set(k, v)
@@ -223,11 +223,9 @@ module Metanorma
       def isodoc_builder(node)
         node or return
 
-        # Kludging namespace back in because of Shale brain damage
-        doc = Nokogiri::XML(node.to_xml.sub(">", " xmlns='http://www.metanorma.org'>"))
         Nokogiri::HTML::Builder.new(encoding: "UTF-8") do |b|
           b.div do |div|
-            doc.root.children&.each { |n| @isodoc.parse(n, div) }
+            node.children.each { |n| @isodoc.parse(n, div) }
           end
         end.doc.root.to_html
       end

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

@@ -156,23 +156,31 @@ module Metanorma
         #           style.gsub(%r{url\(#([^()]+)\)}, "url(#\\1_#{document_suffix})")
         #         end
 
+        # @deprecated Call Metanorma::Core::Isodoc.resolve_converter directly.
         def load_isodoc(flavor, presxml: false)
           Metanorma::Core::Isodoc.resolve_converter(flavor, presxml: presxml)
         end
 
+        # @deprecated Call Metanorma::Core::Isodoc.create directly. Kept as
+        #   a back-compat shim so existing callers keep working unchanged
+        #   while the wrapper is retired.
         def isodoc_create(flavor, lang, script, xml, presxml: false)
-          conv = Metanorma::Core::Isodoc.resolve_converter(flavor,
-                                                           presxml: presxml)
-          Metanorma::Core::Isodoc.init(conv, lang: lang, script: script,
-                                             xml: xml)
-        end
-
-        def asciidoc_dummy_header
-          <<~DUMMY
-            = X
-            A
-
-          DUMMY
+          Metanorma::Core::Isodoc.create(flavor, lang: lang, script: script,
+                                                 xml: xml, presxml: presxml)
+        end
+
+        # Dummy asciidoc header used by the prefatory-content parse so we
+        # can run Asciidoctor against arbitrary text. If +docidentifier+
+        # is supplied, it is injected as +:docidentifier:+ so the flavor
+        # processor's metadata_id has a real value to put into the
+        # bibdata, instead of falling back to its (Liquid-templated)
+        # docid_template. This prevents the prefatory parse from feeding
+        # an unresolved Liquid template through Relaton/pubid in flavors
+        # whose relaton-* gem eagerly parses the docidentifier in
+        # content= (issue #558).
+        def asciidoc_dummy_header(docidentifier: nil)
+          attrs = docidentifier ? ":docidentifier: #{docidentifier}\n" : ""
+          "= X\nA\n#{attrs}\n"
         end
 
         def nokogiri_to_temp(xml, filename, suffix)

data/lib/metanorma/compile/render.rb

@@ -1,5 +1,7 @@
 module Metanorma
   class Compile
+    NO_FONTIST_FORMATS = %i[xml presentation rxl].freeze
+
     # Generate presentation XML from semantic XML
     def generate_presentation_xml(source_file, xml, bibdata, output_paths, opt)
       process_ext(:presentation, source_file, xml, bibdata, output_paths, opt)
@@ -56,7 +58,8 @@ module Metanorma
 
     # isodoc is Raw Metanorma XML
     def gather_and_install_fonts(source_file, options, extensions)
-      Util.sort_extensions_execution(extensions).each do |ext|
+      font_exts = extensions - NO_FONTIST_FORMATS
+      Util.sort_extensions_execution(font_exts).each do |ext|
         isodoc_options = get_isodoc_options(source_file, options, ext)
         font_install(isodoc_options.merge(options))
       end

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "2.3.8".freeze
+  VERSION = "2.4.0".freeze
 end

data/metanorma.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "metanorma-standoc"
   spec.add_runtime_dependency "mn2pdf", "~> 2"
   spec.add_runtime_dependency "nokogiri"
-  spec.add_development_dependency "canon"
+  spec.add_development_dependency "canon" #, "= 0.2.3"
   spec.add_development_dependency "metanorma-iho"
   spec.add_development_dependency "metanorma-iso"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 2.3.8
+  version: 2.4.0
 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: asciidoctor
@@ -234,7 +234,9 @@ files:
 - lib/metanorma/collection/config/config.rb
 - lib/metanorma/collection/config/converters.rb
 - lib/metanorma/collection/config/directive.rb
+- lib/metanorma/collection/config/doc_container.rb
 - lib/metanorma/collection/config/manifest.rb
+- lib/metanorma/collection/config/namespaces.rb
 - lib/metanorma/collection/document/document.rb
 - lib/metanorma/collection/filelookup/base.rb
 - lib/metanorma/collection/filelookup/filelookup.rb