metanorma-standoc 2.0.5 → 2.0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 219579e1dcc116cb03bfddaa5d11819180d7e5b8b306f499335a39a61c2e8075
-  data.tar.gz: 7d8c958d3ae1e834d5e8a93c8ee3c8ebb4040e4dcee899f1bc66c87e538cdad7
+  metadata.gz: 0dc54789f419f00172644d6e4a9fe3bbba74e962ff0abd452ef4f2ad4277c695
+  data.tar.gz: 0f76a11d0488e02438a625f8b0d050a1ce5199e209af3e5a3eb392834c996c38
 SHA512:
-  metadata.gz: a4925a6bbee7f29186d5a98cd90a51c647b4443b383f5b09e714554c1bc12da5f88c7c7143236077d96ea3685f2885c4057f245c687a5404d9f6c77489ea8063
-  data.tar.gz: 3644084092782115188b9240f0e8dc68e4ef4b2bb663e5e4270214ab861018ec3a3c4bfd082fbb49f9134af62e714acb309fa774d7ebeaac85a4b20444ef5ef9
+  metadata.gz: eae38aaec6ee444c7652de6ea7792fb21299ba8cc970ed74441a241810a46a408c90ce01310d5c832a6e212e1a566560d1b38f098c3e15cb507372831a5b3337
+  data.tar.gz: ba50432c6fe3a54e2bb77f2b527f2c6b162b7fcd2febbf008cab773658447c0a9f585aa903c3f7eadff43f0cdffedb61844e5c3919216b32e3460feb4f60375a

data/lib/metanorma/standoc/blocks.rb

@@ -174,11 +174,11 @@ module Metanorma
       def paragraph(node)
         return termsource(node) if node.role == "source"
 
-        ret = noko do |xml|
+        noko do |xml|
           xml.p **para_attrs(node) do |xml_t|
             xml_t << node.content
           end
-        end.join
+        end.join("\n")
       end
 
       def quote_attrs(node)
@@ -203,7 +203,7 @@ module Metanorma
             quote_attribution(node, q)
             wrap_in_para(node, q)
           end
-        end.join
+        end.join("\n")
       end
 
       def listing_attrs(node)

data/lib/metanorma/standoc/blocks_notes.rb

@@ -36,7 +36,7 @@ module Metanorma
           xml.review **sidebar_attrs(node) do |r|
             wrap_in_para(node, r)
           end
-        end
+        end.join("\n")
       end
 
       def todo_attrs(node)
@@ -53,7 +53,7 @@ module Metanorma
           xml.review **todo_attrs(node) do |r|
             wrap_in_para(node, r)
           end
-        end
+        end.join("\n")
       end
 
       def termnote(node)

data/lib/metanorma/standoc/cleanup_boilerplate.rb

@@ -126,7 +126,7 @@ module Metanorma
           file = File.join(@localdir,
                            @boilerplateauthority)
         end
-        (!file.nil? and File.exists?(file)) or return
+        (!file.nil? and File.exist?(file)) or return
         conv.populate_template(File.read(file, encoding: "UTF-8"), nil)
       end
 

data/lib/metanorma/standoc/cleanup_text.rb

@@ -2,7 +2,7 @@ module Metanorma
   module Standoc
     module Cleanup
       def textcleanup(result)
-        text = result.flatten.map { |l| l.sub(/\s*$/, "") } * "\n"
+        text = result.flatten.map { |l| l.sub(/\s*\Z/, "") } * "\n"
         !@keepasciimath and text = asciimath2mathml(text)
         text = text.gsub(/\s+<fn /, "<fn ")
         text.gsub(%r{<passthrough\s+formats="metanorma">([^<]*)
@@ -32,7 +32,7 @@ module Metanorma
       end
 
       def uninterrupt_quotes_around_xml_skip(elem)
-        !(/^['"]/.match?(elem.text) &&
+        !(/\A['"]/.match?(elem.text) &&
           elem.previous.ancestors("pre, tt, sourcecode, stem, figure, bibdata")
           .empty? &&
           ((elem.previous.text.strip.empty? &&
@@ -42,11 +42,11 @@ module Metanorma
 
       def uninterrupt_quotes_around_xml1(elem)
         prev = elem.at(".//preceding::text()[1]") or return
-        /\S$/.match?(prev.text) or return
+        /\S\Z/.match?(prev.text) or return
         foll = elem.at(".//following::text()[1]")
-        m = /^(["'][[:punct:]]*)(\s|$)/
+        m = /\A(["'][[:punct:]]*)(\s|\Z)/
           .match(HTMLEntities.new.decode(foll&.text)) or return
-        foll.content = foll.text.sub(/^(["'][[:punct:]]*)/, "")
+        foll.content = foll.text.sub(/\A(["'][[:punct:]]*)/, "")
         prev.content = "#{prev.text}#{m[1]}"
       end
 
@@ -79,8 +79,8 @@ module Metanorma
       def dumb2smart_quotes1(curr, prev)
         /[-'"(<>]|\.\.|\dx/.match?(curr.text) or return
 
-        /^["']/.match?(curr.text) && prev.match?(/\S$/) and
-          curr.content = curr.text.sub(/^"/, "”").sub(/"’"/, "‘")
+        /\A["']/.match?(curr.text) && prev.match?(/\S\Z/) and
+          curr.content = curr.text.sub(/\A"/, "”").sub(/\A'/, "‘")
         curr.replace(Metanorma::Utils::smartformat(curr.text))
       end
 

data/lib/metanorma/standoc/validate.rb

@@ -64,7 +64,7 @@ module Metanorma
 
       def max_td_count(table)
         max = 0
-        table.xpath(".//tr").each do |tr|
+        table.xpath("./tr").each do |tr|
           n = tr.xpath("./td | ./th").size
           max < n and max = n
         end
@@ -72,8 +72,8 @@ module Metanorma
       end
 
       def maxrowcols_validate(table, maxcols)
-        cells2d = table.xpath(".//tr").each_with_object([]) { |_r, m| m << {} }
-        table.xpath(".//tr").each_with_index do |tr, r|
+        cells2d = table.xpath("./*/tr").each_with_object([]) { |_r, m| m << {} }
+        table.xpath("./*/tr").each_with_index do |tr, r|
           curr = 0
           tr.xpath("./td | ./th").each do |td|
             curr = maxcols_validate1(td, r, curr, cells2d, maxcols)

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.0.5".freeze
+    VERSION = "2.0.5.3".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.5.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor