isodoc 2.4.1 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba10d3ff61b6c99d2251fd1d8e868bf09aea5dde1da505bc1745003778f8750d
-  data.tar.gz: b758cac0f031d6a16c95ba8dd05c963bf227438d64d63f1f3146dd745d5c42e9
+  metadata.gz: a0720c3026536785125b4c6c495e4f2573dfa7b2186094c0f36efa9c20a1fbd3
+  data.tar.gz: 9ea3325d067e417956b865edd0baf70dff9a5cb80008e6dfe5fbfbdaaaf16ff4
 SHA512:
-  metadata.gz: 1ba1187b3202d8b8ef7d8c0376ba6cd100230a0cbe889cfaa729510f174cdbfba884b2ca2b5607525b53391b83a007313e21427539aa8c42d604d295b90feb3b
-  data.tar.gz: 0b15b2d4bee5c08e2a0989eba6909d37827f67943eb8f0e86f9815f202ca7f408955b1905c7d041e32ae1433ddc1fa99e7fdecf4bf49c0174ee194731104135f
+  metadata.gz: 2e97827c7adacaa26ef823222897672413056219fba5a3e0a6dee92079ac680cd50a9f1dde9cb7c40fddf23ef000fcb0478709a95916a4e6b222bf3d4e94ca54
+  data.tar.gz: 888734821add95629f8709aac1e5ac8b95b372b6a33d43e366e78e0c4ec6a3957dc9264a86015501458ca2752b881f44053e1f7a3997c5d0fb1b43ec816abc74

data/lib/isodoc/base_style/all.css

@@ -124,6 +124,35 @@ a.FootnoteRef + a.FootnoteRef:before {
   color: red;
   text-decoration: line-through; }
 
+/* code highlighting with line numbers */
+table.rouge-line-table td.rouge-gutter {
+  -moz-user-select: none;
+  -ms-user-select: none;
+  -webkit-user-select: none;
+  user-select: none;
+  padding-right: 1em; }
+
+table.rouge-line-table td.rouge-code {
+  -moz-user-select: all;
+  -ms-user-select: all;
+  -webkit-user-select: all;
+  user-select: all; }
+
+table.rouge-line-table,
+table.rouge-line-table th,
+table.rouge-line-table td {
+  width: auto;
+  border: none;
+  margin: 0;
+  padding: 0;
+  font-size: 100%; }
+
+table.rouge-line-table pre {
+  margin: 0;
+  padding: 0;
+  overflow-x: visible;
+  font-size: 100%; }
+
 #standard-band {
   background-color: #0AC442; }
 

data/lib/isodoc/base_style/metanorma_word.css

@@ -45,3 +45,12 @@ span.addition {
 span.deletion {
   color: red;
   text-decoration: line-through; }
+
+table.rouge-line-table {
+  border: none;
+  mso-border-alt: none;
+  mso-border-insideh: none;
+  mso-border-insidev: none; }
+
+td.rouge-code p.Sourcecode {
+  margin: 0px; }

data/lib/isodoc/base_style/metanorma_word.scss

@@ -42,3 +42,14 @@ span.deletion {
         color: red;
         text-decoration: line-through;
 }
+
+table.rouge-line-table {
+  border:none;
+  mso-border-alt:none;
+  mso-border-insideh:none;
+  mso-border-insidev:none;
+}
+
+td.rouge-code p.Sourcecode {
+  margin: 0px;
+}

data/lib/isodoc/base_style/reset.css

@@ -123,3 +123,32 @@ a.FootnoteRef + a.FootnoteRef:before {
 .deletion {
   color: red;
   text-decoration: line-through; }
+
+/* code highlighting with line numbers */
+table.rouge-line-table td.rouge-gutter {
+  -moz-user-select: none;
+  -ms-user-select: none;
+  -webkit-user-select: none;
+  user-select: none;
+  padding-right: 1em; }
+
+table.rouge-line-table td.rouge-code {
+  -moz-user-select: all;
+  -ms-user-select: all;
+  -webkit-user-select: all;
+  user-select: all; }
+
+table.rouge-line-table,
+table.rouge-line-table th,
+table.rouge-line-table td {
+  width: auto;
+  border: none;
+  margin: 0;
+  padding: 0;
+  font-size: 100%; }
+
+table.rouge-line-table pre {
+  margin: 0;
+  padding: 0;
+  overflow-x: visible;
+  font-size: 100%; }

data/lib/isodoc/base_style/reset.scss

@@ -152,3 +152,37 @@ a.FootnoteRef + a.FootnoteRef:before {
   color: red;
   text-decoration: line-through;
 }
+
+/* code highlighting with line numbers */
+
+table.rouge-line-table td.rouge-gutter {
+  -moz-user-select: none;
+  -ms-user-select: none;
+  -webkit-user-select: none;
+  user-select: none;
+  padding-right: 1em;
+}
+
+table.rouge-line-table td.rouge-code {
+  -moz-user-select: all;
+  -ms-user-select: all;
+  -webkit-user-select: all;
+  user-select: all;
+}
+
+table.rouge-line-table,
+table.rouge-line-table th,
+table.rouge-line-table td {
+  width: auto;
+  border: none;
+  margin: 0;
+  padding: 0;
+  font-size: 100%;
+}
+
+table.rouge-line-table pre {
+  margin: 0;
+  padding: 0;
+  overflow-x: visible;
+  font-size: 100%;
+}

data/lib/isodoc/base_style/rouge.css

@@ -0,0 +1,39 @@
+sourcecode table td { padding: 5px; }
+sourcecode table pre { margin: 0; }
+sourcecode, sourcecode .w {
+  color: #444444;
+}
+sourcecode .cp {
+  color: #CC00A3;
+}
+sourcecode .cs {
+  color: #CC00A3;
+}
+sourcecode .c, sourcecode .ch, sourcecode .cd, sourcecode .cm, sourcecode .cpf, sourcecode .c1 {
+  color: #FF0000;
+}
+sourcecode .kc {
+  color: #C34E00;
+}
+sourcecode .kd {
+  color: #0000FF;
+}
+sourcecode .kr {
+  color: #007575;
+}
+sourcecode .k, sourcecode .kn, sourcecode .kp, sourcecode .kt, sourcecode .kv {
+  color: #0000FF;
+}
+sourcecode .s, sourcecode .sb, sourcecode .sc, sourcecode .ld, sourcecode .sd, sourcecode .s2, sourcecode .se, sourcecode .sh, sourcecode .si, sourcecode .sx, sourcecode .sr, sourcecode .s1, sourcecode .ss {
+  color: #009C00;
+}
+sourcecode .sa {
+  color: #0000FF;
+}
+sourcecode .nb, sourcecode .bp {
+  color: #C34E00;
+}
+sourcecode .nt {
+  color: #0000FF;
+}
+

data/lib/isodoc/base_style/typography.scss

@@ -65,6 +65,6 @@
     padding: 1em;
   }
   td.header {
-    font-weigth: 400;
+    font-weight: 400;
   }
 }

data/lib/isodoc/convert.rb

@@ -50,6 +50,8 @@ module IsoDoc
     # fontlicenseagreement: fontist font license agreement
     # modspecidentifierbase: base prefix for any Modspec identifiers
     # sourcehighlighter: whether to apply sourcecode highlighting
+    # semantic_xml_insert: whether to insert into presentation XML
+    #   a copy of semantic XML
     def initialize(options) # rubocop:disable Lint/MissingSuper
       @options = options_preprocess(options)
       init_stylesheets(@options)
@@ -60,6 +62,7 @@ module IsoDoc
       init_locations(@options)
       init_i18n(@options)
       init_rendering(@options)
+      init_arrangement(@options)
     end
 
     def options_preprocess(options)
@@ -77,14 +80,18 @@ module IsoDoc
       @datauriimage = options[:datauriimage]
       @suppressheadingnumbers = options[:suppressheadingnumbers]
       @break_up_urls_in_tables = options[:breakupurlsintables]
-      @sectionsplit = options[:sectionsplit] == "true"
       @suppressasciimathdup = options[:suppressasciimathdup]
-      @bare = options[:bare]
       @aligncrosselements = options[:aligncrosselements]
       @modspecidentifierbase = options[:modspecidentifierbase]
       @sourcehighlighter = options[:sourcehighlighter]
     end
 
+    def init_arrangement(options)
+      @sectionsplit = options[:sectionsplit] == "true"
+      @bare = options[:bare]
+      @semantic_xml_insert = options[:semanticxmlinsert] != "false"
+    end
+
     def init_i18n(options)
       @i18nyaml = options[:i18nyaml]
       @lang = options[:language] || "en"
@@ -187,7 +194,7 @@ module IsoDoc
       @xrefs.parse docxml
       bibitem_lookup(docxml)
       noko do |xml|
-        xml.html **{ lang: @lang.to_s } do |html|
+        xml.html lang: @lang.to_s do |html|
           html.parent.add_namespace("epub", "http://www.idpf.org/2007/ops")
           info docxml, nil
           populate_css

data/lib/isodoc/function/blocks.rb

@@ -6,19 +6,19 @@ module IsoDoc
       @annotation = false
 
       def middle_title(_isoxml, out)
-        out.p(**{ class: "zzSTDTitle1" }) { |p| p << @meta.get[:doctitle] }
+        out.p(class: "zzSTDTitle1") { |p| p << @meta.get[:doctitle] }
       end
 
       def figure_name_parse(_node, div, name)
         return if name.nil?
 
-        div.p **{ class: "FigureTitle", style: "text-align:center;" } do |p|
+        div.p class: "FigureTitle", style: "text-align:center;" do |p|
           name.children.each { |n| parse(n, p) }
         end
       end
 
       def figure_key(out)
-        out.p **{ style: "page-break-after:avoid;" } do |p|
+        out.p style: "page-break-after:avoid;" do |p|
           p.b { |b| b << @i18n.key }
         end
       end
@@ -63,7 +63,7 @@ module IsoDoc
       def sourcecode_name_parse(_node, div, name)
         return if name.nil?
 
-        div.p **{ class: "SourceTitle", style: "text-align:center;" } do |p|
+        div.p class: "SourceTitle", style: "text-align:center;" do |p|
           name.children.each { |n| parse(n, p) }
         end
       end
@@ -75,13 +75,22 @@ module IsoDoc
       def sourcecode_parse(node, out)
         name = node.at(ns("./name"))
         out.p **sourcecode_attrs(node) do |div|
-          @sourcecode = true unless node.at(ns(".//sourcecode"))
-          node.children.each { |n| parse(n, div) unless n.name == "name" }
-          @sourcecode = false
+          sourcecode_parse1(node, div)
         end
         sourcecode_name_parse(node, out, name)
       end
 
+      def sourcecode_parse1(node, div)
+        @sourcecode = "pre"
+        node.at(ns(".//table[@class = 'rouge-line-table']")) ||
+          node.at("./ancestor::xmlns:table[@class = 'rouge-line-table']") and
+          @sourcecode = "table"
+        # !node.ancestors("table").empty? and
+        # @sourcecode = "table"
+        node.children.each { |n| parse(n, div) unless n.name == "name" }
+        @sourcecode = false
+      end
+
       def pre_parse(node, out)
         out.pre node.text, **attr_code(id: node["id"])
       end
@@ -89,18 +98,22 @@ module IsoDoc
       def annotation_parse(node, out)
         @sourcecode = false
         @annotation = true
-        node.at("./preceding-sibling::*[local-name() = 'annotation']") or
-          out << "<br/>"
-        callout = node.at(ns("//callout[@target='#{node['id']}']"))
-        out << "<br/>&lt;#{callout.text}&gt; "
-        out << node&.children&.text&.strip
-        @annotation = false
+        out.div class: "annotation" do |div|
+          # node.at("./preceding-sibling::*[local-name() = 'annotation']") or
+          #  div << "<br/>"
+          callout = node.at(ns("//callout[@target='#{node['id']}']"))
+          div << "<span class='c'>&lt;#{callout.text}&gt;</span> "
+          div << "<span class='c'>#{node.children&.text&.strip}</span>"
+          node.at("./following-sibling::*[local-name() = 'annotation']") and
+            div << "<br/>"
+          @annotation = false
+        end
       end
 
       def formula_where(dlist, out)
         return unless dlist
 
-        out.p **{ style: "page-break-after:avoid;" } do |p|
+        out.p style: "page-break-after:avoid;" do |p|
           p << @i18n.where
         end
         parse(dlist, out)
@@ -168,7 +181,7 @@ module IsoDoc
         source = node.at(ns("./source"))
         return if author.nil? && source.nil?
 
-        out.p **{ class: "QuoteAttribution" } do |p|
+        out.p class: "QuoteAttribution" do |p|
           p << "&#x2014; #{author.text}" if author
           p << ", " if author && source
           eref_parse(source, p) if source
@@ -198,7 +211,7 @@ module IsoDoc
       end
 
       def toc_parse(node, out)
-        out.div **{ class: "toc" } do |div|
+        out.div class: "toc" do |div|
           node.children.each { |n| parse(n, div) }
         end
       end

data/lib/isodoc/function/inline.rb

@@ -42,7 +42,7 @@ module IsoDoc
                  else
                    "##{node['target']}"
                  end
-        out.a(**{ href: target }) { |l| no_locality_parse(node, l) }
+        out.a(href: target) { |l| no_locality_parse(node, l) }
       end
 
       def suffix_url(url)
@@ -77,10 +77,10 @@ module IsoDoc
         if href = eref_target(node)
           if node["type"] == "footnote"
             out.sup do |s|
-              s.a(**{ href: href }) { |l| no_locality_parse(node, l) }
+              s.a(href: href) { |l| no_locality_parse(node, l) }
             end
           else
-            out.a(**{ href: href }) { |l| no_locality_parse(node, l) }
+            out.a(href: href) { |l| no_locality_parse(node, l) }
           end
         else no_locality_parse(node, out)
         end
@@ -109,7 +109,7 @@ module IsoDoc
                when "LaTeX" then latexmath_parse(node)
                else HTMLEntities.new.encode(node.text)
                end
-        out.span **{ class: "stem" } do |span|
+        out.span class: "stem" do |span|
           span.parent.add_child ooml
         end
       end
@@ -123,7 +123,7 @@ module IsoDoc
       def asciimath_parse(node)
         a = node.at(ns("./asciimath"))&.text || node.text
 
-        "#{@openmathdelim}#{HTMLEntities.new.encode(a)}"\
+        "#{@openmathdelim}#{HTMLEntities.new.encode(a)}" \
           "#{@closemathdelim}"
       end
 
@@ -134,7 +134,7 @@ module IsoDoc
 
       def image_title_parse(out, caption)
         unless caption.nil?
-          out.p **{ class: "FigureTitle", style: "text-align:center;" } do |p|
+          out.p class: "FigureTitle", style: "text-align:center;" do |p|
             p.b { |b| b << caption.to_s }
           end
         end
@@ -151,7 +151,7 @@ module IsoDoc
       end
 
       def smallcap_parse(node, xml)
-        xml.span **{ style: "font-variant:small-caps;" } do |s|
+        xml.span style: "font-variant:small-caps;" do |s|
           node.children.each { |n| parse(n, s) }
         end
       end
@@ -160,21 +160,21 @@ module IsoDoc
         return if node.nil? || node.text.nil?
 
         text = node.to_s
-        if in_sourcecode
+        @sourcecode == "pre" and
           text = text.gsub("\n", "<br/>").gsub("<br/> ", "<br/>&#xa0;")
-            .gsub(/ (?= )/, "&#xa0;")
-        end
+        @sourcecode and
+          text = text.gsub(/ (?= )/, "&#xa0;")
         out << text
       end
 
       def add_parse(node, out)
-        out.span **{ class: "addition" } do |e|
+        out.span class: "addition" do |e|
           node.children.each { |n| parse(n, e) }
         end
       end
 
       def del_parse(node, out)
-        out.span **{ class: "deletion" } do |e|
+        out.span class: "deletion" do |e|
           node.children.each { |n| parse(n, e) }
         end
       end
@@ -182,7 +182,7 @@ module IsoDoc
       def error_parse(node, out)
         text = node.to_xml.gsub(/</, "&lt;").gsub(/>/, "&gt;")
         out.para do |p|
-          p.b(**{ role: "strong" }) { |e| e << text }
+          p.b(role: "strong") { |e| e << text }
         end
       end
     end

data/lib/isodoc/function/inline_simple.rb

@@ -30,7 +30,7 @@ module IsoDoc
       end
 
       def keyword_parse(node, out)
-        out.span **{ class: "keyword" } do |s|
+        out.span class: "keyword" do |s|
           node.children.each { |n| parse(n, s) }
         end
       end

data/lib/isodoc/function/references.rb

@@ -4,55 +4,35 @@ module IsoDoc
       # This is highly specific to ISO, but it's not a bad precedent for
       # references anyway; keeping here instead of in IsoDoc::Iso for now
       def docid_l10n(text)
-        return text if text.nil?
-
-        text.gsub(/All Parts/i, @i18n.all_parts.downcase) if @i18n.all_parts
+        text.nil? and return text
+        @i18n.all_parts and text.gsub!(/All Parts/i, @i18n.all_parts.downcase)
+        text.size < 20 and text.gsub!(/ /, "&#xa0;")
         text
       end
 
-      def nonstd_bibitem(list, bib, _ordinal, biblio) # %%%
+      def nonstd_bibitem(list, bib, _ordinal, biblio)
         list.p **attr_code(iso_bibitem_entry_attrs(bib, biblio)) do |ref|
-          #           ids = bibitem_ref_code(bib)
-          #           idents = render_identifier(ids)
-          #           if biblio then ref_entry_code(ref, ordinal, idents, ids)
-          #           else
-          #             ref << (idents[:ordinal] || idents[:metanorma] || idents[:sdo]).to_s
-          #             ref << ", #{idents[sdo]}" if idents[:ordinal] && idents[:sdo]
-          #           end
-          #           ref << "," if idents[:sdo]
           tag = bib.at(ns("./biblio-tag"))
           tag&.children&.each { |n| parse(n, ref) }
           reference_format(bib, ref)
         end
       end
 
-      def std_bibitem_entry(list, bib, _ordinal, biblio) # %%%
+      def std_bibitem_entry(list, bib, _ordinal, biblio)
         list.p **attr_code(iso_bibitem_entry_attrs(bib, biblio)) do |ref|
-          #           idents = render_identifier(bibitem_ref_code(bib))
-          #           if biblio then ref_entry_code(ref, ordinal, idents, nil)
-          #           else
-          #             ref << (idents[:ordinal] || idents[:metanorma] || idents[:sdo]).to_s
-          #             ref << ", #{idents[:sdo]}" if (idents[:ordinal] ||
-          #                                           idents[:metanorma]) && idents[:sdo]
-          #           end
-          #           date_note_process(bib, ref)
-          #           ref << "," if idents[:sdo]
           tag = bib.at(ns("./biblio-tag"))
           tag&.children&.each { |n| parse(n, ref) }
           reference_format(bib, ref)
         end
       end
 
-      #       # if ids is just a number, only use that ([1] Non-Standard)
-      #       # else, use both ordinal, as prefix, and ids
-      #       def ref_entry_code(ref, ordinal, ids, _id) #%%%
-      #         prefix_bracketed_ref(ref, ids[:ordinal] || ids[:metanorma] ||
-      #                              "[#{ordinal}]")
-      #         ids[:sdo] and ref << (ids[:sdo]).to_s
-      #       end
+      SKIP_DOCID = <<~XPATH.strip.freeze
+        @type = 'DOI' or @type = 'doi' or @type = 'ISSN' or @type = 'issn' or @type = 'ISBN' or @type = 'isbn' or starts-with(@type, 'ISSN.') or starts-with(@type, 'ISBN.') or starts-with(@type, 'issn.') or starts-with(@type, 'isbn.')
+      XPATH
 
-      SKIP_DOCID = "@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or " \
-                   "@type = 'metanorma-ordinal' or @type = 'ISBN'".freeze
+      SKIP_DOC1 = <<~XPATH.strip.freeze
+        #{SKIP_DOCID} or @type = 'metanorma-ordinal' or @type = 'metanorma'
+      XPATH
 
       def pref_ref_code(bib)
         bib["suppress_identifier"] == "true" and return nil
@@ -61,8 +41,8 @@ module IsoDoc
         ret.empty? and
           ret = bib.xpath(ns("./docidentifier[@primary = 'true']"))
         ret.empty? and
-          ret = bib.at(ns("./docidentifier[not(#{SKIP_DOCID})]#{lang}")) ||
-            bib.at(ns("./docidentifier[not(#{SKIP_DOCID})]"))
+          ret = bib.at(ns("./docidentifier[not(#{SKIP_DOC1})]#{lang}")) ||
+            bib.at(ns("./docidentifier[not(#{SKIP_DOC1})]"))
         ret
       end
 
@@ -70,8 +50,7 @@ module IsoDoc
       def bibitem_ref_code(bib)
         id = bib.at(ns("./docidentifier[@type = 'metanorma']"))
         id1 = pref_ref_code(bib)
-        id2 = bib.at(ns("./docidentifier[@type = 'DOI' or @type = 'ISSN' or " \
-                        "@type = 'ISBN']"))
+        id2 = bib.at(ns("./docidentifier[#{SKIP_DOCID}]"))
         id3 = bib.at(ns("./docidentifier[@type = 'metanorma-ordinal']"))
         return [id, id1, id2, id3] if id || id1 || id2 || id3
         return [nil, nil, nil, nil] if bib["suppress_identifier"] == "true"
@@ -139,9 +118,9 @@ module IsoDoc
 
       def standard?(bib)
         ret = false
-        drop = %w(metanorma DOI ISSN ISBN)
         bib.xpath(ns("./docidentifier")).each do |id|
-          next if id["type"].nil? || drop.include?(id["type"])
+          next if id["type"].nil? ||
+            id.at(".//self::*[#{SKIP_DOCID} or @type = 'metanorma']")
 
           ret = true
         end
@@ -194,7 +173,7 @@ module IsoDoc
           return
         page_break(out)
         out.div do |div|
-          div.h1 **{ class: "Section3" } do |h1|
+          div.h1 class: "Section3" do |h1|
             f.at(ns("./title"))&.children&.each { |c2| parse(c2, h1) }
           end
           biblio_list(f, div, true)

data/lib/isodoc/function/table.rb

@@ -103,7 +103,7 @@ module IsoDoc
         !header && cell.name == "th" and
           scope = (cell["rowspan"] ? "rowgroup" : "row")
         { rowspan: cell["rowspan"], colspan: cell["colspan"],
-          style: style.gsub(/\n/, ""), scope: scope }
+          style: style.gsub(/\n/, ""), scope: scope, class: cell["class"] }
       end
 
       def make_tr_attr_style(row, rowmax, totalrows, _header, bordered)

data/lib/isodoc/function/to_word_html.rb

@@ -8,10 +8,6 @@ module IsoDoc
         @termdomain = termdomain
       end
 
-      def in_sourcecode
-        @sourcecode
-      end
-
       def note?
         @note
       end

data/lib/isodoc/function/utils.rb

@@ -37,10 +37,14 @@ module IsoDoc
       DOCTYPE_HDR = "<!DOCTYPE html SYSTEM " \
                     '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'.freeze
 
+      HUGESTRICT =
+        Nokogiri::XML::ParseOptions::HUGE |
+        Nokogiri::XML::ParseOptions::STRICT
+
       def to_xhtml(xml)
         xml = to_xhtml_prep(xml)
         begin
-          Nokogiri::XML.parse(xml, &:strict)
+          Nokogiri::XML.parse(xml, nil, nil, HUGESTRICT)
         rescue Nokogiri::XML::SyntaxError => e
           File.open("#{@filename}.#{@format}.err", "w:UTF-8") do |f|
             f.write xml
@@ -65,7 +69,7 @@ module IsoDoc
       end
 
       def from_xhtml(xml)
-        numeric_escapes(xml.to_xml
+        numeric_escapes(to_xml(xml)
           .sub(%r{ xmlns="http://www.w3.org/1999/xhtml"}, ""))
       end