[PATCH] makeinfo @multitable html output fix

[Jan Nieuwenhuizen]

Hi,

Here's a small fix to get nice tables in html, from texinfo's
@multitable environment.

Greetings,

Jan.

Also available from:

    http://appel.lilypond.org/software/texinfo-4.0.jcn3.diff


diff -urN --exclude=*~ --exclude=#* --exclude=Makefile.in --exclude=Makefile 
--exclude=configure --exclude=aclocal.m4 --exclude=.deps 
../texinfo-4.0.jcn2/ChangeLog ./ChangeLog
--- ../texinfo-4.0.jcn2/ChangeLog       Tue Nov 14 00:17:52 2000
+++ ./ChangeLog Tue Dec 19 21:35:45 2000
@@ -1,3 +1,9 @@
+2000-12-19  Jan Nieuwenhuizen  <address@hidden>
+
+       * makeinfo/multi.c (multitable_item),
+       (cm_tab): close html table columns.  Also, align cell contents to
+       top, which is probably the most sensible thing to do for text.
+
 2000-11-14  Jan Nieuwenhuizen  <address@hidden>
 
        * makeinfo/toc.c (contents_update_html): 
diff -urN --exclude=*~ --exclude=#* --exclude=Makefile.in --exclude=Makefile 
--exclude=configure --exclude=aclocal.m4 --exclude=.deps 
../texinfo-4.0.jcn2/NEWS ./NEWS
--- ../texinfo-4.0.jcn2/NEWS    Thu Nov  9 09:47:40 2000
+++ ./NEWS      Tue Dec 19 20:41:53 2000
@@ -1,5 +1,9 @@
 This file records noteworthy changes.
 
+4.0.jcn3 (19 December 2000)
+* makeinfo:
+  . Bugfix in html output for @multitable, now formats real tables in html.
+
 4.0.jcn2 (8 November 2000)
 * makeinfo:
   . Supports splitting of HTML output with --html option, by default.
diff -urN --exclude=*~ --exclude=#* --exclude=Makefile.in --exclude=Makefile 
--exclude=configure --exclude=aclocal.m4 --exclude=.deps 
../texinfo-4.0.jcn2/configure.in ./configure.in
--- ../texinfo-4.0.jcn2/configure.in    Thu Nov  9 12:35:18 2000
+++ ./configure.in      Tue Dec 19 20:38:05 2000
@@ -5,7 +5,7 @@
 AC_PREREQ(2.13)dnl Minimum Autoconf version required.
 AM_CONFIG_HEADER(config.h:config.in)dnl Keep filename to 8.3 for MS-DOS.
 
-AM_INIT_AUTOMAKE([texinfo], [4.0.jcn2])
+AM_INIT_AUTOMAKE([texinfo], [4.0.jcn3])
 
 AM_CONDITIONAL(TEXINFO_MAINT, test -n "$TEXINFO_MAINT")
 
diff -urN --exclude=*~ --exclude=#* --exclude=Makefile.in --exclude=Makefile 
--exclude=configure --exclude=aclocal.m4 --exclude=.deps 
../texinfo-4.0.jcn2/doc/stamp-vti ./doc/stamp-vti
--- ../texinfo-4.0.jcn2/doc/stamp-vti   Thu Nov  9 12:44:58 2000
+++ ./doc/stamp-vti     Tue Dec 19 20:56:33 2000
@@ -1,3 +1,3 @@
 @set UPDATED 9 November 2000
address@hidden EDITION 4.0.jcn2
address@hidden VERSION 4.0.jcn2
address@hidden EDITION 4.0.jcn3
address@hidden VERSION 4.0.jcn3
diff -urN --exclude=*~ --exclude=#* --exclude=Makefile.in --exclude=Makefile 
--exclude=configure --exclude=aclocal.m4 --exclude=.deps 
../texinfo-4.0.jcn2/doc/stamp-vti1 ./doc/stamp-vti1
--- ../texinfo-4.0.jcn2/doc/stamp-vti1  Thu Nov  9 12:41:12 2000
+++ ./doc/stamp-vti1    Tue Dec 19 20:56:32 2000
@@ -1,3 +1,3 @@
 @set UPDATED 25 June 1999
address@hidden EDITION 4.0.jcn2
address@hidden VERSION 4.0.jcn2
address@hidden EDITION 4.0.jcn3
address@hidden VERSION 4.0.jcn3
diff -urN --exclude=*~ --exclude=#* --exclude=Makefile.in --exclude=Makefile 
--exclude=configure --exclude=aclocal.m4 --exclude=.deps 
../texinfo-4.0.jcn2/doc/version.texi ./doc/version.texi
--- ../texinfo-4.0.jcn2/doc/version.texi        Thu Nov  9 12:41:12 2000
+++ ./doc/version.texi  Tue Dec 19 20:56:33 2000
@@ -1,3 +1,3 @@
 @set UPDATED 9 November 2000
address@hidden EDITION 4.0.jcn2
address@hidden VERSION 4.0.jcn2
address@hidden EDITION 4.0.jcn3
address@hidden VERSION 4.0.jcn3
diff -urN --exclude=*~ --exclude=#* --exclude=Makefile.in --exclude=Makefile 
--exclude=configure --exclude=aclocal.m4 --exclude=.deps 
../texinfo-4.0.jcn2/makeinfo/multi.c ./makeinfo/multi.c
--- ../texinfo-4.0.jcn2/makeinfo/multi.c        Tue Aug 17 23:06:56 1999
+++ ./makeinfo/multi.c  Tue Dec 19 21:33:17 2000
@@ -385,8 +385,8 @@
   if (html)
     {
       if (!first_row)
-       add_word ("<br></tr>"); /* <br> for non-tables browsers. */
-      add_word ("<tr align=\"left\"><td>");
+       add_word ("<br></td></tr>");    /* <br> for non-tables browsers. */
+      add_word ("<tr align=\"left\"><td valign=\"top\">");
       first_row = 0;
       return;
     }
@@ -504,7 +504,7 @@
     error (_("ignoring @tab outside of multitable"));
   
   if (html)
-    add_word ("<td>");
+    add_word ("</td><td valign=\"top\">");
   else
     nselect_next_environment ();
 
@@ -528,7 +528,7 @@
   close_insertion_paragraph ();
 
   if (html)
-    add_word ("<br></tr></table>\n");
+    add_word ("<br></td></tr></table>\n");
 
 #if 0
   printf (_("** Multicolumn output from last row:\n"));

-- 
Jan Nieuwenhuizen <address@hidden> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien       | http://www.lilypond.org