metanorma 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c21a32c429827b3a3f308801ec2e8617f2e30f2baf8c8e5e6c80f2c105b0ce2
-  data.tar.gz: b59f55514b1413623471c7c408a7688a87513f03aca899afeb433372577f37e1
+  metadata.gz: ab41d7fdd92143add890202f0e64c0c88216c7936e603a0efd7a41df02b833c3
+  data.tar.gz: '09fc660fdf0eddeb88ee0094560113a2d05504767c0b6c220a63be6be7e80eea'
 SHA512:
-  metadata.gz: 06e63a51abf0ff822b2f6bed6cf51a1c0a55f08375aff1aec64d41016fd5c3f4d61ed21661911dee7bb9c4477a406b1a5bd125f95c2d00a9096415249cba24c5
-  data.tar.gz: 78352215966b37d04fbb5cb0203bd65d725b63eade9652ecf2142ef4d9b594fe69229232de6e5796c44c782cef3763af4e5d31c2eee2a0f67e8ab3c66bc470da
+  metadata.gz: 82c0f8b50777b5cf34262690a6e860d189c5eecf4b5365375ef24872e847d8c04d4624731155407d89b86d3d6839ce0295b3c3c44d76a350139555ff3c8d47fa
+  data.tar.gz: a7f8736e34eb0bc5ab76092ab9eeaae682f1058d52f634bc8d06f45cfa26982ef97813584430af5eb262317b6fdde7baf065c2c077645727f4a32dd569974479

data/README.adoc

@@ -2,7 +2,7 @@
 
 image:https://img.shields.io/gem/v/metanorma.svg["Gem Version", link="https://rubygems.org/gems/metanorma"]
 image:https://github.com/metanorma/metanorma/workflows/rake/badge.svg["Build Status", link="https://github.com/metanorma/metanorma/actions?workflow=rake"]
-image:https://codeclimate.com/github/metanorma/metanorma/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma"]
+// image:https://codeclimate.com/github/metanorma/metanorma/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma"]
 image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma.svg["Pull Requests", link="https://github.com/metanorma/metanorma/pulls"]
 image:https://img.shields.io/github/commits-since/metanorma/metanorma/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma/releases"]
 

data/lib/metanorma/collection/filelookup/filelookup.rb

@@ -26,7 +26,6 @@ module Metanorma
         @disambig = Util::DisambigFiles.new
         @manifest = parent.manifest
         read_files(@manifest.entry, parent.manifest)
-        #warn pp @files
       end
 
       def read_files(entries, parent)

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

@@ -11,7 +11,6 @@ module Metanorma
       # warn "metanorma compile -x html #{f.path}"
       def file_compile(file, filename, identifier)
         @files.get(identifier, :sectionsplit) and return
-        #require "debug"; binding.b
         opts = {
           format: :asciidoc,
           extension_keys: @files.get(identifier, :format),

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

@@ -181,9 +181,12 @@ module Metanorma
       # collection manifest
       def coverpage
         @coverpage or return
+
+        @coverpage_path = Util::rel_path_resolve(@dirname, @coverpage)
         warn "\n\n\n\n\nCoverpage: #{DateTime.now.strftime('%H:%M:%S')}"
+
         File.open(File.join(@outdir, "index.html"), "w:UTF-8") do |f|
-          f.write @isodoc.populate_template(File.read(@coverpage))
+          f.write @isodoc.populate_template(File.read(@coverpage_path))
         end
       end
     end

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

@@ -11,21 +11,31 @@ module Metanorma
       end
 
       def svgmap_resolve(docxml, docid, presxml)
+        ids, docxml, isodoc, tag = svgmap_resolve_prep(docxml, docid, presxml)
+        docxml.xpath(ns("//svgmap//#{tag}")).each do |e|
+          svgmap_resolve_eref(e, isodoc, docxml, ids, presxml)
+        end
+        svgmap_fmt_prefix_remove(docxml)
+        Vectory::SvgMapping.new(docxml, "").call
+        docxml.xpath(ns("//svgmap")).each { |s| isodoc.svgmap_extract(s) }
+      end
+
+      def svgmap_resolve_prep(docxml, docid, presxml)
         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|
-          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
+        [ids, docxml, isodoc, tag]
+      end
+
+      # undo Presentation XML update: Vectory takes eref not fmt-eref
+      def svgmap_fmt_prefix_remove(docxml)
+        docxml.xpath(ns("//svgmap/target")).each do |t|
           n = t.at(ns(".//fmt-link | .//fmt-xref | .//fmt-eref")) or next
           n.name = n.name.sub(/^fmt-/, "")
           t.children = n
         end
-        Vectory::SvgMapping.new(docxml, "").call
-        docxml.xpath(ns("//svgmap")).each { |s| isodoc.svgmap_extract(s) }
       end
 
       def svg_unnest(docxml)

data/lib/metanorma/collection/sectionsplit/sectionsplit.rb

@@ -72,7 +72,7 @@ module Metanorma
       def block?(node)
         %w(p table formula admonition ol ul dl figure quote sourcecode example
            pre note pagebreak hr bookmark requirement recommendation permission
-           svgmap inputform toc passthrough review imagemap).include?(node.name)
+           svgmap inputform toc passthrough annotation imagemap).include?(node.name)
       end
 
       def conflate_floatingtitles(nodes)
@@ -151,7 +151,7 @@ module Metanorma
       def create_sectionfile(xml, out, file, chunks, parentnode)
         ins = out.at(ns("//metanorma-extension")) || out.at(ns("//bibdata"))
         sectionfile_insert(ins, chunks, parentnode)
-        sectionfile_fn_filter(sectionfile_review_filter(out))
+        sectionfile_fn_filter(sectionfile_annotation_filter(out))
         Metanorma::Collection::XrefProcess::xref_process(out, xml, @key,
                                                          @ident, @isodoc, true)
         outname = "#{file}.xml"
@@ -211,34 +211,35 @@ module Metanorma
         fnlabel.children = @isodoc_presxml.fn_body_label(fnbody)
       end
 
-      # map fmt-review-body/@id = fmt-review-{start/end}/@target
-      # to fmt-review-{stary/end}
-      def sectionfile_review_filter_prep(xml)
-        xml.xpath(ns("//fmt-review-start | //fmt-review-end"))
+      # map fmt-annotation-body/@id = fmt-annotation-{start/end}/@target
+      # to fmt-annotation-{start/end}
+      def sectionfile_annotation_filter_prep(xml)
+        xml.xpath(ns("//fmt-annotation-start | //fmt-annotation-end"))
           .each_with_object({}) do |f, m|
             m[f["target"]] ||= []
             m[f["target"]] << f
           end
       end
 
-      def sectionfile_review_filter(xml)
-        ids = sectionfile_review_filter_prep(xml)
-        xml.root.xpath(ns("./review-container/fmt-review-body")).each do |f|
+      def sectionfile_annotation_filter(xml)
+        ids = sectionfile_annotation_filter_prep(xml)
+        xml.root.xpath(ns("./annotation-container/fmt-annotation-body"))
+          .each do |f|
           ids.has_key?(f["id"]) or f.remove
         end
-        xml.root.xpath(ns("./review-container/fmt-review-body"))
+        xml.root.xpath(ns("./annotation-container/fmt-annotation-body"))
           .each_with_index do |fnbody, i|
-            sectionfile_review_filter_renumber(fnbody, i, ids)
+            sectionfile_annotation_filter_renumber(fnbody, i, ids)
           end
         xml
       end
 
-      def sectionfile_review_filter_renumber(fnbody, _idx, ids)
+      def sectionfile_annotation_filter_renumber(fnbody, _idx, ids)
         ids[fnbody["id"]].each do |f|
           case f.name
-          when "fmt-review-start"
+          when "fmt-annotation-start"
             f.children = @isodoc_presxml.comment_bookmark_start_label(f)
-          when "fmt-review-end"
+          when "fmt-annotation-end"
             f.children = @isodoc_presxml.comment_bookmark_end_label(f)
           end
         end

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "2.2.2".freeze
+  VERSION = "2.2.3".freeze
 end

data/metanorma.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   # spec.add_dependency "metanorma-standoc"
 
   spec.add_development_dependency "debug"
-  spec.add_development_dependency "equivalent-xml", "~> 0.6"
+  spec.add_development_dependency "equivalent-xml"
   spec.add_development_dependency "metanorma-iso"
   spec.add_development_dependency "mnconvert"
   spec.add_development_dependency "pry"
@@ -49,5 +49,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop-performance"
   spec.add_development_dependency "sassc-embedded", "~> 1"
   spec.add_development_dependency "simplecov", "~> 0.15"
-  spec.add_development_dependency "xml-c14n"
+  spec.add_development_dependency "canon"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-05 00:00:00.000000000 Z
+date: 2025-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -140,16 +140,16 @@ dependencies:
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
   requirement: !ruby/object:Gem::Requirement
@@ -291,7 +291,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.15'
 - !ruby/object:Gem::Dependency
-  name: xml-c14n
+  name: canon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="