metanorma 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af06733dd8691111633e6309c85ebfa069baa2edf16cbd7e8458a17ad34d4b2a
-  data.tar.gz: e924bb9b298cc37c2cebef6f8d9251ae3979e9cd9b537539057a5ade07e11c88
+  metadata.gz: 5d66c44fc8123332b449ee23540a8e0d009aa19b5a34f408bca97375f85223b0
+  data.tar.gz: 0227a49a94646c2bd0197fb5d49eabc237a6eb51350809a3f8436c601f41d41c
 SHA512:
-  metadata.gz: 29499feb91dd56f4fe6f281f885263c897fb555a9905ce3a32b56d175199b520e9066041ff96489d5221302c259a08bf0d3c07bde19a232b3893d79a0bde747b
-  data.tar.gz: 717f1409b88dfc565393c71cddb0fda604e062d38e80b45c470dc06957ac5e7cf2f5adfd7ef7083666aeb4f7f7b6356fcbc95014bb2e9091c9c927232d7c225f
+  metadata.gz: 503d2edd8d015e341949ab4de920abb7668bc1b13fb7d97697026fddad1ab11d9f94138257cffdd3b57ac32873d606cbe05689bcf8b9e8f7fb3baa19289a7d76
+  data.tar.gz: 41ba35a1a2ad8d740c9b7e3409f0297665c1746e3e461d2b26e2b203d66b09e26fc6bc9f1afebbe26134806a699ac8aa36350d28548629a08a2ae036aa3aa0e3

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

@@ -6,16 +6,37 @@ module Metanorma
       module Converters
         def bibdata_from_yaml(model, value)
           value and !value.empty? or return
+          force_primary_docidentifier_yaml(value)
           model.bibdata = Relaton::Cli::YAMLConvertor.convert_single_file(value)
         end
 
+        def force_primary_docidentifier_yaml(value)
+          case value["docid"]
+          when Array
+            value["docid"].empty? ||
+              value["docid"].none? do |x|
+                x["primary"] == "true"
+              end or
+              value["docid"].first["primary"] = "true"
+          when Hash
+            value["docid"]["primary"] ||= "true"
+          end
+        end
+
         def bibdata_to_yaml(model, doc)
           doc["bibdata"] = model.bibdata&.to_hash
         end
 
         def bibdata_from_xml(model, node)
-          node and
-            model.bibdata = Relaton::Cli.parse_xml(node.adapter_node)
+          node or return
+          force_primary_docidentifier_xml(node.adapter_node)
+          model.bibdata = Relaton::Cli.parse_xml(node.adapter_node)
+        end
+
+        def force_primary_docidentifier_xml(node)
+          node.at("//docidentifier[@primary = 'true']") and return node
+          d = node.at("//docidentifier") or return node
+          d["primary"] = "true"
         end
 
         def bibdata_to_xml(model, parent, doc)

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

@@ -11,14 +11,12 @@ module Metanorma
       end
 
       def svgmap_resolve(docxml, docid, presxml)
-        #require "debug"; binding.b
         ids = @files.get(docid, :ids)
         docxml = svg_unnest(svg_datauri(docxml, docid))
         isodoc = IsoDoc::PresentationXMLConvert.new({})
         isodoc.bibitem_lookup(docxml)
         tag = presxml ? "fmt-eref" : "eref"
         docxml.xpath(ns("//svgmap//#{tag}")).each do |e|
-        #require "debug"; binding.b
           svgmap_resolve_eref(e, isodoc, docxml, ids, presxml)
         end
         docxml.xpath(ns("//svgmap/target")).each do |t| # undo Presentation XML: Vectory takes eref not fmt-eref

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

@@ -39,8 +39,6 @@ module Metanorma
         def add_suffix_to_attrs(doc, suffix, tag_name, attr_name, isodoc)
           (suffix.nil? || suffix.empty?) and return
           doc.xpath(isodoc.ns("//#{tag_name}[@#{attr_name}]")).each do |elem|
-            #warn "#{tag_name} : #{elem.name}" if attr_name == "bibitemid"
-            #require 'debug'; binding.b if attr_name == "bibitemid" && #!%w(eref fmt-eref link fmt-link).include?(elem.name)
             a = elem.attributes[attr_name].value
             /_#{suffix}$/.match?(a) or
               elem.attributes[attr_name].value = "#{a}_#{suffix}"
@@ -91,6 +89,8 @@ module Metanorma
           isodoc.i18n_init(lang, script, nil) # read in internationalisation
           # TODO locale?
           isodoc.metadata_init(lang, script, nil, isodoc.i18n)
+          isodoc.xref_init(lang, script, nil, isodoc.i18n, {})
+          isodoc.xrefs.klass.meta = isodoc.meta
           isodoc.info(xml, nil)
           isodoc
         end

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "2.2.0".freeze
+  VERSION = "2.2.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-09 00:00:00.000000000 Z
+date: 2025-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor