isodoc 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba10d3ff61b6c99d2251fd1d8e868bf09aea5dde1da505bc1745003778f8750d
-  data.tar.gz: b758cac0f031d6a16c95ba8dd05c963bf227438d64d63f1f3146dd745d5c42e9
+  metadata.gz: 5f122ad0105340afb41607b8639eb00b7205328f9bddad0a5a3726e9644c912e
+  data.tar.gz: 04b386a592680a3315ed3d55e7c6716bc177fd628a8d67f520e224b1a4d4de5f
 SHA512:
-  metadata.gz: 1ba1187b3202d8b8ef7d8c0376ba6cd100230a0cbe889cfaa729510f174cdbfba884b2ca2b5607525b53391b83a007313e21427539aa8c42d604d295b90feb3b
-  data.tar.gz: 0b15b2d4bee5c08e2a0989eba6909d37827f67943eb8f0e86f9815f202ca7f408955b1905c7d041e32ae1433ddc1fa99e7fdecf4bf49c0174ee194731104135f
+  metadata.gz: 6fef982e2095471e35cc7235a3bc5712066845fd4302131e9760e8d10da548ec73b40f344816077b915b63d93d32cb5b459507ad2133ac52da257a6230e99353
+  data.tar.gz: cbbaa050b52517cf272d7d0da4d875075e094b3dcda074a89c55945ceedb6c357914f9e9be0cd09e45ac9d6ace9f61f71b8f9d2ccb5c8d3ebb5ba4fd9251e632

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/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,19 @@ 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")) || !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 +95,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 +178,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 +208,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/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

data/lib/isodoc/html_function/html.rb

@@ -7,7 +7,7 @@ module IsoDoc
       def convert1(docxml, filename, dir)
         bibitem_lookup(docxml)
         noko do |xml|
-          xml.html **{ lang: @lang.to_s } do |html|
+          xml.html lang: @lang.to_s do |html|
             info docxml, nil
             populate_css
             html.head { |head| define_head head, filename, dir }
@@ -19,7 +19,7 @@ module IsoDoc
       def make_body1(body, _docxml)
         return if @bare
 
-        body.div **{ class: "title-section" } do |div1|
+        body.div class: "title-section" do |div1|
           div1.p { |p| p << "&#xa0;" } # placeholder
         end
         section_break(body)
@@ -28,14 +28,14 @@ module IsoDoc
       def make_body2(body, _docxml)
         return if @bare
 
-        body.div **{ class: "prefatory-section" } do |div2|
+        body.div class: "prefatory-section" do |div2|
           div2.p { |p| p << "&#xa0;" } # placeholder
         end
         section_break(body)
       end
 
       def make_body3(body, docxml)
-        body.div **{ class: "main-section" } do |div3|
+        body.div class: "main-section" do |div3|
           boilerplate docxml, div3
           preface_block docxml, div3
           abstract docxml, div3
@@ -51,8 +51,8 @@ module IsoDoc
 
       def googlefonts
         <<~HEAD.freeze
-          <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet">
-          <link href="https://fonts.googleapis.com/css?family=Lato:400,400i,700,900" rel="stylesheet">
+          <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet"/>
+          <link href="https://fonts.googleapis.com/css?family=Lato:400,400i,700,900" rel="stylesheet"/>
         HEAD
       end
 
@@ -66,11 +66,11 @@ module IsoDoc
           <script type="text/javascript">#{toclevel}</script>
 
           <!--Google fonts-->
-          <link rel="preconnect" href="https://fonts.gstatic.com">#{' '}
+          <link rel="preconnect" href="https://fonts.gstatic.com"/>
           #{googlefonts}
           <!--Font awesome import for the link icon-->
-          <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css" integrity="sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk" crossorigin="anonymous">
-          <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" integrity="sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P" crossorigin="anonymous">
+          <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css" integrity="sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk" crossorigin="anonymous"/>
+          <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" integrity="sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P" crossorigin="anonymous"/>
           <style class="anchorjs"></style>
         HEAD
       end
@@ -91,10 +91,10 @@ module IsoDoc
 
       def sourcecode_parse(node, out)
         name = node.at(ns("./name"))
-        out.pre **sourcecode_attrs(node).merge(class: "sourcecode") do |div|
-          @sourcecode = true unless node.at(ns(".//sourcecode"))
-          node.children.each { |n| parse(n, div) unless n.name == "name" }
-          @sourcecode = false
+        tag = node.at(ns(".//sourcecode | .//table")) ? "div" : "pre"
+        attr = sourcecode_attrs(node).merge(class: "sourcecode")
+        out.send tag, **attr do |div|
+          sourcecode_parse1(node, div)
         end
         sourcecode_name_parse(node, out, name)
       end

data/lib/isodoc/html_function/postprocess.rb

@@ -27,7 +27,20 @@ module IsoDoc
       def html_cleanup(html)
         html = term_header(html_footnote_filter(html_preface(htmlstyle(html))))
         html = footnote_format(footnote_backlinks(html_toc(html)))
-        mathml(html_list_clean(remove_placeholder_paras(html)))
+        html = mathml(html_list_clean(remove_placeholder_paras(html)))
+        sourcecode_cleanup(html)
+      end
+
+      def sourcecode_cleanup(html)
+        ann = ".//div[@class = 'annotation']"
+        html.xpath("//pre[#{ann}] | //div[@class = 'sourcecode'][#{ann}]")
+          .each do |p|
+          ins = p.after("<pre class='sourcecode'/>").next_element
+          p.xpath(ann).each do |d|
+            ins << d.remove.children
+          end
+        end
+        html
       end
 
       def remove_placeholder_paras(html)

data/lib/isodoc/presentation_function/block.rb

@@ -1,4 +1,5 @@
 require_relative "./image"
+require_relative "./sourcecode"
 require "rouge"
 
 module IsoDoc
@@ -26,104 +27,6 @@ module IsoDoc
       end
     end
 
-    def sourcehighlighter_theme
-      "igorpro"
-    end
-
-    def sourcehighlighter_css(docxml)
-      @sourcehighlighter or return
-      ins = docxml.at(ns("//misc-container")) ||
-        docxml.at(ns("//bibdata")).after("<misc-container/>").next_element
-      x = Rouge::Theme.find(sourcehighlighter_theme)
-        .render(scope: "sourcecode")
-      ins << "<source-highlighter-css>#{x}</source-highlighter-css>"
-    end
-
-    def sourcehighlighter
-      @sourcehighlighter or return
-      f = Rouge::Formatters::HTML.new
-      { formatter: f,
-        formatter_line: Rouge::Formatters::HTMLTable.new(f, {}) }
-    end
-
-    def sourcecode(docxml)
-      sourcehighlighter_css(docxml)
-      @highlighter = sourcehighlighter
-      docxml.xpath(ns("//sourcecode")).each do |f|
-        sourcecode1(f)
-      end
-    end
-
-    def sourcecode1(elem)
-      source_highlight(elem)
-      source_label(elem)
-    end
-
-    def source_highlight(elem)
-      @highlighter or return
-      markup = source_remove_markup(elem)
-      p = source_lex(elem)
-      wrapper, code =
-        if elem["linenums"] == "true" then sourcecode_table_to_elem(elem, p)
-        else
-          r = Nokogiri::XML.fragment(@highlighter[:formatter].format(p))
-          [r, r]
-        end
-      elem.children = source_restore_markup(wrapper, code, markup)
-    end
-
-    def source_remove_markup(elem)
-      ret = {}
-      name = elem.at(ns("./name")) and ret[:name] = name.remove.to_xml
-      ret[:ann] = elem.xpath(ns("./annotation")).each(&:remove)
-      ret[:call] = elem.xpath(ns("./callout")).each_with_object([]) do |c, m|
-        m << { xml: c.remove.to_xml, line: c.line - elem.line }
-      end
-      ret
-    end
-
-    def source_restore_markup(wrapper, code, markup)
-      text = source_restore_callouts(code, markup[:call])
-      ret = if code == wrapper
-              text
-            else
-              code.replace(text)
-              to_xml(wrapper)
-            end
-      "#{markup[:name]}#{ret}#{markup[:ann]}"
-    end
-
-    def source_restore_callouts(code, callouts)
-      text = to_xml(code)
-      text.split(/[\n\r]/).each_with_index do |c, i|
-        while !callouts.empty? && callouts[0][:line] == i
-          c.sub!(/\s+$/, " #{callouts[0][:xml]} ")
-          callouts.shift
-        end
-      end.join("\n")
-    end
-
-    def sourcecode_table_to_elem(elem, tokens)
-      r = Nokogiri::XML(@highlighter[:formatter_line].format(tokens)).root
-      pre = r.at(".//td[@class = 'rouge-code']/pre")
-      %w(style).each { |n| elem[n] and pre[n] = elem[n] }
-      pre.name = "sourcecode"
-      [r, pre]
-    end
-
-    def source_lex(elem)
-      l = (Rouge::Lexer.find(elem["lang"] || "plaintext") ||
-       Rouge::Lexer.find("plaintext"))
-      l.lex(@c.decode(elem.children.to_xml))
-    end
-
-    def source_label(elem)
-      labelled_ancestor(elem) and return
-      lbl = @xrefs.anchor(elem["id"], :label, false) or return
-      prefix_name(elem, block_delim,
-                  l10n("#{lower2cap @i18n.figure} #{lbl}"), "name")
-    end
-
     def formula(docxml)
       docxml.xpath(ns("//formula")).each { |f| formula1(f) }
     end