metanorma-standoc 2.0.5.1 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfc9dd3ae0dd167d4c3b92c4b051619cde74ae602a66c9b34e363af1498682a0
-  data.tar.gz: 1cde7c4c003cdf59c2ef85e0ec1fc3247095716b6fc4f99b121c638f0744aaf9
+  metadata.gz: d902ad2befbbd472837eceebed5f29e138d9c10a6dd2a7dc4c465addc6e5bb14
+  data.tar.gz: e84f81d8e37fde67646aac29bfda98a48ed9d5e851318dfb3acfdefca0872d12
 SHA512:
-  metadata.gz: af0f552acb3f93c8c2e1f1bff1ca60fadff61a5242e08bf0de29df086906a14025a1f6b2d2fb23a6e97afdd086fb60c9b812a91359056e6195a42a6d1d305630
-  data.tar.gz: cfad71e3de0a31950aee00c477a50449b97eb436ea6261584b73c616d7d24d30ab380ff7504b0357bd5e234752639a7705a43dca46f9f15983114ea50eaf2210
+  metadata.gz: 07d40940c3dac1176e80861e39b1fa527c9ae5c028cbde11624677c85f17645160c230725d1c010de16121a47031360c354a62db164534d6fba7d2d5456af8bf
+  data.tar.gz: 8f2220572c54be5e184d63fa694ce031be239a10d06888c92ac91f028ffa5bee9d2cf516e043df921dc5d932529d9686fadcb4b0547a5604717b14f261650310

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

@@ -108,7 +108,7 @@ module Metanorma
           bib.uri code[:key].sub(/\.[a-zA-Z0-9]+$/, ""), **{ type: "URI" }
           bib.uri code[:key].sub(/\.[a-zA-Z0-9]+$/, ""), **{ type: "citation" }
         end
-        code[:id].sub!(/[:-](19|20)[0-9][0-9]$/, "")
+        # code[:id].sub!(/[:-](19|20)[0-9][0-9]$/, "")
         docid(bib, match[:usrlbl]) if match[:usrlbl]
         docid(bib, /^\d+$/.match?(code[:id]) ? "[#{code[:id]}]" : code[:id])
         code[:type] == "repo" and
@@ -123,7 +123,8 @@ module Metanorma
           end
           yr_match = /[:-](?<year>(?:19|20)[0-9][0-9])\b/.match(code[:id])
           refitem_render1(match, code, t)
-          docnumber(t, code[:id]) unless /^\d+$|^\(.+\)$/.match?(code[:id])
+          /^\d+$|^\(.+\)$/.match?(code[:id]) or
+            docnumber(t, code[:id].sub(/[:-](19|20)[0-9][0-9]$/, ""))
           conditional_date(t, yr_match || match, false)
         end
       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.1".freeze
+    VERSION = "2.0.6".freeze
   end
 end

data/spec/metanorma/refs_spec.rb

@@ -970,7 +970,7 @@ RSpec.describe Metanorma::Standoc do
                <formattedref format='application/x-isodoc+xml'>
                  <em>Standard</em>
                </formattedref>
-               <docidentifier type='ISO'>ISO/IEC TR 12382</docidentifier>
+               <docidentifier type='ISO'>ISO/IEC TR 12382:1992</docidentifier>
                <docnumber>12382</docnumber>
                 <date type='published'><on>1992</on></date>
              </bibitem>
@@ -1820,7 +1820,7 @@ RSpec.describe Metanorma::Standoc do
           <em>Standard</em>
         </formattedref>
         <docidentifier type='metanorma'>[1]</docidentifier>
-        <docidentifier>XYZ 123</docidentifier>
+        <docidentifier>XYZ 123:1966</docidentifier>
         <docnumber>123</docnumber>
                       <date type='published'>
          <on>1966</on>