metanorma 2.2.7 → 2.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b9a1d97703df1ebbf3b6f803afdb93550cd9bb9bda68978a29119d2fa734687
-  data.tar.gz: 1eb0d1a3effe2cc9ca6728eaa65b460cff0ddb3ceb2f43b7610eb249bee3f66a
+  metadata.gz: f949939db63522ce80839447f7a4a2c860f2b6c1a8a8bef299bb12e5a375f23c
+  data.tar.gz: cd92ed471004f16de40d4c0e02bc457a7a2492a4b0a92729a1b36d312eef2672
 SHA512:
-  metadata.gz: 5d61028ef6bbcab315a1616e47ecea392f4537f34e7a439d21e95e3e252f36f28d30c6b244979a0b8374dc48c3e2d053289b8afdb4a57dbb5c88703355169509
-  data.tar.gz: e9f9044bfffc22eff4c26a01798252a2fabe49971f227da736bbc9dd561eb273bce8d2f737b6b189f19e35f0cda98894c968cadd6ad534571a937520b5e9cf92
+  metadata.gz: f85234d7dea81dda16e4c66d1f883666bd1f9b7382ab6bd20770e75f3dc04ad940d78a54a49c2df7dfc25859f1434f5559233ce8c2eb585761397b7fcb0d22af
+  data.tar.gz: 4bddae518329cebca7cf762666c0d769243524a40c595f3ea7e94db33fad26fc3daaf26598c73a85b3ab12d13cd974a5a89ce7a1548ef679bec00156de8e6608

data/lib/metanorma/collection/collection.rb

@@ -44,6 +44,8 @@ module Metanorma
     def initialize_vars
       @compile = Metanorma::Compile.new # feeds @manifest
       @log = Metanorma::Utils::Log.new
+      @log.suppress_log = { severity: 4, category: [], error_ids: [],
+                            locations: [] }
       @disambig = Util::DisambigFiles.new
     end
 

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

@@ -63,8 +63,9 @@ module Metanorma
         doclist
       end
 
-      BIBITEM_NOT_REPO_XPATH = "//bibitem[not(ancestor::bibitem)]" \
-        "[not(./docidentifier[@type = 'repository'])]".freeze
+      BIBITEM_NOT_REPO_XPATH = <<~XPATH.strip
+        //bibitem[not(ancestor::bibitem)][not(ancestor::bibdata)][not(./docidentifier[@type = 'repository'])]
+        XPATH
 
       def supply_repo_ids(doc)
         doc.xpath(ns(BIBITEM_NOT_REPO_XPATH)).each do |b|
@@ -82,10 +83,11 @@ module Metanorma
       # Any erefs to that bibitem id are replaced with relative URL
       # Preferably with anchor, and is a job to realise dynamic lookup
       # of localities.
-      def update_direct_refs_to_docs(docxml, identifier, presxml)
+      def update_direct_refs_to_docs(xml, identifier, presxml)
         erefs, erefs_no_anchor, anchors, erefs1 =
-          update_direct_refs_to_docs_prep(docxml, presxml)
-        docxml.xpath(ns("//bibitem")).each do |b|
+          update_direct_refs_to_docs_prep(xml, presxml)
+        x = xml.xpath(ns("//bibitem")) - xml.xpath(ns("//bibdata//bibitem"))
+        x.each do |b|
           docid = b.at(ns("./docidentifier[@type = 'repository']")) or next
           strip_unresolved_repo_erefs(identifier, docid, erefs1, b) or next
           update_bibitem(b, identifier)

data/lib/metanorma/compile/compile.rb

@@ -5,7 +5,7 @@ require "nokogiri"
 require "htmlentities"
 require "yaml"
 require "fontist"
-require "fontist/manifest/install"
+require "fontist/manifest"
 require "metanorma-taste"
 require_relative "writeable"
 require_relative "validator"
@@ -248,7 +248,7 @@ module Metanorma
 
       OUTPUT
       file.close
-      compile(file.path, {})
+      compile(file.path, agree_to_terms: true)
     end
 
     def extract_log_messages(flavor)

data/lib/metanorma/util/fontist_helper.rb

@@ -47,11 +47,11 @@ module Metanorma
             Fontist.log_level = :info
           end
 
-          Fontist::Manifest::Install.from_hash(
-            manifest,
+          instance = Fontist::Manifest.from_hash(manifest)
+          instance.install(
             confirmation: agree ? "yes" : "no",
             no_progress: no_progress,
-          )
+          ).to_hash
         end
 
         def license_error_log(continue)
@@ -112,9 +112,12 @@ module Metanorma
       end
 
       def self.location_manifest(processor, source_attributes)
-        Fontist::Manifest::Locations.from_hash(
+        instance = Fontist::Manifest.from_hash(
           append_source_fonts(processor.fonts_manifest.dup, source_attributes),
+          locations: true
         )
+
+        instance.to_hash unless instance.nil?
       end
 
       def self.append_source_fonts(manifest, source_attributes)

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "2.2.7".freeze
+  VERSION = "2.2.9".freeze
 end

data/metanorma.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "asciidoctor"
   spec.add_runtime_dependency "concurrent-ruby"
-  spec.add_runtime_dependency "fontist", "~> 1.14"
+  spec.add_runtime_dependency "fontist", ">= 2.0.0"
   spec.add_runtime_dependency "htmlentities"
   spec.add_runtime_dependency "isodoc", ">= 3.0.0"
   spec.add_runtime_dependency "metanorma-taste", "~> 0.1.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 2.2.7
+  version: 2.2.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-03 00:00:00.000000000 Z
+date: 2025-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -42,16 +42,16 @@ dependencies:
   name: fontist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement