isodoc 2.1.0.2 → 2.1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9602bbd1d24d83b9b43f2ac41bd1b01d1fd9edf44c3edf4fbb97c45fb93e1292
-  data.tar.gz: 5406db3babbfe8d4f7403b22a81e713081ba5de7c72f250c65bfeb08e98316e8
+  metadata.gz: 415f9833363761b737893c9c03f3d71c1b765ff06500f16223f12a7dbac27152
+  data.tar.gz: dda95049642e7d2743552b4e5249dddeab5a748e6314771ed09c8b2429e02b56
 SHA512:
-  metadata.gz: '0928611616ab02c2a0471ddd92c20bd79019a5c21c022d3a9989609919764f17837e1ae724e72de841b5ef31279537498193cb1ba06be3d65e2032f00bd684d6'
-  data.tar.gz: 6edc16d70239d9106ce0114b92bb0e5f6b85a843fae3abe93456448bc8503d72015c096b12eaaedb3ca9e46cafa135d1b1dcc334781167d9c78a14084f7fe928
+  metadata.gz: ac02cacff1a871b347de4b8d5726fcb888d8887923e002f1615dd446203c42d42d66a252caedd48111058f8389d50eec7fc0ca49ce7701fc5a14cac4edcaaad2
+  data.tar.gz: e4e62b67708eddf8d38fa2d19e2df91877a5647d6b5b84251f6de85105ed7c44db835c74ffef7e50b6834f1bc411efa7f5cddab0d731b067772198cdaa7e74f3

data/isodoc.gemspec

@@ -24,12 +24,15 @@ Gem::Specification.new do |spec|
 
   spec.bindir        = "bin"
   spec.require_paths = ["lib"]
-  spec.files         = `git ls-files`.split("\n")
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features|.github)/}) \
+    || f.match(%r{\.[a-zA-Z0-9_-]+\.yml|Rakefile|bin/rspec})
+  end
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   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 +40,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/blocks.scss

@@ -23,6 +23,13 @@
   }
 }
 
+@mixin listBlock() {
+  .ListTitle {
+    @include blockTitle();
+    text-align: left;
+  }
+}
+
 @mixin figureBlock() {
   .FigureTitle, .figure-title {
     @include blockTitle();

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

@@ -14,6 +14,8 @@ module IsoDoc
         end
       end
 
+      def location_parse(node, out); end
+
       def span_parse(node, out)
         node.children.each { |n| parse(n, out) }
       end
@@ -134,8 +136,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/lists.rb

@@ -1,13 +1,21 @@
 module IsoDoc
   module Function
     module Lists
+      def list_title_parse(node, out)
+        name = node.at(ns("./name")) or return
+        out.p **{ class: "ListTitle" } do |p|
+          name&.children&.each { |n| parse(n, p) }
+        end
+      end
+
       def ul_attrs(node)
         { id: node["id"], style: keep_style(node) }
       end
 
       def ul_parse(node, out)
+        list_title_parse(node, out)
         out.ul **attr_code(ul_attrs(node)) do |ul|
-          node.children.each { |n| parse(n, ul) }
+          node.children.each { |n| n.name == "name" or parse(n, ul) }
         end
       end
 
@@ -44,8 +52,9 @@ module IsoDoc
       end
 
       def ol_parse(node, out)
+        list_title_parse(node, out)
         out.ol **attr_code(ol_attrs(node)) do |ol|
-          node.children.each { |n| parse(n, ol) }
+          node.children.each { |n| n.name == "name" or parse(n, ol) }
         end
       end
 
@@ -82,17 +91,23 @@ module IsoDoc
       end
 
       def dl_parse(node, out)
+        list_title_parse(node, out)
         out.dl **dl_attrs(node) do |v|
           node.elements.select { |n| dt_dd? n }.each_slice(2) do |dt, dd|
-            v.dt **attr_code(id: dt["id"]) do |term|
-              dt_parse(dt, term)
-            end
-            v.dd **attr_code(id: dd["id"]) do |listitem|
-              dd.children.each { |n| parse(n, listitem) }
-            end
+            dl_parse1(v, dt, dd)
           end
         end
-        node.elements.reject { |n| dt_dd? n }.each { |n| parse(n, out) }
+        node.elements.reject { |n| dt_dd?(n) || n.name == "name" }
+          .each { |n| parse(n, out) }
+      end
+
+      def dl_parse1(dlist, dterm, ddef)
+        dlist.dt **attr_code(id: dterm["id"]) do |term|
+          dt_parse(dterm, term)
+        end
+        dlist.dd **attr_code(id: ddef["id"]) do |listitem|
+          ddef.children.each { |n| parse(n, listitem) }
+        end
       end
     end
   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
@@ -231,6 +231,7 @@ module IsoDoc
           when "toc" then toc_parse(node, out)
           when "variant-title" then variant_title(node, out)
           when "span" then span_parse(node, out)
+          when "location" then location_parse(node, out)
           else error_parse(node, out)
           end
         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
 
@@ -58,24 +58,30 @@ module IsoDoc
         end
       end
 
-      def to_xhtml_prep(xml)
-        xml.gsub!(/<\?xml[^>]*>/, "")
-        /<!DOCTYPE /.match(xml) || (xml = DOCTYPE_HDR + xml)
+      def numeric_escapes(xml)
+        c = HTMLEntities.new
         xml.split(/(&[^ \r\n\t#;]+;)/).map do |t|
           if /^(&[^ \t\r\n#;]+;)/.match?(t)
-            HTMLEntities.new.encode(HTMLEntities.new.decode(t), :hexadecimal)
+            c.encode(c.decode(t), :hexadecimal)
           else t
           end
         end.join
       end
 
+      def to_xhtml_prep(xml)
+        xml.gsub!(/<\?xml[^>]*>/, "")
+        /<!DOCTYPE /.match(xml) || (xml = DOCTYPE_HDR + xml)
+        numeric_escapes(xml)
+      end
+
       def to_xhtml_fragment(xml)
         doc = ::Nokogiri::XML.parse(NOKOHEAD)
         doc.fragment(xml)
       end
 
       def from_xhtml(xml)
-        xml.to_xml.sub(%r{ xmlns="http://www.w3.org/1999/xhtml"}, "")
+        numeric_escapes(xml.to_xml
+          .sub(%r{ xmlns="http://www.w3.org/1999/xhtml"}, ""))
       end
 
       CLAUSE_ANCESTOR =
@@ -100,8 +106,12 @@ module IsoDoc
         "local-name() = 'figure' or local-name() = 'formula' or "\
         "local-name() = 'table' or local-name() = 'example']/@id"
 
-      def get_note_container_id(node)
-        container = node.xpath(NOTE_CONTAINER_ANCESTOR)
+      # no recursion on references
+      def get_note_container_id(node, type)
+        xpath = NOTE_CONTAINER_ANCESTOR.dup
+        %w(figure table example).include?(type) and
+          xpath.sub!(%r[ or local-name\(\) = '#{type}'], "")
+        container = node.xpath(xpath)
         container&.last&.text || nil
       end