HTML railroad diagrams

h2/src/docsrc/html/datatypes.html

@@ -33,7 +33,7 @@ ${item.syntax}
 </pre>
 syntax-end -->
 <p>${item.text}</p>
-<b>Example:</b>
+<p>Example:</p>
 <p class="notranslate">${item.example}</p>
 </c:forEach>
 

h2/src/docsrc/html/functions.html

@@ -63,7 +63,7 @@ ${item.syntax}
 </pre>
 syntax-end -->
 <p>${item.text}</p>
-<b>Example:</b>
+<p>Example:</p>
 <p class="notranslate">${item.example}</p>
 </c:forEach>
 

h2/src/docsrc/html/grammar.html

@@ -61,8 +61,9 @@ ${item.syntax}
 </pre>
 syntax-end -->
 <p>${item.text}</p>
-<b>Example:</b>
-<p class="notranslate">${item.example}</p>
+<p>Example:</p>
+<p class="notranslate">
+${item.example}</p>
 </c:forEach>
 
 <c:forEach var="item" items="otherGrammar">
@@ -76,7 +77,7 @@ ${item.syntax}
 </pre>
 syntax-end -->
 <p>${item.text}</p>
-<b>Example:</b>
+<p>Example:</p>
 <p class="notranslate">${item.example}</p>
 </c:forEach>
 
@@ -100,6 +101,7 @@ The range table is a dynamic system table that contains all values from a start
 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>

h2/src/docsrc/html/main.html

@@ -20,7 +20,6 @@ H2 Database Engine
 Welcome to H2, the free Java SQL database engine.
 </p>
 
-<br />
 <p>
 <a href="quickstart.html" style="font-size: 16px; font-weight: bold">Quickstart</a>
 <br />

h2/src/docsrc/html/mainWeb.html

@@ -32,7 +32,7 @@ Welcome to H2, the Java SQL database. The main features of H2 are:
     <tr><td style="border: 0px; background-color: #eee;">
         <table style="border: 0px; margin: 0px 7px 12px 7px;">
             <tr><td style="border: 0px; background-color: #eee;" colspan="2">
-                <h3>Download Beta</h3>
+                <h3 style="margin-top: 1em;">Download Beta</h3>
                 Version ${version} (${versionDate}):
             </td></tr>
             <tr><td style="border: 0px; background-color: #eee;">
@@ -54,7 +54,7 @@ Welcome to H2, the Java SQL database. The main features of H2 are:
     <td style="border: 0px; background-color: #eee;">
         <table style="border: 0px; margin: 0px 7px 12px 7px;">
             <tr><td style="border: 0px; background-color: #eee;">
-                <h3>Support</h3>
+                <h3 style="margin-top: 1em;">Support</h3>
                 <p>
                     <a href="http://groups.google.com/group/h2-database">English Google Group</a><br />
                     <a href="http://groups.google.co.jp/group/h2-database-jp">Japanese Google Group</a><br /><br />
@@ -78,7 +78,7 @@ Welcome to H2, the Java SQL database. The main features of H2 are:
     </td></tr>
 
 <tr><td colspan="3" style="border: 0px; padding: 5px 0px 15px 0px;">
-    <h3>Features</h3>
+    <h3 style="margin-top: 1em;">Features</h3>
     <table style="width: 425px;"><tr class="notranslate">
         <th></th>
         <th>H2</th>
@@ -159,7 +159,7 @@ Welcome to H2, the Java SQL database. The main features of H2 are:
 <tr><td colspan="3" style="border: 0px; background-color: #eee;">
     <table style="border: 0px; margin: 0px 7px 0px 7px;">
         <tr><td style="border: 0px; background-color: #eee;">
-            <h3>News</h3>
+            <h3 style="margin-top: 1em;">News</h3>
             <p>
             <b>Newsfeeds:</b>
             <a href="http://www.h2database.com/html/newsfeed-atom.xml">Full text (Atom)</a>
@@ -180,7 +180,7 @@ Welcome to H2, the Java SQL database. The main features of H2 are:
 <tr><td colspan="3" style="border: 0px; background-color: #eee;">
     <table style="border: 0px; margin: 0px 7px 5px 7px;">
         <tr><td style="border: 0px; background-color: #eee;">
-            <h3>Contribute</h3>
+            <h3 style="margin-top: 1em;">Contribute</h3>
             <p>
             You can contribute to the development of H2 by sending feedback and bug
             reports, or translate the H2 Console application (for details, start the H2 Console

h2/src/docsrc/html/stylesheet.css

@@ -49,14 +49,17 @@ h1 {
 
 h2 {
     font-size: 13pt;
+    margin-top: 1.5em;
 }
 
 h3 {
-    font-size: 10pt;
+    font-size: 11pt;
+    margin-top: 1.5em;
 }
 
 h4 {
     font-size: 9pt;
+    margin-top: 1.5em;
 }
 
 hr {
@@ -218,6 +221,7 @@ td.content {
     border-collapse: collapse;
     vertical-align: top;
 }
+
 .c {
     padding: 1px 3px;
     margin: 0px 0px;
@@ -226,6 +230,7 @@ td.content {
     border-radius: 0.4em;
     background-color: #fff;
 }
+
 .ts {
     border: 0px;
     padding: 0px;
@@ -236,6 +241,7 @@ td.content {
     background-image: url(images/div-ts.png);
     width: 16px;
 }
+
 .ls {
     border: 0px;
     padding: 0px;
@@ -246,6 +252,7 @@ td.content {
     background-image: url(images/div-ls.png);
     width: 16px;
 }
+
 .ks {
     border: 0px;
     padding: 0px;
@@ -256,6 +263,7 @@ td.content {
     background-image: url(images/div-ks.png);
     width: 16px;
 }
+
 .te {
     border: 0px;
     padding: 0px;
@@ -266,6 +274,7 @@ td.content {
     background-image: url(images/div-te.png);
     width: 16px;
 }
+
 .le {
     border: 0px;
     padding: 0px;
@@ -276,6 +285,7 @@ td.content {
     background-image: url(images/div-le.png);
     width: 16px;
 }
+
 .ke {
     border: 0px;
     padding: 0px;
@@ -286,6 +296,7 @@ td.content {
     background-image: url(images/div-ke.png);
     width: 16px;
 }
+
 .d {
     border: 0px;
     padding: 0px;

h2/src/docsrc/html/stylesheetPdf.css

@@ -43,14 +43,17 @@ h1 {
 
 h2 {
     font-size: 13pt;
+    margin-top: 1.5em;
 }
 
 h3 {
-    font-size: 10pt;
+    font-size: 11pt;
+    margin-top: 1.5em;
 }
 
 h4 {
     font-size: 9pt;
+    margin-top: 1.5em;
 }
 
 hr {
@@ -128,89 +131,3 @@ em.u {
     color: #800;
 }
 
-.railroad {
-    border: 0px;
-    padding: 0px;
-    margin: 0px;
-    border-collapse: collapse;
-    vertical-align: top;
-}
-.c {
-    padding: 1px 3px;
-    margin: 0px 0px;
-    border: 2px solid;
-    -moz-border-radius: 0.4em;
-    border-radius: 0.4em;
-    background-color: #fff;
-}
-.ts {
-    border: 0px;
-    padding: 0px;
-    margin: 0px;
-    border-collapse: collapse;
-    vertical-align: top;
-    height: 24px;
-    background-image: url(images/div-ts.png);
-    width: 16px;
-}
-.ls {
-    border: 0px;
-    padding: 0px;
-    margin: 0px;
-    border-collapse: collapse;
-    vertical-align: top;
-    height: 24px;
-    background-image: url(images/div-ls.png);
-    width: 16px;
-}
-.ks {
-    border: 0px;
-    padding: 0px;
-    margin: 0px;
-    border-collapse: collapse;
-    vertical-align: top;
-    height: 24px;
-    background-image: url(images/div-ks.png);
-    width: 16px;
-}
-.te {
-    border: 0px;
-    padding: 0px;
-    margin: 0px;
-    border-collapse: collapse;
-    vertical-align: top;
-    height: 24px;
-    background-image: url(images/div-te.png);
-    width: 16px;
-}
-.le {
-    border: 0px;
-    padding: 0px;
-    margin: 0px;
-    border-collapse: collapse;
-    vertical-align: top;
-    height: 24px;
-    background-image: url(images/div-le.png);
-    width: 16px;
-}
-.ke {
-    border: 0px;
-    padding: 0px;
-    margin: 0px;
-    border-collapse: collapse;
-    vertical-align: top;
-    height: 24px;
-    background-image: url(images/div-ke.png);
-    width: 16px;
-}
-.d {
-    border: 0px;
-    padding: 0px;
-    margin: 0px;
-    border-collapse: collapse;
-    vertical-align: top;
-    height: 24px;
-    background-image: url(images/div-d.png);
-    background-repeat: repeat-x;
-    min-width: 16px;
-}

h2/src/main/org/h2/bnf/Bnf.java

@@ -97,10 +97,6 @@ public class Bnf {
             String topic = rs.getString("TOPIC");
             syntax = rs.getString("SYNTAX").trim();
             currentTopic = section;
-            if (section.startsWith("Function")) {
-                int end = syntax.indexOf(':');
-                syntax = syntax.substring(0, end);
-            }
             tokens = tokenize();
             index = 0;
             Rule rule = parseRule();

h2/src/main/org/h2/bnf/RuleFixed.java

@@ -68,9 +68,9 @@ public class RuleFixed implements Rule {
         case YMD:
             return "2000-01-01";
         case HMS:
-            return "12:00";
+            return "12:00:00";
         case NANOS:
-            return "0";
+            return "000000000";
         case ANY_UNTIL_EOL:
         case ANY_EXCEPT_SINGLE_QUOTE:
         case ANY_EXCEPT_DOUBLE_QUOTE:

h2/src/tools/org/h2/build/doc/dictionary.txt

@@ -617,4 +617,4 @@ scrambling distinguish official unofficial distinguishable overwrites lastval
 notranslate vince bonfanti alphabetically sysdummy sysibm activation
 deactivation concatenating reproducing black railroads railroad radius moz
 imageio argb bilinear rendering stroke interpolation flip diagrams draw
-delim overlap subselect
+delim overlap subselect bitwise