lv2specgen: Flatten page structure

2 files changed, 21 insertions, 11 deletions

diff --git a/lv2specgen/lv2specgen.py b/lv2specgen/lv2specgen.py
index b9f458c..88e1380 100755
--- a/lv2specgen/lv2specgen.py
+++ b/lv2specgen/lv2specgen.py
@@ -706,7 +706,7 @@ def docTerms(category, list, m, classlist, proplist, instalist):
         t = termName(m, term)
         curie = term.split(spec_ns_str[-1])[1]
         doc += '<div class="specterm" id="%s" about="%s">' % (t, term)
-        doc += '<h4><a href="#%s">%s</a></h4>' % (getAnchor(term), curie)
+        doc += '<h3><a href="#%s">%s</a></h3>' % (getAnchor(term), curie)
 
         comment = getFullDocumentation(m, term, classlist, proplist, instalist)
         is_deprecated = isDeprecated(m, term)
@@ -1311,11 +1311,19 @@ def specgen(specloc, indir, style_uri, docdir, tags, opts, instances=False, root
 
     termlist = ''
     if classlist:
-        termlist += '<h3><a id="ref-classes" />Classes</h3>' + classlist
+        termlist += '<div class="section">'
+        termlist += '<h2><a id="ref-classes" />Classes</h2>' + classlist
+        termlist += '</div>'
+
     if proplist:
-        termlist += '<h3><a id="ref-properties" />Properties</h3>' + proplist
+        termlist += '<div class="section">'
+        termlist += '<h2><a id="ref-properties" />Properties</h2>' + proplist
+        termlist += '</div>'
+
     if instlist:
-        termlist += '<h3><a id="ref-instances" />Instances</h3>' + instlist
+        termlist += '<div class="section">'
+        termlist += '<h2><a id="ref-instances" />Instances</h2>' + instlist
+        termlist += '</div>'
 
     name = specProperty(m, spec, doap.name)
     title = name
diff --git a/lv2specgen/template.html b/lv2specgen/template.html
index 059a599..1522472 100644
--- a/lv2specgen/template.html
+++ b/lv2specgen/template.html
@@ -41,7 +41,7 @@
         <!-- Contents: -->
         <ul id="contents">
           <!-- <li><a href="#sec-description">Description</a></li> -->
-          <li><a href="#sec-reference">Reference</a></li>
+          <li><a href="#sec-index">Index</a></li>
           <li><a href="#sec-history">History</a></li>
           @CONTENT_LINKS@
         </ul>
@@ -51,17 +51,19 @@
       <!-- DESCRIPTION -->
       <div class="section">@DESCRIPTION@</div>
 
+      <!-- INDEX -->
+      <h2 id="sec-index">Index</h2>
+      <div class="section">
+        @INDEX@
+      </div>
+
       <!-- REFERENCE -->
-      <h2 class="sec" id="sec-reference">Reference</h2>
       <div class="section">
-        <div id="indexbox">
-          @INDEX@
-          @REFERENCE@
-        </div>
+        @REFERENCE@
       </div>
 
       <!-- HISTORY -->
-      <h2 class="sec" id="sec-history">History</h2>
+      <h2 id="sec-history">History</h2>
       <div class="section">
         @HISTORY@
       </div>