isodoc 1.7.3 → 1.7.6

data/lib/isodoc/function/table.rb

@@ -1,116 +1,119 @@
-module IsoDoc::Function
-  module Table
-    def table_title_parse(node, out)
-      name = node.at(ns("./name")) or return
-      out.p **{ class: "TableTitle", style: "text-align:center;" } do |p|
-        name&.children&.each { |n| parse(n, p) }
+module IsoDoc
+  module Function
+    module Table
+      def table_title_parse(node, out)
+        name = node.at(ns("./name")) or return
+        out.p **{ class: "TableTitle", style: "text-align:center;" } do |p|
+          name&.children&.each { |n| parse(n, p) }
+        end
       end
-    end
 
-    def thead_parse(node, table)
-      thead = node.at(ns("./thead"))
-      if thead
-        table.thead do |h|
-          thead.element_children.each_with_index do |n, i|
-            tr_parse(n, h, i, thead.element_children.size, true)
+      def thead_parse(node, table)
+        thead = node.at(ns("./thead"))
+        if thead
+          table.thead do |h|
+            thead.element_children.each_with_index do |n, i|
+              tr_parse(n, h, i, thead.element_children.size, true)
+            end
           end
         end
       end
-    end
 
-    def tbody_parse(node, table)
-      tbody = node.at(ns("./tbody")) || return
-      table.tbody do |h|
-        tbody.element_children.each_with_index do |n, i|
-          tr_parse(n, h, i, tbody.element_children.size, false)
+      def tbody_parse(node, table)
+        tbody = node.at(ns("./tbody")) || return
+        table.tbody do |h|
+          tbody.element_children.each_with_index do |n, i|
+            tr_parse(n, h, i, tbody.element_children.size, false)
+          end
         end
       end
-    end
 
-    def tfoot_parse(node, table)
-      tfoot = node.at(ns("./tfoot"))
-      if tfoot
-        table.tfoot do |h|
-          tfoot.element_children.each_with_index do |n, i|
-            tr_parse(n, h, i, tfoot.element_children.size, false)
+      def tfoot_parse(node, table)
+        tfoot = node.at(ns("./tfoot"))
+        if tfoot
+          table.tfoot do |h|
+            tfoot.element_children.each_with_index do |n, i|
+              tr_parse(n, h, i, tfoot.element_children.size, false)
+            end
           end
         end
       end
-    end
 
-    def table_attrs(node)
-      width = node["width"] ? "width:#{node['width']};" : nil
-      attr_code(
-        id: node["id"],
-        class: "MsoISOTable",
-        style: "border-width:1px;border-spacing:0;#{width}#{keep_style(node)}",
-        title: node["alt"],
-      )
-    end
+      def table_attrs(node)
+        width = node["width"] ? "width:#{node['width']};" : nil
+        attr_code(
+          id: node["id"],
+          class: "MsoISOTable",
+          style: "border-width:1px;border-spacing:0;"\
+                 "#{width}#{keep_style(node)}",
+          title: node["alt"],
+        )
+      end
 
-    def tcaption(node, table)
-      return unless node["summary"]
+      def tcaption(node, table)
+        return unless node["summary"]
 
-      table.caption do |c|
-        c.span **{ style: "display:none" } do |s|
-          s << node["summary"]
+        table.caption do |c|
+          c.span **{ style: "display:none" } do |s|
+            s << node["summary"]
+          end
         end
       end
-    end
 
-    def colgroup(node, table)
-      colgroup = node.at(ns("./colgroup")) or return
-      table.colgroup do |cg|
-        colgroup.xpath(ns("./col")).each do |c|
-          cg.col **{ style: "width: #{c['width']};" }
+      def colgroup(node, table)
+        colgroup = node.at(ns("./colgroup")) or return
+        table.colgroup do |cg|
+          colgroup.xpath(ns("./col")).each do |c|
+            cg.col **{ style: "width: #{c['width']};" }
+          end
         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)
-        (dl = node.at(ns("./dl"))) && parse(dl, out)
-        node.xpath(ns("./note")).each { |n| parse(n, out) }
+      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)
+          (dl = node.at(ns("./dl"))) && parse(dl, out)
+          node.xpath(ns("./note")).each { |n| parse(n, out) }
+        end
+        @in_table = false
+        # out.p { |p| p << "&nbsp;" }
       end
-      @in_table = false
-      # out.p { |p| p << "&nbsp;" }
-    end
 
-    SW = "solid windowtext".freeze
+      SW = "solid windowtext".freeze
 
-    # def make_tr_attr(td, row, totalrows, cols, totalcols, header)
-    # border-left:#{col.zero? ? "#{SW} 1.5pt;" : "none;"}
-    # border-right:#{SW} #{col == totalcols && !header ? "1.5" : "1.0"}pt;
+      # def make_tr_attr(td, row, totalrows, cols, totalcols, header)
+      # border-left:#{col.zero? ? "#{SW} 1.5pt;" : "none;"}
+      # border-right:#{SW} #{col == totalcols && !header ? "1.5" : "1.0"}pt;
 
-    def make_tr_attr(cell, row, totalrows, header)
-      style = cell.name == "th" ? "font-weight:bold;" : ""
-      cell["align"] and style += "text-align:#{cell['align']};"
-      cell["valign"] and style += "vertical-align:#{cell['valign']};"
-      rowmax = cell["rowspan"] ? row + cell["rowspan"].to_i - 1 : row
-      style += <<~STYLE
-        border-top:#{row.zero? ? "#{SW} 1.5pt;" : 'none;'}
-        border-bottom:#{SW} #{rowmax == totalrows ? '1.5' : '1.0'}pt;
-      STYLE
-      header and scope = (cell["colspan"] ? "colgroup" : "col")
-      !header and cell.name == "th" and scope =
-                                          (cell["rowspan"] ? "rowgroup" : "row")
-      { rowspan: cell["rowspan"], colspan: cell["colspan"],
-        style: style.gsub(/\n/, ""), scope: scope }
-    end
+      def make_tr_attr(cell, row, totalrows, header)
+        style = cell.name == "th" ? "font-weight:bold;" : ""
+        cell["align"] and style += "text-align:#{cell['align']};"
+        cell["valign"] and style += "vertical-align:#{cell['valign']};"
+        rowmax = cell["rowspan"] ? row + cell["rowspan"].to_i - 1 : row
+        style += <<~STYLE
+          border-top:#{row.zero? ? "#{SW} 1.5pt;" : 'none;'}
+          border-bottom:#{SW} #{rowmax == totalrows ? '1.5' : '1.0'}pt;
+        STYLE
+        header and scope = (cell["colspan"] ? "colgroup" : "col")
+        !header && cell.name == "th" and
+          scope = (cell["rowspan"] ? "rowgroup" : "row")
+        { rowspan: cell["rowspan"], colspan: cell["colspan"],
+          style: style.gsub(/\n/, ""), scope: scope }
+      end
 
-    def tr_parse(node, out, ord, totalrows, header)
-      out.tr do |r|
-        node.elements.each do |td|
-          attrs = make_tr_attr(td, ord, totalrows - 1, header)
-          r.send td.name, **attr_code(attrs) do |entry|
-            td.children.each { |n| parse(n, entry) }
+      def tr_parse(node, out, ord, totalrows, header)
+        out.tr do |r|
+          node.elements.each do |td|
+            attrs = make_tr_attr(td, ord, totalrows - 1, header)
+            r.send td.name, **attr_code(attrs) do |entry|
+              td.children.each { |n| parse(n, entry) }
+            end
           end
         end
       end

data/lib/isodoc/function/terms.rb

@@ -1,77 +1,79 @@
-module IsoDoc::Function
-  module Terms
-    def definition_parse(node, out)
-      node.children.each { |n| parse(n, out) }
-    end
+module IsoDoc
+  module Function
+    module Terms
+      def definition_parse(node, out)
+        node.children.each { |n| parse(n, out) }
+      end
 
-    def modification_parse(node, out)
-      out << "[MODIFICATION]"
-      para = node.at(ns("./p"))
-      para.children.each { |n| parse(n, out) }
-    end
+      def modification_parse(node, out)
+        out << "[MODIFICATION]"
+        para = node.at(ns("./p"))
+        para.children.each { |n| parse(n, out) }
+      end
 
-    def deprecated_term_parse(node, out)
-      out.p **{ class: "DeprecatedTerms", style: "text-align:left;" } do |p|
-        p << l10n("#{@i18n.deprecated}: ")
-        node.children.each { |c| parse(c, p) }
+      def deprecated_term_parse(node, out)
+        out.p **{ class: "DeprecatedTerms", style: "text-align:left;" } do |p|
+          p << l10n("#{@i18n.deprecated}: ")
+          node.children.each { |c| parse(c, p) }
+        end
       end
-    end
 
-    def admitted_term_parse(node, out)
-      out.p **{ class: "AltTerms", style: "text-align:left;" } do |p|
-        node.children.each { |c| parse(c, p) }
+      def admitted_term_parse(node, out)
+        out.p **{ class: "AltTerms", style: "text-align:left;" } do |p|
+          node.children.each { |c| parse(c, p) }
+        end
       end
-    end
 
-    def term_parse(node, out)
-      out.p **{ class: "Terms", style: "text-align:left;" } do |p|
-        node.children.each { |c| parse(c, p) }
+      def term_parse(node, out)
+        out.p **{ class: "Terms", style: "text-align:left;" } do |p|
+          node.children.each { |c| parse(c, p) }
+        end
       end
-    end
 
-    def para_then_remainder(first, node, para, div)
-      if first.name == "p"
-        first.children.each { |n| parse(n, para) }
-        node.elements.drop(1).each { |n| parse(n, div) }
-      else
-        node.elements.each { |n| parse(n, div) }
+      def para_then_remainder(first, node, para, div)
+        if first.name == "p"
+          first.children.each { |n| parse(n, para) }
+          node.elements.drop(1).each { |n| parse(n, div) }
+        else
+          node.elements.each { |n| parse(n, div) }
+        end
       end
-    end
 
-    def termnote_delim
-      l10n(": ")
-    end
+      def termnote_delim
+        l10n(": ")
+      end
 
-    def termnote_parse(node, out)
-      name = node&.at(ns("./name"))&.remove
-      out.div **note_attrs(node) do |div|
-        div.p do |p|
-          if name
-            name.children.each { |n| parse(n, p) }
-            p << termnote_delim
+      def termnote_parse(node, out)
+        name = node&.at(ns("./name"))&.remove
+        out.div **note_attrs(node) do |div|
+          div.p do |p|
+            if name
+              name.children.each { |n| parse(n, p) }
+              p << termnote_delim
+            end
+            para_then_remainder(node.first_element_child, node, p, div)
           end
-          para_then_remainder(node.first_element_child, node, p, div)
         end
       end
-    end
 
-    def termref_parse(node, out)
-      out.p do |p|
-        p << "[TERMREF]"
-        node.children.each { |n| parse(n, p) }
-        p << "[/TERMREF]"
+      def termref_parse(node, out)
+        out.p do |p|
+          p << "[TERMREF]"
+          node.children.each { |n| parse(n, p) }
+          p << "[/TERMREF]"
+        end
       end
-    end
 
-    def termdef_parse(node, out)
-      name = node&.at(ns("./name"))&.remove
-      out.p **{ class: "TermNum", id: node["id"] } do |p|
-        name&.children&.each { |n| parse(n, p) }
+      def termdef_parse(node, out)
+        name = node&.at(ns("./name"))&.remove
+        out.p **{ class: "TermNum", id: node["id"] } do |p|
+          name&.children&.each { |n| parse(n, p) }
+        end
+        set_termdomain("")
+        node.children.each { |n| parse(n, out) }
       end
-      set_termdomain("")
-      node.children.each { |n| parse(n, out) }
-    end
 
-    def termdocsource_parse(_node, _out); end
+      def termdocsource_parse(_node, _out); end
+    end
   end
 end

data/lib/isodoc/function/to_word_html.rb

@@ -21,7 +21,8 @@ module IsoDoc
         filename = filepath.sub_ext("").sub(/\.presentation$/, "").to_s
         dir = init_dir(filename, debug)
         @filename = filename
-        @localdir = "#{filepath.parent}/"
+        @localdir = @baseassetpath || filepath.parent.to_s
+        @localdir += "/"
         @sourcedir = @localdir
         @sourcefilename and
           @sourcedir = "#{Pathname.new(@sourcefilename).parent}/"
@@ -233,6 +234,7 @@ module IsoDoc
           when "option" then option_parse(node, out)
           when "textarea" then textarea_parse(node, out)
           when "toc" then toc_parse(node, out)
+          when "variant-title" then variant_title(node, out)
           else error_parse(node, out)
           end
         end

data/lib/isodoc/function/utils.rb

@@ -37,14 +37,14 @@ module IsoDoc
       end
 
       def attr_code(attributes)
-        attributes = attributes.reject { |_, val| val.nil? }.map
+        attributes = attributes.compact.map
         attributes.map do |k, v|
           [k, v.is_a?(String) ? HTMLEntities.new.decode(v) : v]
         end.to_h
       end
 
       DOCTYPE_HDR = "<!DOCTYPE html SYSTEM "\
-        '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'
+                    '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'
 
       def to_xhtml(xml)
         xml = to_xhtml_prep(xml)
@@ -55,7 +55,7 @@ module IsoDoc
             f.write xml
           end
           abort "Malformed Output XML for #{@format}: #{e} "\
-            "(see #{@filename}.#{@format}.err)"
+                "(see #{@filename}.#{@format}.err)"
         end
       end
 
@@ -67,7 +67,7 @@ module IsoDoc
             HTMLEntities.new.encode(HTMLEntities.new.decode(t), :hexadecimal)
           else t
           end
-        end.join("")
+        end.join
       end
 
       def to_xhtml_fragment(xml)
@@ -148,18 +148,12 @@ module IsoDoc
           elem.name == "span" && /mso-bookmark/.match(elem["style"])
       end
 
-=begin
-      def liquid(doc)
-        self.class.liquid(doc)
-      end
-=end
-
       def liquid(doc)
         # unescape HTML escapes in doc
         doc = doc.split(%r<(\{%|%\})>).each_slice(4).map do |a|
           a[2] = a[2].gsub(/&lt;/, "<").gsub(/&gt;/, ">") if a.size > 2
-          a.join("")
-        end.join("")
+          a.join
+        end.join
         Liquid::Template.parse(doc)
       end
 
@@ -181,8 +175,9 @@ module IsoDoc
       end
 
       def save_dataimage(uri, _relative_dir = true)
-        %r{^data:(image|application)/(?<imgtype>[^;]+);base64,(?<imgdata>.+)$} =~ uri
-        imgtype.sub!(/\+[a-z0-9]+$/, "") # svg+xml
+        %r{^data:(?<imgclass>image|application)/(?<imgtype>[^;]+);(charset=[^;]+;)?base64,(?<imgdata>.+)$} =~ uri
+        imgtype = "emf" if emf?("#{imgclass}/#{imgtype}")
+        imgtype = imgtype.sub(/\+[a-z0-9]+$/, "") # svg+xml
         imgtype = "png" unless /^[a-z0-9]+$/.match? imgtype
         Tempfile.open(["image", ".#{imgtype}"]) do |f|
           f.binmode
@@ -206,6 +201,31 @@ module IsoDoc
         !node.ancestors("example, requirement, recommendation, permission, "\
                         "note, table, figure, sourcecode").empty?
       end
+
+      def emf?(type)
+        %w(application/emf application/x-emf image/x-emf image/x-mgx-emf
+           application/x-msmetafile image/x-xbitmap).include? type
+      end
+
+      def cleanup_entities(text)
+        c = HTMLEntities.new
+        text.split(/([<>])/).each_slice(4).map do |a|
+          a[0] = c.encode(c.decode(a[0]), :hexadecimal)
+          a[1] = c.encode(c.decode(a[1]), :hexadecimal)
+          a
+        end.join
+      end
+
+      def external_path(path)
+        win = !!((RUBY_PLATFORM =~ /(win|w)(32|64)$/) ||
+                 (RUBY_PLATFORM =~ /mswin|mingw/))
+        if win
+          path.gsub!(%{/}, "\\")
+          path[/\s/] ? "\"#{path}\"" : path
+        else
+          path
+        end
+      end
     end
   end
 end