isodoc 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d8386094c2e6b1ea70008d548b0f0c475242457dcb58152a04bd7e59403cc7b
-  data.tar.gz: 4606afd5a06cede44afc418efc3e67267a5f75c615626475df57f6e881f8adcc
+  metadata.gz: aff7d421567c13d1c20aa58af56f75a5ef83d78c5268580cef8236b951e41f4d
+  data.tar.gz: 3f81f0d40caa3e069cc814195e565e824c5fd072a8ca408aa70ce2d7026862eb
 SHA512:
-  metadata.gz: 453d7f0089ed9325a0e1b9fbe49b223365811f3115d3b08cc3862be80e56933a3a229273c84b6c52a153e8b8772b8aab50b06215cff2cba76547e8f6105002f3
-  data.tar.gz: a40f39df17dffbd8ef3286d841c1f5e96ff6abcbc1e41433895126217fa77b78cc650e4f7ba8ccea3948d6cb569cd1725b74e8df19d7cd7f608c9c95960b02a9
+  metadata.gz: 722f301c40200078c8753612504b5311bd5f1f87041143c9172b70a9b121066579ffb7fd9ce13ebce46a052360e105590fce318324a25175878685ca65958210
+  data.tar.gz: 1f78ddc58e32b347464eb1f73245fc85b4ddb3cb6ac5d27aa9bdaf6f0cc47dfd1db74e648e26ee8ad2860d28eef7530d503471a8ade31f572d9d495299ee033b

data/.github/workflows/release.yml

@@ -21,4 +21,4 @@ jobs:
       event_name: ${{ github.event_name }}
     secrets:
       rubygems-api-key: ${{ secrets.METANORMA_CI_RUBYGEMS_API_KEY }}
-
+      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/isodoc.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "asciimath"
-  spec.add_dependency "html2doc", "~> 1.4.0"
+  spec.add_dependency "html2doc", "~> 1.4.1"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "isodoc-i18n", "~> 1.0.0"
   spec.add_dependency "liquid", "~> 4"
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "emf2svg"
   spec.add_dependency "mathml2asciimath"
   spec.add_dependency "metanorma-utils"
-  spec.add_dependency "nokogiri", "~> 1.12.0"
+
   spec.add_dependency "relaton-cli"
   spec.add_dependency "relaton-render", ">= 0.3.1"
   spec.add_dependency "roman-numerals"

data/lib/isodoc/class_utils.rb

@@ -7,7 +7,7 @@ module IsoDoc
       return date.text unless from || on || to
       return on.text if on
 
-      ret = "#{from.text}–"
+      ret = "#{from.text}–"
       ret += to.text if to
       ret
     end

data/lib/isodoc/function/blocks.rb

@@ -169,7 +169,7 @@ module IsoDoc
         return if author.nil? && source.nil?
 
         out.p **{ class: "QuoteAttribution" } do |p|
-          p << "&mdash; #{author.text}" if author
+          p << "&#x2014; #{author.text}" if author
           p << ", " if author && source
           eref_parse(source, p) if source
         end

data/lib/isodoc/function/cleanup.rb

@@ -66,7 +66,7 @@ module IsoDoc
           title = d.at("./title")
           n = title.next_element
           n&.children&.first
-            &.add_previous_sibling("#{title.remove.text}—")
+            &.add_previous_sibling("#{title.remove.text}—")
         end
         docxml
       end

data/lib/isodoc/function/inline.rb

@@ -134,8 +134,8 @@ module IsoDoc
 
         text = node.to_s
         if in_sourcecode
-          text = text.gsub("\n", "<br/>").gsub("<br/> ", "<br/>&nbsp;")
-            .gsub(/ (?= )/, "&nbsp;")
+          text = text.gsub("\n", "<br/>").gsub("<br/> ", "<br/>&#xa0;")
+            .gsub(/ (?= )/, "&#xa0;")
         end
         out << text
       end

data/lib/isodoc/function/table.rb

@@ -82,7 +82,7 @@ module IsoDoc
           node.xpath(ns("./note")).each { |n| parse(n, out) }
         end
         @in_table = false
-        # out.p { |p| p << "&nbsp;" }
+        # out.p { |p| p << "&#xa0;" }
       end
 
       SW = "solid windowtext".freeze

data/lib/isodoc/function/to_word_html.rb

@@ -73,14 +73,14 @@ module IsoDoc
 
       def make_body1(body, _docxml)
         body.div **{ class: "title-section" } do |div1|
-          div1.p { |p| p << "&nbsp;" } # placeholder
+          div1.p { |p| p << "&#xa0;" } # placeholder
         end
         section_break(body)
       end
 
       def make_body2(body, _docxml)
         body.div **{ class: "prefatory-section" } do |div2|
-          div2.p { |p| p << "&nbsp;" } # placeholder
+          div2.p { |p| p << "&#xa0;" } # placeholder
         end
         section_break(body)
       end

data/lib/isodoc/function/utils.rb

@@ -12,7 +12,7 @@ module IsoDoc
       end
 
       def insert_tab(out, count)
-        tab = %w(Hans Hant).include?(@script) ? "　" : "  "
+        tab = %w(Hans Hant).include?(@script) ? "　" : "  "
         [1..count].each { out << tab }
       end
 

data/lib/isodoc/html_function/html.rb

@@ -20,7 +20,7 @@ module IsoDoc
         return if @bare
 
         body.div **{ class: "title-section" } do |div1|
-          div1.p { |p| p << "&nbsp;" } # placeholder
+          div1.p { |p| p << "&#xa0;" } # placeholder
         end
         section_break(body)
       end
@@ -29,7 +29,7 @@ module IsoDoc
         return if @bare
 
         body.div **{ class: "prefatory-section" } do |div2|
-          div2.p { |p| p << "&nbsp;" } # placeholder
+          div2.p { |p| p << "&#xa0;" } # placeholder
         end
         section_break(body)
       end

data/lib/isodoc/presentation_function/block.rb

@@ -31,7 +31,7 @@ module IsoDoc
       return if labelled_ancestor(elem)
 
       lbl = @xrefs.anchor(elem["id"], :label, false) or return
-      prefix_name(elem, " — ",
+      prefix_name(elem, " — ",
                   l10n("#{lower2cap @i18n.figure} #{lbl}"), "name")
     end
 
@@ -60,7 +60,7 @@ module IsoDoc
             else
               l10n("#{@i18n.example} #{n[:label]}")
             end
-      prefix_name(elem, " — ", lbl, "name")
+      prefix_name(elem, " — ", lbl, "name")
     end
 
     def note(docxml)
@@ -130,7 +130,7 @@ module IsoDoc
       return if elem["unnumbered"] && !elem.at(ns("./name"))
 
       n = @xrefs.anchor(elem["id"], :label, false)
-      prefix_name(elem, " — ", l10n("#{lower2cap @i18n.table} #{n}"),
+      prefix_name(elem, " — ", l10n("#{lower2cap @i18n.table} #{n}"),
                   "name")
     end
 

data/lib/isodoc/presentation_function/image.rb

@@ -32,7 +32,7 @@ module IsoDoc
       return if elem.at(ns("./figure")) && !elem.at(ns("./name"))
 
       lbl = @xrefs.anchor(elem["id"], :label, false) or return
-      prefix_name(elem, " — ",
+      prefix_name(elem, " — ",
                   l10n("#{lower2cap @i18n.figure} #{lbl}"), "name")
     end
 

data/lib/isodoc/presentation_function/inline.rb

@@ -158,7 +158,7 @@ module IsoDoc
     # TODO: move to localization file
     def eref_localities1_zh(_target, type, from, upto, node)
       ret = "第#{from}" if from
-      ret += "–#{upto}" if upto
+      ret += "–#{upto}" if upto
       loc = eref_locality_populate(type, node)
       ret += " #{loc}" unless node["droploc"] == "true"
       ret
@@ -172,7 +172,7 @@ module IsoDoc
         return l10n(eref_localities1_zh(target, type, from, upto, node))
       ret = eref_locality_populate(type, node)
       ret += " #{from}" if from
-      ret += "–#{upto}" if upto
+      ret += "–#{upto}" if upto
       l10n(ret)
     end
 

data/lib/isodoc/presentation_function/section.rb

@@ -56,11 +56,11 @@ module IsoDoc
 
     def single_term_clause(elem)
       t = elem.at(ns("./terms | ./definitions | ./references"))
-      t.at(ns("./title")).remove
+      t.at(ns("./title"))&.remove
       t.xpath(ns(".//clause | .//terms | .//definitions | .//references"))
         .each do |c|
           tit = c.at(ns("./title")) or return
-          tit["depth"] = tit["depth"].to_i - 1
+          tit["depth"] = tit["depth"].to_i - 1 unless tit["depth"] == "1"
         end
     end
 
@@ -84,6 +84,8 @@ module IsoDoc
     end
 
     def bibitem(xml)
+      @xrefs.klass.implicit_reference(xml) and
+        xml["hidden"] = "true"
       bibrender(xml)
     end
 

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.1.0".freeze
+  VERSION = "2.1.1".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -20,7 +20,7 @@ module IsoDoc
 
       def make_body1(body, _docxml)
         body.div **{ class: "WordSection1" } do |div1|
-          div1.p { |p| p << "&nbsp;" } # placeholder
+          div1.p { |p| p << "&#xa0;" } # placeholder
         end
         section_break(body)
       end
@@ -34,7 +34,7 @@ module IsoDoc
           introduction docxml, div2
           preface docxml, div2
           acknowledgements docxml, div2
-          div2.p { |p| p << "&nbsp;" } # placeholder
+          div2.p { |p| p << "&#xa0;" } # placeholder
         end
         section_break(body)
       end
@@ -64,7 +64,7 @@ module IsoDoc
       def para_parse(node, out)
         out.p **attr_code(para_attrs(node)) do |p|
           unless @termdomain.empty?
-            p << "&lt;#{@termdomain}&gt; "
+            p << "&#x3c;#{@termdomain}&#x3e; "
             @termdomain = ""
           end
           node.children.each { |n| parse(n, p) unless n.name == "note" }

data/lib/isodoc/word_function/postprocess.rb

@@ -187,7 +187,7 @@ module IsoDoc
           next unless t.children.empty?
 
           t["style"] = t["style"].sub(/;?$/, ";font-size:0pt;")
-          t.children = " "
+          t.children = " "
         end
       end
 

data/lib/isodoc/word_function/postprocess_cover.rb

@@ -60,7 +60,7 @@ module IsoDoc
           <span lang="EN-GB"><span
             style='mso-element:field-begin'></span><span
             style='mso-spacerun:yes'>&#xA0;</span>TOC
-            \\o &quot;1-#{level}&quot; \\h \\z \\u <span
+            \\o "1-#{level}" \\h \\z \\u <span
             style='mso-element:field-separator'></span></span>
         TOC
       end
@@ -68,7 +68,7 @@ module IsoDoc
       WORD_TOC_SUFFIX1 = <<~TOC.freeze
         <p class="MsoToc1"><span lang="EN-GB"><span
           style='mso-element:field-end'></span></span><span
-          lang="EN-GB"><o:p>&nbsp;</o:p></span></p>
+          lang="EN-GB"><o:p>&#xA0;</o:p></span></p>
       TOC
 
       def make_WordToC(docxml, level)
@@ -86,7 +86,7 @@ module IsoDoc
         <span lang="EN-GB"><span
         style='mso-element:field-begin'></span><span
         style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t &quot;RecommendationTitle,RecommendationTestTitle,recommendationtitle,recommendationtesttitle&quot;
+        \\h \\z \\t "RecommendationTitle,RecommendationTestTitle,recommendationtitle,recommendationtesttitle"
         <span style='mso-element:field-separator'></span></span>
       TOC
 
@@ -94,7 +94,7 @@ module IsoDoc
         <span lang="EN-GB"><span
         style='mso-element:field-begin'></span><span
         style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t &quot;TableTitle,tabletitle&quot; <span
+        \\h \\z \\t "TableTitle,tabletitle" <span
         style='mso-element:field-separator'></span></span>
       TOC
 
@@ -102,7 +102,7 @@ module IsoDoc
         <span lang="EN-GB"><span
         style='mso-element:field-begin'></span><span
         style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t &quot;FigureTitle,figuretitle&quot; <span
+        \\h \\z \\t "FigureTitle,figuretitle" <span
         style='mso-element:field-separator'></span></span>
       TOC
 

data/spec/isodoc/metadata_spec.rb

@@ -113,7 +113,7 @@ RSpec.describe IsoDoc do
       :circulateddate=>"2015",
       :confirmeddate=>"2017",
       :copieddate=>"2016",
-      :createddate=>"2010–2011",
+      :createddate=>"2010–2011",
       :doc=>"URL E",
       :docnumber=>"17301-1",
       :docnumeric=>"17301",

data/spec/isodoc/postproc_spec.rb

@@ -529,7 +529,8 @@ RSpec.describe IsoDoc do
     word = File.read("test.doc")
       .sub(/^.*<div class="WordSection2">/m, '<div class="WordSection2">')
       .sub(%r{<p class="MsoNormal">\s*<br clear="all" class="section"/>\s*</p>\s*<div class="WordSection3">.*$}m, "")
-    expect(xmlpp(word.gsub(/_Toc\d\d+/, "_Toc")))
+    expect(xmlpp(word.gsub(/_Toc\d\d+/, "_Toc")
+      .gsub(/<o:p>&#xA0;<\/o:p>/, "")))
       .to be_equivalent_to xmlpp(<<~'OUTPUT')
           <div class="WordSection2">
         /* an empty word intro page */
@@ -573,7 +574,6 @@ RSpec.describe IsoDoc do
             <span style="mso-element:field-end"></span>
           </span>
           <span lang="EN-GB" xml:lang="EN-GB">
-            <p class="MsoNormal">&#xA0;</p>
           </span>
         </p>
                 <p class="MsoNormal">&#xA0;</p>
@@ -611,7 +611,8 @@ RSpec.describe IsoDoc do
     word = File.read("test.doc")
       .sub(/^.*<div class="WordSection2">/m, '<div class="WordSection2">')
       .sub(%r{<p class="MsoNormal">\s*<br clear="all" class="section"/>\s*</p>\s*<div class="WordSection3">.*$}m, "")
-    expect(xmlpp(word.gsub(/_Toc\d\d+/, "_Toc")))
+    expect(xmlpp(word.gsub(/_Toc\d\d+/, "_Toc")
+                .gsub(/<o:p>&#xA0;<\/o:p>/, "")))
       .to be_equivalent_to xmlpp(<<~'OUTPUT')
                    <div class="WordSection2">
                /* an empty word intro page */
@@ -667,7 +668,6 @@ RSpec.describe IsoDoc do
                    <span style="mso-element:field-end"></span>
                  </span>
                  <span lang="EN-GB" xml:lang="EN-GB">
-                   <p class="MsoNormal">&#xA0;</p>
                  </span>
                </p>
                        <p class="MsoNormal">&#xA0;</p>
@@ -719,7 +719,8 @@ RSpec.describe IsoDoc do
     word = File.read("test.doc")
       .sub(/^.*<div class="WordSection2">/m, '<div class="WordSection2">')
       .sub(%r{<p class="MsoNormal">\s*<br clear="all" class="section"/>\s*</p>\s*<div class="WordSection3">.*$}m, "")
-    expect(xmlpp(word.gsub(/_Toc\d\d+/, "_Toc")))
+    expect(xmlpp(word.gsub(/_Toc\d\d+/, "_Toc")
+                .gsub(/<o:p>&#xA0;<\/o:p>/, "")))
       .to be_equivalent_to xmlpp(<<~'OUTPUT')
             <div class='WordSection2'>
            /* an empty word intro page */
@@ -830,7 +831,6 @@ RSpec.describe IsoDoc do
               <span style='mso-element:field-end'/>
             </span>
             <span lang='EN-GB' xml:lang='EN-GB'>
-              <p class='MsoNormal'>&#xA0;</p>
             </span>
           </p>
           <p class='MsoNormal'>&#xA0;</p>
@@ -856,7 +856,8 @@ RSpec.describe IsoDoc do
     word = File.read("test.doc")
       .sub(/^.*<div class="WordSection2">/m, '<div class="WordSection2">')
       .sub(%r{<p class="MsoNormal">\s*<br clear="all" class="section"/>\s*</p>\s*<div class="WordSection3">.*$}m, "")
-    expect(xmlpp(word.gsub(/_Toc\d\d+/, "_Toc")))
+    expect(xmlpp(word.gsub(/_Toc\d\d+/, "_Toc")
+                .gsub(/<o:p>&#xA0;<\/o:p>/, "")))
       .to be_equivalent_to xmlpp(<<~'OUTPUT')
             <div class='WordSection2'>
            /* an empty word intro page */
@@ -967,7 +968,6 @@ RSpec.describe IsoDoc do
               <span style='mso-element:field-end'/>
             </span>
             <span lang='EN-GB' xml:lang='EN-GB'>
-              <p class='MsoNormal'>&#xA0;</p>
             </span>
           </p>
           <p class='TOCTitle'>List of tables</p>
@@ -1006,7 +1006,6 @@ RSpec.describe IsoDoc do
               <span style='mso-element:field-end'/>
             </span>
             <span lang='EN-GB' xml:lang='EN-GB'>
-              <p class='MsoNormal'>&#xA0;</p>
             </span>
           </p>
           <p class='TOCTitle'>List of figures</p>
@@ -1045,7 +1044,6 @@ RSpec.describe IsoDoc do
               <span style='mso-element:field-end'/>
             </span>
             <span lang='EN-GB' xml:lang='EN-GB'>
-              <p class='MsoNormal'>&#xA0;</p>
             </span>
           </p>
           <p class='TOCTitle'>List of recommendations</p>
@@ -1133,7 +1131,6 @@ RSpec.describe IsoDoc do
               <span style='mso-element:field-end'/>
             </span>
             <span lang='EN-GB' xml:lang='EN-GB'>
-              <p class='MsoNormal'>&#xA0;</p>
             </span>
           </p>
           <p class='MsoNormal'>&#xA0;</p>

data/spec/spec_helper.rb

@@ -22,6 +22,13 @@ RSpec.configure do |config|
 end
 
 def xmlpp(xml)
+  c = HTMLEntities.new
+  xml &&= xml.split(/(&\S+?;)/).map do |n|
+    if /^&\S+?;$/.match?(n)
+      c.encode(c.decode(n), :hexadecimal)
+    else n
+    end
+  end.join
   s = ""
   f = REXML::Formatters::Pretty.new(2)
   f.compact = true
@@ -30,7 +37,7 @@ def xmlpp(xml)
 end
 
 def metadata(hash)
-  Hash[hash.sort].delete_if do |_k, v|
+  hash.sort.to_h.delete_if do |_k, v|
     v.nil? || (v.respond_to?(:empty?) && v.empty?)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-09 00:00:00.000000000 Z
+date: 2022-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.12.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: relaton-cli
   requirement: !ruby/object:Gem::Requirement