isodoc 2.3.2 → 2.3.4

data/.rubocop.yml

@@ -0,0 +1,10 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+inherit_from:
+  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
+
+# local repo-specific modifications
+# ...
+
+AllCops:
+  TargetRubyVersion: 2.5

data/isodoc.gemspec

@@ -25,23 +25,23 @@ Gem::Specification.new do |spec|
   spec.bindir        = "bin"
   spec.require_paths = ["lib"]
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features|.github)/}) \
-    || f.match(%r{\.[a-zA-Z0-9_-]+\.yml|Rakefile|bin/rspec})
+    f.match(%r{^(test|spec|features|bin|.github)/}) \
+    || f.match(%r{Rakefile|bin/rspec})
   end
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "asciimath"
-  spec.add_dependency "html2doc", "~> 1.4.1"
+  spec.add_dependency "html2doc", "~> 1.4.3"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   # spec.add_dependency "isodoc-i18n", "~> 1.1.0" # already in relaton-render and mn-requirements
   spec.add_dependency "liquid", "~> 4"
   # spec.add_dependency "metanorma", ">= 1.2.0"
   spec.add_dependency "emf2svg"
   spec.add_dependency "mathml2asciimath"
-  spec.add_dependency "metanorma-utils", "~> 1.4.3"
+  spec.add_dependency "metanorma-utils", "~> 1.4.5"
   spec.add_dependency "mn2pdf"
-  spec.add_dependency "mn-requirements", "~> 0.1.7"
+  spec.add_dependency "mn-requirements", "~> 0.2.0"
   spec.add_dependency "relaton-cli"
   spec.add_dependency "relaton-render", "~> 0.5.2"
   spec.add_dependency "roman-numerals"

data/lib/isodoc/base_style/blocks.scss

@@ -35,7 +35,7 @@
     @include blockTitle();
   }
 
-  > img {
+  > img, > svg {
     margin-left: auto;
     margin-right: auto;
     display: block;

data/lib/isodoc/convert.rb

@@ -47,6 +47,7 @@ module IsoDoc
     # tocrecommendations: add ToC for rcommendations
     # fonts: fontist fonts to install
     # fontlicenseagreement: fontist font license agreement
+    # modspecidentifierbase: base prefix for any Modspec identifiers
     def initialize(options) # rubocop:disable Lint/MissingSuper
       @options = options_preprocess(options)
       init_stylesheets(@options)
@@ -78,6 +79,7 @@ module IsoDoc
       @suppressasciimathdup = options[:suppressasciimathdup] == "true"
       @bare = options[:bare]
       @aligncrosselements = options[:aligncrosselements]
+      @modspecidentifierbase = options[:modspecidentifierbase]
     end
 
     def init_i18n(options)
@@ -216,7 +218,7 @@ module IsoDoc
       i18n_init(@lang, @script, @locale)
       @reqt_models = requirements_processor
         .new({ default: "default", lang: @lang, script: @script, locale: @locale,
-               labels: @i18n.get })
+               labels: @i18n.get, modspecidentifierbase: @modspecidentifierbase })
     end
 
     def convert(input_filename, file = nil, debug = false,

data/lib/isodoc/function/references.rb

@@ -71,7 +71,7 @@ module IsoDoc
       def bibitem_ref_code(bib)
         id = bib.at(ns("./docidentifier[@type = 'metanorma']"))
         id1 = pref_ref_code(bib)
-        id2 = bib.at(ns("./docidentifier[@type = 'DOI' or @type = 'ISSN' or "\
+        id2 = bib.at(ns("./docidentifier[@type = 'DOI' or @type = 'ISSN' or " \
                         "@type = 'ISBN']"))
         id3 = bib.at(ns("./docidentifier[@type = 'metanorma-ordinal']"))
         return [id, id1, id2, id3] if id || id1 || id2 || id3
@@ -179,7 +179,7 @@ module IsoDoc
       end
 
       def norm_ref_xpath
-        "//bibliography/references[@normative = 'true'] | "\
+        "//bibliography/references[@normative = 'true'] | " \
           "//bibliography/clause[.//references[@normative = 'true']]"
       end
 
@@ -198,8 +198,8 @@ module IsoDoc
       end
 
       def bibliography_xpath
-        "//bibliography/clause[.//references]"\
-          "[not(.//references[@normative = 'true'])] | "\
+        "//bibliography/clause[.//references]" \
+          "[not(.//references[@normative = 'true'])] | " \
           "//bibliography/references[@normative = 'false']"
       end
 

data/lib/isodoc/function/section.rb

@@ -82,7 +82,7 @@ module IsoDoc
         f = isoxml.at(ns("//sections/definitions")) or return num
         out.div **attr_code(id: f["id"], class: "Symbols") do |div|
           num = num + 1
-          clause_name(num, f&.at(ns("./title")) || @i18n.symbols, div, nil)
+          clause_name(num, f.at(ns("./title")), div, nil)
           f.elements.each do |e|
             parse(e, div) unless e.name == "title"
           end

data/lib/isodoc/function/to_word_html.rb

@@ -32,7 +32,8 @@ module IsoDoc
       def init_dir(filename, debug)
         dir = "#{filename}#{@tmpfilesdir_suffix}"
         unless debug
-          Dir.mkdir(dir, 0o777) unless File.exist?(dir)
+          FileUtils.mkdir_p(dir)
+          FileUtils.chmod 0o777, dir
           FileUtils.rm_rf "#{dir}/*"
         end
         dir
@@ -205,10 +206,10 @@ module IsoDoc
           when "recommendation" then recommendation_parse(node, out)
           when "permission" then permission_parse(node, out)
           when "div" then div_parse(node, out)
-          #when "subject", "classification"
+          # when "subject", "classification"
           #  requirement_skip_parse(node, out)
-          #when "inherit", "description", "specification", "measurement-target",
-          #"verification", "import", "component"
+          # when "inherit", "description", "specification", "measurement-target",
+          # "verification", "import", "component"
           # requirement_component_parse(node, out)
           when "index" then index_parse(node, out)
           when "index-xref" then index_xref_parse(node, out)

data/lib/isodoc/function/utils.rb

@@ -1,3 +1,5 @@
+require "metanorma-utils"
+
 module IsoDoc
   module Function
     module Utils
@@ -18,24 +20,8 @@ module IsoDoc
         [1..count].each { out << tab }
       end
 
-      # add namespaces for Word fragments
-      NOKOHEAD = <<~HERE.freeze
-        <!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
+        Metanorma::Utils::noko_html(&block)
       end
 
       def attr_code(attributes)
@@ -44,7 +30,7 @@ module IsoDoc
         end
       end
 
-      DOCTYPE_HDR = "<!DOCTYPE html SYSTEM "\
+      DOCTYPE_HDR = "<!DOCTYPE html SYSTEM " \
                     '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'.freeze
 
       def to_xhtml(xml)
@@ -55,19 +41,13 @@ module IsoDoc
           File.open("#{@filename}.#{@format}.err", "w:UTF-8") do |f|
             f.write xml
           end
-          abort "Malformed Output XML for #{@format}: #{e} "\
+          abort "Malformed Output XML for #{@format}: #{e} " \
                 "(see #{@filename}.#{@format}.err)"
         end
       end
 
       def numeric_escapes(xml)
-        c = HTMLEntities.new
-        xml.split(/(&[^ \r\n\t#;]+;)/).map do |t|
-          if /^(&[^ \t\r\n#;]+;)/.match?(t)
-            c.encode(c.decode(t), :hexadecimal)
-          else t
-          end
-        end.join
+        Metanorma::Utils::numeric_escapes(xml)
       end
 
       def to_xhtml_prep(xml)
@@ -77,8 +57,7 @@ module IsoDoc
       end
 
       def to_xhtml_fragment(xml)
-        doc = ::Nokogiri::XML.parse(NOKOHEAD)
-        doc.fragment(xml)
+        Metanorma::Utils::to_xhtml_fragment(xml)
       end
 
       def from_xhtml(xml)
@@ -87,11 +66,11 @@ module IsoDoc
       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 "\
+        ".//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".freeze
 
       def get_clause_id(node)
@@ -99,12 +78,12 @@ module IsoDoc
       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 "\
+        ".//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".freeze
 
       # no recursion on references
@@ -121,7 +100,7 @@ module IsoDoc
 
         if array.length == 1 then array[0]
         else
-          @i18n.l10n("#{array[0..-2].join(', ')} "\
+          @i18n.l10n("#{array[0..-2].join(', ')} " \
                      "#{@i18n.and} #{array.last}",
                      @lang, @script)
         end
@@ -197,7 +176,17 @@ module IsoDoc
         end
       end
 
+      def save_svg(img)
+        Tempfile.open(["image", ".svg"]) do |f|
+          f.write(img.to_xml)
+          @tempfile_cache << f # persist to the end
+          f.path
+        end
+      end
+
       def image_localfile(img)
+        img.name == "svg" && !img["src"] and
+          return save_svg(img)
         case img["src"]
         when /^data:/ then save_dataimage(img["src"], false)
         when %r{^([A-Z]:)?/} then img["src"]
@@ -206,7 +195,7 @@ module IsoDoc
       end
 
       def labelled_ancestor(node)
-        !node.ancestors("example, requirement, recommendation, permission, "\
+        !node.ancestors("example, requirement, recommendation, permission, " \
                         "note, table, figure, sourcecode").empty?
       end
 

data/lib/isodoc/html_function/postprocess.rb

@@ -1,5 +1,6 @@
 require "isodoc/html_function/mathvariant_to_plain"
 require_relative "postprocess_footnotes"
+require_relative "postprocess_cover"
 require "metanorma-utils"
 
 module IsoDoc
@@ -11,16 +12,9 @@ module IsoDoc
         @files_to_delete.each { |f| FileUtils.rm_rf f }
       end
 
-      def script_cdata(result)
-        result.gsub(%r{<script([^>]*)>\s*<!\[CDATA\[}m, "<script\\1>")
-          .gsub(%r{\]\]>\s*</script>}, "</script>")
-          .gsub(%r{<!\[CDATA\[\s*<script([^>]*)>}m, "<script\\1>")
-          .gsub(%r{</script>\s*\]\]>}, "</script>")
-      end
-
       def toHTML(result, filename)
         result = from_xhtml(html_cleanup(to_xhtml(result)))
-        result = from_xhtml(move_images(to_xhtml(result)))
+        result = from_xhtml(move_images(resize_images(to_xhtml(result))))
         result = html5(script_cdata(inject_script(result)))
         File.open(filename, "w:UTF-8") { |f| f.write(result) }
       end
@@ -56,132 +50,20 @@ module IsoDoc
         IsoDoc::HtmlFunction::MathvariantToPlain.new(docxml).convert
       end
 
-      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")
-        file.close
-        file.unlink if file.is_a?(Tempfile)
-        xml.root.to_s
-      end
-
-      def htmlstyle(docxml)
-        return docxml unless @htmlstylesheet
-
-        head = docxml.at("//*[local-name() = 'head']")
-        head << htmlstylesheet(@htmlstylesheet)
-        s = htmlstylesheet(@htmlstylesheet_override) and head << s
-        @bare and
-          head << "<style>body {margin-left: 2em; margin-right: 2em;}</style>"
-        docxml
-      end
-
-      def html_preface(docxml)
-        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)
-        authority_cleanup(docxml)
-        docxml
-      end
-
-      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(&:remove)
-        auth&.xpath(".//h1 | .//h2")&.each { |h| h["class"] = "IntroTitle" }
-        dest and auth and dest.replace(auth.remove)
-      end
-
-      def authority_cleanup(docxml)
-        %w(copyright license legal feedback).each do |t|
-          authority_cleanup1(docxml, t)
-        end
-        coverpage_note_cleanup(docxml)
-      end
-
-      def coverpage_note_cleanup(docxml)
-        if dest = docxml.at("//div[@id = 'coverpage-note-destination']")
-          auth = docxml.xpath("//*[@coverpage]")
-          if auth.empty? then dest.remove
-          else
-            auth.each do |x|
-              dest << x.remove
-            end
-          end
-        end
-        docxml.xpath("//*[@coverpage]").each { |x| x.delete("coverpage") }
-      end
-
-      def html_cover(docxml)
-        doc = to_xhtml_fragment(File.read(@htmlcoverpage, encoding: "UTF-8"))
-        d = docxml.at('//div[@class="title-section"]')
-        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(
-          populate_template(doc.to_xml(encoding: "US-ASCII"), :html),
-        )
-      end
-
-      def html_toc_entry(level, header)
-        content = header.at("./following-sibling::p"\
-                            "[@class = 'variant-title-toc']") || header
-        %(<li class="#{level}"><a href="##{header['id']}">\
-      #{header_strip(content)}</a></li>)
-      end
-
-      def toclevel_classes
-        (1..@htmlToClevels).reduce([]) { |m, i| m << "h#{i}" }
-      end
-
-      def toclevel
-        ret = toclevel_classes.map do |l|
-          "#{l}:not(:empty):not(.TermNum):not(.noTOC)"
-        end
-        <<~HEAD.freeze
-          function toclevel() { return "#{ret.join(',')}";}
-        HEAD
-      end
-
-      # needs to be same output as toclevel
-      def html_toc(docxml)
-        idx = docxml.at("//div[@id = 'toc']") or return docxml
-        toc = "<ul>"
-        path = toclevel_classes.map do |l|
-          "//main//#{l}#{toc_exclude_class}"
-        end
-        docxml.xpath(path.join(" | ")).each_with_index do |h, tocidx|
-          h["id"] ||= "toc#{tocidx}"
-          toc += html_toc_entry(h.name, h)
+      def resize_images(docxml)
+        docxml.xpath("//*[local-name() = 'img' or local-name() = 'svg']")
+          .each do |i|
+          i["width"], i["height"] = Html2Doc.new({})
+            .image_resize(i, image_localfile(i), @maxheight, @maxwidth)
         end
-        idx.children = "#{toc}</ul>"
         docxml
       end
 
-      def toc_exclude_class
-        "[not(@class = 'TermNum')][not(@class = 'noTOC')]"\
-          "[string-length(normalize-space(.))>0]"
-      end
-
       # presupposes that the image source is local
       def move_images(docxml)
         FileUtils.rm_rf tmpimagedir
         FileUtils.mkdir tmpimagedir
         docxml.xpath("//*[local-name() = 'img']").each do |i|
-          i["width"], i["height"] = Html2Doc.new({})
-            .image_resize(i, image_localfile(i), @maxheight, @maxwidth)
           next if /^data:/.match? i["src"]
 
           @datauriimage ? datauri(i) : move_image1(i)
@@ -212,38 +94,6 @@ module IsoDoc
         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}#{scripts_override}</body>#{a[1]}"
-      end
-
-      def sourcecode_highlighter
-        '<script src="https://cdn.rawgit.com/google/code-prettify/master/'\
-          'loader/run_prettify.js"></script>'
-      end
-
-      MATHJAX_ADDR =
-        "https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/latest.js".freeze
-      MATHJAX = <<~"MATHJAX".freeze
-        <script type="text/x-mathjax-config">
-          MathJax.Hub.Config({
-            "HTML-CSS": { preferredFont: "STIX" },
-            asciimath2jax: { delimiters: [['OPEN', 'CLOSE']] }
-         });
-        </script>
-        <script src="#{MATHJAX_ADDR}?config=MML_HTMLorMML-full" async="async"></script>
-      MATHJAX
-
-      def mathjax(open, close)
-        MATHJAX.gsub("OPEN", open).gsub("CLOSE", close)
-      end
-
       def term_header(docxml)
         %w(h1 h2 h3 h4 h5 h6 h7 h8).each do |h|
           docxml.xpath("//p[@class = 'TermNum'][../#{h}]").each do |p|

data/lib/isodoc/html_function/postprocess_cover.rb

@@ -0,0 +1,167 @@
+require "isodoc/html_function/mathvariant_to_plain"
+require_relative "postprocess_footnotes"
+require "metanorma-utils"
+
+module IsoDoc
+  module HtmlFunction
+    module Html
+      def script_cdata(result)
+        result.gsub(%r{<script([^>]*)>\s*<!\[CDATA\[}m, "<script\\1>")
+          .gsub(%r{\]\]>\s*</script>}, "</script>")
+          .gsub(%r{<!\[CDATA\[\s*<script([^>]*)>}m, "<script\\1>")
+          .gsub(%r{</script>\s*\]\]>}, "</script>")
+      end
+
+      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")
+        file.close
+        file.unlink if file.is_a?(Tempfile)
+        xml.root.to_s
+      end
+
+      def htmlstyle(docxml)
+        return docxml unless @htmlstylesheet
+
+        head = docxml.at("//*[local-name() = 'head']")
+        head << htmlstylesheet(@htmlstylesheet)
+        s = htmlstylesheet(@htmlstylesheet_override) and head << s
+        @bare and
+          head << "<style>body {margin-left: 2em; margin-right: 2em;}</style>"
+        docxml
+      end
+
+      def html_preface(docxml)
+        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)
+        authority_cleanup(docxml)
+        docxml
+      end
+
+      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(&:remove)
+        auth&.xpath(".//h1 | .//h2")&.each { |h| h["class"] = "IntroTitle" }
+        dest and auth and dest.replace(auth.remove)
+      end
+
+      def authority_cleanup(docxml)
+        %w(copyright license legal feedback).each do |t|
+          authority_cleanup1(docxml, t)
+        end
+        coverpage_note_cleanup(docxml)
+      end
+
+      def coverpage_note_cleanup(docxml)
+        if dest = docxml.at("//div[@id = 'coverpage-note-destination']")
+          auth = docxml.xpath("//*[@coverpage]")
+          if auth.empty? then dest.remove
+          else
+            auth.each do |x|
+              dest << x.remove
+            end
+          end
+        end
+        docxml.xpath("//*[@coverpage]").each { |x| x.delete("coverpage") }
+      end
+
+      def html_cover(docxml)
+        doc = to_xhtml_fragment(File.read(@htmlcoverpage, encoding: "UTF-8"))
+        d = docxml.at('//div[@class="title-section"]')
+        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(
+          populate_template(doc.to_xml(encoding: "US-ASCII"), :html),
+        )
+      end
+
+      def html_toc_entry(level, header)
+        content = header.at("./following-sibling::p"\
+                            "[@class = 'variant-title-toc']") || header
+        %(<li class="#{level}"><a href="##{header['id']}">\
+      #{header_strip(content)}</a></li>)
+      end
+
+      def toclevel_classes
+        (1..@htmlToClevels).reduce([]) { |m, i| m << "h#{i}" }
+      end
+
+      def toclevel
+        ret = toclevel_classes.map do |l|
+          "#{l}:not(:empty):not(.TermNum):not(.noTOC)"
+        end
+        <<~HEAD.freeze
+          function toclevel() { return "#{ret.join(',')}";}
+        HEAD
+      end
+
+      # needs to be same output as toclevel
+      def html_toc(docxml)
+        idx = docxml.at("//div[@id = 'toc']") or return docxml
+        toc = "<ul>"
+        path = toclevel_classes.map do |l|
+          "//main//#{l}#{toc_exclude_class}"
+        end
+        docxml.xpath(path.join(" | ")).each_with_index do |h, tocidx|
+          h["id"] ||= "toc#{tocidx}"
+          toc += html_toc_entry(h.name, h)
+        end
+        idx.children = "#{toc}</ul>"
+        docxml
+      end
+
+      def toc_exclude_class
+        "[not(@class = 'TermNum')][not(@class = 'noTOC')]"\
+          "[string-length(normalize-space(.))>0]"
+      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}#{scripts_override}</body>#{a[1]}"
+      end
+
+      def sourcecode_highlighter
+        '<script src="https://cdn.rawgit.com/google/code-prettify/master/'\
+          'loader/run_prettify.js"></script>'
+      end
+
+      MATHJAX_ADDR =
+        "https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/latest.js".freeze
+      MATHJAX = <<~"MATHJAX".freeze
+        <script type="text/x-mathjax-config">
+          MathJax.Hub.Config({
+            "HTML-CSS": { preferredFont: "STIX" },
+            asciimath2jax: { delimiters: [['OPEN', 'CLOSE']] }
+         });
+        </script>
+        <script src="#{MATHJAX_ADDR}?config=MML_HTMLorMML-full" async="async"></script>
+      MATHJAX
+
+      def mathjax(open, close)
+        MATHJAX.gsub("OPEN", open).gsub("CLOSE", close)
+      end
+    end
+  end
+end

data/lib/isodoc/presentation_function/image.rb

@@ -108,6 +108,11 @@ module IsoDoc
 
     def svg_to_emf(node)
       uri = svg_to_emf_uri(node)
+      if node.elements&.first&.name == "svg" &&
+          (!node["height"] || node["height"] == "auto")
+        node["height"] = node.elements.first["height"]
+        node["width"] = node.elements.first["width"]
+      end
       ret = imgfile_suffix(uri, "emf")
       File.exist?(ret) and return ret
       inkscape_convert(uri, ret, '--export-type="emf"')
@@ -143,7 +148,7 @@ module IsoDoc
     end
 
     def svg_to_emf_uri_convert(node)
-      if node&.elements&.first&.name == "svg"
+      if node.elements&.first&.name == "svg"
         a = Base64.strict_encode64(node.children.to_xml)
         "data:image/svg+xml;base64,#{a}"
       else node["src"]