isodoc 1.5.5 → 1.6.4

data/lib/isodoc/function/table.rb

@@ -51,6 +51,7 @@ module IsoDoc::Function
 
     def tcaption(node, t)
       return unless node["summary"]
+
       t.caption do |c|
         c.span **{ style: "display:none" } do |s|
           s << node["summary"]

data/lib/isodoc/function/to_word_html.rb

@@ -18,15 +18,23 @@ module IsoDoc::Function
 
     def init_file(filename, debug)
       filepath = Pathname.new(filename)
-      filename = filepath.sub_ext('').sub(/\.presentation$/, "").to_s
+      filename = filepath.sub_ext("").sub(/\.presentation$/, "").to_s
+      dir = init_dir(filename, debug)
+      @filename = filename
+      @localdir = "#{filepath.parent}/"
+      @sourcedir = @localdir
+      @sourcefilename and
+        @sourcedir = "#{Pathname.new(@sourcefilename).parent}/"
+      [filename, dir]
+    end
+
+    def init_dir(filename, debug)
       dir = "#{filename}_files"
       unless debug
-        Dir.mkdir(dir, 0777) unless File.exists?(dir)
+        Dir.mkdir(dir, 0o777) unless File.exists?(dir)
         FileUtils.rm_rf "#{dir}/*"
       end
-      @filename = filename
-      @localdir = filepath.parent.to_s + '/'
-      [filename, dir]
+      dir
     end
 
     # tmp image dir is same directory as @filename
@@ -40,19 +48,18 @@ module IsoDoc::Function
 
     # isodoc.css overrides any CSS injected by Html2Doc, which
     # is inserted before this CSS.
-    def define_head(head, filename, _dir)
+    def define_head(head, _filename, _dir)
       if @standardstylesheet
         head.style do |style|
           @standardstylesheet.open
-          stylesheet = @standardstylesheet.read.
-            gsub("FILENAME", File.basename(filename).sub(/\.presentation$/, ""))
+          stylesheet = @standardstylesheet.read
           style.comment "\n#{stylesheet}\n"
         end
       end
     end
 
     def body_attr
-      { lang: "#{@lang}" }
+      { lang: @lang.to_s }
     end
 
     def make_body(xml, docxml)
@@ -70,7 +77,7 @@ module IsoDoc::Function
       section_break(body)
     end
 
-    def make_body2(body, docxml)
+    def make_body2(body, _docxml)
       body.div **{ class: "prefatory-section" } do |div2|
         div2.p { |p| p << "&nbsp;" } # placeholder
       end
@@ -109,46 +116,36 @@ module IsoDoc::Function
       @meta.get
     end
 
-    def middle_title(_isoxml, out)
-      out.p(**{ class: "zzSTDTitle1" }) { |p| p << @meta.get[:doctitle] }
-    end
-
-    def middle_admonitions(isoxml, out)
-      isoxml.xpath(ns("//sections/note | //sections/admonition")).each do |x|
-        parse(x, out)
-      end
-    end
-
     def middle(isoxml, out)
       middle_title(isoxml, out)
       middle_admonitions(isoxml, out)
       i = scope isoxml, out, 0
       i = norm_ref isoxml, out, i
       i = terms_defs isoxml, out, i
-      i = symbols_abbrevs isoxml, out, i
+      symbols_abbrevs isoxml, out, i
       clause isoxml, out
       annex isoxml, out
       bibliography isoxml, out
     end
 
     def boilerplate(node, out)
+      return if @bare
+
       boilerplate = node.at(ns("//boilerplate")) or return
-      out.div **{class: "authority"} do |s|
+      out.div **{ class: "authority" } do |s|
         boilerplate.children.each do |n|
           if n.name == "title"
             s.h1 do |h|
               n.children.each { |nn| parse(nn, h) }
             end
-          else
-            parse(n, s)
+          else parse(n, s)
           end
         end
       end
     end
 
     def parse(node, out)
-      if node.text?
-        text_parse(node, out)
+      if node.text? then text_parse(node, out)
       else
         case node.name
         when "em" then em_parse(node, out)
@@ -225,9 +222,16 @@ module IsoDoc::Function
         when "passthrough" then passthrough_parse(node, out)
         when "amend" then amend_parse(node, out)
         when "tab" then clausedelimspace(out) # in Presentation XML only
-        when "svg" then svg_parse(node, out) # introduced in Presentation XML only
-        else
-          error_parse(node, out)
+        when "svg" then svg_parse(node, out) # in Presentation XML only
+        when "add" then add_parse(node, out)
+        when "del" then del_parse(node, out)
+        when "form" then form_parse(node, out)
+        when "input" then input_parse(node, out)
+        when "select" then select_parse(node, out)
+        when "label" then label_parse(node, out)
+        when "option" then option_parse(node, out)
+        when "textarea" then textarea_parse(node, out)
+        else error_parse(node, out)
         end
       end
     end

data/lib/isodoc/function/utils.rb

@@ -1,190 +1,211 @@
 # frozen_string_literal: true
 
-module IsoDoc::Function
-  module Utils
-    def date_range(date)
-      self.class.date_range(date)
-    end
+module IsoDoc
+  module Function
+    module Utils
+      def date_range(date)
+        self.class.date_range(date)
+      end
 
-    def ns(xpath)
-      self.class.ns(xpath)
-    end
+      def ns(xpath)
+        self.class.ns(xpath)
+      end
 
-    def insert_tab(out, n)
-      tab = %w(Hans Hant).include?(@script) ? "　" : "  "
-      [1..n].each { out << tab }
-    end
+      def insert_tab(out, count)
+        tab = %w(Hans Hant).include?(@script) ? "&#x3000;" : "&nbsp; "
+        [1..count].each { out << tab }
+      end
 
-    # add namespaces for Word fragments
-    NOKOHEAD = <<~HERE
-      <!DOCTYPE html SYSTEM
-      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-      <html xmlns="http://www.w3.org/1999/xhtml">
-      <head> <title></title> <meta charset="UTF-8" /> </head>
-      <body> </body> </html>
-    HERE
-
-    # block for processing XML document fragments as XHTML,
-    # to allow for HTMLentities
-    def noko(&block)
-      doc = ::Nokogiri::XML.parse(NOKOHEAD)
-      fragment = doc.fragment('')
-      ::Nokogiri::XML::Builder.with fragment, &block
-      fragment.to_xml(encoding: 'US-ASCII').lines.map do |l|
-        l.gsub(/\s*\n/, '')
+      # add namespaces for Word fragments
+      NOKOHEAD = <<~HERE
+        <!DOCTYPE html SYSTEM
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+        <html xmlns="http://www.w3.org/1999/xhtml">
+        <head> <title></title> <meta charset="UTF-8" /> </head>
+        <body> </body> </html>
+      HERE
+
+      # block for processing XML document fragments as XHTML,
+      # to allow for HTMLentities
+      def noko(&block)
+        doc = ::Nokogiri::XML.parse(NOKOHEAD)
+        fragment = doc.fragment("")
+        ::Nokogiri::XML::Builder.with fragment, &block
+        fragment.to_xml(encoding: "US-ASCII").lines.map do |l|
+          l.gsub(/\s*\n/, "")
+        end
       end
-    end
 
-    def attr_code(attributes)
-      attributes = attributes.reject { |_, val| val.nil? }.map
-      attributes.map do |k, v|
-        [k, v.is_a?(String) ? HTMLEntities.new.decode(v) : v]
-      end.to_h
-    end
+      def attr_code(attributes)
+        attributes = attributes.reject { |_, val| val.nil? }.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">'
-
-    def to_xhtml(xml)
-      xml.gsub!(/<\?xml[^>]*>/, '')
-      /<!DOCTYPE /.match(xml) || (xml = DOCTYPE_HDR + xml)
-      xml = xml.split(/(\&[^ \r\n\t#;]+;)/).map do |t|
-        /^(\&[^ \t\r\n#;]+;)/.match?(t) ?
-          HTMLEntities.new.encode(HTMLEntities.new.decode(t), :hexadecimal) : t
-      end.join('')
-      begin
-        Nokogiri::XML.parse(xml, &: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)"
+      DOCTYPE_HDR = "<!DOCTYPE html SYSTEM "\
+        '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'
+
+      def to_xhtml(xml)
+        xml = to_xhtml_prep(xml)
+        begin
+          Nokogiri::XML.parse(xml, &:strict)
+        rescue Nokogiri::XML::SyntaxError => e
+          File.open("#{@filename}.#{@format}.err", "w:UTF-8") do |f|
+            f.write xml
+          end
+          abort "Malformed Output XML for #{@format}: #{e} "\
+            "(see #{@filename}.#{@format}.err)"
+        end
       end
-    end
 
-    def to_xhtml_fragment(xml)
-      doc = ::Nokogiri::XML.parse(NOKOHEAD)
-      fragment = doc.fragment(xml)
-      fragment
-    end
+      def to_xhtml_prep(xml)
+        xml.gsub!(/<\?xml[^>]*>/, "")
+        /<!DOCTYPE /.match(xml) || (xml = DOCTYPE_HDR + xml)
+        xml.split(/(&[^ \r\n\t#;]+;)/).map do |t|
+          if /^(&[^ \t\r\n#;]+;)/.match?(t)
+            HTMLEntities.new.encode(HTMLEntities.new.decode(t), :hexadecimal)
+          else t
+          end
+        end.join("")
+      end
 
-    def from_xhtml(xml)
-      xml.to_xml.sub(%r{ xmlns="http://www.w3.org/1999/xhtml"}, '')
-    end
+      def to_xhtml_fragment(xml)
+        doc = ::Nokogiri::XML.parse(NOKOHEAD)
+        doc.fragment(xml)
+      end
 
-    CLAUSE_ANCESTOR =
-      ".//ancestor::*[local-name() = 'annex' or "\
-      "local-name() = 'acknowledgements' or local-name() = 'term' or "\
-      "local-name() = 'appendix' or local-name() = 'foreword' or "\
-      "local-name() = 'introduction' or local-name() = 'terms' or "\
-      "local-name() = 'clause' or local-name() = 'references']/@id"
+      def from_xhtml(xml)
+        xml.to_xml.sub(%r{ xmlns="http://www.w3.org/1999/xhtml"}, "")
+      end
 
-    def get_clause_id(node)
-      clause = node.xpath(CLAUSE_ANCESTOR)
-      clause&.last&.text || nil
-    end
+      CLAUSE_ANCESTOR =
+        ".//ancestor::*[local-name() = 'annex' or "\
+        "local-name() = 'definitions' or "\
+        "local-name() = 'acknowledgements' or local-name() = 'term' or "\
+        "local-name() = 'appendix' or local-name() = 'foreword' or "\
+        "local-name() = 'introduction' or local-name() = 'terms' or "\
+        "local-name() = 'clause' or local-name() = 'references']/@id"
+
+      def get_clause_id(node)
+        clause = node.xpath(CLAUSE_ANCESTOR)
+        clause&.last&.text || nil
+      end
 
-    NOTE_CONTAINER_ANCESTOR =
-      ".//ancestor::*[local-name() = 'annex' or "\
-      "local-name() = 'foreword' or local-name() = 'appendix' or "\
-      "local-name() = 'introduction' or local-name() = 'terms' or "\
-      "local-name() = 'acknowledgements' or local-name() = 'term' or "\
-      "local-name() = 'clause' or local-name() = 'references' or "\
-      "local-name() = 'figure' or local-name() = 'formula' or "\
-      "local-name() = 'table' or local-name() = 'example']/@id"
-
-    def get_note_container_id(node)
-      container = node.xpath(NOTE_CONTAINER_ANCESTOR)
-      container&.last&.text || nil
-    end
+      NOTE_CONTAINER_ANCESTOR =
+        ".//ancestor::*[local-name() = 'annex' or "\
+        "local-name() = 'foreword' or local-name() = 'appendix' or "\
+        "local-name() = 'introduction' or local-name() = 'terms' or "\
+        "local-name() = 'acknowledgements' or local-name() = 'term' or "\
+        "local-name() = 'clause' or local-name() = 'references' or "\
+        "local-name() = 'figure' or local-name() = 'formula' or "\
+        "local-name() = 'table' or local-name() = 'example']/@id"
+
+      def get_note_container_id(node)
+        container = node.xpath(NOTE_CONTAINER_ANCESTOR)
+        container&.last&.text || nil
+      end
 
-    def sentence_join(array)
-      return '' if array.nil? || array.empty?
-      if array.length == 1 then array[0]
-      else
-        @i18n.l10n("#{array[0..-2].join(', ')} "\
-                   "#{@i18n.and} #{array.last}",
-                                     @lang, @script)
+      def sentence_join(array)
+        return "" if array.nil? || array.empty?
+
+        if array.length == 1 then array[0]
+        else
+          @i18n.l10n("#{array[0..-2].join(', ')} "\
+                     "#{@i18n.and} #{array.last}",
+                     @lang, @script)
+        end
       end
-    end
 
-    # avoid `; avoid {{ (Liquid Templates); avoid [[ (Javascript)
-    def extract_delims(text)
-      @openmathdelim = '(#('
-      @closemathdelim = ')#)'
-      while text.include?(@openmathdelim) || text.include?(@closemathdelim)
-        @openmathdelim += '('
-        @closemathdelim += ')'
+      # avoid `; avoid {{ (Liquid Templates); avoid [[ (Javascript)
+      def extract_delims(text)
+        @openmathdelim = "(#("
+        @closemathdelim = ")#)"
+        while text.include?(@openmathdelim) || text.include?(@closemathdelim)
+          @openmathdelim += "("
+          @closemathdelim += ")"
+        end
+        [@openmathdelim, @closemathdelim]
       end
-      [@openmathdelim, @closemathdelim]
-    end
 
-    def header_strip(h)
-      h = h.to_s.gsub(%r{<br\s*/>}, ' ').gsub(/<\/?h[123456][^>]*>/, '')
-           .gsub(/<\/?b[^>]*>/, '')
-      h1 = to_xhtml_fragment(h.dup)
-      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['class'] == 'FootnoteRef'
-        x.remove if x.name == 'span' && /mso-bookmark/.match(x['style'])
-        x.replace(x.children) if x.name == 'a'
-      end
-      from_xhtml(h1)
-    end
+      def header_strip(hdr)
+        h1 = to_xhtml_fragment(hdr.to_s.gsub(%r{<br\s*/>}, " ")
+          .gsub(/<\/?h[123456][^>]*>/, "").gsub(/<\/?b[^>]*>/, "").dup)
+        h1.traverse do |x|
+          if x.name == "span" && /mso-tab-count/.match(x["style"])
+            x.replace(" ")
+          elsif header_strip_elem?(x) then x.remove
+          elsif x.name == "a" then x.replace(x.children)
+          end
+        end
+        from_xhtml(h1)
+      end
 
-    def liquid(doc)
-      self.class.liquid(doc)
-    end
+      def header_strip_elem?(elem)
+        elem.name == "img" ||
+          elem.name == "span" && elem["class"] == "MsoCommentReference" ||
+          elem.name == "a" && elem["class"] == "FootnoteRef" ||
+          elem.name == "span" && /mso-bookmark/.match(elem["style"])
+      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('')
-      Liquid::Template.parse(doc)
-    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("")
+        Liquid::Template.parse(doc)
+      end
 
-    def empty2nil(v)
-      return nil if !v.nil? && v.is_a?(String) && v.empty?
-      v
-    end
+      def empty2nil(str)
+        return nil if !str.nil? && str.is_a?(String) && str.empty?
 
-    def populate_template(docxml, _format = nil)
-      meta = @meta
-             .get
-             .merge(@labels ? {labels: @labels} : {})
-             .merge(@meta.labels ? {labels: @meta.labels} : {})
-             .merge(fonts_options || {})
-      template = liquid(docxml)
-      template.render(meta.map { |k, v| [k.to_s, empty2nil(v)] }.to_h)
-              .gsub('&lt;', '&#x3c;').gsub('&gt;', '&#x3e;').gsub('&amp;', '&#x26;')
-    end
+        str
+      end
 
-    def save_dataimage(uri, _relative_dir = true)
-      %r{^data:(image|application)/(?<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
-        f.write(Base64.strict_decode64(imgdata))
-        @tempfile_cache << f # persist to the end
-        f.path
+      def populate_template(docxml, _format = nil)
+        meta = @meta
+          .get
+          .merge(@labels ? { labels: @labels } : {})
+          .merge(@meta.labels ? { labels: @meta.labels } : {})
+          .merge(fonts_options || {})
+        template = liquid(docxml)
+        template.render(meta.map { |k, v| [k.to_s, empty2nil(v)] }.to_h)
+          .gsub("&lt;", "&#x3c;").gsub("&gt;", "&#x3e;").gsub("&amp;", "&#x26;")
       end
-    end
 
-    def image_localfile(i)
-      if /^data:/.match? i['src']
-        save_dataimage(i['src'], false)
-      elsif %r{^([A-Z]:)?/}.match? i['src']
-        i['src']
-      else
-        File.join(@localdir, i['src'])
+      def save_dataimage(uri, _relative_dir = true)
+        %r{^data:(image|application)/(?<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
+          f.write(Base64.strict_decode64(imgdata))
+          @tempfile_cache << f # persist to the end
+          f.path
+        end
+      end
+
+      def image_localfile(img)
+        if /^data:/.match? img["src"]
+          save_dataimage(img["src"], false)
+        elsif %r{^([A-Z]:)?/}.match? img["src"]
+          img["src"]
+        else
+          File.join(@localdir, img["src"])
+        end
       end
-    end
 
-    def labelled_ancestor(node)
-      !node.ancestors('example, requirement, recommendation, permission, '\
-                             'note, table, figure, sourcecode').empty?
+      def labelled_ancestor(node)
+        !node.ancestors("example, requirement, recommendation, permission, "\
+                        "note, table, figure, sourcecode").empty?
+      end
     end
   end
 end