metanorma-standoc 2.10.2 → 2.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d72c6ed69fa0ccc28a28c17306eee42d5a79512aac74e88fac810415ebed8744
-  data.tar.gz: 7f965dc03a094785be980450a1c5370de9d43ddbae30c805ca65669911d0dc69
+  metadata.gz: 11972c007dd10b95b91d8598f5dce3843e59f7867e53768f43f03d04c63bf321
+  data.tar.gz: c22fd5262f6024f145c23d9f88471a9d8d061d51e7346fdac3535701715c36e5
 SHA512:
-  metadata.gz: 49896c1fd5521c1065a6a789baf7008a312bc1706772aff2b9938621d97185d77f4f8cd24d13c7b50554549e33b1f04c7b3a12364548d2fd6994431b12c967b4
-  data.tar.gz: 95e3c3de4fc714b04ebf54e24d2ae1c4d24cfafd9f9e3fb5795a5be8c5b86b302c6f2025d55eba42634666239faaa4cb863ad307eff14300765e8c096c00cc49
+  metadata.gz: 2f39425e1441e9b6d251669be2e3fd02967cd41a1f4f5bd65c71e9546a4e510bcf42ab89203eade13afa4e755847b4b3557c0be3c2a9839efd5a64ec013b5d36
+  data.tar.gz: bf360c1ce44587d5c7244e0edbb759109db93bd71c7c852c94bd3b020ca70fc4d981582891f98588492a923ee87e5224b2ed33617dd4cd37edf7480cc1e24955

data/lib/metanorma/standoc/cleanup_footnotes.rb

@@ -34,14 +34,21 @@ module Metanorma
         end
       end
 
-      def table_footnote_renumber1(fnote, idx, seen)
+      def duplicate_footnote(fnote, idx, seen)
         content = footnote_content(fnote)
-        if seen[content] then outnum = seen[content]
+        if seen[content]
+          outnum = seen[content]
+          fnote.xpath(".//index | .//bookmark").each(&:remove)
         else
           idx += 1
           outnum = idx
           seen[content] = outnum
         end
+        [fnote, idx, seen, outnum]
+      end
+
+      def table_footnote_renumber1(fnote, idx, seen)
+        fnote, idx, seen, outnum = duplicate_footnote(fnote, idx, seen)
         fnote["reference"] = table_footnote_number(outnum)
         fnote["table"] = true
         [idx, seen]
@@ -62,15 +69,8 @@ module Metanorma
       end
 
       def other_footnote_renumber1(fnote, idx, seen)
-        return [idx, seen] if fnote["table"]
-
-        content = footnote_content(fnote)
-        if seen[content] then outnum = seen[content]
-        else
-          idx += 1
-          outnum = idx
-          seen[content] = outnum
-        end
+        fnote["table"] and return [idx, seen]
+        fnote, idx, seen, outnum = duplicate_footnote(fnote, idx, seen)
         fnote["reference"] = outnum.to_s
         [idx, seen]
       end

data/lib/metanorma/standoc/merge_bibitems.rb

@@ -59,8 +59,10 @@ module Metanorma
             new[:extent] = [{ locality_stack: new[:extent] }]
           ret = merge_by_type(old.dig(:extent, 0),
                               new.dig(:extent, 0), :locality_stack,
-                              %i[locality type])
-          (ret && !old.dig(:extent, 0)) or return
+                              [:locality, 0, :type]) or return
+          ret = ret.each_with_object([{ locality: [] }]) do |r, m|
+            m[0][:locality] += r[:locality]
+          end
           old[:extent] ||= []
           old[:extent][0] ||= {}
           old[:extent][0][:locality_stack] = ret

data/lib/metanorma/standoc/validate.rb

@@ -219,7 +219,7 @@ module Metanorma
 
       # manually check for xref/@target, xref/@to integrity
       def xref_validate(doc)
-        @doc_xrefs = doc.xpath("//xref/@target | //xref/@to")
+        @doc_xrefs = doc.xpath("//xref/@target | //xref/@to | //index/@to")
           .each_with_object({}) do |x, m|
           m[x.text] = x
           @doc_ids[x.text] and next

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.10.2".freeze
+    VERSION = "2.10.4".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -43,7 +43,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "asciimath2unitsml", "~> 0.4.0"
   spec.add_dependency "concurrent-ruby"
   spec.add_dependency "pngcheck"
-  spec.add_dependency "relaton-cli", "~> 1.19.0"
+  spec.add_dependency "relaton-cli", "~> 1.20.0"
   spec.add_dependency "relaton-iev", "~> 1.2.0"
   spec.add_dependency "unicode2latex", "~> 0.0.1"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.10.2
+  version: 2.10.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-10 00:00:00.000000000 Z
+date: 2024-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.20.0
 - !ruby/object:Gem::Dependency
   name: relaton-iev
   requirement: !ruby/object:Gem::Requirement