Skip to content

Commit

Permalink
render column widths: metanorma/metanorma-standoc#251
Browse files Browse the repository at this point in the history
  • Loading branch information
@opoudjis
opoudjis committed Dec 5, 2020
1 parent 7f5f702 commit c65c0a5
Show file tree
Hide file tree
Showing 7 changed files with 414 additions and 81 deletions.
10 changes: 10 additions & 0 deletions lib/isodoc/function/table.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,21 @@ def tcaption(node, t)
end
end

def colgroup(node, t)
colgroup = node.at(ns("./colgroup")) or return
t.colgroup do |cg|
colgroup.xpath(ns("./col")).each do |c|
cg.col **{ style: "width: #{c['width']};" }
end
end
end

def table_parse(node, out)
@in_table = true
table_title_parse(node, out)
out.table **table_attrs(node) do |t|
tcaption(node, t)
colgroup(node, t)
thead_parse(node, t)
tbody_parse(node, t)
tfoot_parse(node, t)
Expand Down
118 changes: 38 additions & 80 deletions lib/isodoc/word_function/postprocess.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@ module IsoDoc::WordFunction
module Postprocess
# add namespaces for Word fragments
WORD_NOKOHEAD = <<~HERE.freeze
<!DOCTYPE html SYSTEM
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!DOCTYPE html SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:v="urn:schemas-microsoft-com:vml"
xmlns:o="urn:schemas-microsoft-com:office:office"
xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office"
xmlns:w="urn:schemas-microsoft-com:office:word"
xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
<head> <title></title> <meta charset="UTF-8" /> </head>
Expand All @@ -18,15 +16,13 @@ module Postprocess

def to_word_xhtml_fragment(xml)
doc = ::Nokogiri::XML.parse(WORD_NOKOHEAD)
fragment = ::Nokogiri::XML::DocumentFragment.new(doc, xml, doc.root)
fragment
::Nokogiri::XML::DocumentFragment.new(doc, xml, doc.root)
end

def table_note_cleanup(docxml)
super
# preempt html2doc putting MsoNormal there
docxml.xpath("//p[not(self::*[@class])]"\
"[ancestor::*[@class = 'Note']]").each do |p|
docxml.xpath("//p[not(self::*[@class])][ancestor::*[@class = 'Note']]").each do |p|
p["class"] = "Note"
end
end
Expand Down Expand Up @@ -56,15 +52,15 @@ def toWord(result, filename, dir, header)

def word_admonition_images(docxml)
docxml.xpath("//div[@class = 'Admonition']//img").each do |i|
i["width"], i["height"] =
Html2Doc.image_resize(i, image_localfile(i), @maxheight, 300)
i["width"], i["height"] = Html2Doc.image_resize(i, image_localfile(i), @maxheight, 300)
end
end

def word_cleanup(docxml)
word_annex_cleanup(docxml)
word_preface(docxml)
word_nested_tables(docxml)
word_colgroup(docxml)
word_table_align(docxml)
word_table_separator(docxml)
word_admonition_images(docxml)
Expand All @@ -78,28 +74,44 @@ def word_cleanup(docxml)
docxml
end

def word_nested_tables(docxml)
docxml.xpath("//table").each do |t|
t.xpath(".//table").reverse.each do |tt|
t.next = tt.remove
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] do
x += 1
end
for y2 in r..(r + rs - 1)
for x2 in x..(x + cs - 1)
cells2d[y2][x2] = 1
end
end
width = (x..(x+cs-1)).each_with_object({width: 0}) { |z, m| m[:width] += w[z] }
td["width"] = "#{width[:width]}%"
x += cs
end
end
end
end

def authority_cleanup1(docxml, klass)
dest = docxml.at("//div[@id = 'boilerplate-#{klass}-destination']")
auth = docxml.at("//div[@id = 'boilerplate-#{klass}' or @class = 'boilerplate-#{klass}']")
auth&.xpath(".//h1[not(text())] | .//h2[not(text())]")&.each { |h| h.remove }
auth&.xpath(".//h1 | .//h2")&.each do |h|
h.name = "p"
h["class"] = "TitlePageSubhead"
# assume percentages
def colgroup_widths(t)
t.xpath("./colgroup/col").each_with_object([]) do |c, m|
m << c["width"].sub(/%$/, "").to_f
end
dest and auth and dest.replace(auth.remove)
end

def authority_cleanup(docxml)
%w(copyright license legal feedback).each do |t|
authority_cleanup1(docxml, t)
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

Expand Down Expand Up @@ -144,19 +156,6 @@ def word_table_align(docxml)
end
end

=begin
EMPTY_PARA = "<p style='margin-top:0cm;margin-right:0cm;"\
"margin-bottom:0cm;margin-left:0.0pt;margin-bottom:.0001pt;"\
"line-height:1.0pt;mso-line-height-rule:exactly'>"\
"<span lang=EN-GB style='display:none;mso-hide:all'>&nbsp;</span></p>"
def table_after_table(docxml)
docxml.xpath("//table[following-sibling::*[1]/self::table]").each do |t|
t.add_next_sibling(EMPTY_PARA)
end
end
=end

def word_table_separator(docxml)
docxml.xpath("//p[@class = 'TableTitle']").each do |t|
next unless t.children.empty?
Expand All @@ -180,46 +179,6 @@ def word_pseudocode_cleanup(docxml)
end
end

def generate_header(filename, _dir)
return nil unless @header
template = IsoDoc::Common.liquid(File.read(@header, encoding: "UTF-8"))
meta = @meta.get.merge(@labels || {}).merge(@meta.labels || {})
meta[:filename] = filename
params = meta.map { |k, v| [k.to_s, v] }.to_h
Tempfile.open(%w(header html), :encoding => "utf-8") do |f|
f.write(template.render(params))
f
end
end

def word_section_breaks(docxml)
@landscapestyle = ""
word_section_breaks1(docxml, "WordSection2")
word_section_breaks1(docxml, "WordSection3")
word_remove_pb_before_annex(docxml)
docxml.xpath("//br[@orientation]").each { |br| br.delete("orientation") }
end

def word_section_breaks1(docxml, sect)
docxml.xpath("//div[@class = '#{sect}']//br[@orientation]").reverse.
each_with_index do |br, i|
@landscapestyle += "\ndiv.#{sect}_#{i} {page:#{sect}"\
"#{br["orientation"] == "landscape" ? "L" : "P"};}\n"
split_at_section_break(docxml, sect, br, i)
end
end

def split_at_section_break(docxml, sect, br, i)
move = br.parent.xpath("following::node()") &
br.document.xpath("//div[@class = '#{sect}']//*")
ins = docxml.at("//div[@class = '#{sect}']").
after("<div class='#{sect}_#{i}'/>").next_element
move.each do |m|
next if m.at("./ancestor::div[@class = '#{sect}_#{i}']")
ins << m.remove
end
end

# applies for <div class="WordSectionN_M"><p><pagebreak/></p>...
def word_remove_pb_before_annex(docxml)
docxml.xpath("//div[p/br]").each do |d|
Expand All @@ -237,8 +196,7 @@ def word_footnote_format(docxml)
docxml.xpath("//a[@epub:type = 'footnote']").each do |x|
footnote_reference_format(x)
end
docxml.xpath("//a[@class = 'TableFootnoteRef'] | "\
"//span[@class = 'TableFootnoteRef']").each do |x|
docxml.xpath("//a[@class = 'TableFootnoteRef'] | //span[@class = 'TableFootnoteRef']").each do |x|
table_footnote_reference_format(x)
end
docxml
Expand Down
55 changes: 55 additions & 0 deletions lib/isodoc/word_function/postprocess_cover.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,60 @@ def make_WordToC(docxml, level)
toc.sub(/(<p class="MsoToc1">)/,
%{\\1#{word_toc_preface(level)}}) + WORD_TOC_SUFFIX1
end

def authority_cleanup1(docxml, klass)
dest = docxml.at("//div[@id = 'boilerplate-#{klass}-destination']")
auth = docxml.at("//div[@id = 'boilerplate-#{klass}' or @class = 'boilerplate-#{klass}']")
auth&.xpath(".//h1[not(text())] | .//h2[not(text())]")&.each { |h| h.remove }
auth&.xpath(".//h1 | .//h2")&.each do |h|
h.name = "p"
h["class"] = "TitlePageSubhead"
end
dest and auth and dest.replace(auth.remove)
end

def authority_cleanup(docxml)
%w(copyright license legal feedback).each do |t|
authority_cleanup1(docxml, t)
end
end

def generate_header(filename, _dir)
return nil unless @header
template = IsoDoc::Common.liquid(File.read(@header, encoding: "UTF-8"))
meta = @meta.get.merge(@labels || {}).merge(@meta.labels || {})
meta[:filename] = filename
params = meta.map { |k, v| [k.to_s, v] }.to_h
Tempfile.open(%w(header html), :encoding => "utf-8") do |f|
f.write(template.render(params))
f
end
end

def word_section_breaks(docxml)
@landscapestyle = ""
word_section_breaks1(docxml, "WordSection2")
word_section_breaks1(docxml, "WordSection3")
word_remove_pb_before_annex(docxml)
docxml.xpath("//br[@orientation]").each { |br| br.delete("orientation") }
end

def word_section_breaks1(docxml, sect)
docxml.xpath("//div[@class = '#{sect}']//br[@orientation]").reverse.
each_with_index do |br, i|
@landscapestyle += "\ndiv.#{sect}_#{i} {page:#{sect}#{br["orientation"] == "landscape" ? "L" : "P"};}\n"
split_at_section_break(docxml, sect, br, i)
end
end

def split_at_section_break(docxml, sect, br, i)
move = br.parent.xpath("following::node()") &
br.document.xpath("//div[@class = '#{sect}']//*")
ins = docxml.at("//div[@class = '#{sect}']").after("<div class='#{sect}_#{i}'/>").next_element
move.each do |m|
next if m.at("./ancestor::div[@class = '#{sect}_#{i}']")
ins << m.remove
end
end
end
end
10 changes: 10 additions & 0 deletions lib/isodoc/word_function/table.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,21 @@ def table_attrs(node)
}))
end

def colgroup(node, t)
colgroup = node.at(ns("./colgroup")) or return
t.colgroup do |cg|
colgroup.xpath(ns("./col")).each do |c|
cg.col **{ width: c["width"] }
end
end
end

def table_parse(node, out)
@in_table = true
table_title_parse(node, out)
out.div **{ align: "center", class: "table_container" } do |div|
div.table **table_attrs(node) do |t|
colgroup(node, t)
thead_parse(node, t)
tbody_parse(node, t)
tfoot_parse(node, t)
Expand Down
1 change: 0 additions & 1 deletion spec/isodoc/cleanup_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1186,5 +1186,4 @@
</html>
OUTPUT
end

end
Loading

0 comments on commit c65c0a5

Please sign in to comment.