Merge pull request #942 from katzyn/pdf

Fix page numbers in TOC in PDF and move System Tables into own HTML / section in PDF

Merge pull request #942 from katzyn/pdf
Fix page numbers in TOC in PDF and move System Tables into own HTML / section in PDF
516ab294 · Evgenij Ryazanov · GitHub · 10ba7102 · ac37c7ae · 516ab294
--- a/h2/src/docsrc/html/fragments.html
+++ b/h2/src/docsrc/html/fragments.html
@@ -78,6 +78,7 @@ translate -->
 <a href="grammar.html">SQL Grammar</a><br />
 <a href="functions.html">Functions</a><br />
 <a href="datatypes.html">Data Types</a><br />
+<a href="systemtables.html">System Tables</a><br />
 <a href="../javadoc/index.html">Javadoc</a><br />
 <a href="../h2.pdf">PDF (1 MB)</a><br />
 <br />

--- a/h2/src/docsrc/html/grammar.html
+++ b/h2/src/docsrc/html/grammar.html
@@ -159,12 +159,6 @@ syntax-end -->
 </table>
 <!-- railroad-end -->

-<h3>System Tables</h3>
-<p class="notranslate">
-<a href="#information_schema">Information Schema</a><br />
-<a href="#range_table">Range Table</a><br />
-</p>
-
 <!-- railroad-start -->
 <h2>Details</h2>
 <p>Click on the header to switch between railroad diagram and BNF.</p>
@@ -274,34 +268,6 @@ 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
-of all tables in the database as well as the current settings.
-</p>
-<table class="main">
-<tr><th>Table</th><th>Columns</th></tr>
-<c:forEach var="item" items="informationSchema">
-<tr class="notranslate">
-    <td>${item.topic}</td>
-    <td>${item.syntax}</td>
-</tr>
-</c:forEach>
-</table>
-
-<h3 id="range_table" class="notranslate">Range Table</h3>
-<p>
-The range table is a dynamic system table that contains all values from a start to an end value.
-The table contains one column called X. Both the start and end values are included in the result.
-The table is used as follows:
-</p>
-<p>Example:</p>
-<pre>
-SELECT X FROM SYSTEM_RANGE(1, 10);
-</pre>
-
 <!--[if lte IE 7]><script language="javascript">switchBnf(null);</script><![endif]-->

 <!-- [close] { --></div></td></tr></table><!-- } --><!-- analytics --></body></html>
--- a/h2/src/docsrc/html/systemtables.html
+++ b/h2/src/docsrc/html/systemtables.html
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!--
+Copyright 2004-2018 H2 Group. Multiple-Licensed under the MPL 2.0, Version 1.0,
+and under the Eclipse Public License, Version 1.0
+Initial Developer: H2 Group
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head><meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+<title>
+System Tables
+</title>
+<link rel="stylesheet" type="text/css" href="stylesheet.css" />
+<!-- [search] { -->
+<script type="text/javascript" src="navigation.js"></script>
+</head><body onload="frameMe();">
+<table class="content"><tr class="content"><td class="content"><div class="contentDiv">
+<!-- } -->
+
+<h1>System Tables</h1>
+
+<p class="notranslate">
+<a href="#information_schema">Information Schema</a><br />
+<a href="#range_table">Range Table</a><br />
+</p>
+
+<h2 id="information_schema" class="notranslate">Information Schema</h2>
+<p>
+The system tables in the schema <code>INFORMATION_SCHEMA</code> contain the meta data
+of all tables in the database as well as the current settings.
+</p>
+<c:forEach var="item" items="informationSchema">
+<h3 class="notranslate">${item.topic}</h3>
+<p class="notranslate">${item.syntax}</p>
+</c:forEach>
+
+<h2 id="range_table" class="notranslate">Range Table</h2>
+<p>
+The range table is a dynamic system table that contains all values from a start to an end value.
+The table contains one column called X. Both the start and end values are included in the result.
+The table is used as follows:
+</p>
+<p>Example:</p>
+<pre>
+SELECT X FROM SYSTEM_RANGE(1, 10);
+</pre>
+
+<!-- [close] { --></div></td></tr></table><!-- } --><!-- analytics --></body></html>
--- a/h2/src/installer/openoffice.txt
+++ b/h2/src/installer/openoffice.txt
@@ -92,11 +92,15 @@ sub H2Pdf
    dim linkStart(0) As New com.sun.star.beans.PropertyValue
    dim linkEnd(0) As New com.sun.star.beans.PropertyValue

-    For i = 1 To 4
+    for i = 1 To 4
        oLevel = toc.LevelFormat.getByIndex(i)
-        x = DimArray(5)
-        x = Array(linkStart, oLevel(0), oLevel(1), oLevel(2), oLevel(3), linkEnd)
-        old = oLevel(0)
+        bound = UBound(oLevel)
+        x = DimArray(bound + 2)
+        x(0) = linkStart
+        for j = 0 to bound
+            x(j + 1) = oLevel(j)
+        next
+        x(bound + 2) = linkEnd
        linkStart(0).Name = "TokenType"
        linkStart(0).Value = "TokenHyperlinkStart"
        linkStart(0).Handle = -1

--- a/h2/src/tools/org/h2/build/doc/MergeDocs.java
+++ b/h2/src/tools/org/h2/build/doc/MergeDocs.java
@@ -32,7 +32,8 @@ public class MergeDocs {
        String[] pages = { "quickstart.html", "installation.html",
                "tutorial.html", "features.html", "performance.html",
                "advanced.html", "grammar.html", "functions.html",
-                "datatypes.html", "build.html", "history.html", "faq.html" };
+                "datatypes.html", "systemtables.html",
+                "build.html", "history.html", "faq.html" };
        StringBuilder buff = new StringBuilder();
        for (String fileName : pages) {
            String text = getContent(fileName);

--- a/h2/src/tools/org/h2/build/doc/dictionary.txt
+++ b/h2/src/tools/org/h2/build/doc/dictionary.txt
@@ -766,4 +766,4 @@ interpolated thead

 die weekdiff osx subprocess dow proleptic microsecond microseconds divisible cmp denormalized suppressed saturated mcs
 london dfs weekdays intermittent looked msec tstz africa monrovia asia tokyo weekday joi callers multipliers ucn
-openoffice organize libre
+openoffice organize libre systemtables