isodoc 1.0.24 → 1.0.29

data/lib/isodoc/headlesshtml_convert.rb

@@ -14,6 +14,11 @@ module IsoDoc
       "_headlessimages"
     end
 
+    def initialize(options)
+      @format = :html
+      super
+    end
+
     def convert(filename, file = nil, debug = false)
       file = File.read(filename, encoding: "utf-8") if file.nil?
       @openmathdelim, @closemathdelim = extract_delims(file)

data/lib/isodoc/html_convert.rb

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

data/lib/isodoc/html_function/footnotes.rb

@@ -48,7 +48,7 @@ module IsoDoc::HtmlFunction
     end
 
     def table_footnote_parse(node, out)
-      fn = node["reference"]
+      fn = node["reference"] || UUIDTools::UUID.random_create.to_s
       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
@@ -64,8 +64,8 @@ module IsoDoc::HtmlFunction
     def footnote_parse(node, out)
        return table_footnote_parse(node, out) if (@in_table || @in_figure) &&
         !node.ancestors.map {|m| m.name }.include?("name")
-      fn = node["reference"]
-      attrs = { "epub:type": "footnote", rel: "footnote", href: "#fn:#{fn}" }
+      fn = node["reference"] || UUIDTools::UUID.random_create.to_s
+      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)
+      anchor_names 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

@@ -108,7 +108,7 @@ module IsoDoc::HtmlFunction
       idx = docxml.at("//div[@id = 'toc']") or return docxml
       toc = "<ul>"
       path = toclevel_classes.map do |l|
-        "//main//#{l}[not(@class = 'TermNum')][not(@class = 'noTOC')][not(text())]"
+        "//main//#{l}[not(@class = 'TermNum')][not(@class = 'noTOC')][text()]"
       end
       docxml.xpath(path.join(" | ")).each_with_index do |h, tocidx|
         h["id"] ||= "toc#{tocidx}"
@@ -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

@@ -3,7 +3,8 @@ require_relative "./metadata_date"
 module IsoDoc
   class Metadata
     DATETYPES = %w{published accessed created implemented obsoleted confirmed
-    updated issued received transmitted copied unchanged circulated}.freeze
+    updated issued received transmitted copied unchanged circulated vote-started
+    vote-ended}.freeze
 
     def ns(xpath)
       Common::ns(xpath)
@@ -15,7 +16,7 @@ module IsoDoc
 
     def initialize(lang, script, labels)
       @metadata = {}
-      DATETYPES.each { |w| @metadata["#{w}date".to_sym] = "XXX" }
+      DATETYPES.each { |w| @metadata["#{w.gsub(/-/, "_")}date".to_sym] = "XXX" }
       @lang = lang
       @script = script
       @c = HTMLEntities.new
@@ -84,7 +85,7 @@ module IsoDoc
 
     def bibdate(isoxml, _out)
       isoxml.xpath(ns("//bibdata/date")).each do |d|
-        set("#{d['type']}date".to_sym, Common::date_range(d))
+        set("#{d['type'].gsub(/-/, "_")}date".to_sym, Common::date_range(d))
       end
     end
 
@@ -217,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/metadata_date.rb

@@ -14,14 +14,26 @@ module IsoDoc
         "10": @labels["month_october"],
         "11": @labels["month_november"],
         "12": @labels["month_december"],
-      }
+    }
     end
 
-      def monthyr(isodate)
-        m = /(?<yr>\d\d\d\d)-(?<mo>\d\d)/.match isodate
-        return isodate unless m && m[:yr] && m[:mo]
-        IsoDoc::Function::I18n::l10n("#{months[m[:mo].to_sym]} #{m[:yr]}",
-                                     @lang, @script)
-      end
+    def monthyr(isodate)
+      m = /(?<yr>\d\d\d\d)-(?<mo>\d\d)/.match isodate
+      return isodate unless m && m[:yr] && m[:mo]
+      IsoDoc::Function::I18n::l10n("#{months[m[:mo].to_sym]} #{m[:yr]}",
+                                   @lang, @script)
+    end
+
+    def MMMddyyyy(isodate)
+      return nil if isodate.nil?
+      arr = isodate.split("-")
+      date = if arr.size == 1 and (/^\d+$/.match isodate)
+               Date.new(*arr.map(&:to_i)).strftime("%Y")
+             elsif arr.size == 2
+               Date.new(*arr.map(&:to_i)).strftime("%B %Y")
+             else
+               Date.parse(isodate).strftime("%B %d, %Y")
+             end
+    end
   end
 end

data/lib/isodoc/pdf_convert.rb

@@ -22,6 +22,11 @@ module IsoDoc
       "_pdfimages"
     end
 
+    def initialize(options)
+      @format = :pdf
+      super
+    end
+
     def convert(filename, file = nil, debug = false)
       file = File.read(filename, encoding: "utf-8") if file.nil?
       @openmathdelim, @closemathdelim = extract_delims(file)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.0.24".freeze
+  VERSION = "1.0.29".freeze
 end

data/lib/isodoc/word_convert.rb

@@ -30,6 +30,11 @@ module IsoDoc
     include WordFunction::Body
     include WordFunction::Postprocess
 
+    def initialize(options)
+      @format = :doc
+      super
+    end
+
     def convert(filename, file = nil, debug = false)
       ret = super
       FileUtils.rm_rf tmpimagedir

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,7 +153,7 @@ 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']]
@@ -185,45 +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"] }
-      if node["height"] == "auto" || node["width"] == "auto"
-        attrs[:height] = nil
-        attrs[:width] = nil
-      end
-      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
 
@@ -244,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

@@ -56,7 +56,7 @@ module IsoDoc::WordFunction
     end
 
     def table_footnote_parse(node, out)
-      fn = node["reference"]
+      fn = node["reference"] || UUIDTools::UUID.random_create.to_s
       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
@@ -80,11 +80,11 @@ module IsoDoc::WordFunction
     def footnote_parse(node, out)
       return table_footnote_parse(node, out) if (@in_table || @in_figure) &&
         !node.ancestors.map {|m| m.name }.include?("name")
-      fn = node["reference"]
+      fn = node["reference"] || UUIDTools::UUID.random_create.to_s
       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

data/lib/isodoc/word_function/postprocess.rb

@@ -39,7 +39,6 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
     end
 
     def toWord(result, filename, dir, header)
-      #result = populate_template(result, :word)
       result = from_xhtml(word_cleanup(to_xhtml(result)))
       unless @landscapestyle.empty?
         @wordstylesheet&.open
@@ -196,6 +195,8 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
       @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)
@@ -203,7 +204,6 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
         each_with_index do |br, i|
         @landscapestyle += "\ndiv.#{sect}_#{i} {page:#{sect}"\
           "#{br["orientation"] == "landscape" ? "L" : "P"};}\n"
-        br.delete("orientation")
         split_at_section_break(docxml, sect, br, i)
       end
     end
@@ -219,6 +219,17 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
       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|
+        /^WordSection\d+_\d+$/.match(d["class"]) or next
+        d.elements[0].name == "p" && !d.elements[0].elements.empty? or next
+        d.elements[0].elements[0].name == "br" && d.elements[0].elements[0]["style"] ==
+          "mso-special-character:line-break;page-break-before:always" or next
+        d.elements[0].remove
+      end
+    end
+
     def word_footnote_format(docxml)
       # the content is in a[@epub:type = 'footnote']//sup, but in Word, 
       # we need to inject content around the autonumbered footnote reference