isodoc 2.1.0.2 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9602bbd1d24d83b9b43f2ac41bd1b01d1fd9edf44c3edf4fbb97c45fb93e1292
-  data.tar.gz: 5406db3babbfe8d4f7403b22a81e713081ba5de7c72f250c65bfeb08e98316e8
+  metadata.gz: aff7d421567c13d1c20aa58af56f75a5ef83d78c5268580cef8236b951e41f4d
+  data.tar.gz: 3f81f0d40caa3e069cc814195e565e824c5fd072a8ca408aa70ce2d7026862eb
 SHA512:
-  metadata.gz: '0928611616ab02c2a0471ddd92c20bd79019a5c21c022d3a9989609919764f17837e1ae724e72de841b5ef31279537498193cb1ba06be3d65e2032f00bd684d6'
-  data.tar.gz: 6edc16d70239d9106ce0114b92bb0e5f6b85a843fae3abe93456448bc8503d72015c096b12eaaedb3ca9e46cafa135d1b1dcc334781167d9c78a14084f7fe928
+  metadata.gz: 722f301c40200078c8753612504b5311bd5f1f87041143c9172b70a9b121066579ffb7fd9ce13ebce46a052360e105590fce318324a25175878685ca65958210
+  data.tar.gz: 1f78ddc58e32b347464eb1f73245fc85b4ddb3cb6ac5d27aa9bdaf6f0cc47dfd1db74e648e26ee8ad2860d28eef7530d503471a8ade31f572d9d495299ee033b

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"
+
   spec.add_dependency "relaton-cli"
   spec.add_dependency "relaton-render", ">= 0.3.1"
   spec.add_dependency "roman-numerals"

data/lib/isodoc/base_style/all.css

@@ -0,0 +1,227 @@
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, output, ruby, section, summary,
+time, mark, audio, video {
+  margin: 0;
+  padding: 0; }
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+  border: 0;
+  font-size: 100%; }
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, tt, var,
+b, u, i, center,
+dl, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+  vertical-align: baseline; }
+
+html, body, div, span, applet, object, iframe,
+p, blockquote,
+a, abbr, acronym, address, big, cite,
+del, dfn, em, img, ins, q, s,
+small, strike, strong, sub, sup, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+  font-family: {{bodyfont}}; }
+
+code, pre, tt, kbd, samp {
+  font-family: {{monospacefont}};
+  font-variant-ligatures: none; }
+
+code *, pre *, tt *, kbd *, samp * {
+  font-family: {{monospacefont}} !important;
+  font-variant-ligatures: none; }
+
+p code, dt code, li code, label code, legend code, caption code, th code, td code,
+p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
+p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
+p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
+  font-size: {{monospacefontsize}}; }
+
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section {
+  display: block; }
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0; }
+
+h1, h2, h3, h4, h5, h6 {
+  font-family: {{headerfont}}; }
+
+.h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: {{headerfont}}; }
+
+blockquote, q {
+  quotes: none; }
+  blockquote:before, blockquote:after, q:before, q:after {
+    content: '';
+    content: none; }
+
+.h2Annex {
+  font-family: {{headerfont}}; }
+
+dl {
+  display: grid;
+  grid-template-columns: max-content auto; }
+  dl dt p, dl dd p {
+    margin-top: 0; }
+  dl dt {
+    grid-column-start: 1; }
+  dl dd {
+    grid-column-start: 2; }
+
+b, strong {
+  font-weight: bold; }
+
+div.document-stage-band, div.document-type-band {
+  background-color: #333333; }
+
+a.FootnoteRef + a.FootnoteRef:before {
+  content: ", ";
+  vertical-align: super; }
+
+.addition {
+  color: blue; }
+
+.deletion {
+  color: red;
+  text-decoration: line-through; }
+
+#standard-band {
+  background-color: #0AC442; }
+
+#standard {
+  border-bottom: solid 3px #0AC442; }
+
+#directive-band {
+  background-color: #540D6E; }
+
+#directive {
+  border-bottom: solid 3px #540D6E; }
+
+#guide-band {
+  background-color: #D183C9; }
+
+#guide {
+  border-bottom: solid 3px #D183C9; }
+
+#specification-band {
+  background-color: #65AFFF; }
+
+#specification {
+  border-bottom: solid 3px #65AFFF; }
+
+#report-band {
+  background-color: #3A405A; }
+
+#report {
+  border-bottom: solid 3px #3A405A; }
+
+#amendment-band {
+  background-color: #F26430; }
+
+#amendment {
+  border-bottom: solid 3px #F26430; }
+
+#corrigendum-band {
+  background-color: #C84630; }
+
+#corrigendum {
+  border-bottom: solid 3px #C84630; }
+
+#administrative-band {
+  background-color: #BFAE48; }
+
+#administrative {
+  border-bottom: solid 3px #BFAE48; }
+
+#advisory-band {
+  background-color: #BD9391; }
+
+#advisory {
+  border-bottom: solid 3px #BD9391; }
+
+#proposal-band {
+  background-color: #39A0ED; }
+
+#proposal {
+  border-bottom: solid 3px #39A0ED; }
+
+#working-draft-band {
+  background-color: #2D7393; }
+
+#working-draft {
+  border-bottom: solid 3px #2D7393; }
+
+#committee-draft-band {
+  background-color: #2A6B7C; }
+
+#committee-draft {
+  border-bottom: solid 3px #2A6B7C; }
+
+#draft-standard-band {
+  background-color: #1C7F7A; }
+
+#draft-standard {
+  border-bottom: solid 3px #1C7F7A; }
+
+#final-draft-band {
+  background-color: #53C170; }
+
+#final-draft {
+  border-bottom: solid 3px #53C170; }
+
+#published-band {
+  background-color: #069E2D; }
+
+#published {
+  border-bottom: solid 3px #069E2D; }
+
+#withdrawn-band {
+  background-color: #004E64; }
+
+#withdrawn {
+  border-bottom: solid 3px #004E64; }
+
+#cancelled-band {
+  background-color: #2E382E; }
+
+#cancelled {
+  border-bottom: solid 3px #2E382E; }

data/lib/isodoc/base_style/metanorma_word.css

@@ -0,0 +1,47 @@
+div.table_container {
+  margin-bottom: 14pt; }
+
+ol {
+  margin-bottom: 0cm; }
+
+ul {
+  margin-bottom: 0cm; }
+
+table.MsoISOTable tr {
+  page-break-inside: avoid; }
+
+td {
+  page-break-inside: avoid; }
+
+tr {
+  page-break-after: avoid; }
+
+table.MsoISOTableBig tr {
+  page-break-inside: auto; }
+
+table.MsoISOTableBig td {
+  page-break-inside: auto; }
+
+span.stem {
+  font-family: "Cambria Math",serif;
+  mso-ascii-font-family: "Cambria Math";
+  font-style: italic; }
+
+dt {
+  page-break-inside: avoid;
+  page-break-after: avoid; }
+
+br.section {
+  page-break-before: always;
+  mso-break-type: section-break; }
+
+br.pagebreak {
+  page-break-before: always;
+  mso-special-character: line-break; }
+
+span.addition {
+  color: blue; }
+
+span.deletion {
+  color: red;
+  text-decoration: line-through; }

data/lib/isodoc/base_style/reset.css

@@ -0,0 +1,125 @@
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, output, ruby, section, summary,
+time, mark, audio, video {
+  margin: 0;
+  padding: 0; }
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+  border: 0;
+  font-size: 100%; }
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, tt, var,
+b, u, i, center,
+dl, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+  vertical-align: baseline; }
+
+html, body, div, span, applet, object, iframe,
+p, blockquote,
+a, abbr, acronym, address, big, cite,
+del, dfn, em, img, ins, q, s,
+small, strike, strong, sub, sup, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+  font-family: {{bodyfont}}; }
+
+code, pre, tt, kbd, samp {
+  font-family: {{monospacefont}};
+  font-variant-ligatures: none; }
+
+code *, pre *, tt *, kbd *, samp * {
+  font-family: {{monospacefont}} !important;
+  font-variant-ligatures: none; }
+
+p code, dt code, li code, label code, legend code, caption code, th code, td code,
+p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
+p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
+p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
+  font-size: {{monospacefontsize}}; }
+
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section {
+  display: block; }
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0; }
+
+h1, h2, h3, h4, h5, h6 {
+  font-family: {{headerfont}}; }
+
+.h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: {{headerfont}}; }
+
+blockquote, q {
+  quotes: none; }
+  blockquote:before, blockquote:after, q:before, q:after {
+    content: '';
+    content: none; }
+
+.h2Annex {
+  font-family: {{headerfont}}; }
+
+dl {
+  display: grid;
+  grid-template-columns: max-content auto; }
+  dl dt p, dl dd p {
+    margin-top: 0; }
+  dl dt {
+    grid-column-start: 1; }
+  dl dd {
+    grid-column-start: 2; }
+
+b, strong {
+  font-weight: bold; }
+
+div.document-stage-band, div.document-type-band {
+  background-color: #333333; }
+
+a.FootnoteRef + a.FootnoteRef:before {
+  content: ", ";
+  vertical-align: super; }
+
+.addition {
+  color: blue; }
+
+.deletion {
+  color: red;
+  text-decoration: line-through; }

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,7 +56,7 @@ 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
@@ -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.2".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.2
+  version: 2.1.1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-10 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'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: relaton-cli
   requirement: !ruby/object:Gem::Requirement
@@ -419,15 +405,23 @@ files:
 - lib/isodoc-yaml/i18n-ru.yaml
 - lib/isodoc-yaml/i18n-zh-Hans.yaml
 - lib/isodoc.rb
+- lib/isodoc/base_style/all.css
 - lib/isodoc/base_style/all.scss
 - lib/isodoc/base_style/bands.scss
+- lib/isodoc/base_style/blocks.css
 - lib/isodoc/base_style/blocks.scss
+- lib/isodoc/base_style/coverpage.css
 - lib/isodoc/base_style/coverpage.scss
+- lib/isodoc/base_style/defaults.css
 - lib/isodoc/base_style/defaults.scss
+- lib/isodoc/base_style/metanorma_word.css
 - lib/isodoc/base_style/metanorma_word.scss
+- lib/isodoc/base_style/nav.css
 - lib/isodoc/base_style/nav.scss
+- lib/isodoc/base_style/reset.css
 - lib/isodoc/base_style/reset.scss
 - lib/isodoc/base_style/scripts.html
+- lib/isodoc/base_style/typography.css
 - lib/isodoc/base_style/typography.scss
 - lib/isodoc/class_utils.rb
 - lib/isodoc/common.rb
@@ -542,7 +536,7 @@ homepage: https://github.com/metanorma/isodoc
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -557,8 +551,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.9
+signing_key:
 specification_version: 4
 summary: Convert documents in IsoDoc into Word and HTML in AsciiDoc.
 test_files: []