isodoc 2.4.1 → 2.4.3

data/lib/isodoc/word_function/postprocess_toc.rb

@@ -0,0 +1,165 @@
+module IsoDoc
+  module WordFunction
+    module Postprocess
+      def insert_toc(intro, docxml, level)
+        toc = ""
+        toc += make_WordToC(docxml, level)
+        toc += make_table_word_toc(docxml)
+        toc += make_figure_word_toc(docxml)
+        toc += make_recommendation_word_toc(docxml)
+        intro.sub(/WORDTOC/, toc)
+      end
+
+      def word_toc_entry(toclevel, heading)
+        bookmark = bookmarkid # Random.rand(1000000000)
+        <<~TOC
+          <p class="MsoToc#{toclevel}"><span class="MsoHyperlink"><span lang="EN-GB" style='mso-no-proof:yes'>
+          <a href="#_Toc#{bookmark}">#{heading}<span lang="EN-GB" class="MsoTocTextSpan">
+          <span style='mso-tab-count:1 dotted'>. </span>
+          </span><span lang="EN-GB" class="MsoTocTextSpan">
+          <span style='mso-element:field-begin'></span></span>
+          <span lang="EN-GB" class="MsoTocTextSpan"> PAGEREF _Toc#{bookmark} \\h </span>
+            <span lang="EN-GB" class="MsoTocTextSpan"><span style='mso-element:field-separator'></span></span><span
+            lang="EN-GB" class="MsoTocTextSpan">1</span>
+            <span lang="EN-GB" class="MsoTocTextSpan"></span><span
+            lang="EN-GB" class="MsoTocTextSpan"><span style='mso-element:field-end'></span></span></a></span></span></p>
+
+        TOC
+      end
+
+      def word_toc_preface(level)
+        <<~TOC
+          <span lang="EN-GB"><span style='mso-element:field-begin'></span><span
+            style='mso-spacerun:yes'>&#xA0;</span>TOC \\o "1-#{level}" \\h \\z \\u <span
+            style='mso-element:field-separator'></span></span>
+        TOC
+      end
+
+      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>&#xA0;</o:p></span></p>
+      TOC
+
+      def make_WordToC(docxml, level)
+        toc = ""
+        # docxml.xpath("//h1 | //h2[not(ancestor::*[@class = 'Section3'])]").
+        xpath = (1..level).each.map { |i| "//h#{i}" }.join (" | ")
+        docxml.xpath(xpath).each do |h|
+          toc += word_toc_entry(h.name[1].to_i, header_strip(h))
+        end
+        toc.sub(/(<p class="MsoToc1">)/,
+                %{\\1#{word_toc_preface(level)}}) + WORD_TOC_SUFFIX1
+      end
+
+      # inheriting gems need to add native Word name of style, if different
+      # including both CSS style name and human readable style name.
+      # Any human readable style name needs to come first for the Word template
+      # to work in regenerating the ToC
+      def table_toc_class
+        %w(TableTitle tabletitle)
+      end
+
+      def figure_toc_class
+        %w(FigureTitle figuretitle)
+      end
+
+      def reqt_toc_class
+        %w(RecommendationTitle RecommendationTestTitle
+           recommendationtitle recommendationtesttitle)
+      end
+
+      def toc_word_class_list(classes)
+        classes.map do |x|
+          / /.match?(x) ? %(&quot;#{x}&quot;) : x
+        end.join(",")
+      end
+
+      def word_toc_reqt_preface1
+        <<~TOC
+          <span lang="EN-GB"><span style='mso-element:field-begin'></span><span
+          style='mso-spacerun:yes'>&#xA0;</span>TOC \\h \\z \\t #{toc_word_class_list reqt_toc_class}
+          <span style='mso-element:field-separator'></span></span>
+        TOC
+      end
+
+      def word_toc_table_preface1
+        <<~TOC
+          <span lang="EN-GB"><span style='mso-element:field-begin'></span><span style='mso-spacerun:yes'>&#xA0;</span>TOC
+          \\h \\z \\t #{toc_word_class_list table_toc_class} <span style='mso-element:field-separator'></span></span>
+        TOC
+      end
+
+      def word_toc_figure_preface1
+        <<~TOC
+          <span lang="EN-GB"><span style='mso-element:field-begin'></span><span style='mso-spacerun:yes'>&#xA0;</span>TOC
+          \\h \\z \\t #{toc_word_class_list figure_toc_class} <span style='mso-element:field-separator'></span></span>
+        TOC
+      end
+
+      def table_toc_xpath
+        attr = table_toc_class.map { |x| "@class = '#{x}'" }
+        "//p[#{attr.join(' or ')}]"
+      end
+
+      def make_table_word_toc(docxml)
+        (docxml.at(table_toc_xpath) && @toctablestitle) or return ""
+        toc = %{<p class="TOCTitle">#{@toctablestitle}</p>}
+        docxml.xpath(table_toc_xpath).each do |h|
+          toc += word_toc_entry(1, header_strip(h))
+        end
+        toc.sub(/(<p class="MsoToc1">)/,
+                %{\\1#{word_toc_table_preface1}}) + WORD_TOC_SUFFIX1
+      end
+
+      def figure_toc_xpath
+        attr = figure_toc_class.map { |x| "@class = '#{x}'" }
+        "//p[#{attr.join(' or ')}]"
+      end
+
+      def make_figure_word_toc(docxml)
+        (docxml.at(figure_toc_xpath) && @tocfigurestitle) or return ""
+        toc = %{<p class="TOCTitle">#{@tocfigurestitle}</p>}
+        docxml.xpath(figure_toc_xpath).each do |h|
+          toc += word_toc_entry(1, header_strip(h))
+        end
+        toc.sub(/(<p class="MsoToc1">)/,
+                %{\\1#{word_toc_figure_preface1}}) + WORD_TOC_SUFFIX1
+      end
+
+      def reqt_toc_xpath
+        attr = reqt_toc_class.map { |x| "@class = '#{x}'" }
+        "//p[#{attr.join(' or ')}]"
+      end
+
+      def make_recommendation_word_toc(docxml)
+        (docxml.at(reqt_toc_xpath) && @tocrecommendationstitle) or return ""
+        toc = %{<p class="TOCTitle">#{@tocrecommendationstitle}</p>}
+        docxml.xpath(reqt_toc_xpath).sort_by do |h|
+          recommmendation_sort_key(h.text)
+        end.each do |h|
+          toc += word_toc_entry(1, header_strip(h))
+        end
+        toc.sub(/(<p class="MsoToc1">)/,
+                %{\\1#{word_toc_reqt_preface1}}) + WORD_TOC_SUFFIX1
+      end
+
+      def recommmendation_sort_key(header)
+        m = /^([^0-9]+) (\d+)/.match(header) || /^([^:]+)/.match(header)
+        m ||= [header, nil]
+        ret = "#{recommmendation_sort_key1(m[1])}::"
+        m[2] and ret += ("%04d" % m[2].to_i).to_s
+        ret
+      end
+
+      def recommmendation_sort_key1(type)
+        case type&.downcase
+        when "requirement" then "04"
+        when "recommendation" then "05"
+        when "permission" then "06"
+        else type
+        end
+      end
+    end
+  end
+end

data/lib/isodoc/word_function/table.rb

@@ -24,34 +24,53 @@ module IsoDoc
       def make_tr_attr(cell, row, totalrows, header, bordered)
         style = cell.name == "th" ? "font-weight:bold;" : ""
         rowmax = cell["rowspan"] ? row + cell["rowspan"].to_i - 1 : row
-        style += make_tr_attr_style(row, rowmax, totalrows, header, bordered)
+        style += make_tr_attr_style(cell, row, rowmax, totalrows,
+                                    { header: header, bordered: bordered })
         { rowspan: cell["rowspan"], colspan: cell["colspan"],
-          valign: cell["valign"], align: cell["align"], style: style }
+          valign: cell["valign"], align: cell["align"], style: style,
+          class: cell["class"] }
       end
 
-      def make_tr_attr_style(row, rowmax, totalrows, header, bordered)
+      def make_tr_attr_style(cell, row, rowmax, totalrows, opt)
+        top = row.zero? ? "#{SW1} 1.5pt;" : "none;"
+        bottom = "#{SW1} #{rowmax >= totalrows ? '1.5' : '1.0'}pt;"
         ret = <<~STYLE.gsub(/\n/, "")
-          border-top:#{row.zero? ? "#{SW1} 1.5pt;" : 'none;'}
-          mso-border-top-alt:#{row.zero? ? "#{SW1} 1.5pt;" : 'none;'}
-          border-bottom:#{SW1} #{rowmax >= totalrows ? '1.5' : '1.0'}pt;
-          mso-border-bottom-alt:#{SW1} #{rowmax >= totalrows ? '1.5' : '1.0'}pt;
+          border-top:#{top}mso-border-top-alt:#{top}
+          border-bottom:#{bottom}mso-border-bottom-alt:#{bottom}
         STYLE
-        bordered or ret = ""
-        pb = header || (totalrows <= 10 && rowmax < totalrows) ? "avoid" : "auto"
+        opt[:bordered] or ret = ""
+        pb = keep_rows_together(cell, rowmax, totalrows, opt) ? "avoid" : "auto"
         "#{ret}page-break-after:#{pb};"
       end
 
+      def keep_rows_together(cell, rowmax, totalrows, opt)
+        opt[:header] and return true
+        table_line_count(cell.parent.parent) > 15 and return false
+        (totalrows <= 10 && rowmax < totalrows)
+      end
+
+      def table_line_count(tbody)
+        sum = 0
+        tbody.xpath(ns(".//tr")).each do |r|
+          i = 1
+          r.xpath(ns(".//td | .//th")).each do |c|
+            n = c.xpath(ns(".//li | .//p | .//br")).size
+            n > i and i = n
+          end
+          sum += i
+        end
+        sum
+      end
+
       def table_attrs(node)
         c = node["class"]
         bordered = "border-spacing:0;border-width:1px;"
         (%w(modspec).include?(c) || !c) or bordered = nil
         ret = {
-          summary: node["summary"],
-          width: node["width"],
+          summary: node["summary"], width: node["width"],
           style: "mso-table-anchor-horizontal:column;mso-table-overlap:never;" \
                  "#{bordered}#{keep_style(node)}",
-          class: (node.text.length > 4000 ? "MsoISOTableBig" : "MsoISOTable"),
-        }
+          class: (node.text.length > 4000 ? "MsoISOTableBig" : "MsoISOTable") }
         bordered or ret.delete(:class)
         super.merge(attr_code(ret))
       end
@@ -60,7 +79,7 @@ module IsoDoc
         colgroup = node.at(ns("./colgroup")) or return
         table.colgroup do |cg|
           colgroup.xpath(ns("./col")).each do |c|
-            cg.col **{ width: c["width"] }
+            cg.col width: c["width"]
           end
         end
       end
@@ -68,7 +87,7 @@ module IsoDoc
       def table_parse(node, out)
         @in_table = true
         table_title_parse(node, out)
-        out.div **{ align: "center", class: "table_container" } do |div|
+        out.div align: "center", class: "table_container" do |div|
           div.table **table_attrs(node) do |t|
             colgroup(node, t)
             thead_parse(node, t)

data/lib/isodoc/xref/xref_gen.rb

@@ -133,10 +133,8 @@ module IsoDoc
       end
 
       def example_anchor_names1(notes, counter)
-        notes.each do |n|
-          next if @anchors[n["id"]] || blank?(n["id"])
-
-          @anchors[n["id"]] =
+        notes.noblank.each do |n|
+          @anchors[n["id"]] ||=
             anchor_struct(increment_label(notes, n, counter), n,
                           @labels["example_xref"], "example", n["unnumbered"])
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-19 00:00:00.000000000 Z
+date: 2023-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -416,6 +416,7 @@ files:
 - lib/isodoc/base_style/nav.scss
 - lib/isodoc/base_style/reset.css
 - lib/isodoc/base_style/reset.scss
+- lib/isodoc/base_style/rouge.css
 - lib/isodoc/base_style/scripts.html
 - lib/isodoc/base_style/typography.css
 - lib/isodoc/base_style/typography.scss
@@ -465,6 +466,7 @@ files:
 - lib/isodoc/presentation_function/math.rb
 - lib/isodoc/presentation_function/refs.rb
 - lib/isodoc/presentation_function/section.rb
+- lib/isodoc/presentation_function/sourcecode.rb
 - lib/isodoc/presentation_function/terms.rb
 - lib/isodoc/presentation_function/xrefs.rb
 - lib/isodoc/presentation_xml_convert.rb
@@ -478,6 +480,8 @@ files:
 - lib/isodoc/word_function/inline.rb
 - lib/isodoc/word_function/postprocess.rb
 - lib/isodoc/word_function/postprocess_cover.rb
+- lib/isodoc/word_function/postprocess_table.rb
+- lib/isodoc/word_function/postprocess_toc.rb
 - lib/isodoc/word_function/table.rb
 - lib/isodoc/xref.rb
 - lib/isodoc/xref/xref_anchor.rb