isodoc 2.3.6 → 2.4.1

data/lib/isodoc/word_function/postprocess.rb

@@ -52,11 +52,17 @@ module IsoDoc
         @wordstylesheet.unlink if @wordstylesheet.is_a?(Tempfile)
       end
 
+      def sourcecode_style
+        "Sourcecode"
+      end
+
       def wordstylesheet_update
         return if @wordstylesheet.nil?
 
         f = File.open(@wordstylesheet.path, "a")
         @landscapestyle.empty? or f.write(@landscapestyle)
+        s = @meta.get[:code_css] and
+          f.write(s.gsub(/sourcecode/, "p.#{sourcecode_style}"))
         if @wordstylesheet_override && @wordstylesheet
           f.write(@wordstylesheet_override.read)
           @wordstylesheet_override.close
@@ -70,13 +76,15 @@ module IsoDoc
       def word_admonition_images(docxml)
         docxml.xpath("//div[@class = 'Admonition']//img").each do |i|
           i["width"], i["height"] =
-            Html2Doc.new({}).image_resize(i, image_localfile(i), @maxheight, 300)
+            Html2Doc.new({}).image_resize(i, image_localfile(i), @maxheight,
+                                          300)
         end
       end
 
       def word_cleanup(docxml)
         word_annex_cleanup(docxml)
         word_preface(docxml)
+        word_sourcecode_table(docxml)
         word_nested_tables(docxml)
         word_colgroup(docxml)
         word_table_align(docxml)
@@ -93,6 +101,27 @@ module IsoDoc
         docxml
       end
 
+      def word_sourcecode_table(docxml)
+        docxml.xpath("//p[@class='Sourcecode']/div[@class='table_container']")
+          .each do |d|
+            pre = d.at(".//p[@class='Sourcecode']")
+            to_sourcecode_para(pre)
+            d["id"] = d.parent["id"]
+            d.parent.replace(d)
+          end
+      end
+
+      def to_sourcecode_para(pre)
+        @sourcecode = true
+        pre.traverse do |x|
+          x.text? or next
+          ret = []
+          text_parse(x, ret)
+          x.replace(ret.join)
+        end
+        @sourcecode = false
+      end
+
       def word_tab_clean(docxml)
         docxml.xpath("//p[@class='Biblio']//span[@style='mso-tab-count:1']")
           .each do |s|
@@ -155,7 +184,7 @@ module IsoDoc
           .each do |t|
           if t&.previous_element&.name == "img"
             img = t.previous_element
-            t.previous_element.swap("<p class=\'figure\'>#{img.to_xml}</p>")
+            t.previous_element.swap("<p class='figure'>#{img.to_xml}</p>")
           end
           style_update(t&.previous_element, "page-break-after:avoid;")
         end
@@ -231,7 +260,7 @@ module IsoDoc
         docxml.xpath("//a[@epub:type = 'footnote']").each do |x|
           footnote_reference_format(x)
         end
-        docxml.xpath("//a[@class = 'TableFootnoteRef'] | "\
+        docxml.xpath("//a[@class = 'TableFootnoteRef'] | " \
                      "//span[@class = 'TableFootnoteRef']").each do |x|
           table_footnote_reference_format(x)
         end

data/lib/isodoc/word_function/table.rb

@@ -15,39 +15,50 @@ module IsoDoc
         table.at(".//tr").xpath("./td | ./th").each do |td|
           cols += (td["colspan"] ? td["colspan"].to_i : 1)
         end
-        style = "border-top:0pt;mso-border-top-alt:0pt;"\
+        style = "border-top:0pt;mso-border-top-alt:0pt;" \
                 "border-bottom:#{SW1} 1.5pt;mso-border-bottom-alt:#{SW1} 1.5pt;"
         tfoot.add_child("<tr><td colspan='#{cols}' style='#{style}'/></tr>")
         tfoot.xpath(".//td").last
       end
 
-      def make_tr_attr(td, row, totalrows, _header)
-        style = td.name == "th" ? "font-weight:bold;" : ""
-        rowmax = td["rowspan"] ? row + td["rowspan"].to_i - 1 : row
-        style += <<~STYLE
+      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)
+        { rowspan: cell["rowspan"], colspan: cell["colspan"],
+          valign: cell["valign"], align: cell["align"], style: style }
+      end
+
+      def make_tr_attr_style(row, rowmax, totalrows, header, bordered)
+        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-bottom:#{SW1} #{rowmax >= totalrows ? '1.5' : '1.0'}pt;
+          mso-border-bottom-alt:#{SW1} #{rowmax >= totalrows ? '1.5' : '1.0'}pt;
         STYLE
-        { rowspan: td["rowspan"], colspan: td["colspan"], valign: td["valign"],
-          align: td["align"], style: style.gsub(/\n/, "") }
+        bordered or ret = ""
+        pb = header || (totalrows <= 10 && rowmax < totalrows) ? "avoid" : "auto"
+        "#{ret}page-break-after:#{pb};"
       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"],
-          style: "mso-table-anchor-horizontal:column;mso-table-overlap:never;"\
-                 "border-spacing:0;border-width:1px;#{keep_style(node)}",
+          style: "mso-table-anchor-horizontal:column;mso-table-overlap:never;" \
+                 "#{bordered}#{keep_style(node)}",
           class: (node.text.length > 4000 ? "MsoISOTableBig" : "MsoISOTable"),
         }
+        bordered or ret.delete(:class)
         super.merge(attr_code(ret))
       end
 
-      def colgroup(node, t)
+      def colgroup(node, table)
         colgroup = node.at(ns("./colgroup")) or return
-        t.colgroup do |cg|
+        table.colgroup do |cg|
           colgroup.xpath(ns("./col")).each do |c|
             cg.col **{ width: c["width"] }
           end

data/lib/isodoc/xref/xref_gen.rb

@@ -62,7 +62,7 @@ module IsoDoc
             @anchors[n["id"]] =
               { label: termnote_label(c.print), type: "termnote",
                 value: c.print, elem: @labels["termnote"],
-                xref: l10n("#{anchor(t['id'], :xref)}, "\
+                xref: l10n("#{anchor(t['id'], :xref)}, " \
                            "#{@labels['note_xref']} #{c.print}") }
           end
         end
@@ -82,10 +82,10 @@ module IsoDoc
       end
 
       SECTIONS_XPATH =
-        "//foreword | //introduction | //acknowledgements | "\
-        "//preface/terms | preface/definitions | preface/references | "\
-        "//preface/clause | //sections/terms | //annex | "\
-        "//sections/clause | //sections/definitions | "\
+        "//foreword | //introduction | //acknowledgements | " \
+        "//preface/terms | preface/definitions | preface/references | " \
+        "//preface/clause | //sections/terms | //annex | " \
+        "//sections/clause | //sections/definitions | " \
         "//bibliography/references | //bibliography/clause".freeze
 
       def sections_xpath
@@ -93,8 +93,8 @@ module IsoDoc
       end
 
       CHILD_NOTES_XPATH =
-        "./*[not(self::xmlns:clause) and not(self::xmlns:appendix) and "\
-        "not(self::xmlns:terms) and not(self::xmlns:definitions)]//xmlns:note | "\
+        "./*[not(self::xmlns:clause) and not(self::xmlns:appendix) and " \
+        "not(self::xmlns:terms) and not(self::xmlns:definitions)]//xmlns:note | " \
         "./xmlns:note".freeze
 
       def note_anchor_names(sections)
@@ -117,11 +117,11 @@ module IsoDoc
       end
 
       CHILD_EXAMPLES_XPATH =
-        "./*[not(self::xmlns:clause) and not(self::xmlns:appendix) and "\
-        "not(self::xmlns:terms) and not(self::xmlns:definitions)]//"\
+        "./*[not(self::xmlns:clause) and not(self::xmlns:appendix) and " \
+        "not(self::xmlns:terms) and not(self::xmlns:definitions)]//" \
         "xmlns:example | ./xmlns:example".freeze
 
-      CHILD_SECTIONS = "./clause | ./appendix | ./terms | ./definitions | "\
+      CHILD_SECTIONS = "./clause | ./appendix | ./terms | ./definitions | " \
                        "./references".freeze
 
       def example_anchor_names(sections)
@@ -205,7 +205,7 @@ module IsoDoc
         label = dterm.dup
         label.xpath(ns(".//p")).each { |x| x.replace(x.children) }
         label.xpath(ns(".//index")).each(&:remove)
-        label.children.to_xml
+        Common::to_xml(label.children)
       end
 
       def bookmark_anchor_names(xml)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.3.6
+  version: 2.4.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-21 00:00:00.000000000 Z
+date: 2022-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: relaton-cli
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rouge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: thread_safe
   requirement: !ruby/object:Gem::Requirement
@@ -497,7 +511,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Convert documents in IsoDoc into Word and HTML in AsciiDoc.