isodoc 1.5.3 → 1.6.2

data/lib/isodoc/gem_tasks.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'sassc'
-require 'isodoc/sassc_importer'
-require 'rake/clean'
+require "sassc"
+require "isodoc/sassc_importer"
+require "rake/clean"
 
 module IsoDoc
   module GemTasks
@@ -11,7 +11,7 @@ module IsoDoc
     module_function
 
     def install
-      rule '.css' => [proc { |tn| tn.sub(/\.css$/, '.scss') }] do |current_task|
+      rule ".css" => [proc { |tn| tn.sub(/\.css$/, ".scss") }] do |current_task|
         begin
           puts(current_task)
           compile_scss_task(current_task)
@@ -20,23 +20,23 @@ module IsoDoc
         end
       end
 
-      scss_files = Rake::FileList['lib/**/*.scss']
-      source_files = scss_files.ext('.css')
+      scss_files = Rake::FileList["lib/**/*.scss"]
+      source_files = scss_files.ext(".css")
 
       task :comment_out_liquid do
         process_css_files(scss_files) do |file_name|
-          comment_out_liquid(File.read(file_name, encoding: 'UTF-8'))
+          comment_out_liquid(File.read(file_name, encoding: "UTF-8"))
         end
       end
 
       task build_scss: [:comment_out_liquid].push(*source_files) do
         process_css_files(scss_files) do |file_name|
-          uncomment_out_liquid(File.read(file_name, encoding: 'UTF-8'))
+          uncomment_out_liquid(File.read(file_name, encoding: "UTF-8"))
         end
-        git_cache_compiled_files && puts('Built scss!')
+        git_cache_compiled_files && puts("Built scss!")
       end
 
-      Rake::Task['build'].enhance [:build_scss] do
+      Rake::Task["build"].enhance [:build_scss] do
         git_rm_compiled_files
         Rake::Task[:clean].invoke
       end
@@ -44,7 +44,7 @@ module IsoDoc
 
     def notify_borken_compilation(error, current_task)
       puts("Cannot compile #{current_task} because of #{error.message}")
-      puts('continue anyway[y|n]?')
+      puts("continue anyway[y|n]?")
       answer = STDIN.gets.strip
       if %w[y yes].include?(answer.strip.downcase)
         puts("Cannot compile #{current_task} because of #{error.message}")
@@ -68,7 +68,7 @@ module IsoDoc
     def process_css_files(scss_files)
       scss_files.each do |file_name|
         result = yield(file_name)
-        File.open(file_name, 'w', encoding: 'UTF-8') do |file|
+        File.open(file_name, "w", encoding: "UTF-8") do |file|
           file.puts(result)
         end
       end
@@ -81,42 +81,41 @@ module IsoDoc
         else
           line
         end
-      end
-          .join("\n")
+      end.join("\n")
     end
 
     def uncomment_out_liquid(text)
       text
-        .gsub('/* LIQUID_COMMENT', '')
-        .gsub('LIQUID_COMMENT */', '')
-        .gsub('"{{', '{{').gsub('}}"', '}}')
+        .gsub("/* LIQUID_COMMENT", "")
+        .gsub("LIQUID_COMMENT */", "")
+        .gsub('"{{', '{{').gsub('}}"', "}}")
     end
 
     def fonts_placeholder
       <<~TEXT
-        $bodyfont: '{{bodyfont}}';
-        $headerfont: '{{headerfont}}';
-        $monospacefont: '{{monospacefont}}';
-        $normalfontsize: '{{normalfontsize}}';
-        $smallerfontsize: '{{smallerfontsize}}';
-        $footnotefontsize: '{{footnotefontsize}}';
-        $monospacefontsize: '{{monospacefontsize}}';
+        $bodyfont: "{{bodyfont}}";
+        $headerfont: "{{headerfont}}";
+        $monospacefont: "{{monospacefont}}";
+        $normalfontsize: "{{normalfontsize}}";
+        $smallerfontsize: "{{smallerfontsize}}";
+        $footnotefontsize: "{{footnotefontsize}}";
+        $monospacefontsize: "{{monospacefontsize}}";
       TEXT
     end
 
     def compile_scss(filename)
-      require 'sassc'
+      require "sassc"
 
-      isodoc_path = if Gem.loaded_specs['isodoc']
-                      File.join(Gem.loaded_specs['isodoc'].full_gem_path, 'lib', 'isodoc')
+      isodoc_path = if Gem.loaded_specs["isodoc"]
+                      File.join(Gem.loaded_specs["isodoc"].full_gem_path, "lib", "isodoc")
                     else
-                      File.join('lib', 'isodoc')
+                      File.join("lib", "isodoc")
                     end
       [isodoc_path,
        File.dirname(filename)].each do |name|
         SassC.load_paths << name
       end
-      sheet_content = File.read(filename, encoding: 'UTF-8')
+      sheet_content = File.read(filename, encoding: "UTF-8")
       SassC::Engine.new(fonts_placeholder + sheet_content,
                         syntax: :scss,
                         importer: SasscImporter)
@@ -125,10 +124,10 @@ module IsoDoc
 
     def compile_scss_task(current_task)
       filename = current_task.source
-      basename = File.basename(filename, '.*')
+      basename = File.basename(filename, ".*")
       compiled_path = File.join(File.dirname(filename), "#{basename}.css")
       content = uncomment_out_liquid(compile_scss(filename))
-      File.open(compiled_path, 'w:UTF-8') do |f|
+      File.open(compiled_path, "w:UTF-8") do |f|
         f.write(content)
       end
       CLEAN << compiled_path

data/lib/isodoc/html_convert.rb

@@ -1,13 +1,15 @@
-require_relative "html_function/comments.rb"
-require_relative "html_function/footnotes.rb"
-require_relative "html_function/html.rb"
-require_relative "html_function/postprocess.rb"
+require_relative "html_function/comments"
+require_relative "html_function/footnotes"
+require_relative "html_function/html"
+require_relative "html_function/form"
+require_relative "html_function/postprocess"
 
 module IsoDoc
   class HtmlConvert < ::IsoDoc::Convert
 
     include HtmlFunction::Comments
     include HtmlFunction::Footnotes
+    include HtmlFunction::Form
     include HtmlFunction::Html
 
     def tmpimagedir_suffix

data/lib/isodoc/html_function/form.rb

@@ -0,0 +1,62 @@
+module IsoDoc::HtmlFunction
+  module Form
+    def form_parse(node, out)
+      out.form **attr_code(id: node["id"], name: node["name"],
+                           action: node["action"]) do |div|
+        node.children.each do |n|
+          parse(n, div)
+        end
+      end
+    end
+
+    def input_parse(node, out)
+      out.input nil, **attr_code(
+        id: node["id"], name: node["name"], type: node["type"],
+        value: node["value"], disabled: node["disabled"],
+        readonly: node["readonly"], checked: node["checked"],
+        maxlength: node["maxlength"], minlength: node["minlength"]
+      )
+    end
+
+    def select_parse(node, out)
+      selected = node.at(ns("./option[@value = '#{node['value']}']"))
+      selected and selected["selected"] = true
+      out.select **attr_code(
+        id: node["id"], name: node["name"], size: node["size"],
+        disabled: node["disabled"], multiple: node["multiple"]
+      ) do |div|
+        node.children.each do |n|
+          parse(n, div)
+        end
+      end
+    end
+
+    def label_parse(node, out)
+      out.label **attr_code(for: node["for"]) do |div|
+        node.children.each do |n|
+          parse(n, div)
+        end
+      end
+    end
+
+    def option_parse(node, out)
+      out.option **attr_code(
+        disabled: node["disabled"], selected: node["selected"],
+        value: node["value"]
+      ) do |o|
+        node.children.each do |n|
+          parse(n, o)
+        end
+      end
+    end
+
+    def textarea_parse(node, out)
+      out.textarea **attr_code(
+        id: node["id"], name: node["name"], rows: node["rows"],
+        cols: node["cols"]
+      ) do |div|
+        node["value"] and div << node["value"]
+      end
+    end
+  end
+end

data/lib/isodoc/html_function/postprocess.rb

@@ -1,4 +1,5 @@
 require "isodoc/html_function/mathvariant_to_plain"
+require_relative "postprocess_footnotes"
 
 module IsoDoc::HtmlFunction
   module Html
@@ -44,20 +45,25 @@ module IsoDoc::HtmlFunction
       IsoDoc::HtmlFunction::MathvariantToPlain.new(docxml).convert
     end
 
-    def htmlstylesheet
-      @htmlstylesheet.open
-      stylesheet = @htmlstylesheet.read
+    def htmlstylesheet(file)
+      return if file.nil?
+
+      file.open if file.is_a?(Tempfile)
+      stylesheet = file.read
       xml = Nokogiri::XML("<style/>")
       xml.children.first << Nokogiri::XML::Comment.new(xml, "\n#{stylesheet}\n")
-      @htmlstylesheet.close!
+      file.close
+      file.unlink if file.is_a?(Tempfile)
       xml.root.to_s
     end
 
     def htmlstyle(docxml)
       return docxml unless @htmlstylesheet
+
       title = docxml.at("//*[local-name() = 'head']/*[local-name() = 'title']")
       head = docxml.at("//*[local-name() = 'head']")
-      head << htmlstylesheet
+      head << htmlstylesheet(@htmlstylesheet)
+      s = htmlstylesheet(@htmlstylesheet_override) and head << s
       docxml
     end
 
@@ -74,7 +80,7 @@ module IsoDoc::HtmlFunction
     def authority_cleanup1(docxml, klass)
       dest = docxml.at("//div[@id = 'boilerplate-#{klass}-destination']")
       auth = docxml.at("//div[@id = 'boilerplate-#{klass}' or @class = 'boilerplate-#{klass}']")
-      auth&.xpath(".//h1[not(text())] | .//h2[not(text())]")&.each { |h| h.remove }
+      auth&.xpath(".//h1[not(text())] | .//h2[not(text())]")&.each(&:remove)
       auth&.xpath(".//h1 | .//h2")&.each { |h| h["class"] = "IntroTitle" }
       dest and auth and dest.replace(auth.remove)
     end
@@ -89,14 +95,18 @@ module IsoDoc::HtmlFunction
       doc = to_xhtml_fragment(File.read(@htmlcoverpage, encoding: "UTF-8"))
       d = docxml.at('//div[@class="title-section"]')
       # d.children.first.add_previous_sibling doc.to_xml(encoding: "US-ASCII")
-      d.children.first.add_previous_sibling populate_template(doc.to_xml(encoding: "US-ASCII"), :html)
+      d.children.first.add_previous_sibling(
+        populate_template(doc.to_xml(encoding: "US-ASCII"), :html)
+      )
     end
 
     def html_intro(docxml)
       doc = to_xhtml_fragment(File.read(@htmlintropage, encoding: "UTF-8"))
       d = docxml.at('//div[@class="prefatory-section"]')
       # d.children.first.add_previous_sibling doc.to_xml(encoding: "US-ASCII")
-      d.children.first.add_previous_sibling populate_template(doc.to_xml(encoding: "US-ASCII"), :html)
+      d.children.first.add_previous_sibling(
+        populate_template(doc.to_xml(encoding: "US-ASCII"), :html)
+      )
     end
 
     def html_toc_entry(level, header)
@@ -109,7 +119,9 @@ module IsoDoc::HtmlFunction
     end
 
     def toclevel
-      ret = toclevel_classes.map { |l| "#{l}:not(:empty):not(.TermNum):not(.noTOC)" }
+      ret = toclevel_classes.map do |l|
+        "#{l}:not(:empty):not(.TermNum):not(.noTOC)"
+      end
       <<~HEAD.freeze
         function toclevel() { return "#{ret.join(',')}";}
       HEAD
@@ -138,100 +150,47 @@ module IsoDoc::HtmlFunction
         i["width"], i["height"] = Html2Doc.image_resize(i, image_localfile(i),
                                                         @maxheight, @maxwidth)
         next if /^data:/.match i["src"]
+
         @datauriimage ? datauri(i) : move_image1(i)
       end
       docxml
     end
 
-    def datauri(i)
-      type = i["src"].split(".")[-1]
+    def datauri(img)
+      type = img["src"].split(".")[-1]
       supertype = type == "xml" ? "application" : "image"
-      bin = IO.binread(image_localfile(i))
+      bin = IO.binread(image_localfile(img))
       data = Base64.strict_encode64(bin)
-      i["src"] = "data:#{supertype}/#{type};base64,#{data}"
+      img["src"] = "data:#{supertype}/#{type};base64,#{data}"
     end
 
-    def image_suffix(i)
-      type = i["mimetype"]&.sub(%r{^[^/*]+/}, "")
-      matched = /\.(?<suffix>[^. \r\n\t]+)$/.match i["src"]
+    def image_suffix(img)
+      type = img["mimetype"]&.sub(%r{^[^/*]+/}, "")
+      matched = /\.(?<suffix>[^. \r\n\t]+)$/.match img["src"]
       type and !type.empty? and return type
+
       !matched.nil? and matched[:suffix] and return matched[:suffix]
       "png"
     end
 
-    def move_image1(i)
-      suffix = image_suffix(i)
+    def move_image1(img)
+      suffix = image_suffix(img)
       uuid = UUIDTools::UUID.random_create.to_s
       fname = "#{uuid}.#{suffix}"
       new_full_filename = File.join(tmpimagedir, fname)
-      local_filename = image_localfile(i)
+      local_filename = image_localfile(img)
       FileUtils.cp local_filename, new_full_filename
-      i["src"] = File.join(rel_tmpimagedir, fname)
+      img["src"] = File.join(rel_tmpimagedir, fname)
     end
 
     def inject_script(doc)
       return doc unless @scripts
+
       scripts = File.read(@scripts, encoding: "UTF-8")
       a = doc.split(%r{</body>})
       a[0] + scripts + "</body>" + a[1]
     end
 
-    def update_footnote_filter(fn, x, i, seen)
-      if seen[fn.text]
-        x.at("./sup").content = seen[fn.text][:num].to_s
-        fn.remove unless x["href"] == seen[fn.text][:href]
-        x["href"] = seen[fn.text][:href]
-      else
-        seen[fn.text] = { num: i, href: x["href"] }
-        x.at("./sup").content = i.to_s
-        i += 1
-      end
-      [i, seen]
-    end
-
-    def html_footnote_filter(docxml)
-      seen = {}
-      i = 1
-      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
-      docxml
-    end
-
-    def footnote_backlinks1(x, fn)
-      xdup = x.dup
-      xdup.remove["id"]
-      if fn.elements.empty?
-        fn.children.first.previous = xdup
-      else
-        fn.elements.first.children.first.previous = xdup
-      end
-    end
-
-    def footnote_backlinks(docxml)
-      seen = {}
-      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
-        footnote_backlinks1(x, fn)
-        x["id"] ||= "fnref:#{i + 1}"
-        fn.add_child "<a href='##{x['id']}'>&#x21A9;</a>"
-      end
-      docxml
-    end
-
-    def footnote_format(docxml)
-      docxml.xpath("//a[@class = 'FootnoteRef']/sup").each do |x|
-        footnote_reference_format(x)
-      end
-      docxml.xpath("//a[@class = 'TableFootnoteRef'] | "\
-                   "//span[@class = 'TableFootnoteRef']").each do |x|
-        table_footnote_reference_format(x)
-      end
-      docxml
-    end
-
     def sourcecode_highlighter
       '<script src="https://cdn.rawgit.com/google/code-prettify/master/'\
         'loader/run_prettify.js"></script>'

data/lib/isodoc/html_function/postprocess_footnotes.rb

@@ -0,0 +1,59 @@
+module IsoDoc::HtmlFunction
+  module Html
+    def update_footnote_filter(fn, x, i, seen)
+      if seen[fn.text]
+        x.at("./sup").content = seen[fn.text][:num].to_s
+        fn.remove unless x["href"] == seen[fn.text][:href]
+        x["href"] = seen[fn.text][:href]
+      else
+        seen[fn.text] = { num: i, href: x["href"] }
+        x.at("./sup").content = i.to_s
+        i += 1
+      end
+      [i, seen]
+    end
+
+    def html_footnote_filter(docxml)
+      seen = {}
+      i = 1
+      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
+      docxml
+    end
+
+    def footnote_backlinks1(x, fn)
+      xdup = x.dup
+      xdup.remove["id"]
+      if fn.elements.empty?
+        fn.children.first.previous = xdup
+      else
+        fn.elements.first.children.first.previous = xdup
+      end
+    end
+
+    def footnote_backlinks(docxml)
+      seen = {}
+      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
+        footnote_backlinks1(x, fn)
+        x["id"] ||= "fnref:#{i + 1}"
+        fn.add_child "<a href='##{x['id']}'>&#x21A9;</a>"
+      end
+      docxml
+    end
+
+    def footnote_format(docxml)
+      docxml.xpath("//a[@class = 'FootnoteRef']/sup").each do |x|
+        footnote_reference_format(x)
+      end
+      docxml.xpath("//a[@class = 'TableFootnoteRef'] | "\
+                   "//span[@class = 'TableFootnoteRef']").each do |x|
+        table_footnote_reference_format(x)
+      end
+      docxml
+    end
+  end
+end