Changeset 4e425a in git

Timestamp:

Jul 30, 1999, 12:37:05 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

3d276d2b96d8b91e89923453839edc84b93c91ed

Parents:

9613a6779c21616f1854f49fb05fae3c10886d20

Message:

* lib2doc
* new parsing of help strings


git-svn-id: file:///usr/local/Singular/svn/trunk@3387 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

doc

Files:

• Makefile.lib2doc (modified) (2 diffs)
• general.doc (modified) (previous)
• lib2doc.texi (modified) (1 diff)
• pl2doc.pl (modified) (15 diffs)
• t2h_singular.init (modified) (1 diff)
• texi2html (modified) (96 diffs)

doc/Makefile.lib2doc

@@ -2 +2 @@
 ##
 ## Makefiel for generation of docu for libraries
-## $Id: Makefile.lib2doc,v 1.1 1999-07-28 11:36:31 obachman Exp $
+## $Id: Makefile.lib2doc,v 1.2 1999-07-30 10:37:02 obachman Exp $
 #####################################################################
 
@@ -19 +19 @@
 ## 2.) Set this to the name of your latex2html program, if you have latex2html
 ##
-LATEX2HTML = 
+LATEX2HTML = latex2html
 
 

doc/lib2doc.texi

@@ -16 +16 @@
 @strong{Important:} 
 @*To use @code{lib2doc}, you need 
-to have @code{Singular}, @code{libparse}, and @code{perl} (version 5 or
+to have @code{perl} (version 5 or
+higher)  and @code{Singular} and @code{libparse} (version 1-3-4 or
 higher) installed on your system.
-
 
 To generate the documentation for a library, follow these steps:

doc/pl2doc.pl

@@ -1 +1 @@
 #!/usr/local/bin/perl
-# $Id: pl2doc.pl,v 1.6 1999-07-28 11:36:32 obachman Exp $
+# $Id: pl2doc.pl,v 1.7 1999-07-30 10:37:04 obachman Exp $
 ###################################################################
 #  Computer Algebra System SINGULAR
@@ -55 +55 @@
 
 undef @procs; # will be again defined by OutLibInfo
+$parsing = "info-string of lib $lib:";
 $ref = OutLibInfo(\*LDOC, $info, ! $no_fun);
 OutRef(\*LDOC, $ref) if $ref;
@@ -95 +96 @@
       $table_is_open = 1;
       # print help
+      $parsing = "help-string of $lib:$procs[$i]:";
       $ref = OutInfo(\*LDOC, $help{$procs[$i]});
       print LDOC "\@end table\n";
@@ -118 +120 @@
 {
  print LDOC <<EOT;
+\@c ----------------------------------------------------------
+\@node Index, , Singular libraries, Top
+\@chapter Index
+\@printindex cp
 
 \@bye
@@ -124 +130 @@
   
 close(LDOC);
+if ($error)
+{
+  print STDERR "ERROR: $error\n";
+  exit(1);
+}
 exit(0);
 
@@ -134 +145 @@
   my ($FH, $info, $l_fun) = @_;
   print $FH "\@c ---content LibInfo---\n";
-    if ($info =~ /^\@/)
+  if ($info =~ /^\@/)
   {
     print $FH $info;
@@ -153 +164 @@
 {
   my ($FH, $info, $l_fun) = @_;
-  if ($info =~ /^\s*\@/)
+  if ($info =~ /^\@/)
   {
     print $FH $info;
@@ -184 +195 @@
 {
   my $length = shift;
+  my ($pline, $line, $text, $ptext, $special);
+  my ($in_format, $in_example, $in_texinfo);
+
   $length = 0 unless $length;
-  # insert @* infront of all lines whose previous line is shorter than
-  # 60 characters
-  $_ = ' ' x $length . $_;
-  if (/^(.*)\n/)
-  {
-    $_ .= "\n";
-    my $pline;
-    my $line;
-    my $ptext = $_;
-    my $text = '';
-    while ($ptext =~ /(.*)\n/g)
-    {
-      $line = $1;
-      # break line if
-      $text .= '@*' 
-        if ($line =~ /\w/ && $pline =~ /\w/ # line and prev line are not empty
-            && $line !~ /^\s*\@\*/  # line does not start with @*
-            && $pline !~ /\@\*\s*/  # prev line does not end with @*
-            &&
-            ((length($pline) < 60  && # prev line is shorter than 60 chars
-              $pline !~ /\@code{.*?}/ # and does not contain @code, @math
-              && $pline !~ /\@math{.*?}/) 
-             ||
-             $line =~ /^\s*\w*\(.*?\)/ # $line starts with \w*(..)
-             ||
-             $pline =~ /^\s*\w*\(.*?\)[\s;:]*$/)); # prev line is only \w(..)
-      $line =~ s/\s*$//;
-      $text .= "$line\n";
-      $pline = $line;
-    }
-    $_ = $text;
-  }
-  s/\t/ /g;
-  s/\n +/\n/g;
-  s/\s*$//g;
-  s/ +/ /g;  # replace double whitespaces by one
-  s/(\w+\(.*?\))/\@code{$1}/g;
-  s/\@\*\s*/\@\*/g;
-  s/(\@[^\*])/\@$1/g; # escape @ signs, except @*
-  s/{/\@{/g; # escape {}
-  s/}/\@}/g;
-  # unprotect @@math@{@}, @code@{@}
-  while (s/\@\@math\@{(.*?)\@}/\@math{$1}/g) {} 
-  while (s/\@\@code\@{(.*?)\@}/\@code{$1}/g) {}
-  # remove @code{} inside @code{} and inside @math{}
-  while (s/\@math{([^}]*)\@code{(.*?)}(.*)?}/\@math{$1$2$3}/g) {}
-  while (s/\@code{([^}]*)\@code{(.*?)}(.*)?}/\@code{$1$2$3}/g) {}
+  $_ .= "\n";
+  $ptext = $_;
+  while ($ptext =~ /(.*)\n/g)
+  {
+    $pline = $line;
+    $line = $1;
+    # check whether we are in protected env
+    if ($in_format || $in_example || $in_texinfo)
+    {
+      # end protected env?
+      if ($line =~ /^\s*\@end (format|example|texinfo)\s*$/)
+      {
+        if ($in_format && $1 eq 'format')
+        {
+          $in_format = 0;
+          $text .= "$line\n";
+        }
+        elsif ($in_example && $1 eq 'example')
+        {
+          $in_example = 0;
+          $text .= "\@end smallexample\n";
+        }
+        elsif ($in_texinfo && $1 eq 'texinfo')
+        {
+          $in_texinfo = 0;
+          $text .= "\n";
+        }
+        else
+        {
+          $error = "While parsing $parsing: \@end $1 found without matching \@$1" unless $error;
+        }
+        next;
+      }
+      else
+      {
+        $text .= "$line\n";
+        next;
+      }
+    }
+    # look for @example, @format, @texinfo
+    if ($line =~ /^\s*\@(example|format|texinfo)\s*$/)
+    {
+      $special = 1;
+      if ($1 eq 'example')
+      {
+        $text .= "\@smallexample\n";
+        $in_example = 1;
+      }
+      elsif ($1 eq 'format')
+      {
+        $text .= "$line\n";
+        $in_format = 1;
+      }
+      else
+      {
+        $text .= "\n";
+        $in_texinfo = 1;
+      }
+      next;
+    }
+    if ($line =~ /([^\@]|^)\@(code|math){(.*?)}/)
+    {
+      my $l = $line;
+      $l =~ s/^\s*//;
+      $l =~ s/\s$//;
+      while ($l =~ /([^\@]|^)\@(code|math){(.*?)}/)
+      {
+        $text .= CleanAscii($`.$1);
+        $text .= "\@$2\{$3\}";
+        $l = $';
+      }
+      $special = 1;
+      $text .= CleanAscii($l) . "\n";
+      next;
+    }
+    # break line if
+    $text .= '@*' 
+      if ($line =~ /\w/ 
+          && $pline =~ /\w/      # line and prev line are not empty
+          && $line !~ /^\s*\@\*/ # line does not start with @*
+          && $pline !~ /\@\*\s*/ # prev line does not end with @*
+          && length($pline) + $length < 60 # prev line is shorter than 60 chars
+          && ! $special);        # prev line was not special line
+    $line =~ s/^\s*//;
+    $line =~ s/\s$//;
+    $special = 0;
+    $text .= CleanAscii($line) . "\n";
+  }
+  $_ = $text;
+  s/^\s*//;
+  s/\s*$//;
+  $_ .= "\n";
+  if ($in_format || $in_texinfo || $in_example)
+  {
+    $error = "While parsing $parsing: no matching \@end " .
+      ($in_format ? "format" : ($in_texinfo ? "texinfo" : "example" )) .
+        " found"
+          unless $error;
+  }
+}
+
+sub CleanAscii
+{
+  my $a = shift;
+  $a =~ s/(\@([^\*]|$))/\@$1/g; # escape @ signs, except @*, @{, @}
+  $a =~ s/{/\@{/g; # escape {}
+  $a =~ s/}/\@}/g;
+  $a =~ s/\t/ /g;
+  $a =~ s/ +/ /g;          
+  return $a;
 }
 
@@ -237 +314 @@
 {
   my ($FH, $item, $text, $l_fun) = @_;
+  local $parsing  = $parsing . uc($item);
 
   $item = lc $item;
@@ -291 +369 @@
     return '';
   }
-
+  elsif ($item =~ m/keywords/i || m/keyphrases/i)
+  {
+    # index entries
+    return OutKeywords($FH, $text);
+  }
+  
   if (! $table_is_open)
   {
@@ -326 +409 @@
   s/\n/ /g;
   FormatInfoText();
-  
   if ($l_fun)
   {
-    print $FH "* ${proc}:: $_\n";
+    print $FH "* ${proc}:: $_";
     push @procs, $proc;
   }
@@ -335 +417 @@
   {
     print $FH "\@item \@code{$proc($procargs)}  ";
-    print $FH "\n\@cindex $proc\n$_\n";
+    print $FH "\n\@cindex $proc\n$_";
   }
 }
@@ -360 +442 @@
 }
 
+sub OutKeywords
+{
+  my ($FH, $kws) = @_;
+  for $kw (split (/;/, $kws))
+  {
+    $kw =~ s/^\s*(.*?)\s*$/$1/;
+    print $FH "\@cindex $kw\n";
+  }
+}
+
 sub CleanUpExample
 {
@@ -408 +500 @@
 \@setfilename $hlp_file
 \@settitle Formatted manual of $lib.lib
+\@paragraphindent 0
 \@c %**end of header
 
@@ -426 +519 @@
 \@menu
 * Singular libraries::
+* Index::
 \@end menu
 
-\@node Singular libraries,,,Top
+\@node Singular libraries, Index,,Top
 \@comment node-name,next, previous, up
 \@chapter Singular libraries

doc/t2h_singular.init

@@ -67 +67 @@
 EOT
 }
+
+# always use bottom navigation
+$T2H_WORDS_IN_PAGE = 0;
 
 $T2H_VERTICAL_HEAD_NAVIGATION = 1;

doc/texi2html

@@ -1 @@
-#!/usr/bin/perl
+#!/usr/local/bin/perl
 'di ';
 'ig 00 ';
-# $Id: texi2html,v 1.7 1998-06-19 15:55:28 obachman Exp $
-# Description: Program to transform most Texinfo documents to HTML.
-# The plan is for the next version of makeinfo to support HTML output
-# directly, but until then ...
-
-$THISPROG = "texi2html 1.54";                   # program name and version
-# This version of texi2html is currently maintained at
-# ftp://ftp.cs.umb.edu/pub/tex/texi2html by kb@cs.umb.edu.
-
+#+##############################################################################
+#                                                                              #
+# File: texi2html                                                              #
+#                                                                              #
+# Description: Program to transform most Texinfo documents to HTML             #
+#                                                                              #
+#-##############################################################################
+
+# From @(#)texi2html    1.52 01/05/98   
+# $Id: texi2html,v 1.8 1999-07-30 10:37:05 obachman Exp $
+# Homepage:
+$T2H_HOMEPAGE = <<EOT;
+http://www.mathematik.uni-kl.de/~obachman/Texi2html
+EOT
+# Authors:  
+$T2H_AUTHORS = <<EOT;
+Written (mainly) by: Lionel Cons, Lionel.Cons\@cern.ch
+Currently maintained by : Olaf Bachmann, obachman\@mathematik.uni-kl.de
+EOT
+# Version:
+$THISVERSION = "1.58";
+$THISPROG = "texi2html $THISVERSION";   # program name and version
+  
 # The man page for this program is included at the end of this file and can be
 # viewed using the command 'nroff -man texi2html'.
 # Please read the copyright at the end of the man page.
 
-# Fixme:
-# deal with @macro @unmacro @shorttitlepage @detailmenu @image
-# [plus more fixmes below]
-# Use <link>s for Up, Index, Glossary?
-# Inserting copyright links: Having texinfo markup for the online copyright
-#  would allow a link to that from wherever.
+$T2H_TODAY = &pretty_date;              # like "20 September 1993"
+($T2H_USER = (getpwuid ($<))[6]) =~ s/,.*//; # Who am i 
+
+#+++############################################################################
+#                                                                              #
+# Initialization                                                               #
+# Pasted content of File $T2H_HOME/texi2html.init                              #
+#                                                                              #
+#---############################################################################
+
+require "$ENV{T2H_HOME}/texi2html.init"; # Makefile:include
 
 #+++############################################################################
@@ -35 +54 @@
 $DEBUG_HTML  = 32;
 $DEBUG_USER  = 64;
-
-#$IMG_FIRST_ACTIVE  = "<IMG SRC=\"first-b.gif\">";
-#$IMG_FIRST_PASSIVE = "<IMG SRC=\"first-t.gif\">";
-#$IMG_LAST_ACTIVE   = "<IMG SRC=\"last-b.gif\">";
-#$IMG_LAST_PASSIVE  = "<IMG SRC=\"last-t.gif\">";
-#$IMG_NEXT_ACTIVE   = "<IMG SRC=\"next-b.gif\">";
-#$IMG_NEXT_PASSIVE  = "<IMG SRC=\"next-t.gif\">";
-#$IMG_PREV_ACTIVE   = "<IMG SRC=\"previous-b.gif\">";
-#$IMG_PREV_PASSIVE  = "<IMG SRC=\"previous-t.gif\">";
-#$IMG_TOC           = "<IMG SRC=\"toc-b.gif\">";
-$IMG_FIRST_ACTIVE  = "";
-$IMG_FIRST_PASSIVE = "";
-$IMG_LAST_ACTIVE   = "";
-$IMG_LAST_PASSIVE  = "";
-$IMG_NEXT_ACTIVE   = "<IMG SRC=\"images/next_motif.gif\">";
-$IMG_NEXT_PASSIVE  = "<IMG SRC=\"images/next_motif_gr.gif\">";
-$IMG_PREV_ACTIVE   = "<IMG SRC=\"images/previous_motif.gif\">";
-$IMG_PREV_PASSIVE  = "<IMG SRC=\"images/previous_motif_gr.gif\">";
-$IMG_TOC           = "<IMG SRC=\"images/contents_motif.gif\">";
-$IMG_LEFT          = "images/bg_left.gif";
-$IMG_RIGHT         = "images/bg_right.gif";
-
-$BIBRE = '\[[\w\/]+\]';                 # RE for a bibliography reference
+$DEBUG_L2H   = 128;
+
+
+$BIBRE = '\[[\w\/-]+\]';                # RE for a bibliography reference
 $FILERE = '[\/\w.+-]+';                 # RE for a file name
 $VARRE = '[^\s\{\}]+';                  # RE for a variable name
@@ -65 +65 @@
 
 $ERROR = "***";                         # prefix for errors and warnings
-$HOMEPAGE = "http://wwwcn.cern.ch/dci/texi2html/"; # program home page
-$TODAY = &pretty_date;                  # like "20 September 1993"
-$SPLITTAG = "<!-- SPLIT HERE -->\n";    # tag to know where to split
+                                        # program home page
 $PROTECTTAG = "_ThisIsProtected_";      # tag to recognize protected sections
-$TOPTAG = "<!--top-->";         # tag to mark first node (end of preamble)
-$html2_doctype = '<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0 Strict Level 2//EN">';
-
+
+$CHAPTEREND = "<!-- End chapter -->\n"; # to know where a chpater ends
+$SECTIONEND = "<!-- End section -->\n"; # to know where section ends
+$TOPEND     = "<!-- End top     -->\n"; # to know where top ends
+
+  
 #
 # language dependent constants
@@ -81 +82 @@
 #$LDC_GOTO = 'Go to the';
 #$LDC_FOOT = 'Footnotes';
-# TODO: @def* shortcuts
+#TODO: @def* shortcuts
 
 #
@@ -141 +142 @@
                '`',  'grave',
                '\'', 'acute',
-               ',',  'cedil',
-               # fixme: (not Latin1) = H d dotaccent dotless ringaccent
-               # tieaccent u ubaraccent v
                );
 
@@ -152 +150 @@
                # cf. makeinfo.c
                "*", "<BR>",             # HTML+
-               " ", "&#160;",   # nbsp
+               " ", " ",
+               "\t", " ",
+               "-", "&#173;",   # soft hyphen
                "\n", "\n",
                "|", "",
+               'tab', '<\/TD><TD>',
                # spacing commands
                ":", "",
@@ -160 +161 @@
                "?", "?",
                ".", ".",
-               "\t", " ",
-               "-", "&#173;",   # soft hyphen
-               'tab', '<TD>',
-               '-', '',
+               "-", "",
                );
 
@@ -171 +169 @@
 %things_map = (
                'TeX', 'TeX',
-               'br', '<P>',             # paragraph break.  Gone from texinfo 3.9
+               'br', '<P>',             # paragraph break
                'bullet', '*',
-               'copyright', '&#169;',
+               'copyright', '(C)',
                'dots', '...',
-               'enddots', '....',
                'equiv', '==',
                'error', 'error-->',
@@ -183 +180 @@
                'print', '-|',
                'result', '=>',
-               'today', $TODAY,
-               # fixme: output these Latin1 characters as such rather
-               # than as entities?
-               'pounds', '&#163;',
-               'questiondown', '&#191;',
-               'ss', '&#223;',
-               'exclamdown', '&#161;',
-               'AA', '&#197;',
-               'AE', '&#198;',
-               'aa', '&#229;',
-               'ae', '&#230;',
-               'O', '&#216;',
-               'o', '&#248;',
-               # follow info rendering:
-               'L', 'L\/',
-               'l', 'l\/',
-               'OE', 'OE',
-               'oe', 'oe',
+               'today', $T2H_TODAY,
+               'aa', '&aring;',
+               'AA', '&Aring;',
+               'ae', '&aelig;',
+               'AE', '&AElig;',
+               'o',  '&oslash;',
+               'O',  '&Oslash;',
+               'ss', '&szlig;',
                );
 
@@ -206 +193 @@
 # texinfo styles (@foo{bar}) to HTML ones
 #
-%style_l_map = (
-              'center', 'CENTER',
-              );
-
 %style_map = (
-              'asis', '',               # ??
+              'asis', '',
               'b', 'B',
               'cite', 'CITE',
               'code', 'CODE',
-              'ctrl', '&do_ctrl',       # special case (obsolete)
-              'dfn', 'STRONG',          # DFN tag is illegal in the standard
+              'ctrl', '&do_ctrl',       # special case
+              'dfn', 'EM',              # DFN tag is illegal in the standard
               'dmn', '',                # useless
+              'email', '&do_email',     # insert a clickable email address
               'emph', 'EM',
-              'email', '&do_email',     # new special case
               'file', '"TT',            # will put quotes, cf. &apply_style
               'i', 'I',
-              'image', '&do_image',     # in-line images
               'kbd', 'KBD',
-              'key', 'KBD',             # fixme: probably not <KBD>; possibly
-                                        # enclose in angles like makeinfo now does
+              'key', 'KBD',
+              'math', '&do_math',
               'r', '',                  # unsupported
               'samp', '"SAMP',          # will put quotes, cf. &apply_style
@@ -231 +213 @@
               'strong', 'STRONG',
               't', 'TT',
-              'titlefont', 'B',         # make it distinctive, at least
-              'uref', '&do_uref',       # new special case
-              'url', '&do_url',         # new special case
+              'titlefont', '',          # useless
+              'uref', '&do_uref',       # insert a clickable URL
+              'url', '&do_url',         # insert a clickable URL
               'var', 'VAR',
               'w', '',                  # unsupported
-#             'math', 'I',              # not very useful, but at least italicize
-              'math', '',               # don't want italic numbers
               );
 
@@ -246 +226 @@
                'display', 'PRE',
                'example', 'PRE',
-               'format', 'PRE', # fixme: shouldn't use tt, but can't avoid?
+               'format', 'PRE',
                'lisp', 'PRE',
                'quotation', 'BLOCKQUOTE',
@@ -304 +284 @@
 # things to skip
 #
-%to_ignore = (
-            'manual', 1,
-            'end manual', 1,
-            );
-
 %to_skip = (
             # comments
             'c', 1,
             'comment', 1,
+            'ifnotinfo', 1,
+            'ifnottex', 1,
+            'ifhtml', 1,
+            'end ifhtml', 1,
+            'end ifnotinfo', 1,
+            'end ifnottex', 1,
             # useless
+            'detailmenu', 1,
+            'direntry', 1,
             'contents', 1,
             'shortcontents', 1,
@@ -322 +305 @@
             'titlepage', 1,
             'end titlepage', 1,
-            'dircategory', 1,
             # unsupported commands (formatting)
             'afourpaper', 1,
@@ -328 +310 @@
             'finalout', 1,
             'headings', 1,
+            'sp', 1,
             'need', 1,
             'page', 1,
@@ -340 +323 @@
             'vskip', 1,
             'filbreak', 1,
-            'centerchap', 1,
-            'setchapterstyle', 1,
-            'hyphenation', 1,
+            'paragraphindent', 1,
             # unsupported formats
             'cartouche', 1,
@@ -350 +331 @@
             );
 
-%append2num = (
-               'A', 1,
-               'B', 2,
-               'C', 3,
-               'D', 4,
-               'E', 5,
-               'F', 6,
-               'G', 7,
-               'H', 8,
-               'I', 9,
-               'J', 10,
-               );
 #+++############################################################################
 #                                                                              #
@@ -368 +337 @@
 #---############################################################################
 
+#
+# flush stdout and stderr after every write
+#
+select(STDERR);
+$| = 1;
+select(STDOUT);
+$| = 1;
+
+%value = ();                            # hold texinfo variables, see also -D
+
 $use_bibliography = 1;
 $use_acc = 0;
-$debug = 0;
-$doctype = '';
-$check = 0;
-$expandinfo = 0;
-$use_glossary = 0;
-$invisible_mark = '';
-$use_iso = 0;
-@include_dirs = ();
-$show_menu = 0;
-$number_sections = 0;
-$split_node = 0;
-$split_chapter = 0;
-$monolithic = 0;
-$verbose = 0;
-$make_entry_page = 1;
-$make_menu_page = 1;
-$section_type = 0;
-$ignore_part = 0;
 $usage = <<EOT;
 This is $THISPROG
 To convert a Texinfo file to HMTL: $0 [options] file
-  where options can be:
-    -expandinfo    : use \@ifinfo sections, not \@iftex
-    -glossary      : handle a glossary
-    -invisible name: use 'name' as an invisible anchor
-    -I dir         : search also for files in 'dir'
-    -menu          : handle menus and don\'t do the ToC
-    -monolithic    : output only one file including ToC
-    -number        : number sections
-    -split_chapter : split on main sections
-    -split_node    : split on nodes
-    -check         : check given file for possible Texinfo commands
-    -usage         : print usage instructions
-    -verbose       : verbose output
+ where options can be:
+  -expandinfo         : use \@ifinfo sections, not \@iftex
+  -glossary           : handle a glossary
+  -invisible name     : use 'name' as an invisible anchor
+  -Dname              : define name like with \@set
+  -I dir              : search also for files in 'dir'
+  -index_file file    : use 'file' as index file
+  -menu               : handle menus
+  -number             : number sections
+  -split node|chapter : split on node or chapter 
+  -short_ref          : cross references without section numbers
+  -l2h                : use latex2html for \@math, \@tex, and \@sc 
+  -l2h_latex2html prog: use 'prog' as latex2html program 
+                        (default: 'latex2html')
+  -l2h_tmp dir        : use 'dir' as temp dir for latex2html
+  -l2h_clean          : remove temporary files generated by l2h extension
+  -l2h_skip           : skip latex2html run (needs temporary files)
+  -init_file 'file'   : use 'file' for texi2html and latex2html initialization 
+  -sidx               : index jump label to top of section
+  -usage              : print usage instructions
+  -verbose            : verbose output
 To check converted files: $0 -check [-verbose] files
 EOT
 
-while ($#ARGV >= 0 && $ARGV[0] =~ /^-/) {
+while (@ARGV && $ARGV[0] =~ /^-/) {
     $_ = shift(@ARGV);
     if (/^-acc$/)            { $use_acc = 1; next; }
-    if (/^-d(ebug)?(\d+)?$/) { $debug = $2 || shift(@ARGV); next; }
-    if (/^-doctype$/)        { $doctype = shift(@ARGV); next; }
-    if (/^-c(heck)?$/)       { $check = 1; next; }
-    if (/^-e(xpandinfo)?$/)  { $expandinfo = 1; next; }
-    if (/^-g(lossary)?$/)    { $use_glossary = 1; next; }
-    if (/^-i(nvisible)?$/)   { $invisible_mark = shift(@ARGV); next; }
-    if (/^-iso$/)            { $use_iso = 1; next; }
-    if (/^-I(.+)?$/)         { push(@include_dirs, $1 || shift(@ARGV)); next; }
-    if (/^-m(enu)?$/)        { $show_menu = 1; next; }
-    if (/^-mono(lithic)?$/)  { $monolithic = 1; next; }
-    if (/^-n(umber)?$/)      { $number_sections = 1; next; }
-    if (/^-s(plit)?_?(n(ode)?|c(hapter)?)?$/) {
-        if ($2 =~ /^n/) {
-            $split_node = 1;
-        } else {
-            $split_chapter = 1;
-        }
-        next;
-    }
-    if (/^-v(erbose)?$/)     { $verbose = 1; next; }
-    die $usage;
-}
-if ($check) {
-    die $usage unless @ARGV > 0;
+    if (/^-D(.+)?$/)         { $value{$1 || shift(@ARGV)} = 1; next; }
+    if (/^-d(ebug)?(\d+)?$/) { $T2H_DEBUG = $2 || shift(@ARGV); next; }
+    if (/^-doctype$/)        { $T2H_DOCTYPE = shift(@ARGV); next; }
+    if (/^-c(heck)?$/)       { $T2H_CHECK = 1; next; }
+    if (/^-e(xpand)?$/)      { $T2H_EXPAND = shift(@ARGV); next; }
+    if (/^-g(lossary)?$/)    { $T2H_USE_GLOSSARY = 1; next; }
+    if (/^-i(nvisible)?$/)   { $T2H_INVISIBLE_MARK = shift(@ARGV); next; }
+    if (/^-I(.+)?$/)         { push(@T2H_INCLUDE_DIRS, $1 || shift(@ARGV)); next; }
+    if (/^-iso$/)            { $T2H_USE_ISO = 1; next; }
+    if (/^-init_file$/)      
+    { 
+      $init_file = shift(@ARGV); 
+      if (-f $init_file)
+      {
+        print "# reading initialization file from $init_file\n" 
+          if ($T2H_VERBOSE);
+        require($init_file);
+      }
+      else
+      {
+        print "$ERROR Error: can't read init file $int_file\n";
+        $init_file = '';
+      }
+      next; 
+    }
+    if (/^-l2h$/)            { $T2H_L2H     = 1;            next; }
+    if (/^-l2h_l2h$/)        { $T2H_L2H_L2H = shift(@ARGV); next; }
+    if (/^-l2h_skip$/)       { $T2H_L2H_SKIP= 1;            next; }
+    if (/^-l2h_tmp$/)        { $T2H_L2H_TMP = shift(@ARGV); next; }
+    if (/^-l2h_clean$/)      { $T2H_L2H_CLEAN= 1;            next; }
+    if (/^-m(enu)?$/)        { $T2H_SHOW_MENU = 1; next; }
+    if (/^-nu(mber)?$/)      { $T2H_NUMBER_SECTIONS = 1; next; }
+    if (/^-o(ut_file)?$/)    { $T2H_OUT = shift (@ARGV); 
+                               undef $T2H_SPLIT; next;}    
+    if (/^-p(refix)?$/)      { $T2H_PREFIX = shift(@ARGV); next; }
+    if (/^-su(bdir)?$/)      { $T2H_SUBDIR = shift(@ARGV); next; }
+    if (/^-short_e(xtn)?$/)  { $T2H_SHORTEXTN = 1; next; }
+    if (/^-short_r(ef)?$/)   { $T2H_SHORT_REF = 1; next; }
+    if (/^-si(dx)?$/)        { $T2H_SECTION_IDX = 1; next; }
+    if (/^-s(plit)?$/)       { $T2H_SPLIT = shift(@ARGV); next;}
+    if (/^-t(op_file)?$/)    { $T2H_TOP_FILE = shift (@ARGV); next;}    
+    if (/^-v(erbose)?$/)     { $T2H_VERBOSE = 1; next; }
+    if (/^-no_v(erbose)?$/)  { $T2H_VERBOSE = 0; next; }
+    if (/^-vers(ion)?$/)     { print "$THISPROGRAM\n"; exit;}
+    die "Unknown option: $_\n$usage";
+}
+if ($T2H_CHECK) {
+    die "Need file to check\n$usage" unless @ARGV > 0;
     &check;
     exit;
 }
 
-if (($split_node || $split_chapter) && $monolithic) {
-    warn "Can't use -monolithic with -split, -monolithic ignored.\n";
-    $monolithic = 0;
-}
-if ($expandinfo) {
-    $to_skip{'ifinfo'}++;
-    $to_skip{'end ifinfo'}++;
-} else {
-    $to_skip{'iftex'}++;
-    $to_skip{'end iftex'}++;
-}
-$invisible_mark = '<IMG SRC="images/invisible.xbm" ALT="">' if $invisible_mark eq 'xbm';
-die $usage unless @ARGV == 1;
+if ($T2H_EXPAND eq 'info') 
+{
+  $to_skip{'ifinfo'} = 1;
+  $to_skip{'end ifinfo'} = 1;
+} 
+elsif ($T2H_EXPAND eq 'tex')
+{
+  $to_skip{'iftex'} = 1;
+  $to_skip{'end iftex'} = 1;
+  
+}
+
+$T2H_INVISIBLE_MARK = '<IMG SRC="invisible.xbm">' if $T2H_INVISIBLE_MARK eq 'xbm';
+
+#
+# file name buisness
+#
+die "Need exactly one file to translate\n$usage" unless @ARGV == 1;
 $docu = shift(@ARGV);
 if ($docu =~ /.*\//) {
@@ -459 +457 @@
     $docu_name = $docu;
 }
-unshift(@include_dirs, $docu_dir);
+unshift(@T2H_INCLUDE_DIRS, $docu_dir);
 $docu_name =~ s/\.te?x(i|info)?$//;     # basename of the document
-
-$docu_doc = "$docu_name.html";          # document's contents
-if ($monolithic) {
-    $docu_toc = $docu_foot = $docu_doc;
-} else {
-    $docu_toc  = "${docu_name}_toc.html";  # document's table of contents
-    $docu_foot = "${docu_name}_foot.html"; # document's footnotes
-    $docu_left = "${docu_name}_left.html";
-    $docu_main = "index.html";
-}
+$docu_name = $T2H_PREFIX if ($T2H_PREFIX);
+
+# subdir
+if ($T2H_SUBDIR && ! $T2H_OUT)
+{
+  $T2H_SUBDIR =~ s|/*$||;
+  unless (-d "$T2H_SUBDIR" && -w "$T2H_SUBDIR")
+  {
+    if ( mkdir($T2H_SUBDIR, oct(755)))
+    {
+      print "# created directory $T2H_SUBDIR\n" if ($T2H_VERBOSE);
+    }
+    else
+    {
+      warn "$ERROR can't create directory $T2H_SUBDIR. Put results into current directory\n";
+      $T2H_SUBDIR = '';
+    }
+  }
+}
+
+if ($T2H_SUBDIR && ! $T2H_OUT)
+{
+  $docu_rdir = "$T2H_SUBDIR/";
+  print "# putting result files into directory $docu_rdir\n" if ($T2H_VERBOSE);
+}
+else
+{
+  if ($T2H_OUT && $T2H_OUT =~ m|(.*)/|)
+  {
+    $docu_rdir = "$1/";
+    print "# putting result files into directory $docu_rdir\n" if ($T2H_VERBOSE);
+  }
+  else
+  {
+    print "# putting result files into current directory \n" if ($T2H_VERBOSE);
+    $docu_rdir = '';
+  }
+}
+
+# extension
+if ($T2H_SHORTEXTN)
+{
+  $docu_ext = "htm";
+}
+else
+{
+  $docu_ext = "html";
+}
+if ($T2H_TOP_FILE =~ /\..*$/)
+{
+  $T2H_TOP_FILE = $`.".$docu_ext";
+}
+else
+{
+  $T2H_TOP_FILE .= ".$docu_ext";
+}
+
+# result files
+if (! $T2H_OUT && ($T2H_SPLIT =~ /section/i || $T2H_SPLIT =~ /node/i))
+{
+  $T2H_SPLIT = 'section';
+}
+elsif (! $T2H_OUT && $T2H_SPLIT =~ /chapter/i)
+{
+  $T2H_SPLIT = 'chapter'
+}
+else
+{
+  undef $T2H_SPLIT;
+}
+
+$docu_doc = "$docu_name.$docu_ext";             # document's contents
+$docu_doc_file = "$docu_rdir$docu_doc";
+if ($T2H_SPLIT) 
+{
+  $docu_toc  = "${docu_name}_toc.$docu_ext"; # document's table of contents
+  $docu_stoc = "${docu_name}_ovr.$docu_ext"; # document's short toc
+  $docu_foot = "${docu_name}_fot.$docu_ext"; # document's footnotes
+  $docu_about = "${docu_name}_abt.$docu_ext"; # about this document
+  $docu_top  = $T2H_TOP_FILE;
+}
+else
+{
+  if ($T2H_OUT)
+  {
+    $docu_doc = $T2H_OUT;
+    $docu_doc =~ s|.*/||;
+  }
+  $docu_toc = $docu_foot = $docu_stoc = $docu_about = $docu_top = $docu_doc;
+}
+
+$docu_toc_file  = "$docu_rdir$docu_toc";
+$docu_stoc_file = "$docu_rdir$docu_stoc";
+$docu_foot_file = "$docu_rdir$docu_foot";
+$docu_about_file = "$docu_rdir$docu_about";
+$docu_top_file  = "$docu_rdir$docu_top";
 
 #
 # variables
 #
-%value = ();                            # hold texinfo variables
 $value{'html'} = 1;                     # predefine html (the output format)
-$value{'texi2html'} = '1.51a';          # predefine texi2html (the translator)
+$value{'texi2html'} = $THISVERSION;     # predefine texi2html (the translator)
 # _foo: internal to track @foo
 foreach ('_author', '_title', '_subtitle',
@@ -484 +567 @@
 }
 %node2sec = ();                         # node to section name
+%sec2node = ();                         # section to node name
 %node2href = ();                        # node to HREF
+%node2next = ();                        # node to next
+%node2prev = ();                        # node to prev
+%node2up   = ();                        # node to up
 %bib2href = ();                         # bibliography reference to HREF
 %gloss2href = ();                       # glossary term to HREF
 @sections = ();                         # list of sections
-@left_index = ();
 %tag2pro = ();                          # protected sections
 
@@ -505 +591 @@
 # can I use ISO8879 characters? (HTML+)
 #
-if ($use_iso) {
+if ($T2H_USE_ISO) {
     $things_map{'bullet'} = "&bull;";
     $things_map{'copyright'} = "&copy;";
@@ -520 +606 @@
 $extensions = 'texi2html.ext'; # extensions in working directory
 if (-f $extensions) {
-    print "# reading extensions from $extensions\n" if $verbose;
+    print "# reading extensions from $extensions\n" if $T2H_VERBOSE;
     require($extensions);
 }
@@ -527 +613 @@
     $extensions = "${progdir}texi2html.ext"; # extensions in texi2html directory
     if (-f $extensions) {
-        print "# reading extensions from $extensions\n" if $verbose;
+        print "# reading extensions from $extensions\n" if $T2H_VERBOSE;
         require($extensions);
     }
 }
 
-print "# reading from $docu\n" if $verbose;
+
+print "# reading from $docu\n" if $T2H_VERBOSE;
+
+#########################################################################
+#
+# latex2html stuff
+# 
+# latex2html conversions consist of three stages:
+# 1) ToLatex: Put "latex" code into a latex file
+# 2) ToHtml: Use latex2html to generate corresponding html code and images
+# 3) FromHtml: Extract generated code and images from latex2html run
+#
+
+##########################
+# default settings
+#
+
+# defaults for files and names
+
+sub l2h_Init 
+{
+  local($root) = @_;
+  
+  return 0 unless ($root);
+  
+  $l2h_name =  "${root}_l2h";
+  
+  $l2h_latex_file = "$docu_rdir${l2h_name}.tex";
+  $l2h_cache_file = "${docu_rdir}l2h_cache.pm";
+  $T2H_L2H_L2H = "latex2html" unless ($T2H_L2H_L2H);
+  
+  # destination dir -- generated images are put there, should be the same
+  # as dir of enclosing html document -- 
+  $l2h_html_file = "$docu_rdir${l2h_name}.html";
+  $l2h_prefix = "${l2h_name}_";
+  return 1;
+}
+
+
+##########################
+# 
+# First stage: Generation of Latex file
+# Initialize with: l2h_InitToLatex
+# Add content with: l2h_ToLatex($text) --> HTML placeholder comment
+# Finish with: l2h_FinishToLatex
+# 
+
+$l2h_latex_preample = <<EOT;
+% This document was automatically generated by the l2h extenstion of texi2html
+% DO NOT EDIT !!!
+\\documentclass{article}
+\\usepackage{html}
+\\begin{document}
+EOT
+
+$l2h_latex_closing = <<EOT;
+\\end{document}
+EOT
+
+# return used latex 1, if l2h could be initalized properly, 0 otherwise
+sub l2h_InitToLatex
+{
+  %l2h_to_latex = ();
+  unless ($T2H_L2H_SKIP)
+  {
+    unless (open(L2H_LATEX, ">$l2h_latex_file"))
+    {
+      warn "$ERROR Error l2h: Can't open latex file '$latex_file' for writing\n";
+      return 0;
+    }  
+    print "# l2h: use ${l2h_latex_file} as latex file\n" if ($T2H_VERBOSE);
+    print L2H_LATEX $l2h_latex_preample;
+  }
+  # open database for caching
+  l2h_InitCache();
+  $l2h_latex_count = 0;
+  $l2h_to_latex_count = 0;
+  $l2h_cached_count = 0;
+  return  1;
+}
+
+# print text (1st arg) into latex file (if not already there), return
+# HTML commentary which can be later on replaced by the latex2html
+# generated text
+sub l2h_ToLatex
+{
+  my($text) = @_;
+  my($count);
+  
+  $l2h_to_latex_count++;
+  $text =~ s/(\s*)$//;
+  
+  # try whether we can cache it
+  my $cached_text = l2h_FromCache($text);
+  if ($cached_text)
+  {
+    $l2h_cached_count++;
+    return $cached_text;
+  }
+  
+  # try whether we have text already on things to do
+  unless ($count = $l2h_to_latex{$text})
+  {
+    $count = $l2h_latex_count;
+    $l2h_latex_count++;
+    $l2h_to_latex{$text} = $count;
+    $l2h_to_latex[$count] = $text;
+    unless ($T2H_L2H_SKIP)
+    {
+      print L2H_LATEX "\\begin{rawhtml}\n";
+      print L2H_LATEX "<!-- l2h_begin ${l2h_name} ${count} -->\n";
+      print L2H_LATEX "\\end{rawhtml}\n";
+      
+      print L2H_LATEX "$text\n";
+      
+      print L2H_LATEX "\\begin{rawhtml}\n";
+      print L2H_LATEX "<!-- l2h_end ${l2h_name} ${count} -->\n";
+      print L2H_LATEX "\\end{rawhtml}\n";
+    }
+  }
+  return "<!-- l2h_replace ${l2h_name} ${count} -->"; 
+}
+
+# print closing into latex file and close it
+sub l2h_FinishToLatex
+{
+  local ($reused);
+  
+  $reused = $l2h_to_latex_count - $l2h_latex_count - $l2h_cached_count;
+  unless ($T2H_L2H_SKIP)
+  {
+    print L2H_LATEX $l2h_latex_closing;
+    close(L2H_LATEX);
+  }
+  print "# l2h: finished to latex ($l2h_cached_count cached, $reused reused, $l2h_latex_count contents)\n" if ($T2H_VERBOSE);
+  unless ($l2h_latex_count)
+  {
+    l2h_Finish();
+    return 0;
+  }
+  return 1;
+}
+
+###################################
+# Second stage: Use latex2html to generate corresponding html code and images
+#
+# l2h_ToHtml([$l2h_latex_file, [$l2h_html_dir]]):
+#   Call latex2html on $l2h_latex_file
+#   Put images (prefixed with $l2h_name."_") and html file(s) in $l2h_html_dir
+#   Return 1, on success
+#          0, otherwise
+#
+sub l2h_ToHtml
+{
+  local($call, $ext, $root, $dotbug);
+  
+  if ($T2H_L2H_SKIP)
+  {
+    print "# l2h: skipping latex2html run\n" if ($T2H_VERBOSE);
+    return 1;
+  }
+  
+  # Check for dot in directory where dvips will work
+  if ($T2H_L2H_TMP)
+  {
+    if ($T2H_L2H_TMP =~ /\./)
+    {
+      warn "$ERROR Warning l2h: l2h_tmp dir contains a dot. Use /tmp, instead\n";
+      $dotbug = 1;
+    }
+  }
+  else
+  {
+    if (&getcwd =~ /\./)
+    {
+     warn "$ERROR Warning l2h: current dir contains a dot. Use /tmp as l2h_tmp dir \n";
+     $dotbug = 1;
+   }
+  }
+  # fix it, if necessary and hope that it works 
+  $T2H_L2H_TMP = "/tmp" if ($dotbug);
+    
+  $call = $T2H_L2H_L2H;
+  # use init file, if specified
+  $call = $call . " -init_file " . $init_file if ($init_file && -f $init_file);
+  # set output dir
+  $call .=  ($docu_rdir ? " -dir $docu_rdir" : " -no_subdir");
+  # use l2h_tmp, if specified
+  $call = $call . " -tmp $T2H_L2H_TMP" if ($T2H_L2H_TMP);
+  # options we want to be sure of
+  $call = $call ." -address 0 -info 0 -split 0 -no_navigation -no_auto_link";
+  $call = $call ." -prefix ${l2h_prefix} $l2h_latex_file"; 
+
+  print "# l2h: executing '$call'\n" if ($T2H_VERBOSE);
+  if (system($call))
+  {
+    warn "l2h ***Error: '${call}' did not succeed\n";
+    return 0;
+  }
+  else
+  {
+    print "# l2h: latex2html finished successfully\n" if ($T2H_VERBOSE);
+    return 1;
+  }
+}
+
+# this is directly pasted over from latex2html
+sub getcwd {
+    local($_) = `pwd`;
+
+    die "'pwd' failed (out of memory?)\n"
+        unless length;
+    chop;
+    $_;
+}
+
+
+##########################
+# Third stage: Extract generated contents from latex2html run
+# Initialize with: l2h_InitFromHtml
+#   open $l2h_html_file for reading
+#   reads in contents into array indexed by numbers
+#   return 1,  on success -- 0, otherwise
+# Extract Html code with: l2h_FromHtml($text)
+#   replaces in $text all previosuly inserted comments by generated html code
+#   returns (possibly changed) $text
+# Finish with: l2h_FinishFromHtml
+#   closes $l2h_html_dir/$l2h_name.".$docu_ext" 
+
+sub l2h_InitFromHtml
+{
+  local($h_line, $h_content, $count, %l2h_img);
+
+  if (! open(L2H_HTML, "<${l2h_html_file}"))
+  {
+    print "$ERROR Error l2h: Can't open ${l2h_html_file} for reading\n";
+    return 0;
+  }
+  print "# l2h: use ${l2h_html_file} as html file\n" if ($T2H_VERBOSE);
+
+  $l2h_html_count = 0;
+  
+  while ($h_line = <L2H_HTML>)
+  {
+    if ($h_line =~ /^<!-- l2h_begin $l2h_name ([0-9]+) -->/)
+    {
+      $count = $1;
+      $h_content = "";
+      while ($h_line = <L2H_HTML>)
+      {
+        if ($h_line =~ /^<!-- l2h_end $l2h_name $count -->/)
+        {
+          chomp $h_content;
+          chomp $h_content;
+          $l2h_html_count++;
+          $h_content = l2h_ToCache($count, $h_content);
+          $l2h_from_html[$count] = $h_content;
+          $h_content = '';
+          last;
+        }
+        $h_content = $h_content.$h_line;
+      }
+      if ($hcontent)
+      {
+        print "$ERROR Warning l2h: l2h_end $l2h_name $count not found\n" 
+          if ($T2H_VERBOSE);
+        close(L2H_HTML);
+        return 0;
+      }
+    }
+  }
+  print "# l2h: Got $l2h_html_count of $l2h_latex_count html contents\n"
+    if ($T2H_VERBOSE);
+
+  close(L2H_HTML);
+  return 1;
+}
+
+sub l2h_FromHtml
+{
+  local($text) = @_;
+  local($done, $to_do, $count);
+  
+  $to_do = $text;
+  
+  while ($to_do =~ /([^\000]*)<!-- l2h_replace $l2h_name ([0-9]+) -->([^\000]*)/)
+  {
+    $to_do = $1;
+    $count = $2;
+    $done = $3.$done;
+    
+    $done = "<!-- l2h_end $l2h_name $count -->".$done
+      if ($T2H_DEBUG & $DEBUG_L2H);
+
+    $done = &l2h_ExtractFromHtml($count) . $done;
+
+    $done = "<!-- l2h_begin $l2h_name $count -->".$done
+      if ($T2H_DEBUG & $DEBUG_L2H);
+  }
+  return $to_do.$done;
+}
+
+
+sub l2h_ExtractFromHtml
+{
+  local($count) = @_;
+  
+  return $l2h_from_html[$count] if ($l2h_from_html[$count]);
+  
+  if ($count >= 0 && $count < $l2h_latex_count)
+  {
+    # now we are in trouble
+    local($l_l2h, $_);
+
+    $l2h_extract_error++;
+    print "$ERROR l2h: can't extract content $count from html\n" 
+      if ($T2H_VERBOSE);
+    # try simple (ordinary) substition (without l2h)
+    $l_l2h = $T2H_L2H;
+    $T2H_L2H = 0;
+    $_ = $l2h_to_latex{$count};
+    $_ = &substitute_style($_); 
+    &unprotect_texi;
+    $_ = "<!-- l2h: ". __LINE__ . " use texi2html -->" . $_
+      if ($T2H_DEBUG & $DEBUG_L2H);
+    $T2H_L2H = $l_l2h;
+    return $_;
+  }
+  else
+  {
+    # now we have been incorrectly called
+    $l2h_range_error++;
+    print "$ERROR l2h: Request of $count content which is out of valide range [0,$l2h_latex_count)\n";
+    return "<!-- l2h: ". __LINE__ . " out of range count $count -->"
+      if ($T2H_DEBUG & $DEBUG_L2H);
+    return "<!-- l2h: out of range count $count -->";
+  }
+}
+    
+sub l2h_FinishFromHtml
+{
+  if ($T2H_VERBOSE)
+  {
+    if ($l2h_extract_error + $l2h_range_error)
+    {
+      print "# l2h: finished from html ($l2h_extract_error extract and $l2h_range_error errors)\n";
+    }
+    else
+    {
+      print "# l2h: finished from html (no errors)\n";
+    }
+  }
+}
+
+sub l2h_Finish
+{
+  l2h_StoreCache();
+  if ($T2H_L2H_CLEAN)
+  {
+    print "# l2h: removing temporary files generated by l2h extension\n"
+      if $T2H_VERBOSE;
+    while (<"$docu_rdir$l2h_name"*>)
+    {
+      unlink $_;
+    }
+  }
+  print "# l2h: Finished\n" if $T2H_VERBOSE;
+  return 1;
+}
+
+##############################
+# stuff for l2h caching
+#
+
+# I tried doing this with a dbm data base, but it did not store all
+# keys/values. Hence, I did as latex2html does it
+sub l2h_InitCache
+{
+  if (-r "$l2h_cache_file")
+  {
+    my $rdo = do "$l2h_cache_file";
+    warn("$ERROR l2h Error: could not load $docu_rdir$l2h_cache_file: $@\n")
+      unless ($rdo);
+  }
+}
+
+sub l2h_StoreCache
+{
+  return unless $l2h_latex_count;
+  
+  my ($key, $value);
+  open(FH, ">$l2h_cache_file") || return warn"$ERROR l2h Error: could not open $docu_rdir$l2h_cache_file for writing: $!\n";
+
+  
+  while (($key, $value) = each %l2h_cache)
+  {
+    # escape stuff
+    $key =~ s|/|\\/|g;
+    $key =~ s|\\\\/|\\/|g;
+    # weird, a \ at the end of the key results in an error
+    # maybe this also broke the dbm database stuff
+    $key =~ s|\\$|\\\\|;
+    $value =~ s/\|/\\\|/g; 
+    $value =~ s/\\\\\|/\\\|/g; 
+    $value =~ s|\\\\|\\\\\\\\|g;
+    print FH "\n\$l2h_cache_key = q/$key/;\n";
+    print FH "\$l2h_cache{\$l2h_cache_key} = q|$value|;\n";
+  }
+  print FH "1;";
+  close(FH);
+}
+
+# return cached html, if it exists for text, and if all pictures
+# are there, as well
+sub l2h_FromCache
+{
+  my $text = shift;
+  my $cached = $l2h_cache{$text};
+  if ($cached)
+  {
+    while ($cached =~ m/SRC="(.*?)"/g)
+    {
+      unless (-e "$docu_rdir$1")
+      {
+        return undef;
+      }
+    }
+    return $cached;
+  }
+  return undef;
+}
+
+# insert generated html into cache, move away images, 
+# return transformed html
+$maximage = 1;
+sub l2h_ToCache
+{
+  my $count = shift;
+  my $content = shift;
+  my @images = ($content =~ /SRC="(.*?)"/g);
+  my ($src, $dest);
+
+  for $src (@images)
+  {
+    $dest = $l2h_img{$src};
+    unless ($dest)
+    {
+      my $ext;
+      if ($src =~ /.*\.(.*)$/ && $1 ne $docu_ext)
+      {
+        $ext = $1;
+      }
+      else
+      {
+        warn "$ERROR: L2h image $src has invalid extension\n";
+        next;
+      }
+      while (-e "$docu_rdir${docu_name}_$maximage.$ext") { $maximage++;}
+      $dest = "${docu_name}_$maximage.$ext";
+      system("cp -f $docu_rdir$src $docu_rdir$dest");
+      $l2h_img{$src} = $dest;
+      unlink "$docu_rdir$src" unless ($DEBUG & DEBUG_L2H);
+    }
+    $content =~ s/$src/$dest/g;
+  }
+  $l2h_cache{$l2h_to_latex[$count]} = $content;
+  return $content;
+}
+
 
 #+++############################################################################
@@ -542 +1096 @@
 @lines = ();                            # whole document
 @toc_lines = ();                        # table of contents
-@top_lines = ();                        # contents of top node
-@menu_lines = ();
-$toplevel = 0;                          # top level seen in hierarchy
+@stoc_lines = ();                       # table of contents
 $curlevel = 0;                          # current level in TOC
 $node = '';                             # current node name
+$node_next = '';                        # current node next name               
+$node_prev = '';                        # current node prev name
+$node_up = '';                          # current node up name
 $in_table = 0;                          # am I inside a table
-$table_type = '';                       # type of table ('', 'f', 'v')
+$table_type = '';                       # type of table ('', 'f', 'v', 'multi')
 @tables = ();                           # nested table support
 $in_bibliography = 0;                   # am I inside a bibliography
 $in_glossary = 0;                       # am I inside a glossary
 $in_top = 0;                            # am I inside the top node
+$has_top = 0;                           # did I see a top node?
 $in_pre = 0;                            # am I inside a preformatted section
 $in_list = 0;                           # am I inside a list
-$in_html = 0;                           # am I inside an HTML section (@ifhtml)
-$in_raw_html = 0;                       # am I inside an HTML section (@html)
-$in_preamble = 1;                       # am I before the top node
+$in_html = 0;                           # am I inside an HTML section
 $first_line = 1;                        # is it the first line
 $dont_html = 0;                         # don't protect HTML on this line
-$split_num = 0;                         # split index
 $deferred_ref = '';                     # deferred reference for indexes
 @html_stack = ();                       # HTML elements stack
 $html_element = '';                     # current HTML element
 &html_reset;
-@raw_html = ();
+
+# init l2h
+$T2H_L2H = &l2h_Init($docu_name) if ($T2H_L2H);
+$T2H_L2H = &l2h_InitToLatex      if ($T2H_L2H);    
 
 # build code for simple substitutions
@@ -607 +1163 @@
     $tag = '';
     $end_tag = '';
-    if (/^\@end\s+(\w+)\b/) {
+    if (/^\s*\@end\s+(\w+)\b/) {
         $end_tag = $1;
-    } elsif (/^\@(\w+)\b/) {
+    } elsif (/^\s*\@(\w+)\b/) {
         $tag = $1;
     }
     #
-    # handle @ifhtml / @end ifhtml
+    # handle @html / @end html
     #
     if ($in_html) {
-        if ($end_tag eq 'ifhtml') {
+        if ($end_tag eq 'html') {
             $in_html = 0;
         } else {
@@ -622 +1178 @@
         }
         next;
-    } elsif ($tag eq 'ifhtml') {
+    } elsif ($tag eq 'html') {
         $in_html = $PROTECTTAG . ++$html_num;
-        push(@raw_html, $in_html);
+        push(@lines, $in_html);
         next;
-    }
-    #
-    # do raw HTML (no escapes)
-    #
-    if ($in_raw_html) {
-        if ($end_tag eq 'html') {
-            $in_raw_html = 0;
-        } else {
-            push (@raw_html, $_);
-        }
-        next;
-    } elsif ($tag eq 'html') {
-        $in_raw_html = 1;
     }
     #
@@ -649 +1192 @@
         last if $tag eq 'bye';
     }
-
-    if ($end_tag) {
-        if ($to_ignore{"end $end_tag"}) {
-            $ignore_part = 0;
-            next;
-        }
-    } elsif ($tag) {
-        if ($to_ignore{$tag}) {
-            $ignore_part = 1;
-        }
-    }
-    next if $ignore_part;
-
+    if ($in_top) {
+        # parsing the top node
+        if ($tag eq 'node' || $tag eq 'include' || $sec2level{$tag}) {
+            # no more in top
+            $in_top = 0;
+            push(@lines, $TOPEND);
+        }
+    }
     #
     # try to remove inlined comments
     # syntax from tex-mode.el comment-start-skip
     #
-    s/((^|[^\@])(\@\@)*)\@c(omment)? .*/$1/;
+    s/((^|[^\@])(\@\@)*)\@c(omment | |\{).*/$1/;
+#     s/((^|[^\@])(\@\@)*)\@c(omment)? .*/$1/;
+#     s/(.*)\@c{.*?}(.*)/$1$2/;
+#     s/(.*)\@comment{.*?}(.*)/$1$2/;
+#     s/^(.*)\@c /$1/;
+#     s/^(.*)\@comment /$1/;
     # non-@ substitutions cf. texinfmt.el
-    s/``/\"/g;
-    s/''/\"/g;
-    s/([\w ])---([\w ])/$1--$2/g;
+    unless ($in_pre) {
+        s/``/\"/g;
+        s/''/\"/g;
+        s/([\w ])---([\w ])/$1--$2/g;
+    }
     #
     # analyze the tag
@@ -677 +1222 @@
         # skip lines
         &skip_until($tag), next if $tag eq 'ignore';
-        if ($expandinfo) {
-            &skip_until($tag), next if $tag eq 'iftex';
-        } else {
-            &skip_until($tag), next if $tag eq 'ifinfo' &&
-                ! $in_preamble; # we want the contents of the top node
-        }
-        &skip_until($tag), next if $tag eq 'tex';
+        &skip_until($tag), next if $tag eq 'ifnothtml';
+        if ($tag eq 'ifinfo')
+        {
+          &skip_until($tag), next unless $T2H_EXPAND eq 'info';
+        }
+        if ($tag eq 'iftex')
+        {
+          &skip_until($tag), next unless $T2H_EXPAND eq 'tex';
+        } 
+        if ($tag eq 'tex')
+        {
+          # add to latex2html file
+          if ($T2H_EXPAND eq 'tex' && $T2H_L2H && ! $in_pre)
+          {
+            # add space to the end -- tex(i2dvi) does this, as well 
+            push(@lines, &l2h_ToLatex(&string_until($tag) . " "));
+          }
+          else
+          {
+            &skip_until($tag);
+          }
+          next;
+        }
         # handle special tables
-        if ($tag eq 'table') {
-            $table_type = '';
-        } elsif ($tag eq 'ftable') {
+        if ($tag =~ /^(|f|v|multi)table$/) {
+            $table_type = $1;
             $tag = 'table';
-            $table_type = 'f';
-        } elsif ($tag eq 'vtable') {
-            $tag = 'table';
-            $table_type = 'v';
-        } elsif ($tag eq 'multitable') {
-            $tag = 'table';
-            $table_type = '';
         }
         # special cases
-        if ($tag eq 'top' || ($tag eq 'node' && /^\@node\s+Top\s*,/i)) {
-            # We want to stash the contents of the top node (including
-            # @ifinfo bits).
+        if ($tag eq 'top' || ($tag eq 'node' && /^\@node\s+top\s*,/i)) {
             $in_top = 1;
-            $in_preamble = 0;
-            #@lines = (); # ignore all lines before top (title page garbage)
-            @lines = @raw_html;
+            $has_top = 1;
+            @lines = (); # ignore all lines before top (title page garbage)
             next;
         } elsif ($tag eq 'node') {
-            push (@lines, "$TOPTAG") if ($in_top); # Mark end of top node
+          if ($in_top)
+          {
             $in_top = 0;
-            $in_preamble = 0;
-            warn "$ERROR Bad node line: $_" unless $_ =~ /^\@node\s$NODESRE$/o;
-            $_ = &protect_html($_); # if node contains '&' for instance
-            s/^\@node\s+//;
-            ($node) = split(/,/);
-            &normalise_node($node);
-            if ($split_node) {
-                &next_doc;
-                push(@lines, $SPLITTAG) if $split_num++;
-                push(@sections, $node);
-            }
-            next;
+            push(@lines, $TOPEND);
+          }
+          warn "$ERROR Bad node line: $_" unless $_ =~ /^\@node\s$NODESRE$/o;
+          $_ = &protect_html($_); # if node contains '&' for instance
+          s/^\@node\s+//;
+          ($node, $node_next, $node_prev, $node_up) = split(/,/);
+          &normalise_node($node);
+          &normalise_node($node_next);
+          &normalise_node($node_prev);
+          &normalise_node($node_up);
+          next;
         } elsif ($tag eq 'include') {
             if (/^\@include\s+($FILERE)\s*$/o) {
                 $file = $1;
                 unless (-e $file) {
-                    foreach $dir (@include_dirs) {
+                    foreach $dir (@T2H_INCLUDE_DIRS) {
                         $file = "$dir/$1";
                         last if -e $file;
@@ -732 +1282 @@
                 if (-e $file) {
                     &open($file);
-                    print "# including $file\n" if $verbose;
+                    print "# including $file\n" if $T2H_VERBOSE;
                 } else {
                     warn "$ERROR Can't find $file, skipping";
@@ -757 +1307 @@
             next;
         } elsif ($tag eq 'menu') {
-            unless ($show_menu) {
+            unless ($T2H_SHOW_MENU) {
                 &skip_until($tag);
                 next;
@@ -768 +1318 @@
             push(@lines, &html_debug("\n", __LINE__));
             $in_list++ if $format_map{$tag} eq 'UL' || $format_map{$tag} eq 'OL' ;
+            push(@lines, &debug('<FONT size="-1">'."\n", __LINE__))
+               if $tag =~ /smallexample/i;
+            push(@lines, &debug("<BLOCKQUOTE>\n", __LINE__))
+              if $tag =~ /example/i;
             push(@lines, &debug("<$format_map{$tag}>\n", __LINE__));
             next;
         } elsif ($tag eq 'table') {
-            if (/^\@[fv]?table\s+\@(\w+)\s*$/) {
-                $in_table = $1;
+            if (/^\s*\@(|f|v|multi)table\s+\@(\w+)/) {
+                $in_table = $2;
                 unshift(@tables, join($;, $table_type, $in_table));
-                push(@lines, &debug("<DL COMPACT>\n", __LINE__));
-                &html_push_if('DL');
-                push(@lines, &html_debug("\n", __LINE__));
-            } elsif (/^\@multitable\s+/) {
-                # Note descent to HTML 3.2 necessary for multitable.
-                $in_table = ' ';
-                unshift(@tables, join($;, $table_type, $in_table));
-                push(@lines, &debug("<TABLE>\n", __LINE__));
-                &html_push_if('TABLE');
+                if ($table_type eq "multi") {
+                    # don't use borders -- gets confused by empty cells
+                    push(@lines, &debug("<TABLE>\n", __LINE__));
+                    &html_push_if('TABLE');
+                } else {
+                    push(@lines, &debug("<DL COMPACT>\n", __LINE__));
+                    &html_push_if('DL');
+                }
                 push(@lines, &html_debug("\n", __LINE__));
             } else {
@@ -798 +1351 @@
             push(@lines, &debug("<P>\n", __LINE__));
             next;
+        } elsif ($tag eq 'center') {
+            push(@lines, &debug("<center>\n", __LINE__));
+            s/\@center//;
         } elsif ($tag eq 'setref') {
             &protect_html; # if setref contains '&' for instance
@@ -805 +1361 @@
                 $setref =~ s/ $//;
                 $node2sec{$setref} = $name;
+                $sec2node{$name} = $setref;
                 $node2href{$setref} = "$docu_doc#$docid";
             } else {
@@ -817 +1374 @@
             }
             next;
-        } elsif ($tag eq 'direntry') {
-            &skip_until ($tag);
+        } elsif ($tag eq 'lowersections') {
+            local ($sec, $level);
+            while (($sec, $level) = each %sec2level) {
+                $sec2level{$sec} = $level + 1;
+            }
+            next;
+        } elsif ($tag eq 'raisesections') {
+            local ($sec, $level);
+            while (($sec, $level) = each %sec2level) {
+                $sec2level{$sec} = $level - 1;
+            }
             next;
         } elsif (defined($def_map{$tag})) {
@@ -830 +1396 @@
             s/^\@$tag\s+//;
             $sub = $user_sub{$tag};
-            print "# user $tag = $sub, arg: $_" if $debug & $DEBUG_USER;
+            print "# user $tag = $sub, arg: $_" if $T2H_DEBUG & $DEBUG_USER;
             if (defined(&$sub)) {
                 chop($_);
@@ -865 +1431 @@
             $type =~ s/^\{(.*)\}$/$1/;
             print "# def ($tag): {$type} ", join(', ', @args), "\n"
-                if $debug & $DEBUG_DEF;
+                if $T2H_DEBUG & $DEBUG_DEF;
             $type .= ':'; # it's nicer like this
             $name = shift(@args);
@@ -909 +1475 @@
             &html_pop_if();
             push(@lines, &debug("</$format_map{$end_tag}>\n", __LINE__));
+            push(@lines, &debug("</BLOCKQUOTE>\n", __LINE__))
+              if $end_tag =~ /example/i;
+            push(@lines, &debug("</FONT>\n", __LINE__))
+               if $end_tag =~ /smallexample/i;
             push(@lines, &html_debug("\n", __LINE__));
-        } elsif ($end_tag eq 'table' ||
-                 $end_tag eq 'ftable' ||
-                 $end_tag eq 'vtable' ||
-                 $end_tag eq 'multitable') {
-            shift(@tables);
+        } elsif ($end_tag =~ /^(|f|v|multi)table$/) {
+            unless (@tables) {
+                warn "$ERROR \@end $end_tag without \@*table\n";
+                next;
+            }
+            ($table_type, $in_table) = split($;, shift(@tables));
+            unless ($1 eq $table_type) {
+                warn "$ERROR \@end $end_tag without matching \@$end_tag\n";
+                next;
+            }
+            if ($table_type eq "multi") {
+                push(@lines, "</TR></TABLE>\n");
+                &html_pop_if('TR');
+            } else {
+                push(@lines, "</DL>\n");
+                &html_pop_if('DD');
+            }
+            &html_pop_if();
             if (@tables) {
                 ($table_type, $in_table) = split($;, $tables[0]);
@@ -920 +1503 @@
                 $in_table = 0;
             }
-            if ($end_tag eq 'multitable') {
-                push(@lines, "</TABLE>\n");
-                &html_pop_if('TABLE');
-            } else {
-            push(@lines, "</DL>\n");
-            &html_pop_if('DD');
-            }
-            &html_pop_if();
         } elsif (defined($def_map{$end_tag})) {
             push(@lines, &debug("</DL>\n", __LINE__));
@@ -933 +1508 @@
             &html_pop_if();
             push(@lines, $_); # must keep it for pass 2
-        }
+        } 
         next;
     }
@@ -944 +1519 @@
     $dont_html = 0;
     # substitution (unsupported things)
-    # s/^\@center\s+//g;                # fixme: use <center> or <div align=center>?
     s/^\@exdent\s+//g;
     s/\@noindent\s+//g;
@@ -956 +1530 @@
     #
     if ($tag) {
-        if (defined($sec2level{$tag}) && $sec2level{$tag} > 0) {
+      if (defined($sec2level{$tag}) && $sec2level{$tag} > 0) {
             if (/^\@$tag\s+(.+)$/) {
                 $name = $1;
                 $name =~ s/\s+$//;
                 $level = $sec2level{$tag};
-#               print "+++==>$tag<\n";
-                if ($number_sections && $tag !~ /heading$/) {
-                    $name = &update_sec_num($tag, $level) . "  $name";
-                    push(@left_index, $name);
-                }
-#               $name = &update_sec_num($tag, $level) . "  $name"
-#                   if $number_sections && $tag !~ /heading$/;
-#                   if $number_sections && $tag !~ /^unnumbered/;
                 if ($tag =~ /heading$/) {
                     push(@lines, &html_debug("\n", __LINE__));
@@ -975 +1541 @@
                         # even though we are not in the body level. So, we convert it to a
                         # nice, bold, line by itself.
-                        $_ = &debug("\n\n<P><STRONG>$name</STRONG></P>\n\n", __LINE__);
+                        $_ = &debug("\n\n<P><STRONG>$name</STRONG>\n\n", __LINE__);
                     } else {
                         $_ = &debug("<H$level>$name</H$level>\n", __LINE__);
@@ -981 +1547 @@
                     }
                     print "# heading, section $name, level $level\n"
-                        if $debug & $DEBUG_TOC;
+                        if $T2H_DEBUG & $DEBUG_TOC;
                 } else {
-                    if ($split_chapter) {
-                        unless ($toplevel) {
-                            # first time we see a "section"
-                            unless ($level == 1) {
-                                warn "$ERROR The first section found is not of level 1: $_";
-                                warn "$ERROR I'll split on sections of level $level...\n";
-                            }
-                            $toplevel = $level;
-                        }
-                        if ($level == $toplevel) {
-                            &next_doc;
-                            push(@lines, $SPLITTAG) if $split_num++;
-                            push(@sections, $name);
-                        }
+                $node = $name unless $node;  
+                $name = &update_sec_num($tag, $level) . " $name"
+                    if $T2H_NUMBER_SECTIONS && $tag !~ /^unnumbered/;
+                  if (defined($toplevel))
+                  {
+                    push @lines, ($level==$toplevel ? $CHAPTEREND : $SECTIONEND);
+                  }
+                  else
+                  {
+                    # first time we see a "section"
+                    unless ($level == 1) 
+                    {
+                      warn "$ERROR The first section found is not of level 1: $_";
                     }
-                    $sec_num++;
-                    $docid = "SEC$sec_num";
-                    $tocid = "TOC$sec_num";
+                    $toplevel = $level;
+                  }
+                  push(@sections, $name);
+                  next_doc() if ($T2H_SPLIT eq 'section' || 
+                                 ($T2H_SPLIT && $level == $toplevel));
+                  $sec_num++;
+                  $docid = "SEC$sec_num";
+                  $tocid = "TOC$sec_num";
                     # check biblio and glossary
-                    $in_bibliography = ($name =~ /^([A-Z]|\d+)?(\.\d+)*\s*bibliography$/i);
-                    $in_glossary = ($name =~ /^([A-Z]|\d+)?(\.\d+)*\s*glossary$/i);
+                  $in_bibliography = ($name =~ /^([A-Z]|\d+)?(\.\d+)*\s*bibliography$/i);
+                  $in_glossary = ($name =~ /^([A-Z]|\d+)?(\.\d+)*\s*glossary$/i);
                     # check node
-                    if ($node) {
-                        if ($node2sec{$node}) {
-                            warn "$ERROR Duplicate node found: $node\n";
-                        } else {
+                    if ($node2sec{$node}) {
+                      warn "$ERROR Duplicate node found: $node\n";
+                    } else {
                             $node2sec{$node} = $name;
+                            warn "$ERROR Duplicate section found: $name\n"
+                              if ($sec2node{$name});
+                            $sec2node{$name} = $node;
                             $node2href{$node} = "$docu_doc#$docid";
+                            $node2next{$node} = $node_next;
+                            $node2prev{$node} = $node_prev;
+                            $node2up{$node} = $node_up;
                             print "# node $node, section $name, level $level\n"
-                                if $debug & $DEBUG_TOC;
+                                if $T2H_DEBUG & $DEBUG_TOC;
                         }
                         $node = '';
-                    } else {
-                        print "# no node, section $name, level $level\n"
-                            if $debug & $DEBUG_TOC;
-                    }
+                        $node_next = '';
+                        $node_prev = '';
+                        $node_next = '';
                     # update TOC
                     while ($level > $curlevel) {
@@ -1028 +1602 @@
                         push(@toc_lines, "</UL>\n");
                     }
-                    $_ = "<LI>" . &anchor($tocid, "$docu_doc#$docid", '', $name, 1);
-                    push(@toc_lines, &substitute_style($_));
+                    $_ = &t2h_anchor($tocid, "$docu_doc#$docid", $name, 1);
+                    $_ = &substitute_style($_);
+                    push(@stoc_lines, "$_<BR>\n") if ($level == 1);
+                    push(@toc_lines, "<LI>" . $_ ."</LI>");
                     # update DOC
                     push(@lines, &html_debug("\n", __LINE__));
                     &html_reset;
-                    $_ =  "<H$level>".&anchor($docid, "$docu_toc#$tocid", '', $name)."</H$level>\n";
+#                   $_ =  "<H$level>".&t2h_anchor($docid, '', $name)."</H$level>\n";
+                    $_ =  "<H$level> $name </H$level>\n";                   
                     $_ = &debug($_, __LINE__);
                     push(@lines, &html_debug("\n", __LINE__));
@@ -1061 +1638 @@
                     next;
                 }
-                $id = 'IDX' . ++$idx_num;
+                $id = ($T2H_SECTION_IDX ? $docid : 'IDX' . ++$idx_num);
                 $index = $1 . 'index';
                 $what = &substitute_style($');
                 $what =~ s/\s+$//;
                 print "# found $index for '$what' id $id\n"
-                    if $debug & $DEBUG_INDEX;
+                    if $T2H_DEBUG & $DEBUG_INDEX;
                 eval(<<EOC);
                 if (defined(\$$index\{\$what\})) {
@@ -1077 +1654 @@
                 # dirty hack to see if I can put an invisible anchor...
                 #
-                if ($html_element eq 'P' ||
+                unless ($T2H_SECTION_IDX) {
+                if (
+                    $html_element eq 'P' ||
                     $html_element eq 'LI' ||
                     $html_element eq 'DT' ||
@@ -1086 +1665 @@
                     $html_element eq 'PRE' ||
                     $html_element eq 'SAMP') {
-                    push(@lines, &anchor($id, '', '', $invisible_mark, !$in_pre));
+                    push(@lines, &t2h_anchor($id, '', $T2H_INVISIBLE_MARK, !$in_pre));
                 } elsif ($html_element eq 'body') {
                     push(@lines, &debug("<P>\n", __LINE__));
-                    push(@lines, &anchor($id, '', '', $invisible_mark, !$in_pre));
+                    push(@lines, &t2h_anchor($id, '', $T2H_INVISIBLE_MARK, !$in_pre));
                     &html_push('P');
                 } elsif ($html_element eq 'DL' ||
                          $html_element eq 'UL' ||
                          $html_element eq 'OL' ) {
-                    $deferred_ref .= &anchor($id, '', '', $invisible_mark, !$in_pre) . " ";
+                    $deferred_ref .= &t2h_anchor($id, '', $T2H_INVISIBLE_MARK, !$in_pre) . " ";
                 }
+              }
                 next;
             }
             # list item
-            if (/^\@itemx?\s+/) {
+            if (/^\s*\@itemx?\s+/) {
                 $what = $';
                 $what =~ s/\s+$//;
@@ -1107 +1687 @@
                         $bib2href{$what} = "$docu_doc#$id";
                         print "# found bibliography for '$what' id $id\n"
-                            if $debug & $DEBUG_BIB;
-                        $what = &anchor($id, '', '', $what);
+                            if $T2H_DEBUG & $DEBUG_BIB;
+                        $what = &t2h_anchor($id, '', $what);
                     }
-                } elsif ($in_glossary && $use_glossary) {
+                } elsif ($in_glossary && $T2H_USE_GLOSSARY) {
                     $id = 'GLOSS' . ++$gloss_num;
                     $entry = $what;
@@ -1116 +1696 @@
                     $gloss2href{$entry} = "$docu_doc#$id";
                     print "# found glossary for '$entry' id $id\n"
-                        if $debug & $DEBUG_GLOSS;
-                    $what = &anchor($id, '', '', $what);
+                        if $T2H_DEBUG & $DEBUG_GLOSS;
+                    $what = &t2h_anchor($id, '', $what);
                 }
                 &html_pop_if('P');
@@ -1132 +1712 @@
                         unshift(@input_spool, "\@${table_type}index $what\n");
                     }
-                } elsif ($html_element eq 'TABLE' || $html_element eq 'TR') {
-                    # Add <br> at ends of rows for non-tables browsers.
-                    push(@lines, "<BR>\n") if $html_element eq 'TR';
-                    push(@lines, "<TR>$what");
-                    &html_push('TR') unless $html_element eq 'TR';
+                } elsif ($html_element eq 'TABLE') {
+                    push(@lines, &debug("<TR><TD>$what</TD>\n", __LINE__));
+                    &html_push('TR');
+                } elsif ($html_element eq 'TR') {
+                    push(@lines, &debug("</TR>\n", __LINE__));
+                    push(@lines, &debug("<TR><TD>$what</TD>\n", __LINE__));
                 } else {
                     push(@lines, &debug("<LI>$what\n", __LINE__));
@@ -1147 +1728 @@
                 }
                 next;
+            } elsif (/^\@tab\s+(.*)$/) {
+                push(@lines, "<TD>$1</TD>\n");
+                next;
             }
         }
@@ -1154 +1738 @@
         next if $#lines >= 0 && $lines[$#lines] eq "\n";
         if ($html_element eq 'P') {
-            push(@lines, "\n");
-            $_ = &debug("</P>\n", __LINE__);
-            &html_pop;
-        }
-    } elsif ($html_element eq 'body' || $html_element eq 'BLOCKQUOTE') {
-        push(@lines, "<P>\n");
-        &html_push('P');
-        $_ = &debug($_, __LINE__);
-    }
+            push (@lines, &debug("</P><P>\n", __LINE__));
+        }
+#       else
+#       {
+#         push(@lines, "<P></P>\n");
+#         $_ = &debug("<P></P>\n", __LINE__);
+#       }
+        elsif ($html_element eq 'body' || $html_element eq 'BLOCKQUOTE' || $html_element eq 'DD') 
+        {
+          &html_push('P');
+          push(@lines, &debug("<P>\n", __LINE__));
+        }
+      }
     # otherwise
     push(@lines, $_);
+
+    push(@lines, &debug("</center>\n", __LINE__))  if ($tag eq 'center');
 }
 
@@ -1174 +1764 @@
 }
 
-print "# end of pass 1\n" if $verbose;
+print "# end of pass 1\n" if $T2H_VERBOSE;
 
 #+++############################################################################
@@ -1185 +1775 @@
 @lines3 = ();                           # whole document (3rd pass)
 $in_menu = 0;                           # am I inside a menu
-$in_top = 1;
 
 while (@lines) {
@@ -1196 +1785 @@
         next;
     }
-    if ($in_top && $_ eq "$TOPTAG") {
-        $in_top = 0;
-        while(@lines2) {
-            $_ = shift(@lines2);
-            if (/\@(\w+)\ /) {
-                ($before, $style, $after) = ($`, $1, $');
-                if (defined($style_l_map{$style})) {
-                    $_ = $after;
-                    $text = '';
-                    $after = '';
-                    $failed = 1;
-                    while (@lines2) {
-                        if (/\n/) {
-                            $text .= $`;
-                            $after = $';
-                            $failed = 0;
-                            last;
-                        } else {
-                            $text .= $_;
-                            $_ = shift(@lines2);
-                        }
-                    }
-                    if ($failed) {
-                        die "* Bad syntax (\@$style) after: $before\n";
-                    } else {
-                        $text = &apply_l_style($style, $text);
-                        $_ = "$before$text$after\n";
-                    }
-                }
-            }
-            push(@top_lines, $_);
-        }
-        #@top_lines = @lines2;  # Contents of the top node.
-        @lines2 = ();           # Don't use them in place.
-        next;
-    }
     #
     # menu
     #
-    $in_menu = 1, push(@lines2, &debug("<UL>\n", __LINE__)), next if /^\@menu\b/;
-    $in_menu = 0, push(@lines2, &debug("</UL>\n", __LINE__)), next if /^\@end\s+menu\b/;
+    if (/^\@menu\b/)
+    {
+      $in_menu = 1;
+      $T2H_NUMBER_SECTIONS ?
+        push(@lines2, &debug("<BLOCKQUOTE><TABLE BORDER=0 CELLSPACING=0> \n", __LINE__)) :
+          push(@lines2, &debug("<UL>\n", __LINE__));
+      next;
+    }
+    if (/^\@end\s+menu\b/)
+    {
+      $in_menu = 0;
+      $T2H_NUMBER_SECTIONS ?
+        push(@lines2, &debug("</TABLE></BLOCKQUOTE>\n", __LINE__)) :
+          push(@lines2, &debug("</UL>\n", __LINE__));
+      next;
+    }
     if ($in_menu) {
         if (/^\*\s+($NODERE)::/o) {
@@ -1256 +1823 @@
     # printindex
     #
-    if (/^\@printindex\s+(\w\w)\b/) {
-        local($index, *ary, @keys, $key, $letter, $last_letter, @refs);
+    # obachman: replace ^\@printindex by \@printindex, otherwise 
+    # generation in debug mode fails
+    if (/\@printindex\s+(\w\w)\b/) {
+        local($index, *ary, @keys, $key, $letter, $last_letter, @refs, $fhidx);
         if ($predefined_index{$1}) {
             $index = $predefined_index{$1} . 'index';
         } else {
             $index = $1 . 'index';
+        }
+        # check for index summary
+        $letter = $1;
+        if ($letter =~ /$T2H_IDX_SUMMARY/)
+        {
+          open(FHIDX, "> $docu_rdir$docu_name" . "_$letter.idx")
+            || die "Can't open > $docu_rdir$docu_name" . "_$letter.idx for writing: $!\n";
+          $fhidx = \*FHIDX;
+          print "# writing index summary in $docu_rdir$docu_name" . "_$letter.idx..." if $T2H_VERBOSE;
         }
         eval("*ary = *$index");
@@ -1274 +1852 @@
             $key2alpha{$key} = $_;
             print "# index $key sorted as $_\n"
-                if $key ne $_ && $debug & $DEBUG_INDEX;
-        }
+                if $key ne $_ && $T2H_DEBUG & $DEBUG_INDEX;
+        }
+        push(@lines2, "Jump to:\n");
+        $last_letter = undef;
+        foreach $key (sort byalpha @keys) {
+            $letter = substr($key2alpha{$key}, 0, 1);
+            $letter = substr($key2alpha{$key}, 0, 2) if $letter eq $;;
+            if (!defined($last_letter) || $letter ne $last_letter) {
+                push(@lines2, "-\n") if defined($last_letter);
+                push(@lines2, "<A HREF=\"#$index\_$letter\">" . &protect_html($letter) . "</A>\n");
+                $last_letter = $letter;
+            }
+        }
+        push(@lines2, "<P>\n");
         $last_letter = undef;
         foreach $key (sort byalpha @keys) {
@@ -1282 +1872 @@
             if (!defined($last_letter) || $letter ne $last_letter) {
                 push(@lines2, "</DIR>\n") if defined($last_letter);
-                push(@lines2, "<H2>" . &protect_html($letter) . "</H2>\n");
+                push(@lines2, "<H2><A NAME=\"$index\_$letter\">" . &protect_html($letter) . "</A></H2>\n");
                 push(@lines2, "<DIR>\n");
                 $last_letter = $letter;
@@ -1288 +1878 @@
             @refs = ();
             foreach (split(/$;/, $ary{$key})) {
-                push(@refs, &anchor('', $_, '', $key, 0));
+                push(@refs, &t2h_anchor('', $_, $key, 0));
             }
             push(@lines2, "<LI>" . join(", ", @refs) . "\n");
+            if ($fhidx)
+            {
+              ($letter) = split(/$;/, $ary{$key});
+              $key = unprotect_html($key);
+              print $fhidx "$key\t$letter\n";
+            }
         }
         push(@lines2, "</DIR>\n") if defined($last_letter);
+        if ($fhidx)
+        {
+          print "\n" if $T2H_VERBOSE;
+          close($fhidx);
+        }
         next;
     }
@@ -1306 +1907 @@
         ($type, $nodes, $full) = ($1, $2, $3);
         ($before, $after) = ($`, $');
-        $ref_where = "Section";
         if (! $full && $after) {
             warn "$ERROR Bad xref (no ending } on line): $_";
@@ -1349 +1949 @@
         &normalise_node($node);
         $sec = $node2sec{$node};
-        $_ = $sec;
-        if (/^[A-Z]/) {
-            $ref_where = "Appendix";
-        }
+        $href = $node2href{$node};
         if (@args == 5) { # reference to another manual
             $sec = $args[2] || $node;
             $man = $args[4] || $args[3];
-            $_ = "${before}${type}$ref_where `$sec' in \@cite{$man}$after";
+            $_ = "${before}${type}section `$sec' in \@cite{$man}$after";
         } elsif ($type =~ /Info/) { # inforef
             warn "$ERROR Wrong number of arguments: $_" unless @args == 3;
             ($nn, $_, $in) = @args;
             $_ = "${before}${type} file `$in', node `$nn'$after";
-        } elsif ($sec) {
-            $href = $node2href{$node};
-            $_ = "${before}${type}" . &anchor('', $href, '', "$ref_where $sec") . $after;
-        } else {
+        } elsif ($sec && $href && ! $T2H_SHORT_REF) {
+            $_ = "${before}${type}section " . 
+              &t2h_anchor('', $href, $sec) . $after;
+        } 
+        elsif ($href && $T2H_SHORT_REF)
+        {
+          $_ = "${before}${type} " . &t2h_anchor('', $href, $node) . $after;
+        }
+        else {
             warn "$ERROR Undefined node ($node): $_";
             $_ = "$before$;0xref{$nodes}$after";
         }
     }
+    
+    if (/^\@image\s*{/) {
+      s/\@image\s*{//;
+      my (@args) = split (/,/);
+      my $base = $args[0];
+      my $image;
+      if (-r "$base.jpg") {
+        $image = "$base.jpg";
+      } elsif (-r "$base.png") {
+        $image = "$base.png";
+      } elsif (-r "$base.gif") {
+        $image = "$base.gif";
+      } else {
+        warn "$ERROR no image file for $base: $_";
+      }
+      $_ = "<IMG SRC=\"$image\" ALT=\"$base\">";
+    }
+
     #
     # try to guess bibliography references or glossary terms
@@ -1379 +1999 @@
                 $href = $bib2href{$what};
                 if (defined($href) && $post !~ /^[^<]*<\/A>/) {
-                    $done .= $pre . &anchor('', $href, '', $what);
+                    $done .= $pre . &t2h_anchor('', $href, $what);
                 } else {
                     $done .= "$pre$what";
@@ -1387 +2007 @@
             $_ = $done . $_;
         }
-        if ($use_glossary) {
+        if ($T2H_USE_GLOSSARY) {
             $done = '';
             while (/\b\w+\b/) {
@@ -1395 +2015 @@
                 $href = $gloss2href{$entry};
                 if (defined($href) && $post !~ /^[^<]*<\/A>/) {
-                    $done .= $pre . &anchor('', $href, '', $what);
+                    $done .= $pre . &t2h_anchor('', $href, $what);
                 } else {
                     $done .= "$pre$what";
@@ -1407 +2027 @@
     push(@lines2, $_);
 }
-print "# end of pass 2\n" if $verbose;
+print "# end of pass 2\n" if $T2H_VERBOSE;
 
 #
@@ -1453 +2073 @@
             }
         }
-        if (/\@(\w+)\ /) {
-            ($before, $style, $after) = ($`, $1, $');
-            if (defined($style_l_map{$style})) {
-                $_ = $after;
-                $text = '';
-                $after = '';
-                $failed = 1;
-                while (@lines2) {
-                    if (/\n/) {
-                        $text .= $`;
-                        $after = $';
-                        $failed = 0;
-                        last;
-                    } else {
-                        $text .= $_;
-                        $_ = shift(@lines2);
-                    }
-                }
-                if ($failed) {
-                    die "* Bad syntax (\@$style) after: $before\n";
-                } else {
-                    $text = &apply_l_style($style, $text);
-                    $_ = "$before$text$after";
-                }
-            }
-        }
     }
     # otherwise
     push(@lines3, $_);
 }
-print "# end of pass 3\n" if $verbose;
-
+print "# end of pass 3\n" if $T2H_VERBOSE;
+        
 #+++############################################################################
 #                                                                              #
@@ -1494 +2088 @@
 @doc_lines = ();                        # final document
 $end_of_para = 0;                       # true if last line is <P>
-
+        
 while (@lines3) {
     $_ = shift(@lines3);
@@ -1532 +2126 @@
             $footid = "FOOT$foot_num";
             $foot = "($foot_num)";
-            push(@foot_lines, "<H3>" . &anchor($footid, "$d#$docid", '', $foot) . "</H3>\n");
+            push(@foot_lines, "<H3>" . &t2h_anchor($footid, "$d#$docid", $foot) . "</H3>\n");
             $text = "<P>$text" unless $text =~ /^\s*<P>/;
             push(@foot_lines, "$text\n");
-            $_ = $before . &anchor($docid, "$docu_foot#$footid", '', $foot) . $after;
+            $_ = $before . &t2h_anchor($docid, "$docu_foot#$footid", $foot) . $after;
         }
     }
@@ -1549 +2143 @@
     push(@doc_lines, $_);
 }
-print "# end of pass 4\n" if $verbose;
-
-push(@menu_lines, "<BODY BACKGROUND=\"$IMG_LEFT\">\n");
-push(@menu_lines, "<A HREF=\"http://www.mathematik.uni-kl.de/~zca/Singular\" TARGET=\"_parent\">");
-push(@menu_lines, "<IMG SRC=\"images/singular-small.jpg\"></A><P>\n");
-#push(@menu_lines, "<BODY BACKGROUND=\"/rock.gif\" TEXT=\"yellow\"");
-#push(@menu_lines, " LINK=#FFFFFF ALINK=#FF00FF VLINK=\"#00FF00\">\n");
-#push(@menu_lines, "<NOBR>\n");
-push(@menu_lines, "<OL>\n");
-foreach (@left_index) {
-    $entry = $_;
-    @part = split(/\ /);
-    $name = join(' ', @part[1..$#part]);
-    if (!/^[A-Z0-9]\./) {
-        &left_menu_entry($part[0], $name);
-    }
-}
-push(@menu_lines, "</OL>\n");
-print "# end of pass 5\n" if $verbose;
+        
+print "# end of pass 4\n" if $T2H_VERBOSE;
 
 #+++############################################################################
 #                                                                              #
-# Pass 6: print things                                                         #
+# Pass 5: print things                                                         #
 #                                                                              #
 #---############################################################################
 
-$header = <<EOT;
-<!-- This HTML file has been created by $THISPROG
-     from $docu on $TODAY -->
-EOT
-
-$full_title = $value{'_title'} || $value{'_settitle'} || "Untitled Document";
-$title = $value{'_settitle'} || $full_title;
-$_ = &substitute_style($full_title);
-&unprotect_texi;
-s/\n$//; # rmv last \n (if any)
-$full_title = "<H1>" . join("</H1>\n<H1>", split(/\n/, $_)) . "</H1>\n";
-
-#
-# print ToC
-#
-# ... unless using menus instead.  Make the TOC lines empty rather than
-# null so we get a ToC page with the top node (including menu).
-@toc_lines = ("") if $show_menu;
-
-if (!$monolithic && @toc_lines) {
-    if (open(FILE, "> $docu_toc")) {
-        print "# creating $docu_toc...\n" if $verbose;
-        &print_header("$title - Table of Contents", "", 0);
-        # &print_toplevel_header("$title - Table of Contents");
-        &print_ruler;
-        &print (*top_lines, FILE); # Contents of the top node before the TOC.
-        &print(*toc_lines, FILE);
-        &print_toplevel_footer;
-        close(FILE);
-    } else {
-        warn "$ERROR Can't write to $docu_toc: $!\n";
-    }
-}
-
-#
-# print footnotes
-#
-if (!$monolithic && @foot_lines) {
-    if (open(FILE, "> $docu_foot")) {
-        print "# creating $docu_foot...\n" if $verbose;
-        &print_toplevel_header("$title - Footnotes");
-        &print_ruler;
-        &print(*foot_lines, FILE);
-        &print_toplevel_footer;
-        close(FILE);
-    } else {
-        warn "$ERROR Can't write to $docu_foot: $!\n";
-    }
-}
-
-#
-#
-#
-if (!$monolithic && $make_entry_page) {
-    if(open(FILE, "> $docu_main")) {
-        &print_header("$title - $docu_name", "", 1);
-        print "# creating $docu_main...\n" if $verbose;
-        #&print_frame($docu_name . "_1.html");
-        &print_frame($docu_toc);
-        &print_toplevel_footer;
-        close(FILE);
-    } else {
-        warn "$ERROR Can't write to $docu_main: $!\n";
-    }
-}
-
-#
-#
-#
-if (!$monolithic && $make_menu_page && @menu_lines) {
-    if(open(FILE, "> $docu_left")) {
-        &print_header("$title - $docu_left", "", 1);
-        print "# creating $docu_left...\n" if $verbose;
-        &print(*menu_lines, FILE);
-        &print_footer;
-        close(FILE);
-    } else {
-        warn "$ERROR Can't write to $docu_main: $!\n";
-    }
-}
-
-#
-# print document
-#
-if ($split_chapter || $split_node) { # split
-    $doc_num = 0;
-    $last_num = scalar(@sections);
-    $first_doc = &doc_name(1);
-    $last_doc = &doc_name($last_num);
-    while (@sections) {
-        $section = shift(@sections);
-        &next_doc;
-        if (open(FILE, "> $docu_doc")) {
-            print "# creating $docu_doc...\n" if $verbose;
-            $prev_doc = ($doc_num == 1 ? undef : &doc_name($doc_num - 1));
-            $next_doc = ($doc_num == $last_num ? undef : &doc_name($doc_num + 1));
-            $links = ($next_doc ? "<link href=\"$next_doc\" rel=Next>\n" : "");
-            $links .= ($prev_doc ? "<link href=\"$prev_doc\" rel=Previous>\n" : "");
-            $links .= "<link href=\"$docu_toc\" rel=ToC>\n";
-            # fixme: try rel=Index too?
-            &print_header("$title - $section", $links, 0);
-
-            #$navigation = "<p>Go to the ";
-            $navigation = "<p>";
-            if ($IMG_FIRST_ACTIVE ne "") {
-                $navigation .= ($prev_doc ? &anchor('', $first_doc, '', 
-                             $IMG_FIRST_ACTIVE) : $IMG_FIRST_PASSIVE);
-                $navigation .= " ";
-            }
-            $navigation .= ($prev_doc ? &anchor('', $prev_doc, '', $IMG_PREV_ACTIVE) : $IMG_PREV_PASSIVE);
-            $navigation .= " ";
-            $navigation .= ($next_doc ? &anchor('', $next_doc, '', $IMG_NEXT_ACTIVE) : $IMG_NEXT_PASSIVE);
-            if ($IMG_LAST_ACTIVE ne "") {
-                $navigation .= " ";
-                $navigation .= ($next_doc ? &anchor('', $last_doc, '',
-                             $IMG_LAST_ACTIVE) : $IMG_LAST_PASSIVE);
-            }
-            #$navigation .= " section, " . &anchor('', $docu_toc, '', "<IMG SRC=\"toc-b.gif\">") . ".\n";
-            $navigation .= " " . &anchor('', $docu_toc, '', $IMG_TOC) . "\n";
-            print FILE $navigation;
-            &print_ruler;
-            # find corresponding lines
-            @tmp_lines = ();
-            while (@doc_lines) {
-                $_ = shift(@doc_lines);
-                last if ($_ eq $SPLITTAG);
-                push(@tmp_lines, $_);
-            }
-            &print(*tmp_lines, FILE);
-            &print_ruler;
-            print FILE $navigation;
-            &print_footer;
-            close(FILE);
-        } else {
-            warn "$ERROR Can't write to $docu_doc: $!\n";
-        }
-    }
-} else { # not split
-    if (open(FILE, "> $docu_doc")) {
-        print "# creating $docu_doc...\n" if $verbose;
-        if ($monolithic || !@toc_lines) {
-            &print_toplevel_header($title);
-        } else {
-            &print_header($title, "", 0);
-            print FILE $full_title;
-        }
-        if ($monolithic && @toc_lines) {
-            &print_ruler;
-            print FILE "<H1>Table of Contents</H1>\n";
-            &print(*toc_lines, FILE);
-        }
-        &print_ruler;
-        &print(*doc_lines, FILE);
-        if ($monolithic && @foot_lines) {
-            &print_ruler;
-            print FILE "<H1>Footnotes</H1>\n";
-            &print(*foot_lines, FILE);
-        }
-        if ($monolithic || !@toc_lines) {
-            &print_toplevel_footer;
-        } else {
-            &print_footer;
-        }
-        close(FILE);
-    } else {
-        warn "$ERROR Can't write to $docu_doc: $!\n";
-    }
-}
-
-print "# that's all folks\n" if $verbose;
+$T2H_L2H = &l2h_FinishToLatex if ($T2H_L2H);
+$T2H_L2H = &l2h_ToHtml        if ($T2H_L2H);
+$T2H_L2H = &l2h_InitFromHtml  if ($T2H_L2H);
+
+# prepare %T2H_THISDOC
+$T2H_THISDOC{fulltitle} = $value{'_title'} || $value{'_settitle'} || "Untitled Document";
+$T2H_THISDOC{title} = $value{'_settitle'} || $T2H_THISDOC{fulltitle};
+$T2H_THISDOC{author} = $value{'_author'};
+$T2H_THISDOC{subtitle} = $value{'_subtitle'};
+for $key (keys %T2H_THISDOC)
+{
+  $_ = &substitute_style($T2H_THISDOC{$key});
+  &unprotect_texi;
+  s/\s*$//;
+  $T2H_THISDOC{$key} = $_;
+}
+
+# if no sections, then simply print docuemnt as is
+unless (@sections)
+{
+  print "# Writing content into $docu_top_file \n" if $T2H_VERBOSE;
+  open(FILE, "> $docu_doc_file") 
+    || die "$ERROR: Can't open $docu_doc_file for writing: $!\n";
+
+  t2h_print_page_head(\*FILE);
+  $T2H_THIS_SECTION = \@doc_lines;
+  t2h_print_lines(\*FILE);
+  t2h_print_page_foot(\*FILE);
+  close(FILE);
+  goto Finish;
+}
+
+# initialize $T2H_HREF, $T2H_NAME
+%T2H_HREF = 
+  (
+   'First' ,   sec_href($sections[0]),
+   'Last',     sec_href($sections[$#sections]),
+   'About',     $docu_about. '#SEC_About',
+  );
+
+# prepare TOC, OVERVIEW, TOP
+$T2H_TOC = \@toc_lines;
+$T2H_OVERVIEW = \@stoc_lines;
+if ($has_top)
+{
+  while (1)
+  {
+    $_ = shift @doc_lines;
+    last if /$TOPEND/;
+    push @$T2H_TOP, $_;
+  }
+  $T2H_HREF{'Top'} = $docu_top . '#SEC_Top';
+}
+else
+{
+  $T2H_HREF{'Top'} = $T2H_HREF{First};
+}
+
+$node2href{Top} = $T2H_HREF{Top};
+$T2H_HREF{Contents} = $docu_toc.'#SEC_Contents' if @toc_lines;
+$T2H_HREF{Overview} = $docu_stoc.'#SEC_OVERVIEW' if @stoc_lines;
+$T2H_HREF{Index} = $node2href{'Index'};
+
+%T2H_NAME =
+  (
+   'First',   clean_name($sec2node{$sections[0]}),
+   'Last',    clean_name($sec2node{$sections[$#sections]}),
+   'About',    'About this document',
+   'Contents', 'Table of Contents',
+   'Overview', 'Overview (Short Table of Contents)',
+   'Index' ,   '',
+   'Top',      '' 
+  );
+
+#############################################################################
+# print Top
+#
+open(FILE, "> $docu_top_file") 
+  || die "$ERROR: Can't open $docu_top_file for writing: $!\n";
+if ($T2H_TOP)
+{
+  print "# Creating Top in $docu_top_file ...\n" if $T2H_VERBOSE;
+  t2h_print_page_head(\*FILE) unless ($T2H_SPLIT);
+  $T2H_THIS_SECTION = $T2H_TOP;
+  $T2H_HREF{This} = $T2H_HREF{Top};
+  $T2H_NAME{This} = $T2H_NAME{Top};
+  t2h_print_Top(\*FILE);
+  
+}
+close(FILE) if $T2H_SPLIT;
+
+#############################################################################
+# Print sections
+#
+$T2H_NODE{Forward} = $sec2node{$sections[0]};
+$T2H_NAME{Forward} = &clean_name($sec2node{$sections[0]});
+$T2H_HREF{Forward} = sec_href($sections[0]);
+$T2H_NODE{This} = 'Top';
+$T2H_NAME{This} = $T2H_NAME{Top};
+$T2H_HREF{This} = $T2H_HREF{Top};
+if ($T2H_SPLIT)
+{
+  print "# writing " . scalar(@sections) . 
+    " sections in $docu_rdir$docu_name"."_[1.." . 
+      ($T2H_SPLIT eq 'section' ? scalar(@sections) : scalar(@$T2H_OVERVIEW) ) . 
+        "]"  
+          if $T2H_VERBOSE;
+  $previous = ($T2H_SPLIT eq 'chapter' ? $CHAPTEREND : $SECTIONEND);
+  undef $FH;
+  $doc_num = 0;
+}
+else
+{
+  print "# writing " . scalar(@sections) . " sections in $docu_top_file ..." 
+    if $T2H_VERBOSE;
+  $FH = \*FILE;
+  $previous = '';
+}
+
+$counter = 0;
+# loop through sections
+while ($section = shift(@sections)) 
+{
+  if ($T2H_SPLIT && ($T2H_SPLIT eq 'section' || $previous eq $CHAPTEREND))
+  { # open new page
+    if ($FH)
+    { #close previous page
+      t2h_print_page_foot($FH);
+      close($FH);
+    }
+    &next_doc;
+    open(FILE, "> $docu_rdir$docu_doc") || 
+      die "$ERROR: Can't open $docu_rdir$docu_doc for writing: $!\n";
+    $FH = \*FILE;
+    t2h_print_page_head($FH);
+  }
+  $T2H_NAME{Back} = $T2H_NAME{This};
+  $T2H_HREF{Back} = $T2H_HREF{This};
+  $T2H_NODE{Back} = $T2H_NODE{This};
+  $T2H_NAME{This} = $T2H_NAME{Forward};
+  $T2H_HREF{This} = $T2H_HREF{Forward};
+  $T2H_NODE{This} = $T2H_NODE{Forward};
+  if ($sections[0])
+  {
+    $T2H_NODE{Forward} = $sec2node{$sections[0]};
+    $T2H_NAME{Forward} = &clean_name($T2H_NODE{Forward});
+    $T2H_HREF{Forward} = sec_href($sections[0]);
+  }
+  else
+  {
+    undef $T2H_HREF{Forward}, $T2H_NODE{Forward}, $T2H_NAME{Forward};
+  }
+
+  $node = $node2up{$T2H_NODE{This}};
+  $T2H_HREF{Up} = $node2href{$node};
+  if ($T2H_HREF{Up} eq $T2H_HREF{This} || ! $T2H_HREF{Up})
+  {
+    $T2H_NAME{Up} = $T2H_NAME{Top};
+    $T2H_HREF{Up} = $T2H_HREF{Top};
+    $T2H_NODE{Up} = 'Up';
+  }
+  else
+  {
+    $T2H_NAME{Up} = &clean_name($node);
+    $T2H_NODE{Up} = $node;
+  }
+
+  $node = $T2H_NODE{This};
+  $node = $node2prev{$node};
+  $T2H_NAME{Prev} = &clean_name($node);
+  $T2H_HREF{Prev} = $node2href{$node};
+  $T2H_NODE{Prev} = $node;
+
+  $node = $T2H_NODE{This};
+  if ($node2up{$node} && $node2up{$node} ne 'Top'&&
+      ($node2prev{$node} eq $T2H_NODE{Back} || ! $node2prev{$node}))
+  {
+    $node = $node2up{$node};
+    while ($node && $node ne $node2up{$node} && ! $node2prev{$node})
+    {
+      $node = $node2up{$node};
+    }
+    $node = $node2prev{$node} 
+      unless $node2up{$node} eq 'Top' || ! $node2up{$node};
+  }
+  else
+  {
+    $node = $node2prev{$node};
+  }
+  $T2H_NAME{FastBack} = &clean_name($node);
+  $T2H_HREF{FastBack} = $node2href{$node};
+  $T2H_NODE{FastBack} = $node;
+  
+  $node = $T2H_NODE{This};
+  $node = $node2next{$node};
+  $T2H_NAME{Next} = &clean_name($node);
+  $T2H_HREF{Next} = $node2href{$node};
+  $T2H_NODE{Next} = $node;
+
+  $node = $T2H_NODE{This};
+  if ($node2up{$node} && $node2up{$node} ne 'Top'&& 
+      ($node2next{$node} eq $T2H_NODE{Forward} || ! $node2next{$node}))
+  {
+    $node = $node2up{$node};
+    while ($node && $node ne $node2up{$node} && ! $node2next{$node})
+    {
+      $node = $node2up{$node};
+    }
+  }
+  $node = $node2next{$node};
+  $T2H_NAME{FastForward} = &clean_name($node);
+  $T2H_HREF{FastForward} = $node2href{$node};
+  $T2H_NODE{FastForward} = $node;
+
+  $T2H_THIS_SECTION = [];
+  while (@doc_lines) {
+    $_ = shift(@doc_lines);
+    last if ($_ eq $SECTIONEND || $_ eq $CHAPTEREND);
+    push(@$T2H_THIS_SECTION, $_);
+  }
+  $previous = $_;
+  t2h_print_label($FH);
+  t2h_print_section($FH);
+
+  if ($T2H_VERBOSE)
+  {
+    $counter++;
+    print "." if $counter =~ /00$/;
+  }
+}
+if ($T2H_SPLIT)
+{
+  t2h_print_page_foot($FH);
+  close($FH);
+}
+print "\n" if $T2H_VERBOSE;
+
+#############################################################################
+# Print ToC, Overview, Footnotes
+#
+undef $T2H_HREF{Prev};
+undef $T2H_HREF{Next};
+undef $T2H_HREF{Back};
+undef $T2H_HREF{Forward};
+undef $T2H_HREF{Up};
+
+if (@foot_lines)
+{
+  print "# writing Footnotes in $docu_foot_file...\n" if $T2H_VERBOSE;
+  open (FILE, "> $docu_foot_file") || die "$ERROR: Can't open $docu_foot_file for writing: $!\n"
+      if $T2H_SPLIT;
+  $T2H_HREF{This} = $docu_foot;
+  $T2H_NAME{This} = 'Footnotes';
+  $T2H_THIS_SECTION = \@foot_lines;
+  t2h_print_footnotes(\*FILE);
+  close(FILE) if $T2H_SPLIT;
+}
+
+if (@toc_lines)
+{
+  print "# writing Toc in $docu_toc_file...\n" if $T2H_VERBOSE;
+  open (FILE, "> $docu_toc_file") || die "$ERROR: Can't open $docu_toc_file for writing: $!\n"
+      if $T2H_SPLIT;
+  $T2H_HREF{This} = $T2H_HREF{Contents};
+  $T2H_NAME{This} = $T2H_NAME{Contents};
+  $T2H_THIS_SECTION = \@toc_lines;
+  t2h_print_Toc(\*FILE);
+  close(FILE) if $T2H_SPLIT;
+}
+
+if (@stoc_lines)
+{
+  print "# writing Overview in $docu_stoc_file...\n" if $T2H_VERBOSE;
+  open (FILE, "> $docu_stoc_file") || die "$ERROR: Can't open $docu_stoc_file for writing: $!\n"
+      if $T2H_SPLIT;
+  
+  $T2H_HREF{This} = $T2H_HREF{Overview};
+  $T2H_NAME{This} = $T2H_NAME{Overview};
+  $T2H_THIS_SECTION = \@stoc_lines;
+  t2h_print_Overview(\*FILE);
+  close(FILE) if $T2H_SPLIT;
+}
+
+if ($about_body = t2h_about_body())
+{
+  print "# writing About in $docu_about_file...\n" if $T2H_VERBOSE;
+  open (FILE, "> $docu_about_file") || die "$ERROR: Can't open $docu_about_file for writing: $!\n"
+      if $T2H_SPLIT;
+  
+  $T2H_HREF{This} = $T2H_HREF{About};
+  $T2H_NAME{This} = $T2H_NAME{About};
+  $T2H_THIS_SECTION = [$about_body];
+  t2h_print_About(\*FILE);
+  close(FILE) if $T2H_SPLIT;
+}
+
+unless ($T2H_SPLIT)
+{
+  t2h_print_page_foot(\*FILE);
+  close (FILE);
+}
+  
+Finish:
+&l2h_FinishFromHtml if ($T2H_L2H);
+&l2h_Finish if($T2H_L2H);
+print "# that's all folks\n" if $T2H_VERBOSE;
+
+exit(0);
 
 #+++############################################################################
@@ -1752 +2467 @@
 #---############################################################################
 
+sub clean_name 
+{
+  local ($_);
+  $_ = &remove_style($_[0]);
+  &unprotect_texi;
+  return $_;
+}
+
 sub update_sec_num {
     local($name, $level) = @_;
+    my $ret;
 
     $level--; # here we start at 0
-    if (($name =~ /^appendix/) || ($section_type)) {
+    if ($name =~ /^appendix/ || defined(@appendix_sec_num)) {
         # appendix style
-        $section_type = 1;
         if (defined(@appendix_sec_num)) {
             &incr_sec_num($level, @appendix_sec_num);
@@ -1764 +2487 @@
             @appendix_sec_num = ('A', 0, 0, 0);
         }
-        return(join('.', @appendix_sec_num[0..$level]));
+        $ret = join('.', @appendix_sec_num[0..$level]);
     } else {
         # normal style
-        $section_type = 0;
-        if (defined(@normal_sec_num)) {
-            &incr_sec_num($level, @normal_sec_num);
-        } else {
-            @normal_sec_num = (1, 0, 0, 0);
-        }
-        return(join('.', @normal_sec_num[0..$level]));
-    }
+        if (defined(@normal_sec_num)) 
+        {
+          &incr_sec_num($level, @normal_sec_num);
+        } 
+        else 
+        {
+          @normal_sec_num = (1, 0, 0, 0);
+        }
+        $ret = join('.', @normal_sec_num[0..$level]);
+    }
+    
+    $ret .= "." if $level == 0;
+    return $ret;
 }
 
@@ -1792 +2520 @@
         if (/\@(\*|\.|\:|\@|\{|\})/) {
             $seen{$&}++;
-            $context{$&} .= "> $_" if $verbose;
+            $context{$&} .= "> $_" if $T2H_VERBOSE;
             $_ = "$`XX$'";
             redo;
@@ -1800 +2528 @@
             if ($before =~ /\b[\w-]+$/ && $after =~ /^[\w-.]*\b/) { # e-mail address
                 $seen{'e-mail address'}++;
-                $context{'e-mail address'} .= "> $_" if $verbose;
+                $context{'e-mail address'} .= "> $_" if $T2H_VERBOSE;
             } else {
                 $seen{$match}++;
-                $context{$match} .= "> $_" if $verbose;
+                $context{$match} .= "> $_" if $T2H_VERBOSE;
             }
             $match =~ s/^\@/X/;
@@ -1812 +2540 @@
     
     foreach (sort(keys(%seen))) {
-        if ($verbose) {
+        if ($T2H_VERBOSE) {
             print "$_\n";
             print $context{$_};
@@ -1867 +2595 @@
 }
 
+# used in pass 1 for l2h use &next_line
+sub string_until {
+    local($tag) = @_;
+    local($_, $string);
+
+    while ($_ = &next_line) {
+        return $string if /^\@end\s+$tag\s*$/;
+#       $_ =~ s/hbox/mbox/g;
+        $string = $string.$_;
+    }
+    die "* Failed to find '$tag' after: " . $lines[$#lines];
+}
+
 #
 # HTML stacking to have a better HTML output
@@ -1911 +2652 @@
     local($what, $line) = @_;
     return("<!-- $line @html_stack, $html_element -->$what")
-        if $debug & $DEBUG_HTML;
+        if $T2H_DEBUG & $DEBUG_HTML;
     return($what);
 }
@@ -1919 +2660 @@
     local($what, $line) = @_;
     return("<!-- $line -->$what")
-        if $debug & $DEBUG_HTML;
+        if $T2H_DEBUG & $DEBUG_HTML;
     return($what);
 }
@@ -1929 +2670 @@
 }
 
-sub left_menu_entry {
-    local($secnum, $entry) = @_;
-    local($_);
-    local($href, $descr, $oltype,$value);
-
-    $_ = $secnum;
-    $value = $secnum;
-    if (/[A-Z]/) { 
-        $oltype = "<LI TYPE=A";
-        $value = $append2num{$secnum};
-    } else {
-        $oltype = "<LI";
-    }
-    $_ = $entry;
-    print "===>($secnum): $entry\n";
-    #s/^[0-9A-Z.]+ //;
-    $_ = $entry;
-    &normalise_node($_);
-    $href = $node2href{$_};
-    if ($href) {
-        $descr =~ s/^\s+//;
-        $descr = ": $descr" if $descr;
-        push(@menu_lines, "$oltype VALUE=$value>" . &anchor('', $href, "Main", $entry) . "$descr\n");
-        push(@menu_lines, "<P>\n");
-    } else {
-        warn "$ERROR Undefined node ($node): $_";
-    }
-}
-
 sub menu_entry {
     local($entry, $node, $descr) = @_;
@@ -1966 +2678 @@
     if ($href) {
         $descr =~ s/^\s+//;
-        $descr = ": $descr" if $descr;
-        push(@lines2, "<LI>" . &anchor('', $href, '', $entry) . "$descr\n");
+        if ($T2H_NUMBER_SECTIONS)
+        {
+          $entry = $node2sec{$entry} if ! $descr && $node2sec{$entry};
+          push(@lines2, 
+               '<TR><TD ALIGN="left">' . 
+               &t2h_anchor('', $href, $entry) . 
+               '</TD><TD ALIGN="left">' . $descr . "</TD><TR>\n");
+        }
+        else
+        {
+          push(@lines2, "<LI>" . &t2h_anchor('', $href, $entry) . ": $descr\n");
+        }
     } else {
         warn "$ERROR Undefined node ($node): $_";
@@ -1973 +2695 @@
 }
 
+sub do_ctrl { "^$_[0]" }
+
 sub do_email {
-    my($address,$text);
-    ($address,$text) = split(/,/, "$_[0]");
-    $text =~ s/(^\s+)|(\s+$)//; # trim leading and trailing white space
-    $text = $address unless $text;
-    &anchor('', "mailto:${address}", '', "<TT>${text}</TT>")
-}
-
-sub do_image {
-    my($base,$width,$height,$image);
-    ($base,$width,$height) = split(/,/,"$_[0]");
-    if ( -f "${base}.jpg" ) {
-        $image = "${base}.jpg";
-    } elsif ( -f "${base}.gif" ) {
-        $image = "${base}.gif";
-    } else {
-        $image = $base;
-        warn "$ERROR image not found for ($base): $_";
-    }
-    "<BR><IMG SRC=\"${image}\"><BR>";
+    local($addr, $text) = split(/,\s*/, $_[0]);
+
+    $text = $addr unless $text;
+    &t2h_anchor('', "mailto:$addr", $text);
+}
+
+sub do_sc 
+{ 
+  # l2h does this much better
+  return &l2h_ToLatex("{\\sc ".&unprotect_html($_[0])."}") if ($T2H_L2H);
+  return "\U$_[0]\E";
+}
+
+sub do_math
+{
+  return &l2h_ToLatex("\$".&unprotect_html($_[0])."\$") if ($T2H_L2H);
+  return "<EM>".$text."</EM>";
 }
 
 sub do_uref {
-  my($href,$text);
-  ($href,$text) = split(/,/,"$_[0]");
-  $text =~ s/(^\s+)|(\s+$)//;   # trim leading and trailing white space
-  $text = $href unless $text;
-# args to anchor() are: ($name, $href, $text, $newline)
-  &anchor('', "$href", '', "<TT>$text</TT>")
-}
-
-sub do_url {
-    my($address,$text);
-    ($address,$text) = split(/,/, "$_[0]");
-    $text =~ s/(^\s+)|(\s+$)//; # trim leading and trailing white space
-    $text = $address unless $text;
-    $address =~ s/&#173;//g;
-    &anchor('', "${address}", '_parent', "<TT>${text}</TT>")
-}
-
-sub do_ctrl { "^$_[0]" }
-
-sub do_sc { "\U$_[0]\E" }
+    local($url, $text, $only_text) = split(/,\s*/, $_[0]);
+
+    $text = $only_text if $only_text;
+    $text = $url unless $text;
+    &t2h_anchor('', $url, $text);
+}
+
+sub do_url { &t2h_anchor('', $_[0], $_[0]) }
 
 sub apply_style {
@@ -2022 +2732 @@
 
     $style = $style_map{$texi_style};
-    if (defined($style)) { # known style
-        if ($style =~ /^\"/) { # add quotes
-            $style = $';
-            $text = "\`$text\'";
-        }
-        if ($style =~ /^\&/) { # custom
-            $style = $';
-            $text = &$style($text);
-        } elsif ($style) { # good style
-            $text = "<$style>$text</$style>";
-        } else { # no style
-        }
-    } else { # unknown style
-        $text = undef;
-    }
-    return($text);
-}
-
-sub apply_l_style {
-    local($texi_style, $text) = @_;
-    local($style);
-
-    $style = $style_l_map{$texi_style};
     if (defined($style)) { # known style
         if ($style =~ /^\"/) { # add quotes
@@ -2093 +2780 @@
 }
 
-sub anchor {
-    local($name, $href, $target, $text, $newline) = @_;
+sub t2h_anchor {
+    local($name, $href, $text, $newline) = @_;
     local($result);
 
@@ -2100 +2787 @@
     $result .= " NAME=\"$name\"" if $name;
     $result .= " HREF=\"$href\"" if $href;
-    $result .= " TARGET=\"$target\"" if $target;
     $result .= ">$text</A>";
     $result .= "\n" if $newline;
@@ -2109 +2795 @@
     local(@MoY, $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst);
 
-    @MoY = ('January', 'Febuary', 'March', 'April', 'May', 'June',
+    @MoY = ('January', 'February', 'March', 'April', 'May', 'June',
             'July', 'August', 'September', 'October', 'November', 'December');
     ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = localtime(time);
     $year += ($year < 70) ? 2000 : 1900;
-    return("$mday $MoY[$mon] $year");
-}
-
-sub doc_name {
+    # obachman: Let's do it as the Americans do
+    return("$MoY[$mon], $mday  $year");
+}
+
+sub doc_href {
     local($num) = @_;
 
-    return("${docu_name}_$num.html");
+    return("${docu_name}_$num.$docu_ext");
+}
+
+sub sec_href
+{
+  return $node2href{$sec2node{$_[0]}};
 }
 
 sub next_doc {
-    $docu_doc = &doc_name(++$doc_num);
-}
-
-sub print {
-    local(*lines, $fh) = @_;
+    $docu_doc = &doc_href(++$doc_num);
+}
+
+sub t2h_print_lines {
+    my ($fh, $lines) = @_;
     local($_);
-
-    while (@lines) {
-        $_ = shift(@lines);
+    $lines = $T2H_THIS_SECTION unless $lines;
+    my $cnt = 0;
+    for (@$lines) 
+    {
+        $_ = l2h_FromHtml($_) if ($T2H_L2H);
         if (/^$PROTECTTAG/o) {
             $_ = $tag2pro{$_};
@@ -2138 +2832 @@
         }
         print $fh $_;
-    }
-}
-
-sub print_ruler {
-    print FILE "<P><HR><P>\n";
-}
-
-sub print_frame {
-    print FILE <<EOT;
-<FRAMESET COLS="20%,*" BORDER=0>
-<FRAME SRC="$docu_left" NAME="Links">
-<FRAME SRC="$_[0]" NAME="Main">
-</FRAMESET>
-
-EOT
-}
-
-sub print_header {
-    local($_);
-
-    $links = $_[1];
-    $is_frame = $_[2];
-    # clean the title
-    $_ = &remove_style($_[0]);
-    &unprotect_texi;
-    # print the header
-    if ($doctype eq 'html2') {
-        print FILE $html2_doctype; # Wrong if any multitable used
-    } elsif ($doctype) {
-        print FILE $doctype;
-    }
-    print FILE <<EOT;
-<HTML>
-<HEAD>
-$header
-<TITLE>$_</TITLE>
-$links
-</HEAD>
-EOT
-    if(!$is_frame) { print FILE "<BODY background=\"$IMG_RIGHT\">\n"; }
-}
-
-sub print_toplevel_header {
-    local($_);
-
-    &print_header ($_[0], "", 0);
-    print FILE $full_title;
-    if ($value{'_subtitle'}) {
-        $value{'_subtitle'} =~ s/\n+$//;
-        foreach (split(/\n/, $value{'_subtitle'})) {
-            $_ = &substitute_style($_);
-            &unprotect_texi;
-            print FILE "<H2>$_</H2>\n";
-        }
-    }
-    if ($value{'_author'}) {
-        $value{'_author'} =~ s/\n+$//;
-        foreach (split(/\n/, $value{'_author'})) {
-            $_ = &substitute_style($_);
-            &unprotect_texi;
-#           s/[\w.-]+\@[\w.-]+/<A HREF="mailto:$&">$&<\/A>/g;
-            print FILE "<ADDRESS>$_</ADDRESS>\n";
-        }
-    }
-    print FILE "<P>\n";
-}
-
-sub print_footer {
-    print FILE <<EOT;
-</BODY>
-</HTML>
-EOT
-}
-
-sub print_toplevel_footer {
-    &print_ruler;
-    print FILE <<EOT;
-<H6>This document was generated on $TODAY using the
-<A HREF=\"$HOMEPAGE\" TARGET=\"_parent\">texi2html</A>
-translator version 1.51a.</H6>
-<H6>Modified by the Singular-Team 19.6.1998</H6>
-EOT
-    &print_footer;
+        $cnt += split(/\W*\s+\W*/);
+    }
+    return $cnt;
 }
 
@@ -2265 +2879 @@
 }
 
+sub t2h_print_label
+{
+    my $fh = shift;
+    my $href = shift || $T2H_HREF{This};
+    $href =~ s/.*#(.*)$/$1/;
+    print $fh qq{<A NAME="$href"></A>\n};
+}
+
 ##############################################################################
 
@@ -2275 +2897 @@
 .nr % 0                 \" start at page 1
 '; __END__ ############# From here on it's a standard manual page ############
-.TH TEXI2HTML 1 "08/12/97"
+.TH TEXI2HTML 1 "01/05/98"
 .AT 3
 .SH NAME
 texi2html \- a Texinfo to HTML converter
 .SH SYNOPSIS
-.B texi2html [OPTION]... FILE
+.B texi2html [options] file
 .PP
-.B texi2html -check [-verbose] FILE...
+.B texi2html -check [-verbose] files
 .SH DESCRIPTION
 .I Texi2html
@@ -2295 +2917 @@
 .PP
 .I Texi2html
+may furthermore use latex2html to generate HTML (code and/or images) for @math
+and @iftex tags (see the 
+.B \-l2h
+option).
+.PP
+.I Texi2html
 creates several files depending on the contents of the Texinfo file and on
 the chosen options (see FILES).
@@ -2301 +2929 @@
 .I texi2html
 are closer to TeX than to Info, that's why
-.I texi2html
-converts @iftex sections and not @ifinfo ones by default. You can reverse
-this with the \-expandinfo option.
 .SH OPTIONS
 .TP 12
@@ -2312 +2937 @@
 to find the Texinfo commands that have been left in the HTML file.
 .TP
-.B \-expandinfo
-Expand @ifinfo sections, not @iftex ones.
+.B \-expand info|tex|none
+Expand @ifinfo, or @iftex, or sections (default: info)
 .TP
 .B \-glossary
@@ -2320 +2945 @@
 .TP
 .B \-invisible \fIname\fP
-Use \fIname\fP to create invisible destination anchors for index links. This is a workaround
-for a known bug of many WWW browsers, including xmosaic.
+Use \fIname\fP to create invisible destination anchors for index links
+(you can for instance use the invisible.xbm file shipped with this program).
+This is a workaround for a known bug of many WWW browsers, including netscape.
 .TP
 .B \-I \fIdir\fP
@@ -2341 +2967 @@
 .B \-split_node
 Split the output into several HTML files (one per node).
+.TP
+.B \-l2h
+Use latex2html for content of @math and @tex tags. Content must be such that 
+both, latex and tex, can translate it correctly. I.e., no tex-only constructs 
+must be used.
+.TP
+.B \-l2h_latex2html \fIprog\fP  
+Use \fIprog\fP as latex2html program (default \fIlatex2html\fP). 
+Program must be executable. 
+.TP
+.B \-l2h_init \fIfile\fP  
+Use \fIfile\fP as latex2html init file. \fIfile\fP should be used to specify in which way latex2html handles mathematical expressions and formulas. 
+
+Note that latex2html locates  
+(and uses) init-files in the following order (provided they exist): 
+(1) global init file (usually in latex2html source dir) 
+(2) $HOME/.latex2html_init 
+(3) ./.latex2html_init 
+(4) init file given on command line.  
+.TP
+.B \-l2h_dir \fIdir\fP
+Use \fIdir\fP as tmp dir for latex2html. This directory (resp. its path) 
+must not contain a dot  (i.e., a ".").
+.TP 
+.B \-l2h_clean
+remove all intermediate files generated by latex2html (prevents caching!)  
+.TP 
+.B \-l2h_skip
+Do not really run latex2html. Use (kept) files of previous runs, instead.
 .TP
 .B \-usage
@@ -2363 +3018 @@
 .B foo_foot.html
 The footnotes (if any).
+.TP
+.B foo_l2h_img*
+Images generated by latex2html (if any).
 .PP
 When used with the
@@ -2368 +3026 @@
 option, it creates several files (one per chapter or node), named
 .B foo_n.html
-(n being the indice of the chapter or node), instead of the single
+(n being the index of the chapter or node), instead of the single
 .B foo.html
 file.
@@ -2381 +3039 @@
 .SH ADDITIONAL COMMANDS
 .I texi2html
-implements the following non-Texinfo commands:
+implements the following non-Texinfo commands (maybe they are in Texinfo now...):
 .TP 16
-.B @ifhtml
+.B @html
 This indicates the start of an HTML section, this section will passed through
-without any modofication.
+without any modification.
 .TP
-.B @end ifhtml
-This indcates the end of an HTML section.
+.B @end html
+This indicates the end of an HTML section.
 .SH VERSION
-This is \fItexi2html\fP version 1.54, 1998-01-17
+This is \fItexi2html\fP version 1.56k, 1999-02-20.
 .PP
-The latest version of \fItexi2html\fP can be found at
-ftp://ftp.cs.umb.edu/pub/tex/texi2html
+The latest version of \fItexi2html\fP and \fIlatex22html\fPcan be found in WWW, cf. URLs
+http://wwwinfo.cern.ch/dis/texi2html/
+.br
+http://texinfo.org/texi2html/
+.br
+http://www-dsed.llnl.gov/files/programs/unix/latex2html
+.br
 .SH AUTHOR
-The main author is Lionel Cons, CERN CN/DCI/UWS.
-This version is maintained at ftp://ftp.cs.umb.edu/pub/tex/texi2html
-by kb@cs.umb.edu.
+The main author is Lionel Cons, CERN IT/DIS/OSE, Lionel.Cons@cern.ch.
 Many other people around the net contributed to this program.
 .SH COPYRIGHT
@@ -2412 +3073 @@
 World Wide Web (WWW).
 .SH BUGS
-This program does not understand all Texinfo commands (yet).
+This program does not understand all Texinfo commands (yet). A row of
+a  mutlicolumn table has to be in one line.
 .PP
 TeX specific commands (normally enclosed in @iftex) will be
-passed u
+passed over unmodified, unless latex2html is enabled.
+.ex