isodoc 1.5.5 → 1.6.4

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/headlesshtml_convert.rb

@@ -1,11 +1,10 @@
-require_relative "html_function/comments.rb"
-require_relative "html_function/footnotes.rb"
-require_relative "html_function/html.rb"
+require_relative "html_function/comments"
+require_relative "html_function/footnotes"
+require_relative "html_function/html"
 require "fileutils"
 
 module IsoDoc
   class HeadlessHtmlConvert < ::IsoDoc::Convert
-
     include HtmlFunction::Comments
     include HtmlFunction::Footnotes
     include HtmlFunction::Html
@@ -26,16 +25,18 @@ module IsoDoc
       docxml, filename, dir = convert_init(file, input_filename, debug)
       result = convert1(docxml, filename, dir)
       return result if debug
-      postprocess(result, filename + ".tmp.html", dir)
+
+      postprocess(result, "#{filename}.tmp.html", dir)
       FileUtils.rm_rf dir
-      strip_head(filename + ".tmp.html", output_filename || "#{filename}.#{@suffix}")
+      strip_head("#{filename}.tmp.html",
+                 output_filename || "#{filename}.#{@suffix}")
       FileUtils.rm_rf ["#{filename}.tmp.html", tmpimagedir]
     end
 
     def strip_head(input, output)
       file = File.read(input, encoding: "utf-8")
       doc = Nokogiri::XML(file)
-      doc.xpath("//head").each { |x| x.remove }
+      doc.xpath("//head").each(&:remove)
       doc.xpath("//html").each { |x| x.name = "div" }
       body = doc.at("//body")
       body.replace(body.children)

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/comments.rb

@@ -84,6 +84,7 @@ module IsoDoc::HtmlFunction
     def comment_attributes(docxml, x)
       fromlink = docxml.at("//*[@id='#{x['from']}']")
       return(nil) if fromlink.nil?
+
       tolink = docxml.at("//*[@id='#{x['to']}']") || fromlink
       target = docxml.at("//*[@id='#{x['target']}']")
       { from: fromlink, to: tolink, target: target }
@@ -122,6 +123,7 @@ module IsoDoc::HtmlFunction
       comments = []
       docxml.xpath("//div[@style='mso-element:comment']").each do |c|
         next unless c["id"] && !link_order[c["id"]].nil?
+
         comments << { text: c.remove.to_s, id: c["id"] }
       end
       comments.sort! { |a, b| link_order[a[:id]] <=> link_order[b[:id]] }

data/lib/isodoc/html_function/footnotes.rb

@@ -3,6 +3,7 @@ module IsoDoc::HtmlFunction
 
     def footnotes(div)
       return if @footnotes.empty?
+
       @footnotes.each { |fn| div.parent << fn }
     end
 
@@ -44,15 +45,19 @@ module IsoDoc::HtmlFunction
     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
 
+    # @seen_footnote:
+    # do not output footnote text if we have already seen it for this table
+
     def table_footnote_parse(node, out)
       fn = node["reference"] || UUIDTools::UUID.random_create.to_s
       tid = get_table_ancestor_id(node)
       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 **{ class: "footnote" } do |a|
         a << make_table_footnote_text(node, tid + fn, fn)
@@ -62,8 +67,9 @@ module IsoDoc::HtmlFunction
     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")
+      return table_footnote_parse(node, out) if (@in_table || @in_figure) &&
+        !node.ancestors.map(&:name).include?("name")
+
       fn = node["reference"] || UUIDTools::UUID.random_create.to_s
       attrs = { class: "FootnoteRef", href: "#fn:#{fn}" }
       out.a **attrs do |a|
@@ -72,12 +78,13 @@ module IsoDoc::HtmlFunction
       make_footnote(node, fn)
     end
 
-    def make_footnote(node, fn)
-      return if @seen_footnote.include?(fn)
+    def make_footnote(node, fnote)
+      return if @seen_footnote.include?(fnote)
+
       @in_footnote = true
-      @footnotes << make_generic_footnote_text(node, fn)
+      @footnotes << make_generic_footnote_text(node, fnote)
       @in_footnote = false
-      @seen_footnote << fn
+      @seen_footnote << fnote
     end
   end
 end

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/html.rb

@@ -5,9 +5,9 @@ module IsoDoc::HtmlFunction
   module Html
     def convert1(docxml, filename, dir)
       noko do |xml|
-        xml.html **{ lang: "#{@lang}" } do |html|
+        xml.html **{ lang: @lang.to_s } do |html|
           info docxml, nil
-          populate_css()
+          populate_css
           html.head { |head| define_head head, filename, dir }
           make_body(html, docxml)
         end
@@ -15,13 +15,17 @@ module IsoDoc::HtmlFunction
     end
 
     def make_body1(body, _docxml)
+      return if @bare
+
       body.div **{ class: "title-section" } do |div1|
         div1.p { |p| p << "&nbsp;" } # placeholder
       end
       section_break(body)
     end
 
-    def make_body2(body, docxml)
+    def make_body2(body, _docxml)
+      return if @bare
+
       body.div **{ class: "prefatory-section" } do |div2|
         div2.p { |p| p << "&nbsp;" } # placeholder
       end
@@ -43,46 +47,47 @@ module IsoDoc::HtmlFunction
       end
     end
 
-    def googlefonts()
+    def googlefonts
       <<~HEAD.freeze
-      <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css?family=Lato:400,400i,700,900" rel="stylesheet">
+        <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet">
+        <link href="https://fonts.googleapis.com/css?family=Lato:400,400i,700,900" rel="stylesheet">
       HEAD
     end
 
-    def html_head()
+    def html_head
       <<~HEAD.freeze
-    <title>#{@meta&.get&.dig(:doctitle)}</title>
-    <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-
-    <!--TOC script import-->
-    <script type="text/javascript"  src="https://cdn.rawgit.com/jgallen23/toc/0.3.2/dist/toc.min.js"></script>
-    <script type="text/javascript">#{toclevel}</script>
-
-    <!--Google fonts-->
-      <link rel="preconnect" href="https://fonts.gstatic.com"> 
-      #{googlefonts}
-    <!--Font awesome import for the link icon-->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css" integrity="sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk" crossorigin="anonymous">
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" integrity="sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P" crossorigin="anonymous">
-    <style class="anchorjs"></style>
+        <title>#{@meta&.get&.dig(:doctitle)}</title>
+        <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+
+        <!--TOC script import-->
+        <script type="text/javascript"  src="https://cdn.rawgit.com/jgallen23/toc/0.3.2/dist/toc.min.js"></script>
+        <script type="text/javascript">#{toclevel}</script>
+
+        <!--Google fonts-->
+          <link rel="preconnect" href="https://fonts.gstatic.com">#{' '}
+          #{googlefonts}
+        <!--Font awesome import for the link icon-->
+        <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css" integrity="sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk" crossorigin="anonymous">
+        <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" integrity="sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P" crossorigin="anonymous">
+        <style class="anchorjs"></style>
       HEAD
     end
 
-    def html_button()
+    def html_button
       '<button onclick="topFunction()" id="myBtn" '\
         'title="Go to top">Top</button>'.freeze
     end
 
     def html_main(docxml)
-      docxml.at("//head").add_child(html_head())
+      docxml.at("//head").add_child(html_head)
       d = docxml.at('//div[@class="main-section"]')
       d.name = "main"
-      d.children.empty? or d.children.first.previous = html_button()
+      d.children.empty? or d.children.first.previous = html_button
     end
 
     def sourcecodelang(lang)
       return unless lang
+
       case lang.downcase
       when "javascript" then "lang-js"
       when "c" then "lang-c"
@@ -117,7 +122,6 @@ module IsoDoc::HtmlFunction
       end
     end
 
-    def table_long_strings_cleanup(docxml)
-    end
+    def table_long_strings_cleanup(docxml); 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
@@ -28,15 +29,15 @@ module IsoDoc::HtmlFunction
         .sub(%r{<\?xml[^>]+>}, "")
     end
 
-    def html_cleanup(x)
+    def html_cleanup(html)
       mathml(
         footnote_format(
           footnote_backlinks(
             html_toc(
-              term_header(html_footnote_filter(html_preface(htmlstyle(x))))
-            )
-          )
-        )
+              term_header(html_footnote_filter(html_preface(htmlstyle(html)))),
+            ),
+          ),
+        ),
       )
     end
 
@@ -46,6 +47,7 @@ module IsoDoc::HtmlFunction
 
     def htmlstylesheet(file)
       return if file.nil?
+
       file.open if file.is_a?(Tempfile)
       stylesheet = file.read
       xml = Nokogiri::XML("<style/>")
@@ -57,7 +59,7 @@ module IsoDoc::HtmlFunction
 
     def htmlstyle(docxml)
       return docxml unless @htmlstylesheet
-      title = docxml.at("//*[local-name() = 'head']/*[local-name() = 'title']")
+
       head = docxml.at("//*[local-name() = 'head']")
       head << htmlstylesheet(@htmlstylesheet)
       s = htmlstylesheet(@htmlstylesheet_override) and head << s
@@ -65,8 +67,8 @@ module IsoDoc::HtmlFunction
     end
 
     def html_preface(docxml)
-      html_cover(docxml) if @htmlcoverpage
-      html_intro(docxml) if @htmlintropage
+      html_cover(docxml) if @htmlcoverpage && !@bare
+      html_intro(docxml) if @htmlintropage && !@bare
       docxml.at("//body") << mathjax(@openmathdelim, @closemathdelim)
       docxml.at("//body") << sourcecode_highlighter
       html_main(docxml)
@@ -76,8 +78,9 @@ 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 = docxml.at("//div[@id = 'boilerplate-#{klass}' or "\
+                       "@class = 'boilerplate-#{klass}']")
+      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
@@ -92,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)
@@ -112,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
@@ -140,99 +149,49 @@ module IsoDoc::HtmlFunction
       docxml.xpath("//*[local-name() = 'img']").each do |i|
         i["width"], i["height"] = Html2Doc.image_resize(i, image_localfile(i),
                                                         @maxheight, @maxwidth)
-        next if /^data:/.match i["src"]
+        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")
+      scripts_override = ""
+      @scripts_override and
+        scripts_override = File.read(@scripts_override, 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
+      "#{a[0]}#{scripts}#{scripts_override}</body>#{a[1]}"
     end
 
     def sourcecode_highlighter