updated plugin

Author: dafi

_plugins/tocGenerator.rb

@@ -21,6 +21,17 @@ def toc_generate(html)
 
         anchor_prefix = config["anchorPrefix"] || 'tocAnchor-'
 
+        # better for traditional page seo, commonlly use h1 as title
+        toc_top_tag = config["tocTopTag"] || 'h1' 
+        toc_top_tag = toc_top_tag.gsub(/h/, '').to_i
+        if toc_top_tag > 5
+          toc_top_tag = 5
+        end
+        toc_sec_tag = toc_top_tag + 1
+        toc_top_tag = "h#{toc_top_tag}"
+        toc_sec_tag = "h#{toc_sec_tag}"
+
+
         # Text labels
         contents_label = config["contentsLabel"] || 'Contents'
         hide_label = config["hideLabel"] || 'hide'
@@ -36,37 +47,38 @@ def toc_generate(html)
         doc = Nokogiri::HTML(html)
 
         # Find H1 tag and all its H2 siblings until next H1
-        doc.css('h1').each do |h1|
+        doc.css(toc_top_tag).each do |tag|
             # TODO This XPATH expression can greatly improved
-            ct  = h1.xpath('count(following-sibling::h1)')
-            h2s = h1.xpath("following-sibling::h2[count(following-sibling::h1)=#{ct}]")
+            ct  = tag.xpath("count(following-sibling::#{toc_top_tag})")
+            sects = tag.xpath("following-sibling::#{toc_sec_tag}[count(following-sibling::#{toc_top_tag})=#{ct}]")
 
             level_html = '';
             inner_section = 0;
 
-            h2s.map.each do |h2|
+            sects.map.each do |sect|
                 inner_section += 1;
                 anchor_id = anchor_prefix + toc_level.to_s + '-' + toc_section.to_s + '-' + inner_section.to_s
-                h2['id'] = "#{anchor_id}"
+                sect['id'] = "#{anchor_id}"
 
                 level_html += create_level_html(anchor_id,
                     toc_level + 1,
                     toc_section + inner_section,
                     item_number.to_s + '.' + inner_section.to_s,
-                    h2.text,
+                    sect.text,
                     '')
             end
             if level_html.length > 0
                 level_html = '<ul>' + level_html + '</ul>';
             end
+
             anchor_id = anchor_prefix + toc_level.to_s + '-' + toc_section.to_s;
-            h1['id'] = "#{anchor_id}"
+            tag['id'] = "#{anchor_id}"
 
             toc_html += create_level_html(anchor_id,
                 toc_level,
                 toc_section,
                 item_number,
-                h1.text,
+                tag.text,
                 level_html);
 
             toc_section += 1 + inner_section;
@@ -92,7 +104,7 @@ def toc_generate(html)
                     .gsub('%2', toc_html);
                 doc.css('body').children.before(toc_table)
             end
-            doc.css('body').children.to_html()
+            doc.css('body').children.to_xhtml(indent:3, indent_text:" ")
         else
             return html
         end
@@ -114,4 +126,4 @@ def create_level_html(anchor_id, toc_level, toc_section, tocNumber, tocText, toc
   end
 end
 
-Liquid::Template.register_filter(Jekyll::TOCGenerator)
+Liquid::Template.register_filter(Jekyll::TOCGenerator)