metanorma 2.5.4 → 2.5.6.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f36a841296240362316b293a3353c54b85b83485b81d21e762d639fe26ce100
-  data.tar.gz: 7302ecaa3bbf5893fa6a0c52199ce7080475efb00a9973fe8e21ace651a996b8
+  metadata.gz: f225922f924a7498faff8af31ef32af2b2bdb7718ddbdd4d71e8111b1e1c2024
+  data.tar.gz: 25d6d62381fe280580b9914e2e08208b117e69a50f916670174f8cef483de801
 SHA512:
-  metadata.gz: b9d143219d4f9a9130321c675e3b1bc8f5966dcb09961f13527381d493e7d6a6e7efffce28bd807bf5a07b2ae040048a321f498a8d15ecab002a756d8c493f8a
-  data.tar.gz: fd1c20bd7b7d1062130781c1276b95b921a9408d4da2a17d622f5b21053b8a20ab168daa710bfbdefbc652901bea7d5e7c75e891e7a1fb91d2dd74075edbe39b
+  metadata.gz: 705eb23883f6b8c1e30137ebd300e34ab9248c62858e0a49afd0d3a7b08b08d61b0b26ee1d89599af4049bc31862f00b1fba922b6e31a7c5331c73c7c2700069
+  data.tar.gz: 6373b0edc74e3a9fa86faffd9e4c85c08b3ff1e57327e1f54fbea6de2da12825cc995910473b4f44e4b09a33490724130dbd669c4b2437a5729284cedcf3af13

data/Gemfile

@@ -6,6 +6,9 @@ git_source(:github) { |repo| "https://github.com/#{repo}" }
 
 gemspec
 
+# TEMPORARY cross-PR pin (metanorma-core#18): Compile resolves via Core::Flavors
+gem "metanorma-core", github: "metanorma/metanorma-core", branch: "feat/flavor-table"
+
 begin
   eval_gemfile("Gemfile.devel")
 rescue StandardError

data/Gemfile.devel

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

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

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

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

@@ -145,6 +145,12 @@ module Metanorma
       end
 
       def update_filepaths(entry, prefix)
+        # `manifest_expand_yaml_entry` hands us the loaded sub-manifest's
+        # `entry` collection directly, which is an Array of entries.
+        if entry.is_a?(Array)
+          entry.each { |e| update_filepaths(e, prefix) }
+          return
+        end
         entry.file && !(Pathname.new entry.file).absolute? and
           entry.file = File.join(prefix, entry.file)
         entry&.entry&.each do |f|

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

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

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

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

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

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

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

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

data/lib/metanorma/compile/compile_options.rb

@@ -39,7 +39,13 @@ module Metanorma
       end
 
       def options_in_file(filename)
+        # the adoc preprocessing path re-extracts options from a Tempfile
+        filename = filename.path if filename.is_a?(Tempfile)
         content = read_file(filename)
+        # XML inputs carry no AsciiDoc header options; booting the adoc
+        # pipeline for them only drags every plugin into the compile.
+        return extract_xml_options(content) if filename.end_with?(".xml")
+
         Metanorma::Input::Asciidoc.new.extract_metanorma_options(content)
           .merge(extract_xml_options(content))
       end
@@ -74,20 +80,34 @@ module Metanorma
         Metanorma::TasteRegister.document_transformers_for(taste) || {}
       end
 
-      # The processor's output formats merged with the suffixes of any
-      # taste-contributed document-model formats, so those formats pass
-      # extension validation and get an output suffix.
+      # Harness formats available to every flavor, regardless of the
+      # processor's own list. MKO (metanorma-document) is resolved via
+      # Core::Flavors, so it needs nothing from the flavor gems.
+      HARNESS_OUTPUT_FORMATS = { mko: "mko" }.freeze
+
+      # Formats a flavor offers by default: its own list plus
+      # taste-contributed document-model formats. The harness formats
+      # (mko) are deliberately absent — they are opt-in via
+      # --extensions, never a surprise default output.
+      def default_output_formats(options)
+        @processor.output_formats
+                  .merge(
+                    taste_transformers(options)
+                      .transform_values { |spec| spec[:suffix] }.compact,
+                  )
+      end
+
+      # The default formats merged with the harness formats, so those
+      # pass extension validation and get an output suffix.
       def effective_output_formats(options)
-        @processor.output_formats.merge(
-          taste_transformers(options)
-            .transform_values { |spec| spec[:suffix] }.compact,
-        )
+        default_output_formats(options).merge(HARNESS_OUTPUT_FORMATS)
       end
 
       # Whether +ext+ is generated from presentation XML, honouring both the
       # processor's own answer and a taste transformer's +:presentation+ flag.
       def uses_presentation_xml?(ext, options)
-        @processor.use_presentation_xml(ext) ||
+        ext == :mko || # unit numbering comes from the presentation model
+          @processor.use_presentation_xml(ext) ||
           (taste_transformers(options)[ext] || {})[:presentation] == true
       end
 
@@ -98,13 +118,19 @@ module Metanorma
         end and ext << :presentation
         !ext.include?(:rxl) && options[:site_generate] and
           ext << :rxl
+        # Keep options[:extension_keys] in sync: get_isodoc_options filters
+        # output_formats by extension_keys, and presentation is an implicit
+        # dependency of html/doc/pdf — if it is only on the local +ext+ array,
+        # the filter strips it from the formats table (and, when the processor
+        # hands out a live hash, permanently from the flavor config).
+        options[:extension_keys] = ext
         ext
       end
 
       def extract_extensions(options)
         formats = effective_output_formats(options)
         options[:extension_keys] ||=
-          formats.reduce([]) { |memo, (k, _)| memo << k }
+          default_output_formats(options).reduce([]) { |memo, (k, _)| memo << k }
         options[:extension_keys].reduce([]) do |memo, e|
           if formats[e] then memo << e
           else
@@ -134,8 +160,14 @@ module Metanorma
         get_isodoc_fileparams(options, ret)
         copy_isodoc_options_attrs(options, ret)
         font_manifest_mn2pdf(options, ret, ext)
-        ret[:output_formats]&.select! do |k, _|
-          options[:extension_keys].include?(k)
+        # Filter a COPY — never select! the processor's live formats table.
+        # Generic (and any flavor that returns configuration.formats directly)
+        # would otherwise permanently lose :presentation after the first
+        # html/doc request that did not list presentation in extension_keys.
+        if ret[:output_formats]
+          keys = options[:extension_keys] || []
+          ret[:output_formats] = ret[:output_formats]
+            .select { |k, _| keys.include?(k) }
         end
         ret[:log] = @log
         ret

data/lib/metanorma/compile/flavor.rb

@@ -2,16 +2,25 @@
 
 module Metanorma
   class Compile
+    # Thin adapter: taste resolution reads the core table; gem loading
+    # stays on FlavorLoader so the existing SystemExit / processor-
+    # registration contract is byte-identical to main.
     module Flavor
       def load_flavor(stdtype)
-        Metanorma::Core::FlavorLoader.load_flavor(stdtype)
+        Metanorma::Core::FlavorLoader.load_flavor(taste2flavor(stdtype))
       end
 
       def taste2flavor(stdtype)
+        entry = Metanorma::Core::Flavors.find(stdtype)
+        return entry.base_flavor if entry&.taste?
+
         Metanorma::Core::FlavorLoader.taste2flavor(stdtype)
       end
 
       def stdtype2flavor_gem(stdtype)
+        entry = Metanorma::Core::Flavors.find(stdtype)
+        return entry.gem if entry && !entry.taste?
+
         Metanorma::Core::FlavorLoader.stdtype2flavor_gem(stdtype)
       end
     end

data/lib/metanorma/compile/render.rb

@@ -1,6 +1,6 @@
 module Metanorma
   class Compile
-    NO_FONTIST_FORMATS = %i[xml presentation rxl].freeze
+    NO_FONTIST_FORMATS = %i[xml presentation rxl mko].freeze
 
     # Generate presentation XML from semantic XML
     def generate_presentation_xml(source_file, xml, bibdata, output_paths, opt)
@@ -109,6 +109,10 @@ module Metanorma
             end
         FileUtils.cp f, output_paths[:presentationxml]
         true
+      elsif ext == :mko
+        # Harness format: export the MKO bundle from the typed model
+        export_mko_bundle(output_paths)
+        true
       elsif ext == :html && options[:sectionsplit]
         # Special case: Split HTML into sections
         sectionsplit_convert(
@@ -120,6 +124,32 @@ module Metanorma
       end
     end
 
+    # Export the MKO machine serialization (metanorma-document). The
+    # semantic and presentation XML are already on disk by the time this
+    # runs; Mko resolves the flavor model via the Core::Flavors registry.
+    def export_mko_bundle(output_paths)
+      require "metanorma/document"
+      require "metanorma/mko"
+      # :xml is the freshly written semantic XML; orig_filename is the
+      # adoc SOURCE and is only right when an output_dir kept the
+      # semantic XML at the input location.
+      semantic_path = [output_paths[:xml], output_paths[:orig_filename]]
+                       .find { |p1| p1 && File.exist?(p1) && File.extname(p1) != ".adoc" }
+      presentation = if File.exist?(output_paths[:presentationxml])
+                       File.read(output_paths[:presentationxml])
+                     end
+      Metanorma::Mko.export(File.read(semantic_path),
+                            to: File.dirname(output_paths[:out]),
+                            presentation_xml: presentation)
+    rescue LoadError => e
+      @log.add_msg("MKO_OUTPUT" => { category: "MKO Output",
+                                     error: "the mko output format requires " \
+                                            "the metanorma-document gem: %s",
+                                     severity: 0 })
+      @log.add("MKO_OUTPUT", nil, params: [e.message])
+      nil
+    end
+
     # Process format that requires presentation XML
     def process_via_presentation_xml(ext, output_paths, options, isodoc_options)
       @queue.schedule(ext, output_paths.dup, options.dup,

data/lib/metanorma/version.rb

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

data/metanorma.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 2.5.4
+  version: 2.5.6.pre.alpha.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-30 00:00:00.000000000 Z
+date: 2026-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: mn2pdf
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0.pre.alpha
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0.pre.alpha
 description: Library to process any Metanorma standard.
 email:
 - open.source@ribose.com
@@ -223,6 +223,7 @@ files:
 - CHANGELOG.adoc
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.devel
 - LICENSE.txt
 - README.adoc
 - lib/metanorma.rb