isodoc 1.5.2 → 1.6.1

data/lib/isodoc/pdf_convert.rb

@@ -42,9 +42,7 @@ module IsoDoc
     end
 
     def xref_parse(node, out)
-      target = /#/.match(node["target"]) ? node["target"].sub(/#/, ".pdf#") :
-        "##{node["target"]}"
-      out.a(**{ "href": target }) { |l| l << get_linkend(node) }
+      out.a(**{ "href": target_pdf(node) }) { |l| l << get_linkend(node) }
     end
   end
 end

data/lib/isodoc/presentation_function/block.rb

@@ -1,14 +1,16 @@
+require "base64"
+
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def lower2cap(s)
-      return s if /^[[:upper:]][[:upper:]]/.match(s)
+      return s if /^[[:upper:]][[:upper:]]/.match?(s)
+
       s.capitalize
     end
 
     def figure(docxml)
-      docxml.xpath(ns("//figure")).each do |f|
-        figure1(f)
-      end
+      docxml.xpath(ns("//image")).each { |f| svg_extract(f) }
+      docxml.xpath(ns("//figure")).each { |f| figure1(f) }
       docxml.xpath(ns("//svgmap")).each do |s|
         if f = s.at(ns("./figure")) then s.replace(f)
         else
@@ -17,17 +19,27 @@ module IsoDoc
       end
     end
 
+    def svg_extract(f)
+      return unless %r{^data:image/svg\+xml;base64,}.match?(f["src"])
+
+      svg = Base64.strict_decode64(f["src"]
+        .sub(%r{^data:image/svg\+xml;base64,}, ""))
+      f.replace(svg.sub(/<\?xml[^>]*>/, ""))
+    end
+
     def figure1(f)
-      return sourcecode1(f) if f["class"] == "pseudocode" ||
-        f["type"] == "pseudocode"
+      return sourcecode1(f) if f["class"] == "pseudocode" || f["type"] == "pseudocode"
       return if labelled_ancestor(f) && f.ancestors("figure").empty?
       return if f.at(ns("./figure")) and !f.at(ns("./name"))
+
       lbl = @xrefs.anchor(f['id'], :label, false) or return
-      prefix_name(f, "&nbsp;&mdash; ", l10n("#{lower2cap @i18n.figure} #{lbl}"), "name")
+      prefix_name(f, "&nbsp;&mdash; ",
+                  l10n("#{lower2cap @i18n.figure} #{lbl}"), "name")
     end
 
     def prefix_name(f, delim, number, elem)
       return if number.nil? || number.empty?
+
       unless name = f.at(ns("./#{elem}"))
         f.children.empty? and f.add_child("<#{elem}></#{elem}>") or
           f.children.first.previous = "<#{elem}></#{elem}>"
@@ -46,6 +58,7 @@ module IsoDoc
     def sourcecode1(f)
       return if labelled_ancestor(f)
       return unless f.ancestors("example").empty?
+
       lbl = @xrefs.anchor(f['id'], :label, false) or return
       prefix_name(f, "&nbsp;&mdash; ", l10n("#{lower2cap @i18n.figure} #{lbl}"), "name")
     end
@@ -90,6 +103,7 @@ module IsoDoc
     # introduce name element
     def note1(f)
       return if f.parent.name == "bibitem"
+
       n = @xrefs.get[f["id"]]
       lbl = (@i18n.note if n.nil? || n[:label].nil? || n[:label].empty?) ?
         @i18n.note: l10n("#{@i18n.note} #{n[:label]}")
@@ -104,7 +118,7 @@ module IsoDoc
 
     # introduce name element
     def termnote1(f)
-      lbl = l10n(@xrefs.anchor(f['id'], :label) || '???')
+      lbl = l10n(@xrefs.anchor(f["id"], :label) || "???")
       prefix_name(f, "", lower2cap(lbl), "name")
     end
 
@@ -128,7 +142,7 @@ module IsoDoc
 
     # introduce name element
     def recommendation1(f, type)
-      n = @xrefs.anchor(f['id'], :label, false)
+      n = @xrefs.anchor(f["id"], :label, false)
       lbl = (n.nil? ? type : l10n("#{type} #{n}"))
       prefix_name(f, "", lbl, "name")
     end
@@ -142,7 +156,8 @@ module IsoDoc
     def table1(f)
       return if labelled_ancestor(f)
       return if f["unnumbered"] && !f.at(ns("./name"))
-      n = @xrefs.anchor(f['id'], :label, false)
+
+      n = @xrefs.anchor(f["id"], :label, false)
       prefix_name(f, "&nbsp;&mdash; ", l10n("#{lower2cap @i18n.table} #{n}"), "name")
     end
 
@@ -154,7 +169,7 @@ module IsoDoc
     end
 
     def amend1(f)
-      f.xpath(ns("./autonumber")).each { |a| a.remove }
+      f.xpath(ns("./autonumber")).each(&:remove)
       f.xpath(ns("./newcontent")).each { |a| a.name = "quote" }
       f.xpath(ns("./description")).each { |a| a.replace(a.children) }
       f.replace(f.children)

data/lib/isodoc/presentation_function/inline.rb

@@ -1,4 +1,5 @@
 require "twitter_cldr"
+require "bigdecimal"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -10,8 +11,7 @@ module IsoDoc
       if node["citeas"].nil? && node["bibitemid"]
         return @xrefs.anchor(node["bibitemid"] ,:xref) || "???"
       elsif node["target"] && node["droploc"]
-        return @xrefs.anchor(node["target"], :value) ||
-          @xrefs.anchor(node["target"], :label) ||
+        return @xrefs.anchor(node["target"], :value) || @xrefs.anchor(node["target"], :label) ||
           @xrefs.anchor(node["target"], :xref) || "???"
       elsif node["target"] && !/.#./.match(node["target"])
         linkend = anchor_linkend1(node)
@@ -22,9 +22,8 @@ module IsoDoc
     def anchor_linkend1(node)
       linkend = @xrefs.anchor(node["target"], :xref)
       container = @xrefs.anchor(node["target"], :container, false)
-      (container && get_note_container_id(node) != container &&
-       @xrefs.get[node["target"]]) &&
-      linkend = prefix_container(container, linkend, node["target"])
+      (container && get_note_container_id(node) != container && @xrefs.get[node["target"]]) &&
+        linkend = prefix_container(container, linkend, node["target"])
       capitalise_xref(node, linkend)
     end
 
@@ -35,13 +34,11 @@ module IsoDoc
       return linkend if linkend[0,1].match(/\p{Upper}/)
       prec = nearest_block_parent(node).xpath("./descendant-or-self::text()") &
         node.xpath("./preceding::text()")
-      (prec.empty? || /(?!<[^.].)\.\s+$/.match(prec.map { |p| p.text }.join)) ?
-        linkend&.capitalize : linkend
+      (prec.empty? || /(?!<[^.].)\.\s+$/.match(prec.map { |p| p.text }.join)) ?  linkend&.capitalize : linkend
     end
 
     def nearest_block_parent(node)
-      until %w(p title td th name formula
-        li dt dd sourcecode pre).include?(node.name)
+      until %w(p title td th name formula li dt dd sourcecode pre).include?(node.name)
         node = node.parent
       end
       node
@@ -53,69 +50,79 @@ module IsoDoc
       end
     end
 
-    def get_linkend(n)
-      contents = non_locality_elems(n).select { |c| !c.text? || /\S/.match(c) }
+    def get_linkend(node)
+      contents = non_locality_elems(node).select { |c| !c.text? || /\S/.match(c) }
       return unless contents.empty?
-      link = anchor_linkend(n, docid_l10n(n["target"] || n["citeas"]))
-      link += eref_localities(n.xpath(ns("./locality | ./localityStack")), link)
-      non_locality_elems(n).each { |n| n.remove }
-      n.add_child(link)
+      link = anchor_linkend(node, docid_l10n(node["target"] || node["citeas"]))
+      link += eref_localities(node.xpath(ns("./locality | ./localityStack")), link, node)
+      non_locality_elems(node).each { |n| n.remove }
+      node.add_child(link)
     end
     # so not <origin bibitemid="ISO7301" citeas="ISO 7301">
     # <locality type="section"><reference>3.1</reference></locality></origin>
 
-    def eref_localities(refs, target)
+    def eref_localities(refs, target, n)
       ret = ""
       refs.each_with_index do |r, i|
         delim = ","
         delim = ";" if r.name == "localityStack" && i>0
-        ret = eref_locality_stack(r, i, target, delim, ret)
+        ret = eref_locality_stack(r, i, target, delim, ret, n)
       end
       ret
     end
 
-    def eref_locality_stack(r, i, target, delim, ret)
+    def eref_locality_stack(r, i, target, delim, ret, n)
       if r.name == "localityStack"
         r.elements.each_with_index do |rr, j|
-          ret += eref_localities0(rr, j, target, delim)
+          ret += eref_localities0(rr, j, target, delim, n)
           delim = ","
         end
       else
-        ret += eref_localities0(r, i, target, delim)
+        ret += eref_localities0(r, i, target, delim, n)
       end
       ret
     end
 
-    def eref_localities0(r, i, target, delim)
+    def eref_localities0(r, i, target, delim, n)
       if r["type"] == "whole" then l10n("#{delim} #{@i18n.wholeoftext}")
       else
         eref_localities1(target, r["type"], r.at(ns("./referenceFrom")),
-                         r.at(ns("./referenceTo")), delim, @lang)
+                         r.at(ns("./referenceTo")), delim, n, @lang)
       end
     end
 
     # TODO: move to localization file
-    def eref_localities1_zh(target, type, from, to, delim)
+    def eref_localities1_zh(target, type, from, to, n, delim)
       ret = "#{delim} 第#{from.text}" if from
       ret += "&ndash;#{to.text}" if to
       loc = (@i18n.locality[type] || type.sub(/^locality:/, "").capitalize )
-      ret += " #{loc}"
+      ret += " #{loc}" unless n["droploc"] == "true"
       ret
     end
 
     # TODO: move to localization file
-    def eref_localities1(target, type, from, to, delim, lang = "en")
+    def eref_localities1(target, type, from, to, delim, n, lang = "en")
       return "" if type == "anchor"
-      lang == "zh" and
-        return l10n(eref_localities1_zh(target, type, from, to, delim))
+      lang == "zh" and return l10n(eref_localities1_zh(target, type, from, to, n, delim))
       ret = delim
-      loc = @i18n.locality[type] || type.sub(/^locality:/, "").capitalize
-      ret += " #{loc}"
+      ret += eref_locality_populate(type, n)
       ret += " #{from.text}" if from
       ret += "&ndash;#{to.text}" if to
       l10n(ret)
     end
 
+    def eref_locality_populate(type, n)
+      return "" if n["droploc"] == "true"
+      loc = @i18n.locality[type] || type.sub(/^locality:/, "")
+      loc = case n["case"]
+            when "capital" then loc.capitalize
+            when "lowercase" then loc.downcase
+            else
+              loc.capitalize
+            end
+      " #{loc}"
+    end
+
     def xref(docxml)
       docxml.xpath(ns("//xref")).each { |f| xref1(f) }
     end
@@ -163,23 +170,22 @@ module IsoDoc
     # TwitterCldr::DataReaders::NumberDataReader.new(locale).symbols
     def localize_maths(f, locale)
       f.xpath(".//m:mn", MATHML).each do |x|
-        num = /\./.match(x.text) ? x.text.to_f : x.text.to_i
+        num = BigDecimal(x.text)
         precision = /\./.match(x.text) ? x.text.sub(/^.*\./, "").size : 0
         x.children = localized_number(num, locale, precision)
       end
     end
 
-    # By itself twiiter cldr does not support fraction part digits grouping
+    # By itself twitter-cldr does not support fraction part digits grouping
     # and custom delimeter, will decorate fraction part manually
     def localized_number(num, locale, precision)
-      localized = precision == 0 ? num.localize(locale).to_s :
+      localized = (precision == 0) ? num.localize(locale).to_s :
         num.localize(locale).to_decimal.to_s(:precision => precision)
       twitter_cldr_reader_symbols = twitter_cldr_reader(locale)
       return localized unless twitter_cldr_reader_symbols[:decimal]
       integer, fraction = localized.split(twitter_cldr_reader_symbols[:decimal])
       return localized if fraction.nil? || fraction.length.zero?
-      [integer, decorate_fraction_part(fraction, locale)].
-        join(twitter_cldr_reader_symbols[:decimal])
+      [integer, decorate_fraction_part(fraction, locale)].join(twitter_cldr_reader_symbols[:decimal])
     end
 
     def decorate_fraction_part(fract, locale)
@@ -229,8 +235,7 @@ module IsoDoc
     end
 
     def variant1(node)
-      if (!node["lang"] || node["lang"] == @lang) &&
-          (!node["script"] || node["script"] == @script)
+      if (!node["lang"] || node["lang"] == @lang) && (!node["script"] || node["script"] == @script)
       elsif found_matching_variant_sibling(node)
         node["remove"] = "true"
       else
@@ -238,13 +243,14 @@ module IsoDoc
       end
     end
 
+    private
+
     def found_matching_variant_sibling(node)
       prev = node.xpath("./preceding-sibling::xmlns:variant")
       foll = node.xpath("./following-sibling::xmlns:variant")
       found = false
       (prev + foll).each do |n|
-        found = true if n["lang"] == @lang &&
-          (!n["script"] || n["script"] == @script)
+        found = true if n["lang"] == @lang && (!n["script"] || n["script"] == @script)
       end
       found
     end

data/lib/isodoc/presentation_xml_convert.rb

@@ -59,7 +59,7 @@ module IsoDoc
       variant docxml
     end
 
-    def postprocess(result, filename, dir)
+    def postprocess(result, filename, _dir)
       toXML(result, filename)
       @files_to_delete.each { |f| FileUtils.rm_rf f }
     end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.5.2".freeze
+  VERSION = "1.6.1".freeze
 end

data/lib/isodoc/word_function/footnotes.rb

@@ -2,7 +2,7 @@ module IsoDoc::WordFunction
   module Footnotes
     def bookmarkid
       ret = "X"
-      until !@bookmarks_allocated[ret] do
+      until !@bookmarks_allocated[ret]
         ret = Random.rand(1000000000)
       end
       @bookmarks_allocated[ret] = true
@@ -11,6 +11,7 @@ module IsoDoc::WordFunction
 
     def footnotes(div)
       return if @footnotes.empty?
+
       @footnotes.each { |fn| div.parent << fn }
     end
 
@@ -52,6 +53,7 @@ module IsoDoc::WordFunction
     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
 
@@ -61,30 +63,34 @@ module IsoDoc::WordFunction
       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 seen_footnote_parse(node, out, fn)
-      out.span **{style: "mso-element:field-begin"}
-      out << " NOTEREF _Ref#{@fn_bookmarks[fn]} \\f \\h"
-      out.span **{style: "mso-element:field-separator"}
-      out.span **{class: "MsoFootnoteReference"} do |s|
-        s << fn
+    def seen_footnote_parse(_node, out, footnote)
+      out.span **{ style: "mso-element:field-begin" }
+      out << " NOTEREF _Ref#{@fn_bookmarks[footnote]} \\f \\h"
+      out.span **{ style: "mso-element:field-separator" }
+      out.span **{ class: "MsoFootnoteReference" } do |s|
+        s << footnote
       end
-      out.span **{style: "mso-element:field-end"}
+      out.span **{ style: "mso-element:field-end" }
     end
 
     def footnote_parse(node, out)
       return table_footnote_parse(node, out) if (@in_table || @in_figure) &&
-        !node.ancestors.map {|m| m.name }.include?("name")
+        !node.ancestors.map { |m| m.name }.include?("name")
+
       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 **{ "class": "FootnoteRef", "epub:type": "footnote", href: "#ftn#{fn}" } do |a|
+      out.span **{ style: "mso-bookmark:_Ref#{@fn_bookmarks[fn]}" } do |s|
+        s.a **{ "class": "FootnoteRef", "epub:type": "footnote",
+                href: "#ftn#{fn}" } do |a|
           a.sup { |sup| sup << fn }
         end
       end
@@ -94,12 +100,13 @@ module IsoDoc::WordFunction
       @seen_footnote << fn
     end
 
-    def make_footnote(node, fn)
-      return if @seen_footnote.include?(fn)
+    def make_footnote(node, footnote)
+      return if @seen_footnote.include?(footnote)
+
       @in_footnote = true
-      @footnotes << make_generic_footnote_text(node, fn)
+      @footnotes << make_generic_footnote_text(node, footnote)
       @in_footnote = false
-      @seen_footnote << fn
+      @seen_footnote << footnote
     end
   end
 end

data/lib/isodoc/word_function/inline.rb

@@ -22,6 +22,12 @@ module IsoDoc::WordFunction
       end
     end
 
+    def svg_parse(node, out)
+      svg = Base64.strict_encode64(node.to_xml)
+      r = node.replace("<img src='data:image/svg+xml;base64,#{svg}' mimetype='image/svg+xml'/>").first
+      image_parse(r, out, nil)
+    end
+
     def imgsrc(node)
       ret = svg_to_emf(node) and return ret
       return node["src"] unless %r{^data:}.match node["src"]

data/lib/isodoc/word_function/postprocess.rb

@@ -37,17 +37,27 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
 
     def toWord(result, filename, dir, header)
       result = from_xhtml(word_cleanup(to_xhtml(result)))
-      unless @landscapestyle.empty?
-        @wordstylesheet&.open
-        @wordstylesheet&.write(@landscapestyle)
-        @wordstylesheet&.close
-      end
+      @wordstylesheet = wordstylesheet_update
       Html2Doc.process(result, filename: filename, stylesheet: @wordstylesheet&.path,
                        header_file: header&.path, dir: dir,
                        asciimathdelims: [@openmathdelim, @closemathdelim],
                        liststyles: { ul: @ulstyle, ol: @olstyle })
       header&.unlink
-      @wordstylesheet&.unlink
+      @wordstylesheet&.unlink if @wordstylesheet&.is_a?(Tempfile)
+    end
+
+    def wordstylesheet_update()
+      return if @wordstylesheet.nil?
+      f = File.open(@wordstylesheet.path, "a")
+      @landscapestyle.empty? or f.write(@landscapestyle)
+      if @wordstylesheet_override && @wordstylesheet
+        f.write(@wordstylesheet_override.read)
+        @wordstylesheet_override.close
+      elsif @wordstylesheet_override && !@wordstylesheet
+        @wordstylesheet = @wordstylesheet_override
+      end
+      f.close
+      @wordstylesheet
     end
 
     def word_admonition_images(docxml)