isodoc 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f122ad0105340afb41607b8639eb00b7205328f9bddad0a5a3726e9644c912e
-  data.tar.gz: 04b386a592680a3315ed3d55e7c6716bc177fd628a8d67f520e224b1a4d4de5f
+  metadata.gz: a0720c3026536785125b4c6c495e4f2573dfa7b2186094c0f36efa9c20a1fbd3
+  data.tar.gz: 9ea3325d067e417956b865edd0baf70dff9a5cb80008e6dfe5fbfbdaaaf16ff4
 SHA512:
-  metadata.gz: 6fef982e2095471e35cc7235a3bc5712066845fd4302131e9760e8d10da548ec73b40f344816077b915b63d93d32cb5b459507ad2133ac52da257a6230e99353
-  data.tar.gz: cbbaa050b52517cf272d7d0da4d875075e094b3dcda074a89c55945ceedb6c357914f9e9be0cd09e45ac9d6ace9f61f71b8f9d2ccb5c8d3ebb5ba4fd9251e632
+  metadata.gz: 2e97827c7adacaa26ef823222897672413056219fba5a3e0a6dee92079ac680cd50a9f1dde9cb7c40fddf23ef000fcb0478709a95916a4e6b222bf3d4e94ca54
+  data.tar.gz: 888734821add95629f8709aac1e5ac8b95b372b6a33d43e366e78e0c4ec6a3957dc9264a86015501458ca2752b881f44053e1f7a3997c5d0fb1b43ec816abc74

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

@@ -82,8 +82,11 @@ module IsoDoc
 
       def sourcecode_parse1(node, div)
         @sourcecode = "pre"
-        node.at(ns(".//table")) || !node.ancestors("table").empty? and
+        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
@@ -96,7 +99,7 @@ module IsoDoc
         @sourcecode = false
         @annotation = true
         out.div class: "annotation" do |div|
-          #node.at("./preceding-sibling::*[local-name() = 'annotation']") or
+          # 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> "

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/utils.rb

@@ -69,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
 

data/lib/isodoc/metadata.rb

@@ -170,7 +170,7 @@ module IsoDoc
     end
 
     def code_css(isoxml, _out)
-      c = isoxml.at(ns("//misc-container/source-highlighter-css")) or return
+      c = isoxml.at(ns("//metanorma-extension/source-highlighter-css")) or return
       set(:code_css, c.text)
     end
   end

data/lib/isodoc/presentation_function/bibdata.rb

@@ -17,8 +17,8 @@ module IsoDoc
     def toc_metadata(docxml)
       return unless @tocfigures || @toctables || @tocrecommendations
 
-      ins = docxml.at(ns("//misc-container")) ||
-        docxml.at(ns("//bibdata")).after("<misc-container/>").next_element
+      ins = docxml.at(ns("//metanorma-extension"))  ||
+        docxml.at(ns("//bibdata")).after("<metanorma-extension/>").next_element
       @tocfigures and
         ins << "<toc type='figure'><title>#{@i18n.toc_figures}</title></toc>"
       @toctables and
@@ -41,7 +41,7 @@ module IsoDoc
       return unless @fontist_fonts
 
       ins = xmldoc.at(ns("//presentation-metadata")) ||
-        xmldoc.at(ns("//misc-container")) || xmldoc.at(ns("//bibdata"))
+        xmldoc.at(ns("//metanorma-extension")) || xmldoc.at(ns("//bibdata"))
       CSV.parse_line(@fontist_fonts, col_sep: ";").map(&:strip).each do |f|
         ins.next = presmeta("fonts", f)
       end

data/lib/isodoc/presentation_function/math.rb

@@ -32,7 +32,7 @@ module IsoDoc
       return localized unless twitter_cldr_reader_symbols[:decimal]
 
       integer, fraction = localized.split(twitter_cldr_reader_symbols[:decimal])
-      return localized if fraction.nil? || fraction.length.zero?
+      return localized if fraction.nil? || fraction.empty?
 
       [integer, decorate_fraction_part(fraction, locale)]
         .join(twitter_cldr_reader_symbols[:decimal])
@@ -97,14 +97,25 @@ module IsoDoc
     end
 
     def mathml1(node, locale)
+      mathml_style_inherit(node)
       asciimath_dup(node)
       localize_maths(node, locale)
-      return unless node.elements.size == 1 && node.elements.first.name == "mn"
+      mathml_number_to_number(node)
+    end
+
+    def mathml_style_inherit(node)
+      node.at("./ancestor::xmlns:strong") or return
+      node.children =
+        "<mstyle fontweight='bold'>#{node.children.to_xml}</mstyle>"
+    end
 
+    def mathml_number_to_number(node)
+      (node.elements.size == 1 && node.elements.first.name == "mn") or return
+      repl = node.at("./m:mn", MATHML).children
       if node.parent.name == "stem"
-        node.parent.replace(node.at("./m:mn", MATHML).children)
+        node.parent.replace(repl)
       else
-        node.replace(node.at("./m:mn", MATHML).children)
+        node.replace(repl)
       end
     end
   end

data/lib/isodoc/presentation_function/sourcecode.rb

@@ -2,8 +2,8 @@ module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def sourcehighlighter_css(docxml)
       @sourcehighlighter or return
-      ins = docxml.at(ns("//misc-container")) ||
-        docxml.at(ns("//bibdata")).after("<misc-container/>").next_element
+      ins = docxml.at(ns("//metanorma-extension")) ||
+        docxml.at(ns("//bibdata")).after("<metanorma-extension/>").next_element
       ins << "<source-highlighter-css>#{sourcehighlighter_css_file}" \
              "</source-highlighter-css>"
     end
@@ -15,10 +15,11 @@ module IsoDoc
 
     def sourcehighlighter
       @sourcehighlighter or return
+      Rouge::Formatter.enable_escape!
       f = Rouge::Formatters::HTML.new
       opts = { gutter_class: "rouge-gutter", code_class: "rouge-code" }
-      { formatter: f,
-        formatter_line: Rouge::Formatters::HTMLLineTable.new(f, opts) }
+      f1 = Rouge::Formatters::HTMLLineTable.new(f, opts)
+      { formatter: f, formatter_line: f1 }
     end
 
     def sourcecode(docxml)
@@ -50,6 +51,11 @@ module IsoDoc
     def source_remove_markup(elem)
       ret = {}
       name = elem.at(ns("./name")) and ret[:name] = name.remove.to_xml
+      source_remove_annotations(ret, elem)
+      ret
+    end
+
+    def source_remove_annotations(ret, elem)
       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 }
@@ -99,9 +105,11 @@ module IsoDoc
     end
 
     def source_lex(elem)
-      l = (Rouge::Lexer.find(elem["lang"] || "plaintext") ||
+      lexer = (Rouge::Lexer.find(elem["lang"] || "plaintext") ||
        Rouge::Lexer.find("plaintext"))
-      l.lex(@c.decode(elem.children.to_xml))
+      l = Rouge::Lexers::Escape.new(start: "{^^{", end: "}^^}", lang: lexer)
+      source = to_xml(elem.children).gsub(/</, "{^^{<").gsub(/>/, ">}^^}")
+      l.lex(@c.decode(source))
     end
 
     def source_label(elem)

data/lib/isodoc/presentation_xml_convert.rb

@@ -24,6 +24,7 @@ module IsoDoc
     end
 
     def conversions(docxml)
+      semantic_xml_insert(docxml)
       bibdata docxml
       @xrefs.parse docxml
       section docxml
@@ -84,6 +85,43 @@ module IsoDoc
       related docxml
     end
 
+    def semantic_xml_insert(xml)
+      @semantic_xml_insert or return
+      embed = to_xml(embedable_semantic_xml(xml))
+      ins = metanorma_extension_insert_pt(xml)
+      ins = ins.at(ns("./metanorma")) || ins.add_child("<metanorma/>").first
+      ins << "<source>#{embed}</source>"
+    end
+
+    def metanorma_extension_insert_pt(xml)
+      xml.at(ns("//metanorma-extension")) ||
+        xml.at(ns("//bibdata"))&.after("<metanorma-extension/>")
+        &.next_element ||
+        xml.root.elements.first.before("<metanorma-extension/>")
+          .previous_element
+    end
+
+    def embedable_semantic_xml(xml)
+      xml = embedable_semantic_xml_tags(xml)
+      embedable_semantic_xml_attributes(xml)
+    end
+
+    def embedable_semantic_xml_tags(xml)
+      Nokogiri::XML(to_xml(xml).gsub(%r{(</?)([[:alpha:]])},
+                                     "\\1semantic__\\2")).root
+    end
+
+    def embedable_semantic_xml_attributes(xml)
+      Metanorma::Utils::anchor_attributes.each do |(tag_name, attr_name)|
+        tag_name == "*" or tag_name = "semantic__#{tag_name}"
+        xml.xpath(ns("//#{tag_name}[@#{attr_name}]")).each do |elem|
+          elem.attributes[attr_name].value =
+            "semantic__#{elem.attributes[attr_name].value}"
+        end
+      end
+      xml
+    end
+
     def postprocess(result, filename, _dir)
       to_xml_file(result, filename)
       @files_to_delete.each { |f| FileUtils.rm_rf f }

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.4.2".freeze
+  VERSION = "2.4.3".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -244,11 +244,11 @@ module IsoDoc
 
       def info(isoxml, out)
         @tocfigurestitle =
-          isoxml&.at(ns("//misc-container/toc[@type = 'figure']/title"))&.text
+          isoxml&.at(ns("//metanorma-extension/toc[@type = 'figure']/title"))&.text
         @toctablestitle =
-          isoxml&.at(ns("//misc-container/toc[@type = 'table']/title"))&.text
+          isoxml&.at(ns("//metanorma-extension/toc[@type = 'table']/title"))&.text
         @tocrecommendationstitle = isoxml
-          &.at(ns("//misc-container/toc[@type = 'recommendation']/title"))&.text
+          &.at(ns("//metanorma-extension/toc[@type = 'recommendation']/title"))&.text
         super
       end
     end

data/lib/isodoc/word_function/comments.rb

@@ -4,7 +4,7 @@ module IsoDoc
       def comments(div)
         return if @comments.empty?
 
-        div.div **{ style: "mso-element:comment-list" } do |div1|
+        div.div style: "mso-element:comment-list" do |div1|
           @comments.each { |fn| div1.parent << fn }
         end
       end
@@ -26,28 +26,27 @@ module IsoDoc
       # add in from and to links to move the comment into place
       def make_comment_link(out, fnote, node)
         out.span(**comment_link_attrs(fnote, node)) do |s1|
-          s1.span **{ lang: "EN-GB", style: "font-size:9.0pt" } do |s2|
-            s2.a **{ style: "mso-comment-reference:SMC_#{fnote};"\
+          s1.span lang: "EN-GB", style: "font-size:9.0pt" do |s2|
+            s2.a style: "mso-comment-reference:SMC_#{fnote};" \
                             "mso-comment-date:#{node['date'].gsub(/[:-]+/,
-                                                                  '')}" }
-            s2.span **{ style: "mso-special-character:comment",
-                        target: fnote } # do |s|
+                                                                  '')}"
+            s2.span style: "mso-special-character:comment", target: fnote # do |s|
           end
         end
       end
 
       def make_comment_target(out)
-        out.span **{ style: "MsoCommentReference" } do |s1|
-          s1.span **{ lang: "EN-GB", style: "font-size:9.0pt" } do |s2|
-            s2.span **{ style: "mso-special-character:comment" }
+        out.span style: "MsoCommentReference" do |s1|
+          s1.span lang: "EN-GB", style: "font-size:9.0pt" do |s2|
+            s2.span style: "mso-special-character:comment"
           end
         end
       end
 
       def make_comment_text(node, fnote)
         noko do |xml|
-          xml.div **{ style: "mso-element:comment", id: fnote } do |div|
-            div.span **{ style: %{mso-comment-author:"#{node['reviewer']}"} }
+          xml.div style: "mso-element:comment", id: fnote do |div|
+            div.span style: %{mso-comment-author:"#{node['reviewer']}"}
             make_comment_target(div)
             node.children.each { |n| parse(n, div) }
           end
@@ -61,7 +60,7 @@ module IsoDoc
       end
 
       COMMENT_IN_COMMENT_LIST1 =
-        '//div[@style="mso-element:comment-list"]//'\
+        '//div[@style="mso-element:comment-list"]//' \
         'span[@style="MsoCommentReference"]'.freeze
 
       def embed_comment_in_comment_list(docxml)
@@ -80,18 +79,24 @@ module IsoDoc
         link.children = fromlink
       end
 
-      def comment_attributes(docxml, x)
-        fromlink = docxml.at("//*[@id='#{x['from']}']")
+      def comment_attributes(docxml, span)
+        fromlink = docxml.at("//*[@id='#{span['from']}']")
         return(nil) if fromlink.nil?
 
-        tolink = docxml.at("//*[@id='#{x['to']}']") || fromlink
-        target = docxml.at("//*[@id='#{x['target']}']")
+        tolink = docxml.at("//*[@id='#{span['to']}']") || fromlink
+        target = docxml.at("//*[@id='#{span['target']}']")
         { from: fromlink, to: tolink, target: target }
       end
 
       def wrap_comment_cont(from, target)
-        s = from.replace("<span style='mso-comment-continuation:#{target}'>")
-        s.first.children = from
+        if %w(ol ul li div p).include?(from.name)
+          from.children.each do |c|
+            wrap_comment_cont(c, target)
+          end
+        else
+          s = from.replace("<span style='mso-comment-continuation:#{target}'>")
+          s.first.children = from
+        end
       end
 
       def skip_comment_wrap(from)

data/lib/isodoc/word_function/footnotes.rb

@@ -45,7 +45,7 @@ module IsoDoc
 
       def make_generic_footnote_text(node, fnid)
         noko do |xml|
-          xml.aside **{ id: "ftn#{fnid}" } do |div|
+          xml.aside id: "ftn#{fnid}" do |div|
             node.children.each { |n| parse(n, div) }
           end
         end.join("\n")
@@ -72,13 +72,13 @@ module IsoDoc
       end
 
       def seen_footnote_parse(_node, out, footnote)
-        out.span **{ style: "mso-element:field-begin" }
+        out.span style: "mso-element:field-begin"
         out << " NOTEREF _Ref#{@fn_bookmarks[footnote]} \\f \\h"
-        out.span **{ style: "mso-element:field-separator" }
-        out.span **{ class: "MsoFootnoteReference" } do |s|
+        out.span style: "mso-element:field-separator"
+        out.span class: "MsoFootnoteReference" do |s|
           s << footnote
         end
-        out.span **{ style: "mso-element:field-end" }
+        out.span style: "mso-element:field-end"
       end
 
       def footnote_parse(node, out)
@@ -89,9 +89,9 @@ module IsoDoc
         return seen_footnote_parse(node, out, fn) if @seen_footnote.include?(fn)
 
         @fn_bookmarks[fn] = bookmarkid
-        out.span **{ style: "mso-bookmark:_Ref#{@fn_bookmarks[fn]}" } do |s|
-          s.a **{ class: "FootnoteRef", "epub:type": "footnote",
-                  href: "#ftn#{fn}" } do |a|
+        out.span style: "mso-bookmark:_Ref#{@fn_bookmarks[fn]}" do |s|
+          s.a class: "FootnoteRef", "epub:type": "footnote",
+              href: "#ftn#{fn}" do |a|
             a.sup { |sup| sup << fn }
           end
         end

data/lib/isodoc/word_function/postprocess.rb

@@ -1,17 +1,11 @@
 require "fileutils"
 require_relative "./postprocess_cover"
 require_relative "./postprocess_toc"
+require_relative "./postprocess_table"
 
 module IsoDoc
   module WordFunction
     module Postprocess
-      def table_note_cleanup(docxml)
-        super
-        # preempt html2doc putting MsoNormal there
-        docxml.xpath("//p[not(self::*[@class])][ancestor::*[@class = 'Note']]")
-          .each { |p| p["class"] = "Note" }
-      end
-
       def postprocess(result, filename, dir)
         filename = filename.sub(/\.doc$/, "")
         header = generate_header(filename, dir)
@@ -55,6 +49,7 @@ module IsoDoc
         word_nested_tables(docxml)
         word_colgroup(docxml)
         word_table_align(docxml)
+        word_table_pagebreak(docxml)
         word_table_separator(docxml)
         word_admonition_images(docxml)
         word_list_continuations(docxml)
@@ -108,54 +103,6 @@ module IsoDoc
         end
       end
 
-      def word_colgroup(docxml)
-        cells2d = {}
-        docxml.xpath("//table[colgroup]").each do |t|
-          w = colgroup_widths(t)
-          t.xpath(".//tr").each_with_index { |_tr, r| cells2d[r] = {} }
-          t.xpath(".//tr").each_with_index do |tr, r|
-            tr.xpath("./td | ./th").each_with_index do |td, _i|
-              x = 0
-              rs = td.attr("rowspan")&.to_i || 1
-              cs = td.attr("colspan")&.to_i || 1
-              while cells2d[r][x]
-                x += 1
-              end
-              (r..(r + rs - 1)).each do |y2|
-                cells2d[y2].nil? and next
-                (x..(x + cs - 1)).each { |x2| cells2d[y2][x2] = 1 }
-              end
-              width = (x..(x + cs - 1)).each_with_object({ width: 0 }) do |z, m|
-                m[:width] += w[z]
-              end
-              td["width"] = "#{width[:width]}%"
-              x += cs
-            end
-          end
-        end
-      end
-
-      # assume percentages
-      def colgroup_widths(table)
-        table.xpath("./colgroup/col").each_with_object([]) do |c, m|
-          m << c["width"].sub(/%$/, "").to_f
-        end
-      end
-
-      def word_nested_tables(docxml)
-        docxml.xpath("//table").each do |t|
-          t.xpath(".//table").reverse.each do |tt|
-            t.next = tt.remove
-          end
-        end
-      end
-
-      def style_update(node, css)
-        node or return
-        node["style"] =
-          node["style"] ? node["style"].sub(/;?$/, ";#{css}") : css
-      end
-
       def word_image_caption(docxml)
         docxml.xpath("//p[@class = 'FigureTitle' or @class = 'SourceTitle']")
           .each do |t|
@@ -188,21 +135,6 @@ module IsoDoc
         end
       end
 
-      def word_table_align(docxml)
-        docxml.xpath("//td[@align]/p | //th[@align]/p").each do |p|
-          p["align"] and next
-          style_update(p, "text-align: #{p.parent['align']}")
-        end
-      end
-
-      def word_table_separator(docxml)
-        docxml.xpath("//p[@class = 'TableTitle']").each do |t|
-          t.children.empty? or next
-          t["style"] = t["style"].sub(/;?$/, ";font-size:0pt;")
-          t.children = "&#xa0;"
-        end
-      end
-
       def word_annex_cleanup(docxml); end
 
       def word_example_cleanup(docxml)

data/lib/isodoc/word_function/postprocess_table.rb

@@ -0,0 +1,85 @@
+module IsoDoc
+  module WordFunction
+    module Postprocess
+      def table_note_cleanup(docxml)
+        super
+        # preempt html2doc putting MsoNormal there
+        docxml.xpath("//p[not(self::*[@class])][ancestor::*[@class = 'Note']]")
+          .each { |p| p["class"] = "Note" }
+      end
+
+      def word_colgroup(docxml)
+        cells2d = {}
+        docxml.xpath("//table[colgroup]").each do |t|
+          w = colgroup_widths(t)
+          t.xpath(".//tr").each_with_index { |_tr, r| cells2d[r] = {} }
+          t.xpath(".//tr").each_with_index do |tr, r|
+            tr.xpath("./td | ./th").each_with_index do |td, _i|
+              x = 0
+              rs = td.attr("rowspan")&.to_i || 1
+              cs = td.attr("colspan")&.to_i || 1
+              while cells2d[r][x]
+                x += 1
+              end
+              (r..(r + rs - 1)).each do |y2|
+                cells2d[y2].nil? and next
+                (x..(x + cs - 1)).each { |x2| cells2d[y2][x2] = 1 }
+              end
+              width = (x..(x + cs - 1)).each_with_object({ width: 0 }) do |z, m|
+                m[:width] += w[z]
+              end
+              td["width"] = "#{width[:width]}%"
+              x += cs
+            end
+          end
+        end
+      end
+
+      # assume percentages
+      def colgroup_widths(table)
+        table.xpath("./colgroup/col").each_with_object([]) do |c, m|
+          m << c["width"].sub(/%$/, "").to_f
+        end
+      end
+
+      def word_nested_tables(docxml)
+        docxml.xpath("//table").each do |t|
+          t.xpath(".//table").reverse.each do |tt|
+            t.next = tt.remove
+          end
+        end
+      end
+
+      def style_update(node, css)
+        node or return
+        node["style"] =
+          node["style"] ? node["style"].sub(/;?$/, ";#{css}") : css
+      end
+
+      def word_table_align(docxml)
+        docxml.xpath("//td[@align]/p | //th[@align]/p").each do |p|
+          p["align"] and next
+          style_update(p, "text-align: #{p.parent['align']}")
+        end
+      end
+
+      def word_table_separator(docxml)
+        docxml.xpath("//p[@class = 'TableTitle']").each do |t|
+          t.children.empty? or next
+          t["style"] = t["style"].sub(/;?$/, ";font-size:0pt;")
+          t.children = "&#xa0;"
+        end
+      end
+
+      def word_table_pagebreak(docxml)
+        docxml.xpath("//td[@style] | //th[@style]").each do |t|
+          s = /(page-break-after:[^;]+)/.match(t["style"])
+          (s && s[1]) or next
+          t.xpath(".//div | .//p | .//pre").each do |p|
+            style_update(p, s[1])
+          end
+        end
+      end
+    end
+  end
+end

data/lib/isodoc/word_function/table.rb

@@ -24,35 +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,
           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
@@ -61,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
@@ -69,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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-30 00:00:00.000000000 Z
+date: 2023-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -480,6 +480,7 @@ 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