Using informaltable rather than table for list of Object Identifiers.

This is to avoid truncation of the (long) table. Combine OID and Constant
into one column.

diff --git a/src/oidtoc.tcl b/src/oidtoc.tcl
index 2cbe66e..87443e1 100644 (file)
--- a/src/oidtoc.tcl
+++ b/src/oidtoc.tcl
@@ -2,7 +2,7 @@
 # Copyright (c) Index Data 2006-2007
 # See the file LICENSE for details.
 #
-# $Id: oidtoc.tcl,v 1.7 2007-05-08 08:22:36 adam Exp $
+# $Id: oidtoc.tcl,v 1.8 2007-05-31 12:14:02 adam Exp $
 #
 # Converts a CSV file with Object identifiers to C
 
@@ -47,19 +47,16 @@ proc oid_to_xml {srcdir input xname} {
     set xfile [open "${xname}" w]
 
     puts $xfile "<!-- Generated by oidtoc.tcl from $input -->"
-    puts $xfile {<table id="standard-oids">}
-    puts $xfile {<title>Standard Object Identifiers</title>}
-    puts $xfile {<tgroup cols="4">}
+    puts $xfile {<informaltable id="standard-oids">}
+    puts $xfile {<tgroup cols="3">}
     puts $xfile {<colspec colwidth="3*" colname="name"></colspec>}
     puts $xfile {<colspec colwidth="2*" colname="class"></colspec>}
-    puts $xfile {<colspec colwidth="4*" colspec="constant"></colspec>}
-    puts $xfile {<colspec colwidth="5*" colname="oid"></colspec>}
+    puts $xfile {<colspec colwidth="4*" colname="oid"></colspec>}
     puts $xfile {<thead>}
     puts $xfile {<row>}
     puts $xfile {<entry>Name</entry>}
     puts $xfile {<entry>Class</entry>}
-    puts $xfile {<entry>Constant</entry>}
-    puts $xfile {<entry>OID</entry>}
+    puts $xfile {<entry>Constant / OID</entry>}
     puts $xfile {</row>}
     puts $xfile {</thead>}
     puts $xfile {<tbody>}
@@ -67,12 +64,12 @@ proc oid_to_xml {srcdir input xname} {
     foreach oid $oids {
        puts $xfile {<row>}
 
-       puts $xfile {<entry>}
+       puts $xfile {<entry morerows="1">}
        puts $xfile [lindex $oid 2]
        puts $xfile {</entry>}
 
 
-       puts $xfile {<entry>}
+       puts $xfile {<entry morerows="1">}
        puts $xfile [lindex $oid 0]
        puts $xfile {</entry>}
 
@@ -81,7 +78,11 @@ proc oid_to_xml {srcdir input xname} {
        puts $xfile $v
        puts $xfile {</literal></entry>}
 
-       puts $xfile {<entry>}
+
+       puts $xfile {</row>}
+       puts $xfile {<row>}
+
+       puts $xfile {<entry namest="oid">}
        puts $xfile [lindex $oid 1]
        puts $xfile {</entry>}
 
@@ -91,7 +92,7 @@ proc oid_to_xml {srcdir input xname} {
     puts $xfile {</tbody>}
     puts $xfile {</tgroup>}
 
-    puts $xfile {</table>}
+    puts $xfile {</informaltable>}
     close $xfile
 }