Generate proper table of contents for PDF

h2/src/docsrc/html/datatypes.html

@@ -52,7 +52,7 @@ syntax-end -->
 <!-- railroad-end -->
 
 <c:forEach var="item" items="dataTypes">
-<h3 id="${item.link}" class="notranslate" onclick="switchBnf(this)">${item.topic}</h3>
+<h2 id="${item.link}" class="notranslate" onclick="switchBnf(this)">${item.topic}</h2>
 <!-- railroad-start -->
 <pre name="bnf" style="display: none">
 ${item.syntax}

h2/src/docsrc/html/functions.html

@@ -164,7 +164,92 @@ syntax-end -->
 <p>Click on the header to switch between railroad diagram and BNF.</p>
 <!-- railroad-end -->
 
-<c:forEach var="item" items="functionsAll">
+<h2>Aggregate Functions</h2>
+<c:forEach var="item" items="functionsAggregate">
+<h3 id="${item.link}" class="notranslate" onclick="switchBnf(this)">${item.topic}</h3>
+<!-- railroad-start -->
+<pre name="bnf" style="display: none">
+${item.syntax}
+</pre>
+<div name="railroad">
+${item.railroad}
+</div>
+<!-- railroad-end -->
+<!-- syntax-start
+<pre>
+${item.syntax}
+</pre>
+syntax-end -->
+<p>${item.text}</p>
+<p>Example:</p>
+<p class="notranslate">${item.example}</p>
+</c:forEach>
+
+<h2>Numeric Functions</h2>
+<c:forEach var="item" items="functionsNumeric">
+<h3 id="${item.link}" class="notranslate" onclick="switchBnf(this)">${item.topic}</h3>
+<!-- railroad-start -->
+<pre name="bnf" style="display: none">
+${item.syntax}
+</pre>
+<div name="railroad">
+${item.railroad}
+</div>
+<!-- railroad-end -->
+<!-- syntax-start
+<pre>
+${item.syntax}
+</pre>
+syntax-end -->
+<p>${item.text}</p>
+<p>Example:</p>
+<p class="notranslate">${item.example}</p>
+</c:forEach>
+
+<h2>String Functions</h2>
+<c:forEach var="item" items="functionsString">
+<h3 id="${item.link}" class="notranslate" onclick="switchBnf(this)">${item.topic}</h3>
+<!-- railroad-start -->
+<pre name="bnf" style="display: none">
+${item.syntax}
+</pre>
+<div name="railroad">
+${item.railroad}
+</div>
+<!-- railroad-end -->
+<!-- syntax-start
+<pre>
+${item.syntax}
+</pre>
+syntax-end -->
+<p>${item.text}</p>
+<p>Example:</p>
+<p class="notranslate">${item.example}</p>
+</c:forEach>
+
+<h2>Time and Date Functions</h2>
+<c:forEach var="item" items="functionsTimeDate">
+<h3 id="${item.link}" class="notranslate" onclick="switchBnf(this)">${item.topic}</h3>
+<!-- railroad-start -->
+<pre name="bnf" style="display: none">
+${item.syntax}
+</pre>
+<div name="railroad">
+${item.railroad}
+</div>
+<!-- railroad-end -->
+<!-- syntax-start
+<pre>
+${item.syntax}
+</pre>
+syntax-end -->
+<p>${item.text}</p>
+<p>Example:</p>
+<p class="notranslate">${item.example}</p>
+</c:forEach>
+
+<h2>System Functions</h2>
+<c:forEach var="item" items="functionsSystem">
 <h3 id="${item.link}" class="notranslate" onclick="switchBnf(this)">${item.topic}</h3>
 <!-- railroad-start -->
 <pre name="bnf" style="display: none">

h2/src/docsrc/html/grammar.html

@@ -170,7 +170,30 @@ syntax-end -->
 <p>Click on the header to switch between railroad diagram and BNF.</p>
 <!-- railroad-end -->
 
-<c:forEach var="item" items="commands">
+<h2>Commands (Data Manipulation)</h2>
+<c:forEach var="item" items="commandsDML">
+<h3 id="${item.link}" class="notranslate" onclick="switchBnf(this)">${item.topic}</h3>
+<!-- railroad-start -->
+<pre name="bnf" style="display: none">
+${item.syntax}
+</pre>
+<div name="railroad">
+${item.railroad}
+</div>
+<!-- railroad-end -->
+<!-- syntax-start
+<pre>
+${item.syntax}
+</pre>
+syntax-end -->
+<p>${item.text}</p>
+<p>Example:</p>
+<p class="notranslate">
+${item.example}</p>
+</c:forEach>
+
+<h2>Commands (Data Definition)</h2>
+<c:forEach var="item" items="commandsDDL">
 <h3 id="${item.link}" class="notranslate" onclick="switchBnf(this)">${item.topic}</h3>
 <!-- railroad-start -->
 <pre name="bnf" style="display: none">
@@ -191,6 +214,29 @@ syntax-end -->
 ${item.example}</p>
 </c:forEach>
 
+<h2>Commands (Other)</h2>
+<c:forEach var="item" items="commandsOther">
+<h3 id="${item.link}" class="notranslate" onclick="switchBnf(this)">${item.topic}</h3>
+<!-- railroad-start -->
+<pre name="bnf" style="display: none">
+${item.syntax}
+</pre>
+<div name="railroad">
+${item.railroad}
+</div>
+<!-- railroad-end -->
+<!-- syntax-start
+<pre>
+${item.syntax}
+</pre>
+syntax-end -->
+<p>${item.text}</p>
+<p>Example:</p>
+<p class="notranslate">
+${item.example}</p>
+</c:forEach>
+
+<h2>Datetime fields</h2>
 <c:forEach var="item" items="datetimeFields">
 <h3 id="${item.link}" class="notranslate" onclick="switchBnf(this)">${item.topic}</h3>
 <!-- railroad-start -->
@@ -212,6 +258,7 @@ syntax-end -->
 ${item.example}</p>
 </c:forEach>
 
+<h2>Other Grammar</h2>
 <c:forEach var="item" items="otherGrammar">
 <h3 id="${item.link}" class="notranslate" onclick="switchBnf(this)">${item.topic}</h3>
 <!-- railroad-start -->
@@ -227,6 +274,8 @@ syntax-end -->
 <p class="notranslate">${item.example}</p>
 </c:forEach>
 
+<h2>System Tables</h2>
+
 <h3 id="information_schema" class="notranslate">Information Schema</h3>
 <p>
 The system tables in the schema <code>INFORMATION_SCHEMA</code> contain the meta data

h2/src/tools/org/h2/build/doc/GenerateDoc.java

@@ -70,30 +70,26 @@ public class GenerateDoc {
         // String help = "SELECT * FROM INFORMATION_SCHEMA.HELP WHERE SECTION";
         String help = "SELECT ROWNUM ID, * FROM CSVREAD('" +
                 IN_HELP + "', NULL, 'lineComment=#') WHERE SECTION ";
-        map("commands",
-                help + "LIKE 'Commands%' ORDER BY ID", true);
         map("commandsDML",
-                help + "= 'Commands (DML)' ORDER BY ID", false);
+                help + "= 'Commands (DML)' ORDER BY ID", true);
         map("commandsDDL",
-                help + "= 'Commands (DDL)' ORDER BY ID", false);
+                help + "= 'Commands (DDL)' ORDER BY ID", true);
         map("commandsOther",
-                help + "= 'Commands (Other)' ORDER BY ID", false);
+                help + "= 'Commands (Other)' ORDER BY ID", true);
         map("datetimeFields",
                 help + "= 'Datetime fields' ORDER BY ID", true);
         map("otherGrammar",
                 help + "= 'Other Grammar' ORDER BY ID", true);
         map("functionsAggregate",
-                help + "= 'Functions (Aggregate)' ORDER BY ID", false);
+                help + "= 'Functions (Aggregate)' ORDER BY ID", true);
         map("functionsNumeric",
-                help + "= 'Functions (Numeric)' ORDER BY ID", false);
+                help + "= 'Functions (Numeric)' ORDER BY ID", true);
         map("functionsString",
-                help + "= 'Functions (String)' ORDER BY ID", false);
+                help + "= 'Functions (String)' ORDER BY ID", true);
         map("functionsTimeDate",
-                help + "= 'Functions (Time and Date)' ORDER BY ID", false);
+                help + "= 'Functions (Time and Date)' ORDER BY ID", true);
         map("functionsSystem",
-                help + "= 'Functions (System)' ORDER BY ID", false);
-        map("functionsAll",
-                help + "LIKE 'Functions%' ORDER BY SECTION, ID", true);
+                help + "= 'Functions (System)' ORDER BY ID", true);
         map("dataTypes",
                 help + "LIKE 'Data Types%' ORDER BY SECTION, ID", true);
         map("informationSchema", "SELECT TABLE_NAME TOPIC, " +