svn commit - mysqldoc@docsrva: r4400 - in trunk: . refman-4.1 refman-5.0 refman-5.1 tools

[paul]

Author: paul
Date: 2007-01-08 20:51:14 +0100 (Mon, 08 Jan 2007)
New Revision: 4400

Log:
 r17755@polar:  paul | 2007-01-08 12:43:23 -0600
 Write reserve-word changes as table, not in para.


Modified:
   trunk/refman-4.1/reserved-new-4.0.xml
   trunk/refman-4.1/reserved-new-4.1.xml
   trunk/refman-5.0/reserved-new-5.0.xml
   trunk/refman-5.1/Makefile
   trunk/refman-5.1/reserved-new-5.1.xml
   trunk/tools/make-reserved-words-new.rb

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:17651
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:13874
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:13015
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:17755
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:13874
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:13015


Modified: trunk/refman-4.1/reserved-new-4.0.xml
===================================================================
--- trunk/refman-4.1/reserved-new-4.0.xml	2007-01-08 17:20:42 UTC (rev 4399)
+++ trunk/refman-4.1/reserved-new-4.0.xml	2007-01-08 19:51:14 UTC (rev 4400)
Changed blocks: 1, Lines Added: 25, Lines Deleted: 5; 1483 bytes

@@ -6,10 +6,30 @@
 <!-- To regenerate, use ../tools/make-reserved-words-new.rb -->
 <para>
   The following are new reserved words in MySQL 4.0:
-  <literal>CHECK</literal>, <literal>FORCE</literal>,
-  <literal>LOCALTIME</literal>,
<literal>LOCALTIMESTAMP</literal>,
-  <literal>REQUIRE</literal>,
<literal>SQL_CALC_FOUND_ROWS</literal>,
-  <literal>SSL</literal>, <literal>X509</literal>,
-  <literal>XOR</literal>.
+
+  <informaltable>
+    <tgroup cols="3">
+      <colspec colwidth="33*"/>
+      <colspec colwidth="33*"/>
+      <colspec colwidth="33*"/>
+      <tbody>
+        <row>
+          <entry><literal>CHECK</literal></entry>
+          <entry><literal>FORCE</literal></entry>
+          <entry><literal>LOCALTIME</literal></entry>
+        </row>
+        <row>
+          <entry><literal>LOCALTIMESTAMP</literal></entry>
+          <entry><literal>REQUIRE</literal></entry>
+          <entry><literal>SQL_CALC_FOUND_ROWS</literal></entry>
+        </row>
+        <row>
+          <entry><literal>SSL</literal></entry>
+          <entry><literal>X509</literal></entry>
+          <entry><literal>XOR</literal></entry>
+        </row>
+      </tbody>
+    </tgroup>
+  </informaltable>
 </para>
 <!-- END_OF_NEW_RESERVED_WORDS_INFO -->


Modified: trunk/refman-4.1/reserved-new-4.1.xml
===================================================================
--- trunk/refman-4.1/reserved-new-4.1.xml	2007-01-08 17:20:42 UTC (rev 4399)
+++ trunk/refman-4.1/reserved-new-4.1.xml	2007-01-08 19:51:14 UTC (rev 4400)
Changed blocks: 1, Lines Added: 45, Lines Deleted: 11; 2611 bytes

@@ -6,16 +6,50 @@
 <!-- To regenerate, use ../tools/make-reserved-words-new.rb -->
 <para>
   The following are new reserved words in MySQL 4.1:
-  <literal>BEFORE</literal>, <literal>COLLATE</literal>,
-  <literal>CONVERT</literal>, <literal>CURRENT_USER</literal>,
-  <literal>DAY_MICROSECOND</literal>, <literal>DIV</literal>,
-  <literal>DUAL</literal>, <literal>FALSE</literal>,
-  <literal>HOUR_MICROSECOND</literal>,
-  <literal>MINUTE_MICROSECOND</literal>, <literal>MOD</literal>,
-  <literal>NO_WRITE_TO_BINLOG</literal>,
-  <literal>SECOND_MICROSECOND</literal>,
<literal>SEPARATOR</literal>,
-  <literal>SPATIAL</literal>, <literal>TRUE</literal>,
-  <literal>UTC_DATE</literal>, <literal>UTC_TIME</literal>,
-  <literal>UTC_TIMESTAMP</literal>,
<literal>VARCHARACTER</literal>.
+
+  <informaltable>
+    <tgroup cols="3">
+      <colspec colwidth="33*"/>
+      <colspec colwidth="33*"/>
+      <colspec colwidth="33*"/>
+      <tbody>
+        <row>
+          <entry><literal>BEFORE</literal></entry>
+          <entry><literal>COLLATE</literal></entry>
+          <entry><literal>CONVERT</literal></entry>
+        </row>
+        <row>
+          <entry><literal>CURRENT_USER</literal></entry>
+          <entry><literal>DAY_MICROSECOND</literal></entry>
+          <entry><literal>DIV</literal></entry>
+        </row>
+        <row>
+          <entry><literal>DUAL</literal></entry>
+          <entry><literal>FALSE</literal></entry>
+          <entry><literal>HOUR_MICROSECOND</literal></entry>
+        </row>
+        <row>
+          <entry><literal>MINUTE_MICROSECOND</literal></entry>
+          <entry><literal>MOD</literal></entry>
+          <entry><literal>NO_WRITE_TO_BINLOG</literal></entry>
+        </row>
+        <row>
+          <entry><literal>SECOND_MICROSECOND</literal></entry>
+          <entry><literal>SEPARATOR</literal></entry>
+          <entry><literal>SPATIAL</literal></entry>
+        </row>
+        <row>
+          <entry><literal>TRUE</literal></entry>
+          <entry><literal>UTC_DATE</literal></entry>
+          <entry><literal>UTC_TIME</literal></entry>
+        </row>
+        <row>
+          <entry><literal>UTC_TIMESTAMP</literal></entry>
+          <entry><literal>VARCHARACTER</literal></entry>
+          <entry></entry>
+        </row>
+      </tbody>
+    </tgroup>
+  </informaltable>
 </para>
 <!-- END_OF_NEW_RESERVED_WORDS_INFO -->


Modified: trunk/refman-5.0/reserved-new-5.0.xml
===================================================================
--- trunk/refman-5.0/reserved-new-5.0.xml	2007-01-08 17:20:42 UTC (rev 4399)
+++ trunk/refman-5.0/reserved-new-5.0.xml	2007-01-08 19:51:14 UTC (rev 4400)
Changed blocks: 1, Lines Added: 70, Lines Deleted: 17; 3796 bytes

@@ -6,22 +6,75 @@
 <!-- To regenerate, use ../tools/make-reserved-words-new.rb -->
 <para>
   The following are new reserved words in MySQL 5.0:
-  <literal>ASENSITIVE</literal>, <literal>CALL</literal>,
-  <literal>CONDITION</literal>, <literal>CONNECTION</literal>,
-  <literal>CONTINUE</literal>, <literal>CURSOR</literal>,
-  <literal>DECLARE</literal>, <literal>DETERMINISTIC</literal>,
-  <literal>EACH</literal>, <literal>ELSEIF</literal>,
-  <literal>EXIT</literal>, <literal>FETCH</literal>,
-  <literal>INOUT</literal>, <literal>INSENSITIVE</literal>,
-  <literal>ITERATE</literal>, <literal>LEAVE</literal>,
-  <literal>LOOP</literal>, <literal>MODIFIES</literal>,
-  <literal>OUT</literal>, <literal>READS</literal>,
-  <literal>RELEASE</literal>, <literal>REPEAT</literal>,
-  <literal>RETURN</literal>, <literal>SCHEMA</literal>,
-  <literal>SCHEMAS</literal>, <literal>SENSITIVE</literal>,
-  <literal>SPECIFIC</literal>, <literal>SQL</literal>,
-  <literal>SQLEXCEPTION</literal>, <literal>SQLSTATE</literal>,
-  <literal>SQLWARNING</literal>, <literal>TRIGGER</literal>,
-  <literal>UNDO</literal>, <literal>WHILE</literal>.
+
+  <informaltable>
+    <tgroup cols="3">
+      <colspec colwidth="33*"/>
+      <colspec colwidth="33*"/>
+      <colspec colwidth="33*"/>
+      <tbody>
+        <row>
+          <entry><literal>ASENSITIVE</literal></entry>
+          <entry><literal>CALL</literal></entry>
+          <entry><literal>CONDITION</literal></entry>
+        </row>
+        <row>
+          <entry><literal>CONNECTION</literal></entry>
+          <entry><literal>CONTINUE</literal></entry>
+          <entry><literal>CURSOR</literal></entry>
+        </row>
+        <row>
+          <entry><literal>DECLARE</literal></entry>
+          <entry><literal>DETERMINISTIC</literal></entry>
+          <entry><literal>EACH</literal></entry>
+        </row>
+        <row>
+          <entry><literal>ELSEIF</literal></entry>
+          <entry><literal>EXIT</literal></entry>
+          <entry><literal>FETCH</literal></entry>
+        </row>
+        <row>
+          <entry><literal>INOUT</literal></entry>
+          <entry><literal>INSENSITIVE</literal></entry>
+          <entry><literal>ITERATE</literal></entry>
+        </row>
+        <row>
+          <entry><literal>LEAVE</literal></entry>
+          <entry><literal>LOOP</literal></entry>
+          <entry><literal>MODIFIES</literal></entry>
+        </row>
+        <row>
+          <entry><literal>OUT</literal></entry>
+          <entry><literal>READS</literal></entry>
+          <entry><literal>RELEASE</literal></entry>
+        </row>
+        <row>
+          <entry><literal>REPEAT</literal></entry>
+          <entry><literal>RETURN</literal></entry>
+          <entry><literal>SCHEMA</literal></entry>
+        </row>
+        <row>
+          <entry><literal>SCHEMAS</literal></entry>
+          <entry><literal>SENSITIVE</literal></entry>
+          <entry><literal>SPECIFIC</literal></entry>
+        </row>
+        <row>
+          <entry><literal>SQL</literal></entry>
+          <entry><literal>SQLEXCEPTION</literal></entry>
+          <entry><literal>SQLSTATE</literal></entry>
+        </row>
+        <row>
+          <entry><literal>SQLWARNING</literal></entry>
+          <entry><literal>TRIGGER</literal></entry>
+          <entry><literal>UNDO</literal></entry>
+        </row>
+        <row>
+          <entry><literal>WHILE</literal></entry>
+          <entry></entry>
+          <entry></entry>
+        </row>
+      </tbody>
+    </tgroup>
+  </informaltable>
 </para>
 <!-- END_OF_NEW_RESERVED_WORDS_INFO -->


Modified: trunk/refman-5.1/Makefile
===================================================================
--- trunk/refman-5.1/Makefile	2007-01-08 17:20:42 UTC (rev 4399)
+++ trunk/refman-5.1/Makefile	2007-01-08 19:51:14 UTC (rev 4400)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 9307 bytes

@@ -42,7 +42,7 @@
 
 MANUAL_SRCS_EXTRA = versions.ent ../common/fixedchars.ent ../refman-common/urls.ent
../common/phrases.ent
 
-MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml ../refman-common/bug-reports.xml
../refman-common/connector-j.xml ../refman-common/connector-mxj.xml
../refman-common/connector-net.xml ../refman-common/connector-odbc.xml
../refman-common/connector-php.xml ../refman-common/connector-vstudioplugin.xml
../refman-common/credits.xml ../refman-common/environment-variables.xml
../refman-common/gpl-license.xml ../refman-common/images/cmxj-overview.png
../refman-common/images/cnet-win-install-step1.png
../refman-common/images/cnet-win-install-step2.png
../refman-common/images/cnet-win-install-step3.png
../refman-common/images/cnet-win-install-step4.png
../refman-common/images/cnet-win-install-step6.png
../refman-common/images/myaccess-odbc.png ../refman-common/images/myaccess.png
../refman-common/images/myarchitecture.png ../refman-common/images/myflowchart.png
../refman-common/images/myodbc-crystal-1.png ../refman-common/images/myodbc-crystal-2.png
../refman-common/images/myodbc-cryst!
 al-3.png ../refman-common/images/myodbc-crystal-4.png
../refman-common/images/myodbc-crystal-5.png ../refman-common/images/myodbc-crystal-6.png
../refman-common/images/myodbc-excel-step1.png
../refman-common/images/myodbc-excel-step2.png
../refman-common/images/myodbc-excel-step3.png
../refman-common/images/myodbc-excel-step4.png
../refman-common/images/myodbc-excel-step5.png
../refman-common/images/myodbc-macosx-install-step1.png
../refman-common/images/myodbc-macosx-install-step2.png
../refman-common/images/myodbc-macosx-install-step3.png
../refman-common/images/myodbc-macosx-install-step4.png
../refman-common/images/myodbc-macosx-install-step5.png
../refman-common/images/myodbc-macosx-install-step6.png
../refman-common/images/myodbc-macosx-odbcadmin-adddsn.png
../refman-common/images/myodbc-macosx-odbcadmin-main.png
../refman-common/images/myodbc-macosx-odbcadmin-sampledsn.png
../refman-common/images/myodbc-macosx-odbcadmin-tracing.png
../refman-common/images/myodbc-win-!
 install-step1.png ../refman-common/images/myodbc-win-install-s!
 tep2.png
 ../refman-common/images/myodbc-win-install-step3.png
../refman-common/images/myodbc-win-install-step4.png
../refman-common/images/myodbc-win-odbcadmin-adddsn.png
../refman-common/images/myodbc-win-odbcadmin-advanced.png
../refman-common/images/myodbc-win-odbcadmin-driverselect.png
../refman-common/images/myodbc-win-odbcadmin-main.png
../refman-common/images/myodbc-win-odbcadmin-options.png
../refman-common/images/myodbc-win-odbcadmin-sampledsn.png
../refman-common/images/myodbc-win-tracing.png
../refman-common/images/mysql-vstudioplugin-1.png
../refman-common/images/mysql-vstudioplugin-3.png
../refman-common/images/mysql-vstudioplugin-4.png
../refman-common/information-sources.xml ../refman-common/manual-conventions.en.xml
../refman-common/maxdb.en.xml ../refman-common/mysql-floss-license-exception.xml
../refman-common/news-connector-j.xml ../refman-common/news-connector-net.xml
../refman-common/news-myodbc.xml ../refman-common/news-vstudioplugin.xml
../refman-common/regexp!
 .xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml apis-c.xml
apis-cplusplus.xml apis-eiffel.xml apis-libmysqld.xml apis-perl.xml apis-php.xml
apis-progutils.xml apis-python.xml apis-tcl.xml apis.xml charset.xml
client-utility-programs.xml connectors.xml copyright.xml data-types.xml
database-administration.xml dba-optvars-table.xml errmsgs-client.xml errmsgs-server.xml
error-handling.xml events.xml extending-mysql.xml faqs.xml functions.xml
images/PSEArch.png images/blackhole-1.png images/cluster-components-1.png
images/cluster-replication-binlog-injector.png images/cluster-replication-overview.png
images/cluster-upgrade-downgrade-table.png images/multi-comp-1.png
images/ndb-size-pl-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png
images/rolling-restarts.png information-schema.xml installing.xml introduction.xml
language-structure.xml legalnotice.en.xml limits.xml mysql-cluster.xml news-5.1.xml
news.xml optimization.xml partitio!
 ning.xml porting.xml precision-math.xml preface.xml problems.x!
 ml repli
cation.xml reserved-new-5.1.xml reservedwords.xml restrictions.xml se-archive.xml
se-blackhole.xml se-csv.xml se-example.xml se-falcon.xml se-federated.xml se-innodb.xml
se-memory.xml se-merge.xml se-myisam.xml spatial-extensions.xml sql-syntax.xml
storage-engines.xml stored-procedures.xml triggers.xml tutorial.xml
using-mysql-programs.xml views.xml 
+MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml apis-cplusplus.xml apis-c.xml
apis-eiffel.xml apis-libmysqld.xml apis-perl.xml apis-php.xml apis-progutils.xml
apis-python.xml apis-tcl.xml apis.xml charset.xml client-utility-programs.xml
connectors.xml copyright.xml database-administration.xml data-types.xml
dba-optvars-table.xml errmsgs-client.xml errmsgs-server.xml error-handling.xml events.xml
extending-mysql.xml faqs.xml functions.xml images/blackhole-1.png
images/cluster-components-1.png images/cluster-replication-binlog-injector.png
images/cluster-replication-overview.png images/cluster-upgrade-downgrade-table.png
images/multi-comp-1.png images/ndb-size-pl-1.png images/PSEArch.png
images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/rolling-restarts.png
information-schema.xml installing.xml introduction.xml language-structure.xml
legalnotice.en.xml limits.xml mysql-cluster.xml news-5.1.xml news.xml optimization.xml
partitioning.xml porting.xml precision-m!
 ath.xml preface.xml problems.xml ../refman-common/bug-reports.xml
../refman-common/connector-j.xml ../refman-common/connector-mxj.xml
../refman-common/connector-net.xml ../refman-common/connector-odbc.xml
../refman-common/connector-php.xml ../refman-common/connector-vstudioplugin.xml
../refman-common/credits.xml ../refman-common/environment-variables.xml
../refman-common/gpl-license.xml ../refman-common/images/cnet-win-install-step1.png
../refman-common/images/cnet-win-install-step2.png
../refman-common/images/cnet-win-install-step3.png
../refman-common/images/cnet-win-install-step4.png
../refman-common/images/cnet-win-install-step6.png
../refman-common/images/myaccess-odbc.png ../refman-common/images/myaccess.png
../refman-common/images/myarchitecture.png ../refman-common/images/myflowchart.png
../refman-common/images/myodbc-crystal-1.png ../refman-common/images/myodbc-crystal-2.png
../refman-common/images/myodbc-crystal-3.png ../refman-common/images/myodbc-crystal-4.png
.!
 ./refman-common/images/myodbc-crystal-5.png ../refman-common/i!
 mages/my
odbc-crystal-6.png ../refman-common/images/myodbc-excel-step1.png
../refman-common/images/myodbc-excel-step2.png
../refman-common/images/myodbc-excel-step3.png
../refman-common/images/myodbc-excel-step4.png
../refman-common/images/myodbc-excel-step5.png
../refman-common/images/myodbc-macosx-install-step1.png
../refman-common/images/myodbc-macosx-install-step2.png
../refman-common/images/myodbc-macosx-install-step3.png
../refman-common/images/myodbc-macosx-install-step4.png
../refman-common/images/myodbc-macosx-install-step5.png
../refman-common/images/myodbc-macosx-install-step6.png
../refman-common/images/myodbc-macosx-odbcadmin-adddsn.png
../refman-common/images/myodbc-macosx-odbcadmin-main.png
../refman-common/images/myodbc-macosx-odbcadmin-sampledsn.png
../refman-common/images/myodbc-macosx-odbcadmin-tracing.png
../refman-common/images/myodbc-win-install-step1.png
../refman-common/images/myodbc-win-install-step2.png
../refman-common/images/myodbc-win-install-step3.png ..!
 /refman-common/images/myodbc-win-install-step4.png
../refman-common/images/myodbc-win-odbcadmin-adddsn.png
../refman-common/images/myodbc-win-odbcadmin-advanced.png
../refman-common/images/myodbc-win-odbcadmin-driverselect.png
../refman-common/images/myodbc-win-odbcadmin-main.png
../refman-common/images/myodbc-win-odbcadmin-options.png
../refman-common/images/myodbc-win-odbcadmin-sampledsn.png
../refman-common/images/myodbc-win-tracing.png
../refman-common/images/mysql-vstudioplugin-1.png
../refman-common/images/mysql-vstudioplugin-3.png
../refman-common/images/mysql-vstudioplugin-4.png
../refman-common/information-sources.xml ../refman-common/manual-conventions.en.xml
../refman-common/maxdb.en.xml ../refman-common/mysql-floss-license-exception.xml
../refman-common/news-connector-j.xml ../refman-common/news-connector-net.xml
../refman-common/news-myodbc.xml ../refman-common/news-vstudioplugin.xml
../refman-common/regexp.xml ../refman-common/what-is.en.xml ../refman-common/w!
 hat-is-mysql-ab.en.xml replication.xml reserved-new-5.1.xml re!
 servedwo
rds.xml restrictions.xml se-archive.xml se-blackhole.xml se-csv.xml se-example.xml
se-falcon.xml se-federated.xml se-innodb.xml se-memory.xml se-merge.xml se-myisam.xml
spatial-extensions.xml sql-syntax.xml storage-engines.xml stored-procedures.xml
triggers.xml tutorial.xml using-mysql-programs.xml views.xml 
 
 manual-prepped.xml: $(MANUAL_SRCS) $(IDMAP_OBJS)
 manual-manprepped.xml: $(MANUAL_SRCS) $(IDMAP_OBJS)


Modified: trunk/refman-5.1/reserved-new-5.1.xml
===================================================================
--- trunk/refman-5.1/reserved-new-5.1.xml	2007-01-08 17:20:42 UTC (rev 4399)
+++ trunk/refman-5.1/reserved-new-5.1.xml	2007-01-08 19:51:14 UTC (rev 4400)
Changed blocks: 1, Lines Added: 20, Lines Deleted: 3; 1153 bytes

@@ -6,8 +6,25 @@
 <!-- To regenerate, use ../tools/make-reserved-words-new.rb -->
 <para>
   The following are new reserved words in MySQL 5.1:
-  <literal>ACCESSIBLE</literal>, <literal>LINEAR</literal>,
-  <literal>RANGE</literal>, <literal>READ_ONLY</literal>,
-  <literal>READ_WRITE</literal>.
+
+  <informaltable>
+    <tgroup cols="3">
+      <colspec colwidth="33*"/>
+      <colspec colwidth="33*"/>
+      <colspec colwidth="33*"/>
+      <tbody>
+        <row>
+          <entry><literal>ACCESSIBLE</literal></entry>
+          <entry><literal>LINEAR</literal></entry>
+          <entry><literal>RANGE</literal></entry>
+        </row>
+        <row>
+          <entry><literal>READ_ONLY</literal></entry>
+          <entry><literal>READ_WRITE</literal></entry>
+          <entry></entry>
+        </row>
+      </tbody>
+    </tgroup>
+  </informaltable>
 </para>
 <!-- END_OF_NEW_RESERVED_WORDS_INFO -->


Modified: trunk/tools/make-reserved-words-new.rb
===================================================================
--- trunk/tools/make-reserved-words-new.rb	2007-01-08 17:20:42 UTC (rev 4399)
+++ trunk/tools/make-reserved-words-new.rb	2007-01-08 19:51:14 UTC (rev 4400)
Changed blocks: 4, Lines Added: 25, Lines Deleted: 2; 1656 bytes

@@ -44,11 +44,13 @@
 
 # Variables corresponding to command-line options.
 help = false
+columns = 3
 language = "english"
 series = nil
 
 opts = GetoptLong.new(
   [ "--help",     "-h",  GetoptLong::NO_ARGUMENT ],
+  [ "--columns",  "-C",  GetoptLong::REQUIRED_ARGUMENT ],
   [ "--language", "-L",  GetoptLong::REQUIRED_ARGUMENT ],
   [ "--series",   "-S",  GetoptLong::REQUIRED_ARGUMENT ]
 )

@@ -59,6 +61,8 @@
   case opt
   when "--help"
     help = true
+  when "--columns"
+    columns = arg
   when "--language"
     language = arg
   when "--series"

@@ -117,8 +121,12 @@
 end
 
 words = (read_words(ARGV[1]) - read_words(ARGV[0])).sort
-words.collect! { |w| "<literal>" + w + "</literal>" }
+words.collect! { |w| "<entry><literal>" + w +
"</literal></entry>" }
+# pad words array if necessary so that last row is full
+words << "<entry></entry>" while (words.size % columns) != 0
 
+colspecs = "<colspec colwidth=\"#{(100/columns).to_i}*\"/>" * columns
+
 puts <<EOF
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"

@@ -128,7 +136,22 @@
 <!-- To regenerate, use #{$0} -->
 <para>
 #{text}
-#{words.join(",\n")}.
+<informaltable>
+<tgroup cols="#{columns}">
+#{colspecs}
+<tbody>
+EOF
+
+i = 0
+while i < words.size
+  puts "<row>#{words[i...i+columns]}</row>"
+  i += columns
+end
+
+puts <<EOF
+</tbody>
+</tgroup>
+</informaltable>
 </para>
 <!-- END_OF_NEW_RESERVED_WORDS_INFO -->
 EOF