isodoc 1.0.26 → 1.1.1

data/lib/isodoc/function/utils.rb

@@ -49,7 +49,12 @@ module IsoDoc::Function
         /^(\&[^ \t\r\n#;]+;)/.match(t) ? 
           HTMLEntities.new.encode(HTMLEntities.new.decode(t), :hexadecimal) : t
       end.join("")
-      Nokogiri::XML.parse(xml)
+      begin
+        Nokogiri::XML.parse(xml) { |config| config.strict }
+      rescue Nokogiri::XML::SyntaxError => e
+        File.open("#{@filename}.#{@format}.err", "w:UTF-8") { |f| f.write xml }
+        abort "Malformed Output XML for #{@format}: #{e} (see #{@filename}.#{@format}.err)"
+      end
     end
 
     def to_xhtml_fragment(xml)
@@ -116,7 +121,7 @@ module IsoDoc::Function
       h1.traverse do |x|
         x.replace(" ") if x.name == "span" && /mso-tab-count/.match(x["style"])
         x.remove if x.name == "span" && x["class"] == "MsoCommentReference"
-        x.remove if x.name == "a" && x["epub:type"] == "footnote"
+        x.remove if x.name == "a" && x["class"] == "FootnoteRef"
         x.remove if x.name == "span" && /mso-bookmark/.match(x["style"])
         x.replace(x.children) if x.name == "a"
       end
@@ -142,7 +147,7 @@ module IsoDoc::Function
     end
 
     def populate_template(docxml, _format = nil)
-      meta = @meta.get.merge(@labels || {})
+      meta = @meta.get.merge(@labels || {}).merge(@meta.labels || {})
       template = liquid(docxml)
       template.render(meta.map { |k, v| [k.to_s, empty2nil(v)] }.to_h).
         gsub('<', '<').gsub('>', '>').gsub('&', '&')
@@ -150,6 +155,7 @@ module IsoDoc::Function
 
     def save_dataimage(uri, relative_dir = true)
       %r{^data:image/(?<imgtype>[^;]+);base64,(?<imgdata>.+)$} =~ uri
+      imgtype.sub!(/\+[a-z0-9]+$/, "") # svg+xml
       imgtype = "png" unless /^[a-z0-9]+$/.match imgtype
       Tempfile.open(["image", ".#{imgtype}"]) do |f|
         f.binmode

data/lib/isodoc/headlesshtml_convert.rb

@@ -16,18 +16,19 @@ module IsoDoc
 
     def initialize(options)
       @format = :html
+      @suffix = "headless.html"
       super
     end
 
-    def convert(filename, file = nil, debug = false)
-      file = File.read(filename, encoding: "utf-8") if file.nil?
+    def convert(input_filename, file = nil, debug = false, output_filename = nil)
+      file = File.read(input_filename, encoding: "utf-8") if file.nil?
       @openmathdelim, @closemathdelim = extract_delims(file)
-      docxml, outname_html, dir = convert_init(file, filename, debug)
-      result = convert1(docxml, outname_html, dir)
+      docxml, filename, dir = convert_init(file, input_filename, debug)
+      result = convert1(docxml, filename, dir)
       return result if debug
-      postprocess(result, filename + ".tmp", dir)
+      postprocess(result, filename + ".tmp.html", dir)
       FileUtils.rm_rf dir
-      strip_head(filename + ".tmp.html", outname_html + ".headless.html")
+      strip_head(filename + ".tmp.html", output_filename || "#{filename}.#{@suffix}")
       FileUtils.rm_rf ["#{filename}.tmp.html", tmpimagedir]
     end
 

data/lib/isodoc/html_convert.rb

@@ -16,10 +16,11 @@ module IsoDoc
 
     def initialize(options)
       @format = :html
+      @suffix = "html"
       super
     end
 
-    def convert(filename, file = nil, debug = false)
+    def convert(filename, file = nil, debug = false, output_filename = nil)
       ret = super
       Dir.exists?(tmpimagedir) and Dir["#{tmpimagedir}/*"].empty? and
         FileUtils.rm_r tmpimagedir

data/lib/isodoc/html_function/footnotes.rb

@@ -65,7 +65,7 @@ module IsoDoc::HtmlFunction
        return table_footnote_parse(node, out) if (@in_table || @in_figure) &&
         !node.ancestors.map {|m| m.name }.include?("name")
       fn = node["reference"] || UUIDTools::UUID.random_create.to_s
-      attrs = { "epub:type": "footnote", rel: "footnote", href: "#fn:#{fn}" }
+      attrs = { class: "FootnoteRef", href: "#fn:#{fn}" }
       out.a **attrs do |a|
         a.sup { |sup| sup << fn }
       end

data/lib/isodoc/html_function/html.rb

@@ -3,6 +3,18 @@ require "base64"
 
 module IsoDoc::HtmlFunction
   module Html
+    def convert1(docxml, filename, dir)
+      @xrefs.parse docxml
+      noko do |xml|
+        xml.html **{ lang: "#{@lang}" } do |html|
+          info docxml, nil
+          populate_css()
+          html.head { |head| define_head head, filename, dir }
+          make_body(html, docxml)
+        end
+      end.join("\n")
+    end
+
     def make_body1(body, _docxml)
       body.div **{ class: "title-section" } do |div1|
         div1.p { |p| p << "&nbsp;" } # placeholder
@@ -90,12 +102,15 @@ module IsoDoc::HtmlFunction
     def sourcecode_parse(node, out)
       name = node.at(ns("./name"))
       class1 = "prettyprint #{sourcecodelang(node&.at(ns('./@lang'))&.value)}"
-      out.pre **attr_code(id: node["id"], class: class1) do |div|
+      out.pre **sourcecode_attrs(node).merge(class: class1) do |div|
         @sourcecode = true
         node.children.each { |n| parse(n, div) unless n.name == "name" }
         @sourcecode = false
       end
       sourcecode_name_parse(node, out, name)
     end
+
+    def table_long_strings_cleanup(docxml)
+    end
   end
 end

data/lib/isodoc/html_function/postprocess.rb

@@ -18,7 +18,7 @@ module IsoDoc::HtmlFunction
       #result = populate_template(result, :html)
       result = from_xhtml(move_images(to_xhtml(result)))
       result = html5(script_cdata(inject_script(result)))
-      File.open("#{filename}.html", "w:UTF-8") { |f| f.write(result) }
+      File.open(filename, "w:UTF-8") { |f| f.write(result) }
     end
 
     def html5(doc)
@@ -159,7 +159,8 @@ module IsoDoc::HtmlFunction
     def inject_script(doc)
       return doc unless @scripts
       scripts = File.read(@scripts, encoding: "UTF-8")
-      doc.sub("</body>", scripts + "\n</body>")
+      a = doc.split(%r{</body>})
+      a[0] + scripts + "</body>" + a[1]
     end
 
     def update_footnote_filter(fn, x, i, seen)
@@ -178,7 +179,7 @@ module IsoDoc::HtmlFunction
     def html_footnote_filter(docxml)
       seen = {}
       i = 1
-      docxml.xpath('//a[@epub:type = "footnote"]').each do |x|
+      docxml.xpath('//a[@class = "FootnoteRef"]').each do |x|
         fn = docxml.at(%<//*[@id = '#{x['href'].sub(/^#/, '')}']>) || next
         i, seen = update_footnote_filter(fn, x, i, seen)
       end
@@ -187,7 +188,7 @@ module IsoDoc::HtmlFunction
 
     def footnote_backlinks(docxml)
       seen = {}
-      docxml.xpath('//a[@epub:type = "footnote"]').each_with_index do |x, i|
+      docxml.xpath('//a[@class = "FootnoteRef"]').each_with_index do |x, i|
         seen[x["href"]] and next or seen[x["href"]] = true
         fn = docxml.at(%<//*[@id = '#{x['href'].sub(/^#/, '')}']>) || next
         xdup = x.dup
@@ -200,7 +201,7 @@ module IsoDoc::HtmlFunction
     end
 
     def footnote_format(docxml)
-      docxml.xpath("//a[@epub:type = 'footnote']/sup").each do |x|
+      docxml.xpath("//a[@class = 'FootnoteRef']/sup").each do |x|
         footnote_reference_format(x)
       end
       docxml.xpath("//a[@class = 'TableFootnoteRef'] | "\

data/lib/isodoc/metadata.rb

@@ -218,5 +218,11 @@ module IsoDoc
       a = xml.at(ns("//bibdata/uri[@type = 'pdf']")) and set(:pdf, a.text)
       a = xml.at(ns("//bibdata/uri[@type = 'doc']")) and set(:doc, a.text)
     end
+
+    def keywords(isoxml, _out)
+      ret = []
+      isoxml.xpath(ns("//bibdata/keyword")).each { |kw| ret << kw.text }
+      set(:keywords, ret)
+    end
   end
 end

data/lib/isodoc/pdf_convert.rb

@@ -24,19 +24,21 @@ module IsoDoc
 
     def initialize(options)
       @format = :pdf
+      @suffix = "pdf"
       super
     end
 
-    def convert(filename, file = nil, debug = false)
-      file = File.read(filename, encoding: "utf-8") if file.nil?
+    def convert(input_filename, file = nil, debug = false, output_filename = nil)
+      file = File.read(input_filename, encoding: "utf-8") if file.nil?
       @openmathdelim, @closemathdelim = extract_delims(file)
-      docxml, outname_html, dir = convert_init(file, filename, debug)
+      docxml, filename, dir = convert_init(file, input_filename, debug)
       result = convert1(docxml, filename, dir)
       return result if debug
-      postprocess(result, filename, dir)
+      postprocess(result, filename + ".tmp.html", dir)
       FileUtils.rm_rf dir
-      ::Metanorma::Output::Pdf.new.convert("#{filename}.html", outname_html + ".pdf")
-      FileUtils.rm_rf ["#{filename}.html", tmpimagedir]
+      ::Metanorma::Output::Pdf.new.convert("#{filename}.tmp.html",
+                                           output_filename || "#{filename}.#{@suffix}")
+      FileUtils.rm_rf ["#{filename}.tmp.html", tmpimagedir]
     end
 
     def xref_parse(node, out)

data/lib/isodoc/presentation_xml_convert.rb

@@ -0,0 +1,29 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def initialize(options)
+      @format = :presentation
+      @suffix = "presentation.xml"
+      super
+    end
+
+    def convert1(docxml, filename, dir)
+      @xrefs.parse docxml
+      info docxml, nil
+      docxml.to_xml
+    end
+
+    def postprocess(result, filename, dir)
+      #result = from_xhtml(cleanup(to_xhtml(textcleanup(result))))
+      toXML(result, filename)
+      @files_to_delete.each { |f| FileUtils.rm_rf f }
+    end
+
+    def toXML(result, filename)
+      #result = (from_xhtml(html_cleanup(to_xhtml(result))))
+      #result = from_xhtml(move_images(to_xhtml(result)))
+      #result = html5(script_cdata(inject_script(result)))
+      File.open(filename, "w:UTF-8") { |f| f.write(result) }
+    end
+  end
+end
+

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.0.26".freeze
+  VERSION = "1.1.1".freeze
 end

data/lib/isodoc/word_convert.rb

@@ -32,10 +32,11 @@ module IsoDoc
 
     def initialize(options)
       @format = :doc
+      @suffix = "doc"
       super
     end
 
-    def convert(filename, file = nil, debug = false)
+    def convert(filename, file = nil, debug = false, output_filename = nil)
       ret = super
       FileUtils.rm_rf tmpimagedir
       ret

data/lib/isodoc/word_function/body.rb

@@ -1,4 +1,5 @@
 require_relative "./table.rb"
+require_relative "./inline.rb"
 
 module IsoDoc::WordFunction
   module Body
@@ -69,28 +70,6 @@ module IsoDoc::WordFunction
       node.xpath(ns("./note")).each { |n| parse(n, out) }
     end
 
-    def section_break(body)
-      body.p do |p|
-        p.br **{ clear: "all", class: "section" }
-      end
-    end
-
-    def page_break(out)
-      out.p do |p|
-        p.br **{ clear: "all",
-                 style: "mso-special-character:line-break;"\
-                 "page-break-before:always" }
-      end
-    end
-
-    def pagebreak_parse(node, out)
-      return page_break(out) if node["orientation"].nil?
-      out.p do |p|
-        p.br **{clear: "all", class: "section", 
-                orientation: node["orientation"] }
-      end
-    end
-
     WORD_DT_ATTRS = {class: @note ? "Note" : nil, align: "left",
                      style: "margin-left:0pt;text-align:left;"}.freeze
 
@@ -174,10 +153,10 @@ module IsoDoc::WordFunction
     end
 
     def termnote_parse(node, out)
-      out.div **{ class: "Note" } do |div|
+      out.div **note_attrs(node) do |div|
         first = node.first_element_child
         div.p **{ class: "Note" } do |p|
-          anchor = get_anchors[node['id']]
+          anchor = @xrefs.get[node['id']]
           p << "#{anchor&.dig(:label) || '???'}: "
           para_then_remainder(first, node, p, div)
         end
@@ -185,41 +164,23 @@ module IsoDoc::WordFunction
     end
 
     def para_attrs(node)
-      attrs = { class: para_class(node), id: node["id"] }
+      attrs = { class: para_class(node), id: node["id"], style: "" }
       unless node["align"].nil?
         attrs[:align] = node["align"] unless node["align"] == "justify"
-        attrs[:style] = "text-align:#{node['align']}"
+        attrs[:style] += "text-align:#{node['align']};"
       end
+      attrs[:style] += "#{keep_style(node)}"
+      attrs[:style] = nil if attrs[:style].empty?
       attrs
     end
 
-    def imgsrc(uri)
-      return uri unless %r{^data:image/}.match uri
-      save_dataimage(uri)
-    end
-
-    def image_parse(node, out, caption)
-      attrs = { src: imgsrc(node["src"]),
-                height: node["height"],
-                alt: node["alt"],
-                title: node["title"],
-                width: node["width"] }
-      out.img **attr_code(attrs)
-      image_title_parse(out, caption)
-    end
-
-    def xref_parse(node, out)
-      target = /#/.match(node["target"]) ? node["target"].sub(/#/, ".doc#") :
-        "##{node["target"]}"
-        out.a(**{ "href": target }) { |l| l << get_linkend(node) }
-    end
-
     def example_table_attr(node)
       super.merge({
         style: "mso-table-lspace:15.0cm;margin-left:423.0pt;"\
         "mso-table-rspace:15.0cm;margin-right:423.0pt;"\
         "mso-table-anchor-horizontal:column;"\
-        "mso-table-overlap:never;border-collapse:collapse;"
+        "mso-table-overlap:never;border-collapse:collapse;"\
+        "#{keep_style(node)}"
       })
     end
 
@@ -240,5 +201,10 @@ module IsoDoc::WordFunction
         node.children.each { |n| parse(n, li) }
       end
     end
+
+    def suffix_url(url)
+      return url if %r{^http[s]?://}.match(url)
+      url.sub(/#{File.extname(url)}$/, ".doc")
+    end
   end
 end

data/lib/isodoc/word_function/footnotes.rb

@@ -84,7 +84,7 @@ module IsoDoc::WordFunction
       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 **{ "epub:type": "footnote", href: "#ftn#{fn}" } do |a|
+        s.a **{ "class": "FootnoteRef", "epub:type": "footnote", href: "#ftn#{fn}" } do |a|
           a.sup { |sup| sup << fn }
         end
       end

data/lib/isodoc/word_function/inline.rb

@@ -0,0 +1,75 @@
+module IsoDoc::WordFunction
+  module Body
+    def section_break(body)
+      body.p do |p|
+        p.br **{ clear: "all", class: "section" }
+      end
+    end
+
+    def page_break(out)
+      out.p do |p|
+        p.br **{ clear: "all",
+                 style: "mso-special-character:line-break;"\
+                 "page-break-before:always" }
+      end
+    end
+
+    def pagebreak_parse(node, out)
+      return page_break(out) if node["orientation"].nil?
+      out.p do |p|
+        p.br **{clear: "all", class: "section",
+                orientation: node["orientation"] }
+      end
+    end
+
+    def imgsrc(node)
+      ret = svg_to_emf(node) and return ret
+      return node["src"] unless %r{^data:image/}.match node["src"]
+      save_dataimage(node["src"])
+    end
+
+    def image_parse(node, out, caption)
+      attrs = { src: imgsrc(node),
+                height: node["height"],
+                alt: node["alt"],
+                title: node["title"],
+                width: node["width"] }
+      out.img **attr_code(attrs)
+      image_title_parse(out, caption)
+    end
+
+    def svg_to_emf_filename(uri)
+      File.join(File.dirname(uri), File.basename(uri, ".*")) + ".emf"
+    end
+
+    def svg_to_emf(node)
+      return unless node["mimetype"] == "image/svg+xml"
+      uri = node["src"]
+      %r{^data:image/}.match(uri) and uri = save_dataimage(uri)
+      ret = svg_to_emf_filename(uri)
+      File.exists?(ret) and return ret
+      exe = inkscape_installed? or return nil
+      system %(#{exe} --export-type="emf" #{uri}) and
+        return ret
+      nil
+    end
+
+    def inkscape_installed?
+      cmd = "inkscape"
+      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        exts.each do |ext|
+          exe = File.join(path, "#{cmd}#{ext}")
+          return exe if File.executable?(exe) && !File.directory?(exe)
+        end
+      end
+      nil
+    end
+
+    def xref_parse(node, out)
+      target = /#/.match(node["target"]) ? node["target"].sub(/#/, ".doc#") :
+        "##{node["target"]}"
+        out.a(**{ "href": target }) { |l| l << get_linkend(node) }
+    end
+  end
+end