isodoc 0.9.19 → 0.9.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee247cb9d9b705d6a00ec5a27a2cb20295f16c48ffbe4cb6152e934b7c16893b
-  data.tar.gz: b4ddb650b8fcc3fd95f3f6104956cba1e96639158eaf19874704e51bc48aed60
+  metadata.gz: 55728058640cb9c26a315460436606766b1cf09796a64e301bb8081ee325ed31
+  data.tar.gz: 40317b9fbed10a3d553eca0f0ebbf6e268195757aebde5429fa8565fda2fe1ab
 SHA512:
-  metadata.gz: cfc35a27e441b0f50dcb24aed67e1576024e2246c8784193541532361aaa068981ac1bcfc31a35fc8625149daec18c55fbd14ccd231c9ea8ab155c9193100421
-  data.tar.gz: 73c4c6f98f010ad651d86b834514af80f90fcc9b50d5d50a26bf066a3c9a09d9d888494f732f1458dcb6eac0e098d25e911fb97fd43548da43881c412cd00776
+  metadata.gz: e69af0fcd60d7fd7f6f52318d29d4a603172d018d1f926f0bae2aeb4cfa32a099d782acf4d0876e83bbcef06dcb3099824a2751d887187c8ebccf050d1468eab
+  data.tar.gz: 47cb08b0e0fd6f560d119f16fb5070b4b4153ea7f02b5adfb603e42cec1a159b1540950be2351628f315a551f68514e30b7ef782eb0f950a5d1acc0b879e790c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isodoc (0.9.19)
+    isodoc (0.9.20)
       asciimath
       html2doc (~> 0.8.6)
       htmlentities (~> 4.3.4)
@@ -10,7 +10,6 @@ PATH
       nokogiri (>= 1)
       rake (~> 12.0)
       roman-numerals
-      ruby-xslt
       sassc (~> 1.12.1)
       thread_safe
       uuidtools
@@ -18,7 +17,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    asciidoctor (2.0.0)
+    asciidoctor (2.0.5)
     asciimath (1.0.8)
     ast (2.4.0)
     byebug (9.1.0)
@@ -61,21 +60,21 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
-    metanorma (0.3.9)
+    metanorma (0.3.10)
       asciidoctor
       htmlentities
     method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
+    mime-types-data (3.2019.0331)
     mini_portile2 (2.4.0)
     nenv (0.3.0)
-    nokogiri (1.10.1)
+    nokogiri (1.10.2)
       mini_portile2 (~> 2.4.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.14.0)
+    parallel (1.17.0)
     parser (2.6.2.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
@@ -111,7 +110,7 @@ GEM
     ruby-progressbar (1.10.0)
     ruby-xslt (0.9.10)
     ruby_dep (1.5.0)
-    sass (3.7.3)
+    sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)

data/README.adoc

@@ -2,6 +2,7 @@
 
 image:https://img.shields.io/gem/v/isodoc.svg["Gem Version", link="https://rubygems.org/gems/isodoc"]
 image:https://img.shields.io/travis/metanorma/isodoc/master.svg["Build Status", link="https://travis-ci.org/metanorma/isodoc"]
+image:https://ci.appveyor.com/api/projects/status/5od77sei1e1t5h68?svg=true["Appveyor Build Status", link="https://ci.appveyor.com/project/ribose/isodoc"]
 image:https://codeclimate.com/github/metanorma/isodoc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/isodoc"]
 
 == Purpose

data/isodoc.gemspec

@@ -31,7 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "asciimath"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "nokogiri", ">= 1"
-  spec.add_dependency "ruby-xslt"
   spec.add_dependency "thread_safe"
   spec.add_dependency "uuidtools"
   spec.add_dependency "html2doc", "~> 0.8.6"

data/lib/isodoc/convert.rb

@@ -30,9 +30,9 @@ module IsoDoc
         merge!(default_file_locations(options)) { |_, old, new| old || new }
       @options = options
       @files_to_delete = []
-      @htmlstylesheet = generate_css(options[:htmlstylesheet], true, extract_fonts(options))
-      @wordstylesheet = generate_css(options[:wordstylesheet], false, extract_fonts(options))
-      @standardstylesheet = generate_css(options[:standardstylesheet], false, extract_fonts(options))
+      @htmlstylesheet_name = options[:htmlstylesheet]
+      @wordstylesheet_name = options[:wordstylesheet]
+      @standardstylesheet_name = options[:standardstylesheet]
       @header = options[:header]
       @htmlcoverpage = options[:htmlcoverpage]
       @wordcoverpage = options[:wordcoverpage]
@@ -64,6 +64,17 @@ module IsoDoc
       @script = "Latn"
       @maxwidth = 1200
       @maxheight = 800
+      @wordToClevels = options[:doctoclevels].to_i
+      @wordToClevels = 2 if @wordToClevels == 0
+      @htmlToClevels = options[:htmltoclevels].to_i
+      @htmlToClevels = 2 if @htmlToClevels == 0
+    end
+
+    # run this after @meta is populated
+    def populate_css
+      @htmlstylesheet = generate_css(@htmlstylesheet_name, true, extract_fonts(options))
+      @wordstylesheet = generate_css(@wordstylesheet_name, false, extract_fonts(options))
+      @standardstylesheet = generate_css(@standardstylesheet_name, false, extract_fonts(options))
     end
 
     def tmpimagedir_suffix
@@ -111,6 +122,7 @@ module IsoDoc
     def generate_css(filename, stripwordcss, fontheader)
       return nil unless filename
       stylesheet = File.read(filename, encoding: "UTF-8")
+      stylesheet = populate_template(stylesheet, :word)
       stylesheet.gsub!(/(\s|\{)mso-[^:]+:[^;]+;/m, "\\1") if stripwordcss
       engine = SassC::Engine.new(fontheader + stylesheet, syntax: :scss)
       outname = File.basename(filename, ".*") + ".css"
@@ -124,6 +136,8 @@ module IsoDoc
       noko do |xml|
         xml.html do |html|
           html.parent.add_namespace("epub", "http://www.idpf.org/2007/ops")
+          info docxml, nil
+          populate_css()
           define_head html, filename, dir
           make_body(html, docxml)
         end

data/lib/isodoc/function/to_word_html.rb

@@ -69,7 +69,6 @@ module IsoDoc::Function
 
     def make_body2(body, docxml)
       body.div **{ class: "prefatory-section" } do |div2|
-        info docxml, div2
         div2.p { |p| p << "&nbsp;" } # placeholder
       end
       section_break(body)

data/lib/isodoc/function/utils.rb

@@ -134,7 +134,7 @@ module IsoDoc::Function
     end
 
     def populate_template(docxml, _format)
-      meta = @meta.get.merge(@labels)
+      meta = @meta.get.merge(@labels || {})
       docxml = docxml.
         gsub(/\[TERMREF\]\s*/, l10n("[#{@source_lbl}: ")).
         gsub(/\s*\[\/TERMREF\]\s*/, l10n("]")).

data/lib/isodoc/html_function/html.rb

@@ -12,7 +12,6 @@ module IsoDoc::HtmlFunction
 
     def make_body2(body, docxml)
       body.div **{ class: "prefatory-section" } do |div2|
-        info docxml, div2
         div2.p { |p| p << "&nbsp;" } # placeholder
       end
       section_break(body)
@@ -36,9 +35,9 @@ module IsoDoc::HtmlFunction
     end
 
     def script_cdata(result)
-      result.gsub(%r{<script>\s*<!\[CDATA\[}m, "<script>").
+      result.gsub(%r{<script([^>]*)>\s*<!\[CDATA\[}m, "<script\\1>").
         gsub(%r{\]\]>\s*</script>}, "</script>").
-        gsub(%r{<!\[CDATA\[\s*<script>}m, "<script>").
+        gsub(%r{<!\[CDATA\[\s*<script([^>]*)>}m, "<script\\1>").
         gsub(%r{</script>\s*\]\]>}, "</script>")
     end
 
@@ -83,6 +82,22 @@ module IsoDoc::HtmlFunction
       docxml
     end
 
+    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">
+    HEAD
+    end
+
+    def toclevel
+      <<~HEAD.freeze
+    function toclevel() { var i; var text = "";
+      for(i = 1; i <= #{@htmlToClevels}; i++) {
+        if (i > 1) { text += ","; } text += "h" + i + ":not(.TermNum)"; } 
+      return text;}
+      HEAD
+    end
+
     def html_head()
       <<~HEAD.freeze
     <title>{{ doctitle }}</title>
@@ -90,13 +105,14 @@ module IsoDoc::HtmlFunction
 
     <!--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 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">
+    #{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
 

data/lib/isodoc/metadata.rb

@@ -33,8 +33,7 @@ module IsoDoc
     end
 
     def extract_person_names(authors)
-      ret = []
-      authors.each do |a|
+      authors.inject([]) do |ret, a|
         if a.at(ns("./name/completename"))
           ret << a.at(ns("./name/completename")).text
         else
@@ -45,15 +44,22 @@ module IsoDoc
           ret << fn.join(" ") + " " + surname
         end
       end
-      ret
+    end
+
+    def extract_person_affiliations(authors)
+      authors.inject([]) do |m, a|
+        name = a&.at(ns("./affiliation/org/name"))&.text
+        location = a&.at(ns("./affiliation/org/contact/address/"\
+                            "formattedAddress"))&.text
+        m << ((!name.nil? && !location.nil?) ? "#{name}, #{location}" :
+          (name || location || ""))
+        m
+      end
     end
 
     def extract_person_names_affiliations(authors)
       names = extract_person_names(authors)
-      affils = []
-      authors.each do |a|
-        affils << (a&.at(ns("./affiliation/org/name"))&.text || "")
-      end
+      affils = extract_person_affiliations(authors)
       ret = {}
       affils.each_with_index do |a, i|
         ret[a] ||= []

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.9.19".freeze
+  VERSION = "0.9.20".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -11,7 +11,6 @@ module IsoDoc::WordFunction
 
     def make_body2(body, docxml)
       body.div **{ class: "WordSection2" } do |div2|
-        info docxml, div2
         abstract docxml, div2
         foreword docxml, div2
         introduction docxml, div2

data/lib/isodoc/word_function/postprocess.rb

@@ -55,8 +55,8 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
     end
 
     def word_cleanup(docxml)
-      word_preface(docxml)
       word_annex_cleanup(docxml)
+      word_preface(docxml)
       word_table_separator(docxml)
       word_admonition_images(docxml)
       word_list_continuations(docxml)
@@ -93,17 +93,12 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
       end
     end
 
-    # force Annex h2 to be p.h2Annex, so it is not picked up by ToC
     def word_annex_cleanup(docxml)
-      docxml.xpath("//h2[ancestor::*[@class = 'Section3']]").each do |h2|
-        h2.name = "p"
-        h2["class"] = "h2Annex"
-      end
     end
 
     def word_preface(docxml)
       word_cover(docxml) if @wordcoverpage
-      word_intro(docxml) if @wordintropage
+      word_intro(docxml, @wordToClevels) if @wordintropage
     end
 
     def word_cover(docxml)
@@ -114,12 +109,12 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
         coverxml.to_xml(encoding: "US-ASCII")
     end
 
-    def insert_toc(intro, docxml)
-      intro.sub(/WORDTOC/, make_WordToC(docxml))
+    def insert_toc(intro, docxml, level)
+      intro.sub(/WORDTOC/, make_WordToC(docxml, level))
     end
 
-    def word_intro(docxml)
-      intro = insert_toc(File.read(@wordintropage, encoding: "UTF-8"), docxml)
+    def word_intro(docxml, level)
+      intro = insert_toc(File.read(@wordintropage, encoding: "UTF-8"), docxml, level)
       intro = populate_template(intro, :word)
       introxml = to_word_xhtml_fragment(intro)
       docxml.at('//div[@class="WordSection2"]').children.first.previous =
@@ -161,13 +156,15 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
       TOC
     end
 
-    WORD_TOC_PREFACE1 = <<~TOC.freeze
+    def word_toc_preface(level) 
+      <<~TOC.freeze
       <span lang="EN-GB"><span
         style='mso-element:field-begin'></span><span
         style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\o &quot;1-2&quot; \\h \\z \\u <span
+        \\o &quot;1-#{level}&quot; \\h \\z \\u <span
         style='mso-element:field-separator'></span></span>
-    TOC
+      TOC
+    end
 
     WORD_TOC_SUFFIX1 = <<~TOC.freeze
       <p class="MsoToc1"><span lang="EN-GB"><span
@@ -175,14 +172,15 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
         lang="EN-GB"><o:p>&nbsp;</o:p></span></p>
     TOC
 
-    def make_WordToC(docxml)
+    def make_WordToC(docxml, level)
       toc = ""
-      docxml.xpath("//h1 | //h2[not(ancestor::*[@class = 'Section3'])]").
-        each do |h|
-        toc += word_toc_entry(h.name == "h1" ? 1 : 2, header_strip(h))
+      #docxml.xpath("//h1 | //h2[not(ancestor::*[@class = 'Section3'])]").
+      xpath = (1..level).each.map { |i| "//h#{i}" }.join (" | ")
+      docxml.xpath(xpath).each do |h|
+        toc += word_toc_entry(h.name[1].to_i, header_strip(h))
       end
       toc.sub(/(<p class="MsoToc1">)/,
-              %{\\1#{WORD_TOC_PREFACE1}}) +  WORD_TOC_SUFFIX1
+              %{\\1#{word_toc_preface(level)}}) +  WORD_TOC_SUFFIX1
     end
   end
 end

data/spec/isodoc/metadata_spec.rb

@@ -49,7 +49,11 @@ RSpec.describe IsoDoc do
       <surname>Rubble</surname>
       </name>
       <affiliation>
-      <org><name>Bedrock Inc.</name></org>
+      <org><name>Slate Inc.</name>
+      <contact><address>
+      <formattedAddress>Bedrock</formattedAddress>
+      </address></contact>
+        </org>
       </affiliation>
     </person>
   </contributor>
@@ -81,7 +85,7 @@ RSpec.describe IsoDoc do
 </bibdata>
 </iso-standard>
 INPUT
-{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>["Barney Rubble", "Fred Flintstone"], :authors_affiliations=>{"Bedrock Inc."=>["Barney Rubble"], ""=>["Fred Flintstone"]}, :confirmeddate=>"XXX", :createddate=>"2010&ndash;2011", :doc=>"URL E", :docnumber=>"17301-1", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :edition=>"2", :editorialgroup=>["TC 34", "SC 4", "WG 3"], :html=>"URL B", :ics=>"XXX", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :pdf=>"URL D", :publisheddate=>"2011", :receiveddate=>"XXX", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :status=>"Committee draft", :tc=>"TC 34", :unpublished=>true, :updateddate=>"XXX", :url=>"URL A", :wg=>"WG 3", :xml=>"URL C"}
+{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>["Barney Rubble", "Fred Flintstone"], :authors_affiliations=>{"Slate Inc., Bedrock"=>["Barney Rubble"], ""=>["Fred Flintstone"]}, :confirmeddate=>"XXX", :createddate=>"2010&ndash;2011", :doc=>"URL E", :docnumber=>"17301-1", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :edition=>"2", :editorialgroup=>["TC 34", "SC 4", "WG 3"], :html=>"URL B", :ics=>"XXX", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :pdf=>"URL D", :publisheddate=>"2011", :receiveddate=>"XXX", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :status=>"Committee draft", :tc=>"TC 34", :unpublished=>true, :updateddate=>"XXX", :url=>"URL A", :wg=>"WG 3", :xml=>"URL C"}
 OUTPUT
   end
 

data/spec/isodoc/postproc_spec.rb

@@ -233,35 +233,6 @@ RSpec.describe IsoDoc do
     OUTPUT
   end
 
-  it "converts annex subheadings to h2Annex class for Word" do
-    FileUtils.rm_f "test.doc"
-    FileUtils.rm_f "test.html"
-    IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
-    <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <annex id="P" inline-header="false" obligation="normative">
-         <title>Annex</title>
-         <clause id="Q" inline-header="false" obligation="normative">
-         <title>Annex A.1</title>
-         </clause>
-    </annex>
-    </iso-standard>
-    INPUT
-    word = File.read("test.doc").sub(/^.*<div class="WordSection3">/m, '<div class="WordSection3">').
-      sub(%r{<div style="mso-element:footnote-list"/>.*$}m, "")
-    expect(word).to be_equivalent_to <<~"OUTPUT"
-           <div class="WordSection3">
-               <p class="zzSTDTitle1"></p>
-               <p class="MsoNormal"><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
-               <div class="Section3"><a name="P" id="P"></a>
-                 <h1 class="Annex"><b>Annex A</b><br/>(normative)<br/><br/><b>Annex</b></h1>
-                 <div><a name="Q" id="Q"></a>
-            <p class="h2Annex">A.1. Annex A.1</p>
-       </div>
-               </div>
-             </div>
-    OUTPUT
-  end
-
   it "populates Word template with terms reference labels" do
     FileUtils.rm_f "test.doc"
     FileUtils.rm_f "test.html"
@@ -349,6 +320,9 @@ ICAgICAgIDogRU5EIERPQyBJRAoKRklMRU5BTUU6IHRlc3QKCg==
          <p>A<fn reference="1">
   <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">Formerly denoted as 15 % (m/m).</p>
 </fn></p>
+<clause id="P" inline-header="false" obligation="normative">
+<title>Clause 4.2.1</title>
+</clause>
        </clause></clause>
         </sections>
         </iso-standard>
@@ -412,6 +386,120 @@ ICAgICAgIDogRU5EIERPQyBJRAoKRklMRU5BTUU6IHRlc3QKCg==
     OUTPUT
   end
 
+    it "populates Word ToC with custom levels" do
+    FileUtils.rm_f "test.doc"
+    IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css", wordintropage: "spec/assets/wordintro.html", doctoclevels: 3}).convert("test", <<~"INPUT", false)
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <sections>
+               <clause inline-header="false" obligation="normative"><title>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
+
+         <title>Introduction<bookmark id="Q"/> to this<fn reference="1">
+  <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">Formerly denoted as 15 % (m/m).</p>
+</fn></title>
+       </clause>
+       <clause id="O" inline-header="false" obligation="normative">
+         <title>Clause 4.2</title>
+         <p>A<fn reference="1">
+  <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">Formerly denoted as 15 % (m/m).</p>
+</fn></p>
+<clause id="P" inline-header="false" obligation="normative">
+<title>Clause 4.2.1</title>
+</clause>
+       </clause></clause>
+        </sections>
+        </iso-standard>
+
+    INPUT
+    word = File.read("test.doc").sub(/^.*<div class="WordSection2">/m, '<div class="WordSection2">').
+      sub(%r{<p class="MsoNormal">\s*<br clear="all" class="section"/>\s*</p>\s*<div class="WordSection3">.*$}m, "")
+    expect(word.gsub(/_Toc\d\d+/, "_Toc")).to be_equivalent_to <<~'OUTPUT'
+           <div class="WordSection2">
+       /* an empty word intro page */
+
+       <p class="MsoToc1"><span lang="EN-GB" xml:lang="EN-GB"><span style="mso-element:field-begin"></span><span style="mso-spacerun:yes">&#xA0;</span>TOC
+         \o "1-3" \h \z \u <span style="mso-element:field-separator"></span></span>
+       <span class="MsoHyperlink"><span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
+       <a href="#_Toc">1. Clause 4<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+       <span style="mso-tab-count:1 dotted">. </span>
+       </span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+       <span style="mso-element:field-begin"></span></span>
+       <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc \h </span>
+         <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"><span style="mso-element:field-separator"></span></span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">1</span>
+         <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"></span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"><span style="mso-element:field-end"></span></span></a></span></span></p>
+
+       <p class="MsoToc2">
+         <span class="MsoHyperlink">
+           <span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
+       <a href="#_Toc">1.1. Introduction to this<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+       <span style="mso-tab-count:1 dotted">. </span>
+       </span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+       <span style="mso-element:field-begin"></span></span>
+       <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc \h </span>
+         <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"><span style="mso-element:field-separator"></span></span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">1</span>
+         <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"></span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"><span style="mso-element:field-end"></span></span></a></span>
+         </span>
+       </p>
+
+       <p class="MsoToc2">
+         <span class="MsoHyperlink">
+           <span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
+       <a href="#_Toc">1.2. Clause 4.2<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+       <span style="mso-tab-count:1 dotted">. </span>
+       </span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+       <span style="mso-element:field-begin"></span></span>
+       <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc \h </span>
+         <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"><span style="mso-element:field-separator"></span></span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">1</span>
+         <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"></span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"><span style="mso-element:field-end"></span></span></a></span>
+         </span>
+       </p>
+
+       <p class="MsoToc3">
+  <span class="MsoHyperlink">
+    <span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
+<a href="#_Toc">1.2.1. Clause 4.2.1<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+<span style="mso-tab-count:1 dotted">. </span>
+</span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+<span style="mso-element:field-begin"></span></span>
+<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc \h </span>
+  <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"><span style="mso-element:field-separator"></span></span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">1</span>
+  <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"></span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"><span style="mso-element:field-end"></span></span></a></span>
+  </span>
+</p>
+
+       <p class="MsoToc1">
+         <span lang="EN-GB" xml:lang="EN-GB">
+           <span style="mso-element:field-end"></span>
+         </span>
+         <span lang="EN-GB" xml:lang="EN-GB">
+           <p class="MsoNormal">&#xA0;</p>
+         </span>
+       </p>
+
+
+               <p class="MsoNormal">&#xA0;</p>
+             </div>
+    OUTPUT
+    end
+
+      it "generates HTML output with custom ToC levels function" do
+    FileUtils.rm_f "test.doc"
+    FileUtils.rm_f "test.html"
+    IsoDoc::HtmlConvert.new({htmltoclevels: 3}).convert("test", <<~"INPUT", false)
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <note>
+  <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
+</note>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+    html = File.read("test.html")
+    toclevel = <<~"TOCLEVEL"
+function toclevel() { var i; var text = "";\n  for(i = 1; i <= 3; i++) {
+TOCLEVEL
+    expect(html).to include toclevel
+  end
+
   it "reorders footnote numbers in HTML" do
     FileUtils.rm_f "test.html"
     IsoDoc::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css", wordintropage: "spec/assets/wordintro.html"}).convert("test", <<~"INPUT", false)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 0.9.19
+  version: 0.9.20
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-23 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  name: ruby-xslt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: thread_safe
   requirement: !ruby/object:Gem::Requirement