isodoc 0.7.1 → 0.8

data/lib/isodoc/{xref_gen.rb → function/xref_gen.rb}

@@ -1,7 +1,8 @@
 require "roman-numerals"
 
-module IsoDoc
-  class Common
+module IsoDoc::Function
+  module XrefGen
+
     @anchors = {}
 
     def get_anchors
@@ -103,7 +104,7 @@ module IsoDoc
         label = listlabel(depth, i + 1)
         label = "#{prev_label}.#{label}" unless prev_label.empty?
         label = "#{list_anchor[:xref]} #{label}" if refer_list
-        li["id"] && @anchors[li["id"]] = { xref: "#{label})", 
+        li["id"] && @anchors[li["id"]] = { xref: "#{label})",
                                            container: list_anchor[:container] }
         li.xpath(ns("./ol")).each do |ol|
           list_item_anchor_names(ol, list_anchor, depth + 1, label, false)

data/lib/isodoc/{xref_sect_gen.rb → function/xref_sect_gen.rb}

@@ -1,5 +1,6 @@
-module IsoDoc
-  class Common
+module IsoDoc::Function
+  module XrefSectGen
+
     def back_anchor_names(docxml)
       docxml.xpath(ns("//annex")).each_with_index do |c, i|
         annex_names(c, (65 + i).chr.to_s)
@@ -77,7 +78,7 @@ module IsoDoc
     end
 
     def annex_names(clause, num)
-      @anchors[clause["id"]] = { label: annex_name_lbl(clause, num), 
+      @anchors[clause["id"]] = { label: annex_name_lbl(clause, num),
                                  xref: "#{@annex_lbl} #{num}", level: 1 }
       clause.xpath(ns("./clause")).each_with_index do |c, i|
         annex_names1(c, "#{num}.#{i + 1}", 2)

data/lib/isodoc/html_convert.rb

@@ -0,0 +1,12 @@
+require_relative "html_function/comments.rb"
+require_relative "html_function/footnotes.rb"
+require_relative "html_function/html.rb"
+
+module IsoDoc
+  class HtmlConvert < ::IsoDoc::Convert
+
+    include HtmlFunction::Comments
+    include HtmlFunction::Footnotes
+    include HtmlFunction::Html
+  end
+end

data/lib/isodoc/html_function.rb

@@ -0,0 +1,4 @@
+module IsoDoc
+  module HtmlFunction
+  end
+end

data/lib/isodoc/{htmlconvert → html_function}/comments.rb

@@ -1,7 +1,6 @@
-require "uuidtools"
+module IsoDoc::HtmlFunction
+  module Comments
 
-module IsoDoc
-  class Convert < Common
     def in_comment
       @in_comment
     end

data/lib/isodoc/{htmlconvert → html_function}/footnotes.rb

@@ -1,7 +1,6 @@
-require "uuidtools"
+module IsoDoc::HtmlFunction
+  module Footnotes
 
-module IsoDoc
-  class Convert < Common
     def footnotes(div)
       return if @footnotes.empty?
       @footnotes.each { |fn| div.parent << fn }
@@ -69,7 +68,7 @@ module IsoDoc
       end
       make_footnote(node, fn)
     end
-    
+
     def make_footnote(node, fn)
       return if @seen_footnote.include?(fn)
       @in_footnote = true

data/lib/isodoc/{htmlconvert → html_function}/html.rb

@@ -1,6 +1,6 @@
-module IsoDoc
-  class Convert < Common
-        def make_body1(body, _docxml)
+module IsoDoc::HtmlFunction
+  module Html
+    def make_body1(body, _docxml)
       body.div **{ class: "title-section" } do |div1|
         div1.p { |p| p << "&nbsp;" } # placeholder
       end
@@ -78,7 +78,7 @@ module IsoDoc
       docxml
     end
 
-    def html_head() 
+    def html_head()
       <<~HEAD.freeze
     <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
 
@@ -94,7 +94,7 @@ module IsoDoc
       HEAD
     end
 
-    def html_button() 
+    def html_button()
       '<button onclick="topFunction()" id="myBtn" '\
         'title="Go to top">Top</button>'.freeze
     end

data/lib/isodoc/iso/html/html_iso_titlepage.html

@@ -6,9 +6,9 @@
 <p class="coverpage_techcommittee"><a
 name="CVP_Secretariat_Loca">Secretariat</a>: {{ secretariat }}</p>
 
-<div class="doctitle-en"><span class="subtitle">{{ doctitle }}</span></div>
+<div class="doctitle-en"><span class="title">{{ doctitleintro }}</span> <span class="subtitle">{{ doctitlemain }}</span> <span class="part">{{ doctitlepart }}</span></div>
 
-<div class="doctitle-fr"><span class="subtitle">{{ docsubtitle }}</span></div>
+<div class="doctitle-fr"><span class="title">{{ docsubtitleintro }}</span> <span class="subtitle">{{ docsubtitlemain }}</span> <span class="part">{{ docsubtitlepart }}</span></div>
 
 <div class="coverpage_docstage"><p>{{ stageabbr }} stage</p></div>
 

data/lib/isodoc/iso/{convert.rb → html_convert.rb}

@@ -1,6 +1,6 @@
 module IsoDoc
   module Iso
-    class Convert < IsoDoc::Convert
+    class HtmlConvert < IsoDoc::HtmlConvert
 
       def default_fonts(options)
         b = options[:bodyfont] ||

data/lib/isodoc/metadata.rb

@@ -1,5 +1,3 @@
-require "htmlentities"
-
 module IsoDoc
   class Metadata
     DATETYPES = %w{published accessed created implemented obsoleted confirmed
@@ -10,11 +8,15 @@ module IsoDoc
     end
 
     def initialize(lang, script, labels)
-      @metadata = { tc: "XXXX", sc: "XXXX", wg: "XXXX",
-                    editorialgroup: [],
-                    secretariat: "XXXX",
-                    obsoletes: nil,
-                    obsoletes_part: nil }
+      @metadata = {
+        tc: "XXXX",
+        sc: "XXXX",
+        wg: "XXXX",
+        editorialgroup: [],
+        secretariat: "XXXX",
+        obsoletes: nil,
+        obsoletes_part: nil
+      }
       DATETYPES.each { |w| @metadata["#{w}date".to_sym] = "XXX" }
       @lang = lang
       @script = script
@@ -90,7 +92,7 @@ module IsoDoc
     def iso?(org)
       name = org&.at(ns("./name"))&.text
       abbrev = org&.at(ns("./abbreviation"))&.text
-      (abbrev == "ISO" || 
+      (abbrev == "ISO" ||
        name == "International Organization for Standardization" )
     end
 
@@ -163,7 +165,7 @@ module IsoDoc
         draftinfo += ", #{revdate}" if revdate
         draftinfo += ")"
       end
-      Common::l10n(draftinfo, @lang, @script)
+      IsoDoc::Function::I18n::l10n(draftinfo, @lang, @script)
     end
 
     def version(isoxml, _out)
@@ -183,14 +185,20 @@ module IsoDoc
       end
     end
 
+    def part_title(part, partnum, subpartnum, lang)
+      return "" unless part
+      suffix = @c.encode(part.text, :hexadecimal)
+      partnum = "#{partnum}–#{subpartnum}" if partnum && subpartnum
+      suffix = "#{part_label(lang)} #{partnum}: " + suffix if partnum
+      suffix
+    end
+
     def compose_title(main, intro, part, partnum, subpartnum, lang)
       main = main.nil? ? "" : @c.encode(main.text, :hexadecimal)
       intro &&
         main = "#{@c.encode(intro.text, :hexadecimal)} — #{main}"
       if part
-        suffix = @c.encode(part.text, :hexadecimal)
-        partnum = "#{partnum}–#{subpartnum}" if partnum && subpartnum
-        suffix = "#{part_label(lang)} #{partnum}: " + suffix if partnum
+        suffix = part_title(part, partnum, subpartnum, lang)
         main = "#{main} — #{suffix}"
       end
       main
@@ -202,8 +210,12 @@ module IsoDoc
       part = isoxml.at(ns("//title-part[@language='en']"))
       partnumber = isoxml.at(ns("//project-number/@part"))
       subpartnumber = isoxml.at(ns("//project-number/@subpart"))
+
+      set(:doctitlemain, @c.encode(main ? main.text : "", :hexadecimal))
       main = compose_title(main, intro, part, partnumber, subpartnumber, "en")
       set(:doctitle, main)
+      set(:doctitleintro, @c.encode(intro ? intro.text : "", :hexadecimal)) if intro
+      set(:doctitlepart, part_title(part, partnumber, subpartnumber, "en"))
     end
 
     def subtitle(isoxml, _out)
@@ -212,8 +224,11 @@ module IsoDoc
       part = isoxml.at(ns("//title-part[@language='fr']"))
       partnumber = isoxml.at(ns("//project-number/@part"))
       subpartnumber = isoxml.at(ns("//project-number/@subpart"))
+      set(:docsubtitlemain, @c.encode(main ? main.text : "", :hexadecimal))
       main = compose_title(main, intro, part, partnumber, subpartnumber, "fr")
       set(:docsubtitle, main)
+      set(:docsubtitleintro, @c.encode(intro ? intro.text : "", :hexadecimal)) if intro
+      set(:docsubtitlepart, part_title(part, partnumber, subpartnumber, "fr"))
     end
 
     def relations(isoxml, _out)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.7.1".freeze
+  VERSION = "0.8".freeze
 end

data/lib/isodoc/{wordconvert/convert.rb → word_convert.rb}

@@ -1,11 +1,7 @@
-require "uuidtools"
-require "html2doc"
-require "liquid"
-
-require_relative "wordconvertmodule"
-require_relative "comments"
-require_relative "footnotes"
-require_relative "postprocess"
+require_relative "word_function/comments.rb"
+require_relative "word_function/footnotes.rb"
+require_relative "word_function/body.rb"
+require_relative "word_function/postprocess.rb"
 
 module IsoDoc
 
@@ -28,8 +24,10 @@ module IsoDoc
   end
 =end
 
-  class WordConvert < Common
-    #include WordConvertModule
+  class WordConvert < ::IsoDoc::Convert
+    include WordFunction::Comments
+    include WordFunction::Footnotes
+    include WordFunction::Body
+    include WordFunction::Postprocess
   end
 end
-

data/lib/isodoc/word_function.rb

@@ -0,0 +1,4 @@
+module IsoDoc
+  module WordFunction
+  end
+end

data/lib/isodoc/word_function/body.rb

@@ -0,0 +1,149 @@
+module IsoDoc::WordFunction
+  module Body
+    def make_body1(body, _docxml)
+      body.div **{ class: "WordSection1" } do |div1|
+        div1.p { |p| p << "&nbsp;" } # placeholder
+      end
+      section_break(body)
+    end
+
+    def make_body2(body, docxml)
+      body.div **{ class: "WordSection2" } do |div2|
+        info docxml, div2
+        foreword docxml, div2
+        introduction docxml, div2
+        div2.p { |p| p << "&nbsp;" } # placeholder
+      end
+      section_break(body)
+    end
+
+    def make_body3(body, docxml)
+      body.div **{ class: "WordSection3" } do |div3|
+        middle docxml, div3
+        footnotes div3
+        comments div3
+      end
+    end
+
+    def insert_tab(out, n)
+      out.span **attr_code(style: "mso-tab-count:#{n}") do |span|
+        [1..n].each { span << "&#xA0; " }
+      end
+    end
+
+    def para_attrs(node)
+      classtype = nil
+      classtype = "Note" if @note
+      classtype = "MsoCommentText" if in_comment
+      classtype = "Sourcecode" if @annotation
+      attrs = { class: classtype, id: node["id"] }
+      unless node["align"].nil?
+        attrs[:align] = node["align"] unless node["align"] == "justify"
+        attrs[:style] = "text-align:#{node['align']}"
+      end
+      attrs
+    end
+
+    def remove_bottom_border(td)
+      td["style"] =
+        td["style"].gsub(/border-bottom:[^;]+;/, "border-bottom:0pt;").
+        gsub(/mso-border-bottom-alt:[^;]+;/, "mso-border-bottom-alt:0pt;")
+    end
+
+    SW1 = "solid windowtext".freeze
+
+    def new_fullcolspan_row(t, tfoot)
+      # how many columns in the table?
+      cols = 0
+      t.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;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)
+      style = td.name == "th" ? "font-weight:bold;" : ""
+      rowmax = td["rowspan"] ? row + td["rowspan"].to_i - 1 : row
+      style += <<~STYLE
+            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;
+      STYLE
+      { rowspan: td["rowspan"], colspan: td["colspan"],
+        align: td["align"], style: style.gsub(/\n/, "") }
+    end
+
+    def section_break(body)
+      body.br **{ clear: "all", class: "section" }
+    end
+
+    def page_break(out)
+      out.br **{ clear: "all",
+                 style: "mso-special-character:line-break;page-break-before:always" }
+    end
+
+    WORD_DT_ATTRS = {class: @note ? "Note" : nil, align: "left",
+                     style: "margin-left:0pt;text-align:left;"}.freeze
+
+    def dt_parse(dt, term)
+      term.p **attr_code(WORD_DT_ATTRS) do |p|
+        if dt.elements.empty?
+          p << dt.text
+        else
+          dt.children.each { |n| parse(n, p) }
+        end
+      end
+    end
+
+    def dl_parse(node, out)
+      out.table **{ class: "dl" } do |v|
+        node.elements.select { |n| dt_dd? n }.each_slice(2) do |dt, dd|
+          v.tr do |tr|
+            tr.td **{ valign: "top", align: "left" } do |term|
+              dt_parse(dt, term)
+            end
+            tr.td **{ valign: "top" } do |listitem|
+              dd.children.each { |n| parse(n, listitem) }
+            end
+          end
+        end
+        dl_parse_notes(node, v)
+      end
+    end
+
+    def dl_parse_notes(node, v)
+      return if node.elements.reject { |n| dt_dd? n }.empty?
+      v.tr do |tr|
+        tr.td **{ rowspan: 2 } do |td|
+          node.elements.reject { |n| dt_dd? n }.each { |n| parse(n, td) }
+        end
+      end
+    end
+
+    def figure_get_or_make_dl(t)
+      dl = t.at(".//table[@class = 'dl']")
+      if dl.nil?
+        t.add_child("<p><b>#{@key_lbl}</b></p><table class='dl'></table>")
+        dl = t.at(".//table[@class = 'dl']")
+      end
+      dl
+    end
+
+    def figure_aside_process(f, aside, key)
+      # get rid of footnote link, it is in diagram
+      f&.at("./a[@class='TableFootnoteRef']")&.remove
+      fnref = f.at(".//a[@class='TableFootnoteRef']")
+      tr = key.add_child("<tr></tr>").first
+      dt = tr.add_child("<td valign='top' align='left'></td>").first
+      dd = tr.add_child("<td valign='top'></td>").first
+      fnref.parent = dt
+      aside.xpath(".//p").each do |a|
+        a.delete("class")
+        a.parent = dd
+      end
+    end
+  end
+end

data/lib/isodoc/{wordconvert → word_function}/comments.rb

@@ -1,5 +1,5 @@
-module IsoDoc
-  class WordConvert < Common
+module IsoDoc::WordFunction
+  module Comments
 
     def in_comment
       @in_comment

data/lib/isodoc/word_function/footnotes.rb

@@ -0,0 +1,81 @@
+module IsoDoc::WordFunction
+  module Footnotes
+
+    def footnotes(div)
+      return if @footnotes.empty?
+      @footnotes.each { |fn| div.parent << fn }
+    end
+
+    def make_table_footnote_link(out, fnid, fnref)
+      attrs = { href: "##{fnid}", class: "TableFootnoteRef" }
+      out.a **attrs do |a|
+        a << fnref
+      end
+    end
+
+    def make_table_footnote_target(out, fnid, fnref)
+      attrs = { id: fnid, class: "TableFootnoteRef" }
+      out.a **attrs do |a|
+        a << fnref
+        insert_tab(a, 1)
+      end
+    end
+
+    def make_table_footnote_text(node, fnid, fnref)
+      attrs = { id: "ftn#{fnid}" }
+      noko do |xml|
+        xml.div **attr_code(attrs) do |div|
+          make_table_footnote_target(div, fnid, fnref)
+          node.children.each { |n| parse(n, div) }
+        end
+      end.join("\n")
+    end
+
+    def make_generic_footnote_text(node, fnid)
+      noko do |xml|
+        xml.aside **{ id: "ftn#{fnid}" } do |div|
+          node.children.each { |n| parse(n, div) }
+        end
+      end.join("\n")
+    end
+
+    def get_table_ancestor_id(node)
+      table = node.ancestors("table") || node.ancestors("figure")
+      return UUIDTools::UUID.random_create.to_s if table.empty?
+      table.last["id"]
+    end
+
+    def table_footnote_parse(node, out)
+      fn = node["reference"]
+      tid = get_table_ancestor_id(node)
+      make_table_footnote_link(out, tid + fn, fn)
+      # do not output footnote text if we have already seen it for this table
+      return if @seen_footnote.include?(tid + fn)
+      @in_footnote = true
+      out.aside { |a| a << make_table_footnote_text(node, tid + fn, fn) }
+      @in_footnote = false
+      @seen_footnote << (tid + fn)
+    end
+
+    def footnote_parse(node, out)
+      return table_footnote_parse(node, out) if @in_table || @in_figure
+      fn = node["reference"]
+      out.a **{ "epub:type": "footnote", href: "#ftn#{fn}" } do |a|
+        a.sup { |sup| sup << fn }
+      end
+      return if @seen_footnote.include?(fn)
+      @in_footnote = true
+      @footnotes << make_generic_footnote_text(node, fn)
+      @in_footnote = false
+      @seen_footnote << fn
+    end
+
+    def make_footnote(node, fn)
+      return if @seen_footnote.include?(fn)
+      @in_footnote = true
+      @footnotes << make_generic_footnote_text(node, fn)
+      @in_footnote = false
+      @seen_footnote << fn
+    end
+  end
+end