metanorma-utils 1.10.3 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1529d7af0a046a40b3b079adbc36786882be1abce4b515b2ec644c9ade8fb6eb
-  data.tar.gz: 756653fafb5a833206d2f60e7cbcc64c8c0f7dc2d94149655efbd06395694be7
+  metadata.gz: 3d20b8cee0b06766e6832c5751087c03147e751b034a6b9c4c5f503cc72035f3
+  data.tar.gz: 9fce9d155961bf671181f497f6922e2e04ab2b758fa96f3db496bcbab620eefb
 SHA512:
-  metadata.gz: f62f4879f665181f06d1102785dac3e8481cd4d15c9e982c481af56bd079a4440205a7d18549dd1b53ed0c8bc127119742904b088e145ee4f0710f5745b129da
-  data.tar.gz: 8234bac72f1dd5f432af91442c3802a2c03f3ba7f928ef89c2feba5c5a6838176fd2d271f2beb63a70a0c613b24d94a5b6816e594e40c7851070f1125b336716
+  metadata.gz: 2a383dfa442ef5b6915a226a0865b9ec6f65aaf60a404f8a0e70c7e8d2482f8ea4e08bd4172c628db359711882e9a7f3df0e1ef66b1e99683f326cc300aa294e
+  data.tar.gz: 030a5f340137c076344da6d7172fa1092bb24f2d1c6985fe0683b64ce875c708687107ac3f2e3aa4cbb4876a0c3f34a9ea2874688f92cbcab8d2cf394fb378e7

data/lib/utils/log.rb

@@ -86,7 +86,7 @@ module Metanorma
           while !node.nil? && node["id"].nil? && node.respond_to?(:parent)
             node = node.parent
           end
-          node.respond_to?(:parent) ? "ID #{node['id']}" : ""
+          node.respond_to?(:parent) ? "ID #{node['anchor'] || node['id']}" : ""
         elsif node.is_a? String then node
         elsif node.respond_to?(:lineno) && !node.lineno.nil? &&
             !node.lineno.empty?
@@ -224,7 +224,7 @@ module Metanorma
         /^ID /.match?(loc) or return [loc, nil]
         loc.sub!(/^ID /, "")
         loc = @mapid[loc] while @mapid[loc]
-        url = "#{@htmlfilename}##{loc}"
+        url = "#{@htmlfilename}##{to_ncname loc}"
         [loc, url]
       end
 

data/lib/utils/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Utils
-    VERSION = "1.10.3".freeze
+    VERSION = "1.11.0".freeze
   end
 end

data/lib/utils/xml.rb

@@ -69,7 +69,7 @@ module Metanorma
           cjk2 = /#{CJK}/o.match?(nextfirst)
           text1 = /[^\p{Z}\p{C}]/.match?(last)
           text2 = /[^\p{Z}\p{C}]/.match?(nextfirst)
-          (cjk1 && (cjk2 || !text2)) and next
+          cjk1 && (cjk2 || !text2) and next
           !text1 && cjk2 and next
           ret[i] += " "
         end
@@ -125,10 +125,18 @@ module Metanorma
       end
 
       # all element/attribute pairs that are ID anchors in Metanorma
-      def anchor_attributes
-        [%w[* id], %w[* bibitemid], %w[review from],
-         %w[review to], %w[index to], %w[xref target],
-         %w[callout target], %w[location target]]
+      def anchor_attributes(presxml: false)
+        ret = [%w(review from), %w(review to), %w(callout target), %w(xref to),
+               %w(eref bibitemid), %w(citation bibitemid), %w(xref target),
+               %w(label for), %w(location target), %w(index to),
+               %w(termsource bibitemid), %w(admonition target)]
+        ret1 = [%w(fn target), %w(semx source), %w(fmt-title source),
+                %w(fmt-xref to), %w(fmt-xref target), %w(fmt-eref bibitemid),
+                %w(fmt-xref-label container), %w(fmt-fn-body target),
+                %w(fmt-review-start source), %w(fmt-review-start end),
+                %w(fmt-review-start target), %w(fmt-review-end source),
+                %w(fmt-review-end start), %w(fmt-review-end target)]
+        presxml ? ret + ret1 : ret
       end
 
       # convert definition list term/value pair into Nokogiri XML attribute

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-utils
 version: !ruby/object:Gem::Version
-  version: 1.10.3
+  version: 1.11.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-14 00:00:00.000000000 Z
+date: 2025-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor