metanorma 2.3.4 → 2.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f915998387c2b307208f4022e9e8e5187eaec5402bc207be589e87a2db75810
-  data.tar.gz: 7791d0a533ed5825bbdd97786d5e1fcc2bfe05c9c3440ca5cd842aa3141d3a77
+  metadata.gz: 36c2caa601ab189f0039f3965330a54ba8d399a906bedc8575fca354d2bce1cd
+  data.tar.gz: 49ff8a09d81edd8bd8f27b7db85a5a4dbb8a76ba7596d2cf7bf8b6a73aff0f67
 SHA512:
-  metadata.gz: 1f2bcb45e92a68d8963adbf142dabe682967dec2bc4220b99a022a5e7657571b26817bc206b8e7c26dc171ceaac7e677ca7283eebc82db18f90ad7adfd26707d
-  data.tar.gz: 149e62e37840dd568eb11b84770bea7c3e7ad389d52587084db70d035ac2e48f1fae1289cb62e01805644b62710db0d0ffa02729935f237de488c68267864655
+  metadata.gz: e6575113b013098bfd0e364054b455ac6e5fdb958c05a03edf0519862d62670625fadd03d02f7ad93882e4cd09894ca76859c1cef9498fd8e419beaa7566fdba
+  data.tar.gz: 2e48a397971851fd8e53cf97fe6c4590a7a8ef141cad4d7c28e365745649f30b098f19ba7519764f290ebe91ba172f38bc306047b3ff652a0a0b612c183c6627

data/lib/metanorma/collection/collection.rb

@@ -191,12 +191,13 @@ module Metanorma
     # TODO: retrieve flavor based on @bibdata publisher when lookup implemented
     # Will still infer based on docid, but will validate it before proceeding
     def fetch_flavor
-      docid = @bibdata.docidentifier.first or return
-      f = docid.type.downcase || docid.id.sub(/\s.*$/, "").downcase or return
+      docid = @bibdata&.docidentifier&.first or return
+      f = docid.type&.downcase || docid.content&.sub(/\s.*$/,
+                                                     "")&.downcase or return
       f = Util::taste2flavor(f)
       require ::Metanorma::Compile.new.stdtype2flavor_gem(f)
       f
-    rescue LoadError
+    rescue LoadError, NameError
       nil
     end
   end

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

@@ -5,7 +5,7 @@ module Metanorma
   class Collection
     module Config
       class Bibdata < ::Lutaml::Model::Serializable
-        model ::RelatonBib::BibliographicItem
+        model ::Relaton::Bib::ItemData
       end
     end
   end

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

@@ -1,13 +1,47 @@
-require "relaton-cli"
+require "relaton/bib"
+require "relaton/bib/hash_parser_v1"
 
 module Metanorma
   class Collection
     module Config
       module Converters
+        # Keys present only in 1.x YAML format — unambiguously absent in 2.x
+        V1_BIBDATA_KEYS = %w[docid link biblionote].freeze
+
         def bibdata_from_yaml(model, value)
-          value and !value.empty? or return
+          (value and !value.empty?) or return
+          if value.is_a?(String)
+            value = YAML.safe_load_file(value,
+                                        permitted_classes: [Date,
+                                                            Symbol])
+          end
           force_primary_docidentifier_yaml(value)
-          model.bibdata = Relaton::Cli::YAMLConvertor.convert_single_file(value)
+          model.bibdata = if bibdata_yaml_v1_format?(value)
+                            # 1.x YAML format (docid:/link:/biblionote: present) —
+                            # bridge via HashParserV1 for backward compatibility
+                            h = Relaton::Bib::HashParserV1.hash_to_bib(value)
+                            Relaton::Bib::ItemData.new(**h)
+                          else
+                            # 2.x YAML format (docidentifier:/uri:/note: keys) —
+                            # parse directly with lutaml-model
+                            Relaton::Bib::Item.from_yaml(value.to_yaml)
+                          end
+        end
+
+        # Recursively detect 1.x-format YAML by presence of renamed keys.
+        # Checks the entire nested structure so relation:/contributor: entries
+        # are also detected.
+        def bibdata_yaml_v1_format?(obj)
+          case obj
+          when Hash
+            return true if (obj.keys.map(&:to_s) & V1_BIBDATA_KEYS).any?
+
+            obj.values.any? { |v| bibdata_yaml_v1_format?(v) }
+          when Array
+            obj.any? { |v| bibdata_yaml_v1_format?(v) }
+          else
+            false
+          end
         end
 
         def force_primary_docidentifier_yaml(value)
@@ -24,7 +58,10 @@ module Metanorma
         end
 
         def bibdata_to_yaml(model, doc)
-          doc["bibdata"] = model.bibdata&.to_hash
+          return unless model.bibdata
+
+          doc["bibdata"] = YAML.safe_load(model.bibdata.to_yaml,
+                                          permitted_classes: [Date, Symbol])
         end
 
         def bibdata_from_xml(model, node)

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

@@ -48,48 +48,61 @@ module Metanorma
 
         private
 
-        def mn2relaton_parser(tag)
+        # Select the appropriate Relaton parser class for the given flavor tag.
+        # @param tag [String, nil] flavor tag (e.g. "iso", "ietf")
+        # @param bibdata [Boolean] true when parsing a <bibdata> element (has <ext>);
+        #   false when parsing a <bibitem> element (no <ext>)
+        # @return [Class] Relaton parser class (Bibdata or Bibitem subclass)
+        def mn2relaton_parser(tag, bibdata: false)
           case tag
           when "bipm"
-            require "relaton_bipm" unless defined?(::RelatonBipm::XMLParser)
-            ::RelatonBipm::XMLParser
+            require "relaton/bipm" unless defined?(::Relaton::Bipm::Bibdata)
+            bibdata ? ::Relaton::Bipm::Bibdata : ::Relaton::Bipm::Bibitem
           when "bsi"
-            require "relaton_bsi" unless defined?(::RelatonBsi::XMLParser)
-            ::RelatonBsi::XMLParser
+            require "relaton/bsi" unless defined?(::Relaton::Bsi::Bibdata)
+            bibdata ? ::Relaton::Bsi::Bibdata : ::Relaton::Bsi::Bibitem
           when "ietf"
-            require "relaton_ietf" unless defined?(::RelatonIetf::XMLParser)
-            ::RelatonIetf::XMLParser
+            require "relaton/ietf" unless defined?(::Relaton::Ietf::Bibdata)
+            bibdata ? ::Relaton::Ietf::Bibdata : ::Relaton::Ietf::Bibitem
           when "iho"
-            require "relaton_iho" unless defined?(::RelatonIho::XMLParser)
-            ::RelatonIho::XMLParser
+            require "relaton/iho" unless defined?(::Relaton::Iho::Bibdata)
+            bibdata ? ::Relaton::Iho::Bibdata : ::Relaton::Iho::Bibitem
           when "itu"
-            require "relaton_itu" unless defined?(::RelatonItu::XMLParser)
-            ::RelatonItu::XMLParser
+            require "relaton/itu" unless defined?(::Relaton::Itu::Bibdata)
+            bibdata ? ::Relaton::Itu::Bibdata : ::Relaton::Itu::Bibitem
           when "iec"
-            require "relaton_iec" unless defined?(::RelatonIec::XMLParser)
-            ::RelatonIec::XMLParser
+            require "relaton/iec" unless defined?(::Relaton::Iec::Bibdata)
+            bibdata ? ::Relaton::Iec::Bibdata : ::Relaton::Iec::Bibitem
           when "iso"
-            require "relaton_iso" unless defined?(::RelatonIsoBib::XMLParser)
-            ::RelatonIsoBib::XMLParser
+            require "relaton/iso" unless defined?(::Relaton::Iso::Bibdata)
+            bibdata ? ::Relaton::Iso::Bibdata : ::Relaton::Iso::Bibitem
           when "nist"
-            require "relaton_nist" unless defined?(::RelatonNist::XMLParser)
-            ::RelatonNist::XMLParser
+            require "relaton/nist" unless defined?(::Relaton::Nist::Bibdata)
+            bibdata ? ::Relaton::Nist::Bibdata : ::Relaton::Nist::Bibitem
           when "ogc"
-            require "relaton_ogc" unless defined?(::RelatonOgc::XMLParser)
-            ::RelatonOgc::XMLParser
+            require "relaton/ogc" unless defined?(::Relaton::Ogc::Bibdata)
+            bibdata ? ::Relaton::Ogc::Bibdata : ::Relaton::Ogc::Bibitem
           else
-            ::RelatonBib::XMLParser
+            bibdata ? ::Relaton::Bib::Bibdata : ::Relaton::Bib::Bibitem
           end
         rescue LoadError => e
-          warn "Warning: Failed to load relaton gem for '#{tag}': #{e.message}. Falling back to RelatonBib::XMLParser"
-          ::RelatonBib::XMLParser
+          warn "Warning: Failed to load relaton gem for '#{tag}': #{e.message}. Falling back to Relaton::Bib::Bibdata/Bibitem"
+          bibdata ? ::Relaton::Bib::Bibdata : ::Relaton::Bib::Bibitem
         end
 
         # #param xml [Nokogiri::XML::Document, Nokogiri::XML::Element]
         # @return [RelatonBib::BibliographicItem,RelatonIso::IsoBibliographicItem]
         def from_xml(xml)
           b = xml.at("//xmlns:bibitem|//xmlns:bibdata")
-          r = mn2relaton_parser(xml.root["flavor"])
+          # <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.
+          r = if b.name == "bibitem"
+                ::Relaton::Bib::Bibitem
+              else
+                mn2relaton_parser(xml.root["flavor"], bibdata: true)
+              end
           # Relaton doesn't understand Pres XML tags
           b.xpath("//xmlns:fmt-identifier").each(&:remove)
           r.from_xml(b.to_xml)
@@ -137,9 +150,9 @@ module Metanorma
 
       # @return [String]
       def type
-        first = @bibitem.docidentifier.first
+        first = @bibitem.docidentifier&.first
         @type ||= (first&.type&.downcase ||
-                   first&.id&.match(/^[^\s]+/)&.to_s)&.downcase ||
+                   first&.content&.match(/^[^\s]+/)&.to_s)&.downcase ||
           "standoc"
       end
 
@@ -149,7 +162,7 @@ module Metanorma
         if @raw
           builder.parent.add_child(@bibitem.root)
         else
-          builder.send("metanorma") do |b|
+          builder.send(:metanorma) do |b|
             b << @bibitem.to_xml(bibdata: true)
           end
         end

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

@@ -4,10 +4,10 @@ module Metanorma
       # @param elm [Nokogiri::XML::Element]
       # @return [String]
       def indexfile_title(entry)
-        if entry.bibdata &&
-            x = entry.bibdata.title.detect { |t| t.type == "main" } ||
-                entry.bibdata.title.first
-          x.title.content
+        titles = entry.bibdata && Array(entry.bibdata.title)
+        if titles && !titles.empty? &&
+            (x = titles.detect { |t| t.type == "main" } || titles.first)
+          x.content
         else
           entry.title
         end

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

@@ -158,7 +158,7 @@ module Metanorma
         options[:site_generate] and options[:format] << :xml
         options[:format].include?(:rxl) or return
         File.open(File.join(@outdir, "collection.rxl"), "w:UTF-8") do |f|
-          f.write(@bibdata.to_xml)
+          f.write(@bibdata.to_xml(bibdata: true))
         end
       end
 
@@ -231,7 +231,7 @@ module Metanorma
         File.exist?(pres) or return
         xml = Nokogiri::XML(File.read(pres, encoding: "UTF-8"), &:huge)
         x = xml.xpath("//*[local-name() = 'presentation-metadata']/" \
-          "*[local-name() = 'fonts']")
+                      "*[local-name() = 'fonts']")
         x.empty? and return
         x.map(&:text).join(";")
       end

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

@@ -61,8 +61,8 @@ module Metanorma
         tag = presxml ? "fmt-eref" : "eref"
         docxml.xpath(ns("//#{tag}"))
           .each_with_object({ citeas: {}, bibitemid: {} }) do |i, m|
-            m[:citeas][i["citeas"]] = true
-            m[:bibitemid][i["bibitemid"]] = true
+          m[:citeas][i["citeas"]] = true
+          m[:bibitemid][i["bibitemid"]] = true
         end
       end
 
@@ -158,7 +158,7 @@ module Metanorma
           read_in_if_svg(i, directory.sub(%r{(?<!=/)$}, "/"))
         end
         docxml.xpath(ns("//image")).each do |i| # rubocop:disable Style/CombinableLoops
-          i["src"] && !i["src"].empty? or next
+          (i["src"] && !i["src"].empty?) or next
           i["src"] = Vectory::Utils::datauri(i["src"], directory)
         end
         docxml
@@ -209,11 +209,13 @@ module Metanorma
       def isodoc_populate
         @isodoc.info(@xml, nil)
         { navigation: indexfile(@manifest), nav_object: index_object(@manifest),
-          bibdata: @bibdata.to_hash, docrefs: liquid_docrefs(@manifest),
+          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")),
-          doctitle: @bibdata.title.first.title.content,
-          docnumber: @bibdata.docidentifier.first.id }.each do |k, v|
+          doctitle: Array(@bibdata.title).first&.content,
+          docnumber: Array(@bibdata.docidentifier).first&.content }.each do |k, v|
           v and @isodoc.meta.set(k, v)
         end
       end
@@ -239,7 +241,7 @@ module Metanorma
       def error_anchor(erefs, docid)
         erefs.each do |e|
           msg = "<strong>** Unresolved reference to document #{docid} " \
-            "from eref</strong>"
+                "from eref</strong>"
           e << msg
           strip_eref(e)
           @log&.add("METANORMA_3", e, params: [docid])

data/lib/metanorma/util/fontist_helper.rb

@@ -15,12 +15,12 @@ module Metanorma
 
         def validate_install_fonts(processor, options)
           unless install_fonts?(options)
-            Util.log("[fontist] Skip font installation because" \
-                     " --no-install-fonts argument passed", :debug)
+            Util.log("[fontist] Skip font installation because " \
+                     "--no-install-fonts argument passed", :debug)
             return false
           end
           unless has_custom_fonts?(processor, options, options)
-            Util.log("[fontist] Skip font installation because "\
+            Util.log("[fontist] Skip font installation because " \
                      "fonts_manifest is missing", :debug)
             return false
           end
@@ -60,8 +60,8 @@ module Metanorma
               :debug,
             )
           else
-            Util.log("[fontist] Aborting without proper fonts installed," \
-                     " make sure that you have set option --agree-to-terms",
+            Util.log("[fontist] Aborting without proper fonts installed, " \
+                     "make sure that you have set option --agree-to-terms",
                      :fatal)
           end
         end
@@ -91,7 +91,12 @@ module Metanorma
         return unless validate_install_fonts(processor, options)
 
         @@updated_formulas_repo = false
-        manifest = processor.fonts_manifest.dup
+        manifest = if processor.respond_to?(:fonts_manifest) &&
+            !processor.fonts_manifest.nil?
+                     processor.fonts_manifest.dup
+                   else
+                     {}
+                   end
         append_source_fonts(manifest, options)
         agree_to_terms, can_without_fonts, no_progress = validate_options(options)
 
@@ -104,16 +109,25 @@ module Metanorma
       end
 
       def self.has_custom_fonts?(processor, options, source_attributes)
-        install_fonts?(options) \
+        (install_fonts?(options) \
           && processor.respond_to?(:fonts_manifest) \
-          && !processor.fonts_manifest.nil? \
+          && !processor.fonts_manifest.nil?) \
           || source_attributes[:fonts]
       end
 
       def self.location_manifest(processor, source_attributes)
+        base = if processor.respond_to?(:fonts_manifest) &&
+            !processor.fonts_manifest.nil?
+                 processor.fonts_manifest.dup
+               else
+                 {}
+               end
+
+        return nil if base.empty? && !source_attributes[:fonts]
+
         instance = Fontist::Manifest.from_hash(
-          append_source_fonts(processor.fonts_manifest.dup, source_attributes),
-          locations: true
+          append_source_fonts(base, source_attributes),
+          locations: true,
         )
 
         instance.to_hash unless instance.nil?

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "2.3.4".freeze
+  VERSION = "2.3.5".freeze
 end

data/metanorma.gemspec

@@ -28,7 +28,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "concurrent-ruby"
   spec.add_runtime_dependency "fontist", ">= 2.1.2"
   spec.add_runtime_dependency "htmlentities"
-  spec.add_runtime_dependency "isodoc", ">= 3.0.0"
+  spec.add_runtime_dependency "isodoc", ">= 3.5.0"
+  #spec.add_runtime_dependency "metanorma-standoc", ">= 3.4.0"
   spec.add_runtime_dependency "marcel"
   spec.add_runtime_dependency "metanorma-taste", "~> 1.0.0"
   spec.add_runtime_dependency "mn2pdf", "~> 2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.3.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-30 00:00:00.000000000 Z
+date: 2026-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: marcel
   requirement: !ruby/object:Gem::Requirement