metanorma-standoc 2.10.1 → 2.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eba98884570df0264d11870712b7da4d6369a168c43580657897957ed4b3d5ab
-  data.tar.gz: 79535910f373fb36adc22fa6113bcb397cddf7f167c00c9356cc1549998af846
+  metadata.gz: 8c8579fdf53dcc2a4f8bb20de409cb062e6b9391bdad00e87ccdde6a571c025a
+  data.tar.gz: 89991dbd9dc49750e3ba9ca705872768510d0789907191e989e0473a9d0fc2d4
 SHA512:
-  metadata.gz: 874d889b1e6ad14091a6f8dc6aff928070957e95da4ef8d4af1bf55a479c645f1db6965a35e580924d06ea09c467ad201b035003237c6d53718fa9c3d13b6118
-  data.tar.gz: 5d300aa539043afb930059fdc644318a439883645cb1afe9c1bb977beca71a22ed1c043aa615f5d021b80c1d3eaec0275d085ede665235f375e3f980d41b08f2
+  metadata.gz: '0648f42502642e1e2cf3e5db6a9f8d51056c088879f363a2f2cdda4daa9e32ff2a94ddfbc1c0735965cf889c431c6cfc8b8b7d45eb590f9d41b6aa4be3e81b1e'
+  data.tar.gz: f6c43c0445dd5f51942808693dd9b9be01a425ec22ec711a82377630db69aee0cceb03fa5091d1716d78ac911130fc585b82d7f522f0d0bc183bfe41e7c55da7

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/cleanup_text.rb

@@ -88,6 +88,15 @@ module Metanorma
         end
       end
 
+      # "abc<tag/>", def => "abc",<tag/> def
+      # TODO?
+      def uninterrupt_quotes_around_xml1(xmldoc)
+          xmldoc.xpath("//text()[preceding-sibling::*[1]]").each do |n|
+          uninterrupt_quotes_around_xml_skip(n) and next
+          uninterrupt_quotes_around_xml1(n.previous)
+        end
+      end
+
       IGNORE_QUOTES_ELEMENTS =
         %w(pre tt sourcecode stem asciimath figure bibdata passthrough
            identifier metanorma-extension).freeze
@@ -157,6 +166,20 @@ module Metanorma
         end
       end
 
+      def dumb2smart_quotesx(xmldoc)
+        # TODO?>
+        prev = ""
+        xmldoc.xpath("//* | //text()").each do |x|
+          x.is_a?(Nokogiri::XML::Node) or next
+          block?(x) and prev = ""
+          empty_tag_with_text_content?(x) and prev = "dummy"
+          x.text? or next
+ancestor_include?(x, IGNORE_QUOTES_ELEMENTS) and next
+ dumb2smart_quotes1(x, prev)
+          prev = x.text
+        end
+      end
+
       def dumb2smart_quotes1(curr, prev)
         /[-'"(<>]|\.\.|\dx/.match?(curr.text) or return
 

data/lib/metanorma/standoc/merge_bibitems.rb

@@ -59,8 +59,11 @@ 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])
+          ret = ret.each_with_object([{ locality: [] }]) do |r, m|
+            m[0][:locality] += r[:locality]
+          end
+          ret or return
           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.1".freeze
+    VERSION = "2.10.3".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "crass", "~> 1.0.0"
   spec.add_dependency "iev", "~> 0.3.0"
-  spec.add_dependency "isodoc", "~> 2.12.2"
+  spec.add_dependency "isodoc", "~> 2.12.4"
   spec.add_dependency "metanorma", ">= 1.6.0"
   spec.add_dependency "metanorma-plugin-datastruct", "~> 0.3.0"
   spec.add_dependency "metanorma-plugin-glossarist", "~> 0.2.0"
@@ -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.1
+  version: 2.10.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-09 00:00:00.000000000 Z
+date: 2024-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.2
+        version: 2.12.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.2
+        version: 2.12.4
 - !ruby/object:Gem::Dependency
   name: metanorma
   requirement: !ruby/object:Gem::Requirement
@@ -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