isodoc 1.5.4 → 1.6.3

data/lib/isodoc/presentation_function/math.rb

@@ -0,0 +1,84 @@
+require "twitter_cldr"
+require "bigdecimal"
+
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    MATHML = { "m" => "http://www.w3.org/1998/Math/MathML" }.freeze
+
+    def mathml(docxml)
+      locale = twitter_cldr_localiser
+      docxml.xpath("//m:math", MATHML).each do |f|
+        mathml1(f, locale)
+      end
+    end
+
+    # symbols is merged into
+    # TwitterCldr::DataReaders::NumberDataReader.new(locale).symbols
+    def localize_maths(node, locale)
+      node.xpath(".//m:mn", MATHML).each do |x|
+        num = BigDecimal(x.text)
+        precision = /\./.match?(x.text) ? x.text.sub(/^.*\./, "").size : 0
+        x.children = localized_number(num, locale, precision)
+      end
+    end
+
+    # 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 = localized_number1(num, locale, 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])
+    end
+
+    def localized_number1(num, locale, precision)
+      if precision.zero?
+        num.localize(locale).to_s
+      else
+        num.localize(locale).to_decimal.to_s(precision: precision)
+      end
+    end
+
+    def decorate_fraction_part(fract, locale)
+      result = []
+      twitter_cldr_reader_symbols = twitter_cldr_reader(locale)
+      fract = fract.slice(0..(twitter_cldr_reader_symbols[:precision] || -1))
+      fr_group_digits = twitter_cldr_reader_symbols[:fraction_group_digits] || 1
+      until fract.empty?
+        result.push(fract.slice!(0, fr_group_digits))
+      end
+      result.join(twitter_cldr_reader_symbols[:fraction_group].to_s)
+    end
+
+    def twitter_cldr_localiser_symbols
+      {}
+    end
+
+    def twitter_cldr_reader(locale)
+      num = TwitterCldr::DataReaders::NumberDataReader.new(locale)
+      num.symbols.merge!(twitter_cldr_localiser_symbols)
+    end
+
+    def twitter_cldr_localiser
+      locale = TwitterCldr.supported_locale?(@lang.to_sym) ? @lang.to_sym : :en
+      twitter_cldr_reader(locale)
+      locale
+    end
+
+    def mathml1(node, locale)
+      localize_maths(node, locale)
+      return unless node.elements.size == 1 && node.elements.first.name == "mn"
+
+      if node.parent.name == "stem"
+        node.parent.replace(node.at("./m:mn", MATHML).children)
+      else
+        node.replace(node.at("./m:mn", MATHML).children)
+      end
+    end
+  end
+end

data/lib/isodoc/presentation_function/section.rb

@@ -2,20 +2,21 @@ module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def clause(docxml)
       docxml.xpath(ns("//clause | "\
-                      "//terms | //definitions | //references")).
-                     each do |f|
+                      "//terms | //definitions | //references"))
+        .each do |f|
         clause1(f)
       end
     end
 
-    def clause1(f)
-      level = @xrefs.anchor(f['id'], :level, false) || "1"
-      t = f.at(ns("./title")) and t["depth"] = level
-      return if !f.ancestors("boilerplate").empty?
-      return if @suppressheadingnumbers || f["unnumbered"]
-      lbl = @xrefs.anchor(f['id'], :label,
-                          f.parent.name != "sections") or return
-      prefix_name(f, "<tab/>", "#{lbl}#{clausedelim}", "title")
+    def clause1(elem)
+      level = @xrefs.anchor(elem["id"], :level, false) || "1"
+      t = elem.at(ns("./title")) and t["depth"] = level
+      return if !elem.ancestors("boilerplate").empty? ||
+        @suppressheadingnumbers || elem["unnumbered"]
+
+      lbl = @xrefs.anchor(elem["id"], :label,
+                          elem.parent.name != "sections") or return
+      prefix_name(elem, "<tab/>", "#{lbl}#{clausedelim}", "title")
     end
 
     def annex(docxml)
@@ -24,12 +25,12 @@ module IsoDoc
       end
     end
 
-    def annex1(f)
-      lbl = @xrefs.anchor(f['id'], :label)
-      if t = f.at(ns("./title"))
+    def annex1(elem)
+      lbl = @xrefs.anchor(elem["id"], :label)
+      if t = elem.at(ns("./title"))
         t.children = "<strong>#{t.children.to_xml}</strong>"
       end
-      prefix_name(f, "<br/><br/>", lbl, "title")
+      prefix_name(elem, "<br/><br/>", lbl, "title")
     end
 
     def term(docxml)
@@ -38,18 +39,15 @@ module IsoDoc
       end
     end
 
-    def term1(f)
-      lbl = @xrefs.get[f["id"]][:label] or return
-      prefix_name(f, "", "#{lbl}#{clausedelim}", "name")
+    def term1(elem)
+      lbl = @xrefs.get[elem["id"]][:label] or return
+      prefix_name(elem, "", "#{lbl}#{clausedelim}", "name")
     end
 
-    def references(docxml)
-    end
+    def references(docxml); end
 
     def index(docxml)
-      docxml.xpath(ns("//index | //index-xref | //indexsect")).each do |f|
-        f.remove
-      end
+      docxml.xpath(ns("//index | //index-xref | //indexsect")).each(&:remove)
     end
   end
 end

data/lib/isodoc/presentation_xml_convert.rb

@@ -1,5 +1,6 @@
 require_relative "presentation_function/block"
 require_relative "presentation_function/inline"
+require_relative "presentation_function/math"
 require_relative "presentation_function/section"
 require_relative "presentation_function/bibdata"
 
@@ -59,7 +60,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/sassc_importer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'sassc'
+require "sassc"
 
 class SasscImporter < SassC::Importer
   def imports(path, _parent_path)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.5.4".freeze
+  VERSION = "1.6.3".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -1,5 +1,5 @@
-require_relative "./table.rb"
-require_relative "./inline.rb"
+require_relative "./table"
+require_relative "./inline"
 
 module IsoDoc::WordFunction
   module Body
@@ -71,8 +71,8 @@ module IsoDoc::WordFunction
       node.xpath(ns("./note")).each { |n| parse(n, out) }
     end
 
-    WORD_DT_ATTRS = {class: @note ? "Note" : nil, align: "left",
-                     style: "margin-left:0pt;text-align:left;"}.freeze
+    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|
@@ -102,6 +102,7 @@ module IsoDoc::WordFunction
 
     def dl_parse_notes(node, v)
       return if node.elements.reject { |n| dt_dd? n }.empty?
+
       v.tr do |tr|
         tr.td **{ colspan: 2 } do |td|
           node.elements.reject { |n| dt_dd? n }.each { |n| parse(n, td) }
@@ -109,19 +110,19 @@ module IsoDoc::WordFunction
       end
     end
 
-    def figure_get_or_make_dl(t)
-      dl = t.at(".//table[@class = 'dl']")
+    def figure_get_or_make_dl(node)
+      dl = node.at(".//table[@class = 'dl']")
       if dl.nil?
-        t.add_child("<p><b>#{@i18n.key}</b></p><table class='dl'></table>")
-        dl = t.at(".//table[@class = 'dl']")
+        node.add_child("<p><b>#{@i18n.key}</b></p><table class='dl'></table>")
+        dl = node.at(".//table[@class = 'dl']")
       end
       dl
     end
 
-    def figure_aside_process(f, aside, key)
+    def figure_aside_process(fig, aside, key)
       # get rid of footnote link, it is in diagram
-      f&.at("./a[@class='TableFootnoteRef']")&.remove
-      fnref = f.at(".//span[@class='TableFootnoteRef']/..")
+      fig&.at("./a[@class='TableFootnoteRef']")&.remove
+      fnref = fig.at(".//span[@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
@@ -174,31 +175,32 @@ module IsoDoc::WordFunction
         attrs[:align] = node["align"] unless node["align"] == "justify"
         attrs[:style] += "text-align:#{node['align']};"
       end
-      attrs[:style] += "#{keep_style(node)}"
+      attrs[:style] += keep_style(node).to_s
       attrs[:style] = nil if attrs[:style].empty?
       attrs
     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;"\
-        "#{keep_style(node)}"
-      })
+                    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;"\
+                    "#{keep_style(node)}",
+                  })
     end
 
-    def formula_where(dl, out)
-      return unless dl
+    def formula_where(deflist, out)
+      return unless deflist
+
       out.p { |p| p << @i18n.where }
-      parse(dl, out)
+      parse(deflist, out)
       out.parent.at("./table")["class"] = "formula_dl"
     end
 
     def formula_parse1(node, out)
       out.div **attr_code(class: "formula") do |div|
-        div.p do |p|
+        div.p do |_p|
           parse(node.at(ns("./stem")), div)
           insert_tab(div, 1)
           if lbl = node&.at(ns("./name"))&.text
@@ -209,7 +211,7 @@ module IsoDoc::WordFunction
     end
 
     def li_parse(node, out)
-      out.li  **attr_code(id: node["id"]) do |li|
+      out.li **attr_code(id: node["id"]) do |li|
         if node["uncheckedcheckbox"] == "true"
           li << '<span class="zzMoveToFollowing">&#x2610; </span>'
         elsif node["checkedcheckbox"] == "true"
@@ -220,7 +222,9 @@ module IsoDoc::WordFunction
     end
 
     def suffix_url(url)
-      return url if %r{^http[s]?://}.match(url)
+      return url if %r{^https?://}.match?(url)
+      return url unless File.extname(url).empty?
+
       url.sub(/#{File.extname(url)}$/, ".doc")
     end
   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/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)

data/lib/isodoc/xref.rb

@@ -11,7 +11,7 @@ module IsoDoc
     include XrefGen::Blocks
     include XrefGen::Sections
 
-     def initialize(lang, script, klass, i18n, options = {})
+    def initialize(lang, script, klass, i18n, options = {})
       @anchors = {}
       @lang = lang
       @script = script
@@ -28,13 +28,12 @@ module IsoDoc
 
     def anchor(id, lbl, warning = true)
       return nil if id.nil? || id.empty?
-      unless @anchors[id]
-        if warning
-          @seen ||= Seen_Anchor.instance
-          @seen.seen(id) or warn "No label has been processed for ID #{id}"
-          @seen.add(id)
-          return "[#{id}]"
-        end
+
+      if warning && !@anchors[id]
+        @seen ||= Seen_Anchor.instance
+        @seen.seen(id) or warn "No label has been processed for ID #{id}"
+        @seen.add(id)
+        return "[#{id}]"
       end
       @anchors.dig(id, lbl)
     end
@@ -49,15 +48,15 @@ module IsoDoc
       note_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
       example_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
       list_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
-      bookmark_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
+      bookmark_anchor_names(docxml)
     end
 
     def ns(xpath)
       Common::ns(xpath)
     end
 
-    def l10n(a, lang = @lang, script = @script)
-      @i18n.l10n(a, lang, script)
+    def l10n(text, lang = @lang, script = @script)
+      @i18n.l10n(text, lang, script)
     end
   end
 end