171 files changed, 1892 insertions, 28816 deletions

diff --git a/Master/bin/alpha-linux/a2ping b/Master/bin/alpha-linux/a2ping
index 82d202b022e..5cbfe106996 100755..120000
--- a/Master/bin/alpha-linux/a2ping
+++ b/Master/bin/alpha-linux/a2ping
@@ -1,2399 +1 @@
-#! /bin/sh
-eval '(exit $?0)' && eval 'PERL_BADLANG=x;export PERL_BADLANG;: \
-;exec perl -x -S -- "$0" ${1+"$@"};#'if 0;
-eval 'setenv PERL_BADLANG x;exec perl -x -S -- "$0" $argv:q;#'.q+
-#!perl -w
-package Htex::a2ping;  $0=~/(.*)/s;unshift@INC,'.';do($1);die$@if$@;__END__+if !1;
-# This Perl script was generated by JustLib2 at Wed Apr 23 09:14:13 2003.
-# Don't touch/remove any lines above; http://www.inf.bme.hu/~pts/justlib
-#
-# This program is free software, licensed under the GNU GPL, >=2.0.
-# This software comes with absolutely NO WARRANTY. Use at your own risk!
-#
-package just; BEGIN{$INC{'just.pm'}='just.pm'}
-BEGIN{ $just::VERSION=2 }
-sub end(){1}
-sub main(){}
-
-BEGIN{$ INC{'strict.pm'}='strict.pm'} {
-package strict;
-use just;
-# by pts@fazekas.hu at Wed Jan 10 12:42:08 CET 2001
-require 5.002;
-sub bits {
-  (grep{'refs'eq$_}@_ && 2)|
-  (grep{'subs'eq$_}@_ && 0x200)|
-  (grep{'vars'eq$_}@_ && 0x400)|
-  ($@ || 0x602)
-}
-sub import { shift; $^H |= bits @_ }
-sub unimport { shift; $^H &= ~ bits @_ }
-just::end}
-
-BEGIN{$ INC{'integer.pm'}='integer.pm'} {
-package integer;
-use just;
-# by pts@fazekas.hu at Wed Jan 10 12:42:08 CET 2001
-sub import   { $^H |= 1 }
-sub unimport { $^H &= ~1 }
-just::end}
-
-BEGIN{$ INC{'Pts/string.pm'}='Pts/string.pm'} {
-package Pts::string;
-# by pts@fazekas.hu at Sat Dec 21 21:32:18 CET 2002
-use just;
-use integer;
-use strict;
-
-#** @param $_[0] a string
-#** @param $_[1] index of first bit to return. Bit 128 of byte 0 is index 0.
-#** @param $_[2] number of bits to return (<=32)
-#** @return an integer (negative on overflow), bit at $_[1] is its MSB
-sub get_bits_msb($$$) {
-  # assume: use integer;
-  my $loop=$_[1];
-  my $count=$_[2];
-  my $ret=0;
-  ($ret+=$ret+(1&(vec($_[0],$loop>>3,8)>>(7-($loop&7)))), $loop++) while $count--!=0;
-  $ret
-}
-
-#** @param $_[0] a string
-#** @return value if $_[0] represents a floating point numeric constant
-#**   in the C language (without the LU etc. modifiers) -- or undef. Returns
-#**   undef for integer constants
-sub c_floatval($) {
-  my $S=$_[0];
-  no integer; # very important; has local scope
-  return 0.0+$S if $S=~/\A[+-]?(?:[0-9]*\.[0-9]+|[0-9]+\.])(?:[eE][+-]?[0-9]+)?\Z(?!\n)/;
-  undef
-}
-
-#** @param $_[0] a string
-#** @return value if $_[0] represents a floating point or integer numeric
-#**   constant in the C language (without the LU etc. modifiers) -- or undef
-sub c_numval($) {
-  my $S=$_[0];
-  no integer; # very important; has local scope
-  return 0+$S if $S=~/\A[+-]?(?:[0-9]*\.[0-9]+(?:[eE][+-]?[0-9]+)?|[0-9]+\.?)\Z(?!\n)/;
-  undef
-}
-
-#** @param $_[0] a string
-#** @return the integer value of $_[0] in C -- or undef
-sub c_intval($) {
-  my $S=$_[0];
-  my $neg=1;
-  $neg=-1 if $S=~s@\A([+-])@@ and '-'eq$1;
-  return $neg*hex $1 if $S=~/\A0[xX]([0-9a-fA-F]+)\Z(?!\n)/;
-  return $neg*oct $1 if $S=~/\A0([0-7]+)\Z(?!\n)/;
-  return $neg*$1     if $S=~/\A([0-9]+)\Z(?!\n)/;
-  undef
-}
-
-sub import {
-  no strict 'refs';
-  my $package = (caller())[0];
-  shift; # my package
-  for my $p (@_ ? @_ : qw{get_bits_msb c_floatval c_numval c_intval}) { *{$package."::$p"}=\&{$p} }
-}
-
-just::end}
-
-BEGIN{$ INC{'Htex/dimen.pm'}='Htex/dimen.pm'} {
-package Htex::dimen;
-# by pts@fazekas.hu at Sat Dec 21 21:26:15 CET 2002
-use just;
-use integer;
-use strict;
-use Pts::string qw(c_numval);
-
-my %bp_mul;
-{ no integer; %bp_mul=(
-  'bp'=>1, # 1 bp = 1 bp (big point)
-  'in'=>72, # 1 in = 72 bp (inch)
-  'pt'=>72/72.27, # 1 pt = 72/72.27 bp (point)
-  'pc'=>12*72/72.27, # 1 pc = 12*72/72.27 bp (pica)
-  'dd'=>1238/1157*72/72.27, # 1 dd = 1238/1157*72/72.27 bp (didot point) [about 1.06601110141206 bp]
-  'cc'=>12*1238/1157*72/72.27, # 1 cc = 12*1238/1157*72/72.27 bp (cicero)
-  'sp'=>72/72.27/65536, # 1 sp = 72/72.27/65536 bp (scaled point)
-  'cm'=>72/2.54, # 1 cm = 72/2.54 bp (centimeter)
-  'mm'=>7.2/2.54, # 1 mm = 7.2/2.54 bp (millimeter)
-) }
-
-#** @param $_[0] a (real or integer) number, optionally postfixed by a
-#**        TeX dimension specifier (default=bp)
-#** @return the number in bp, or undef
-sub dimen2bp($) {
-  no integer;
-  my $S=$_[0];
-  my $mul;
-  $mul=$bp_mul{$1} if $S=~s/\s*([a-z][a-z0-9]+)\Z(?!\n)// and exists $bp_mul{$1};
-  my $val=c_numval($S);
-  $val*=$mul if defined $val and defined $mul;
-  $val
-}
-
-just::end}
-
-BEGIN{$ INC{'Htex/papers.pm'}='Htex/papers.pm'} {
-package Htex::papers;
-# contains paper size information
-# by pts@fazekas.hu at Sun Dec 22 00:30:58 CET 2002
-use just;
-use integer;
-use strict;
-use Htex::dimen;
-
-my @papers=(
-#
-# paper.txt
-# by pts@fazekas.hu at Tue Jan 16 18:21:59 CET 2001
-# by pts@fazekas.hu at Tue Jan 16 19:13:16 CET 2001
-#
-# Examined: dvips, gs, libpaperg
-#
-# all units are measured in Big Points (bp)
-# 72 bp == 1 in
-# 2.54 cm == 1 in
-#
-# papername	width	height
-qw{Comm10	297	684},
-qw{Monarch	279	540},
-qw{halfexecutive 378	522},
-
-qw{Legal	612	1008},
-qw{Statement	396	612},
-qw{Tabloid	792	1224},
-qw{Ledger	1224	792},
-qw{Folio	612	936},
-qw{Quarto	610	780},
-qw{7x9		504	648},
-qw{9x11		648	792},
-qw{9x12		648	864},
-qw{10x13	720	936},
-qw{10x14	720	1008},
-qw{Executive	540	720},
-
-qw{ISOB0	2835	4008},
-qw{ISOB1	2004	2835},
-qw{ISOB2	1417	2004},
-qw{ISOB3	1001	1417},
-qw{ISOB4	 709	1001},
-qw{ISOB5	 499	 709},
-qw{ISOB6	 354	 499},
-qw{ISOB7	 249	 354},
-qw{ISOB8	 176	 249},
-qw{ISOB9	 125	 176},
-qw{ISOB10	 88	 125},
-qw{jisb0	2916	4128},
-qw{jisb1	2064	2916},
-qw{jisb2	1458	2064},
-qw{jisb3	1032	1458},
-qw{jisb4	 729	1032},
-qw{jisb5	 516	 729},
-qw{jisb6	 363	 516},
-
-qw{C7		230	323},
-qw{DL		312	624},
-
-qw{a3		842	1190},	# defined by Adobe
-qw{a4		595	842},	# defined by Adobe; must precede a4small
-
-# a4small should be a4 with an ImagingBBox of [25 25 570 817].},
-qw{a4small	595	842},
-qw{letter	612	792},	# must precede lettersmall
-# lettersmall should be letter with an ImagingBBox of [25 25 587 767].
-qw{lettersmall	612	792},
-# note should be letter (or some other size) with the ImagingBBox
-# shrunk by 25 units on all 4 sides.
-qw{note		612	792},
-qw{letterLand	792	612},
-# End of Adobe-defined page sizes
-
-qw{a0		2380	3368},
-qw{a1		1684	2380},
-qw{a2		1190	1684},
-qw{a5		421	595},
-qw{a6		297	421},
-qw{a7		210	297},
-qw{a8		148	210},
-qw{a9		105	148},
-qw{a10		74	105},
-qw{b0		2836	4008},
-qw{b1		2004	2836},
-qw{b2		1418	2004},
-qw{b3		1002	1418},
-qw{b4		709	1002},
-qw{b5		501	709}, # defined by Adobe
-
-qw{a0Land	3368	2380},
-qw{a1Land	2380	1684},
-qw{a2Land	1684	1190},
-qw{a3Land	1190	842},
-qw{a4Land	842	595},
-qw{a5Land	595	421},
-qw{a6Land	421	297},
-qw{a7Land	297	210},
-qw{a8Land	210	148},
-qw{a9Land	148	105},
-qw{a10Land	105	74},
-qw{b0Land	4008	2836},
-qw{b1Land	2836	2004},
-qw{b2Land	2004	1418},
-qw{b3Land	1418	1002},
-qw{b4Land	1002	709},
-qw{b5Land	709	501},
-
-qw{c0		2600	3677},
-qw{c1		1837	2600},
-qw{c2		1298	1837},
-qw{c3		918	1298},
-qw{c4		649	918},
-qw{c5		459	649},
-qw{c6		323	459},
-
-# vvv U.S. CAD standard paper sizes
-qw{archE	2592	3456},
-qw{archD	1728	2592},
-qw{archC	1296	1728},
-qw{archB	864	1296},
-qw{archA	648	864},
-
-qw{flsa		612	936},	# U.S. foolscap
-qw{flse		612	936},	# European foolscap
-qw{halfletter	396	612},
-qw{csheet	1224	1584},	# ANSI C 17x22
-qw{dsheet	1584	2448},	# ANSI D 22x34
-qw{esheet	2448	3168},	# ANSI E 34x44
-qw{17x22	1224	1584},	# ANSI C 17x22
-qw{22x34	1584	2448},	# ANSI D 22x34
-qw{34x44	2448	3168},	# ANSI E 34x44
-);
-
-#** Converts a numeric paper size to a well-defined paper name. Tolerance is
-#** 8.5bp
-#** @param $_[0] width, in bp
-#** @param $_[1] height, in bp
-#** @return () or ("papername", ret.paper.width.bp, ret.paper.height.bp)
-sub valid_bp($$;$$) {
-  no integer;
-  my ($W1,$H1)=(defined$_[2]?$_[2]:0,defined$_[3]?$_[3]:0);
-  my ($WW,$HH)=(Htex::dimen::dimen2bp($_[0])-$W1, Htex::dimen::dimen2bp($_[1])-$H1);
-  # Dat: 1mm == 720/254bp; 3mm =~ 8.5bp
-  no integer;
-  for (my $I=0; $I<@papers; $I+=3) {
-    return @papers[$I,$I+1,$I+2] if abs($papers[$I+1]-$WW)<=8.5 and abs($papers[$I+2]-$HH)<=8.5;
-  }
-  ()
-}
-
-#** @param $_[0] (width width_unit "," height height_unit)
-#** @return () or ("papername", width.bp, height.bp)
-sub valid($) { # valid_papersize
-  my $S=lc$_[0];
-  $S=~/^\s*(\d+(\.\d+)?)\s*([a-z][a-z0-9]+)\s*,\s*(\d+(\.\d+)?)\s*([a-z][a-z0-9]+)\s*\Z(?!\n)/ ?
-    valid_bp("$1$3","$4$6") : ();
-}
-
-#** @param $_[0] (width width_unit? ("," || "x") height height_unit?) || (papername)
-#** @return () or ("papername"?, width.bp, height.bp)
-sub any($) {
-  my $S=lc$_[0];
-  if ($S=~/\A[a-z]\w+\Z(?!\n)/) {
-    for (my $I=0; $I<@papers; $I+=3) {
-      return @papers[$I,$I+1,$I+2] if lc($papers[$I]) eq $S;
-    }
-  }
-  return () if $S!~/^\s*(\d+(\.\d+)?)\s*((?:[a-z][a-z0-9]+)?)\s*[,xX]\s*(\d+(\.\d+)?)\s*((?:[a-z][a-z0-9]+)?)\s*\Z(?!\n)/;
-  # ^^^ Dat: [xX] is xdvi-style, [,] is dvips-style spec
-  my($w,$h)=($1.$3, $4.$6);
-  my @L=valid_bp($w,$h);
-  @L ? @L : (undef,Htex::dimen::dimen2bp($w),Htex::dimen::dimen2bp($h))
-}
-
-just::end}
-
-BEGIN{$  INC{'Htex/a2ping.pm'}='Htex/a2ping.pm'}
-
-package Htex::a2ping;
-# a2ping.pl -- convert between PS, EPS and PDF and other page description formats
-# by pts@fazekas.hu et al. at Wed Apr 16 14:54:13 CEST 2003
-# a2ping.pa created at Sun Apr 20 22:25:47 2003
-#
-# This file contains perldoc(1) documentation. Search for `=head1'.
-# See revision history at end of this file.
-#
-
-use just +1; # a JustLib application
-use strict;
-use integer;
-use Htex::papers;
-BEGIN { $Htex::a2ping::VERSION="2.77p" }
-
-# Imp: gs(704?!) sometimes finds too small bbox, see Univers.eps
-# Imp: respect bbox in METAPOST %! (not EPS), don't use Compute-GS T-
-# Imp: -sPDFPassword=...
-# Imp: `a2ping.pl -v jf.eps pdf1: t.pdf' PDF1: must be forced to have --below
-# Imp: option to `clip' an EPS to the specified bbox -- does file size decrease?
-# Imp: fix bug a2ping -v ~/a2ping_bug.ps a2ping_bug.pdf; running type1fix on
-#      all fonts with dff.pl has fixed the problem
-# Imp: post-process PNG etc. written by sam2p
-# Imp: better help and docs
-# Imp: respect full /MediaBox for a PDF -> EPS|PDF1 conversion
-# Imp: --ll x,y command line option
-# Imp: Htex/a2ping.pa -v ../image/tuzv.ps t.pdf  (1st and second page different)
-# Imp: also save+restore /pdfmark ??
-# Imp: fix /MediaBox an all PDF pages if !$ll_zero
-# Imp: PDF -> PDF1 conversion with gs -sDEVICE=pdfwrite
-# Imp: direct PDF to PCL5 conversion with gs
-# Imp: remove %%BeginDefaults | %%PageMedia: plain | %%EndDefaults (pdftops(1))
-# Imp: fix completely bogus margin and papersize handling:
-#      ../justlib2/Htex/a2ping.pa --duplex=force-short -v -p:a3 -r force-unknown tuzv.ps t.pdf
-# Imp: careful distinction between PDF and PDF1
-# Imp: psnup support (-1 -2 -3 -4 ...)
-# Imp: idempotent PS -> PS, add other header
-# Imp: use convert(1) etc.
-# Imp: possibly disable compute-pipe
-# Imp: $header_remove_p ??
-# Imp: --leftright option instead of --below
-# Imp: pdfboxes.pl, get offset from gs
-# Imp: detect error messages from GS, abort...
-# Imp: use all pdftops + gs + acroread
-# Imp: possibly accept /PageSize from %%DocumentMedia
-# Imp: /DocumentMedia seems to screw up sub-pt placement in gv(1)
-#
-# Dat: example: a2ping.pl --extra=-c:ijg:50 -r86 nn1.eps nn1.jpg
-# Dat: calling ``showpage'' is not required for -sDEVICE=pdfwrite with gs 6.50,
-#      but -sDEVICE=pgmraw depends on it
-# Dat: the functionality of pdfboxes.pl cannot be provided here with a shorter
-#      implementation, because gs always outputs the content stream of the PDF
-#      objects first
-# Dat: pdftops -eps writes negative bbox correctly
-# Dat: markedEPS: include pdfmarks
-# Dat: gs 7.04 gdevdjet.[ch], gdevdljm.[ch]
-# Dat: to be undeffed in setpagedevice: /.MarginsHWResolution /PageSize
-#      /ImagingBBox /HWResolution /HWSize /.MediaSize (we undef all)
-
-### program identification
-my $program = "a2ping.pl";
-my $filedate="2004-04-28"; # my $filedate="2001/03/05";
-my $copyright = "Written by <pts\@fazekas.hu> from April 2003.
-This is free software, GNU GPL >=2.0. There is NO WARRANTY.
-(epstopdf 2.7 Copyright 1998-2001 by Sebastian Rahtz et al.)\n";
-# "Contains modifications by pts\@fazekas.hu";
-my $title = "$program $Htex::a2ping::VERSION, $filedate -- $copyright\n";
-
-### ghostscript command name
-my($quote,$GS)=("'","gs");
-($quote,$GS) = ("\"","gswin32c") if $^O eq 'MSWin32' or $^O =~ /cygwin/i;
-
-# --- help functions
-
-sub fnq($) {
-  my $fn=$_[0];
-  return $fn if $fn!~y@-a-zA-Z0-9/.+_@@c;
-  $fn=~s@'@\\'@g if $quote eq "'";
-  $quote.$fn.$quote
-}
-
-sub debug {
-  print STDERR "* @_\n" if $::opt_verbose;
-}
-sub warning {
-  print STDERR "$0: warning: @_\n";
-}
-sub error {
-  my $s=$title; $title="";
-  die "$s$0: @_\n";
-}
-
-# unlink temporary files?
-my $tmpunlink_p=1;
-my $tmpsig=1;
-my %tmpfiles;
-my $tmpdir=exists $ENV{TMPDIR} ? $ENV{TMPDIR} : '/tmp';
-$tmpdir="." if (!-d $tmpdir or !-w $tmpdir) and -w '.';
-sub cleanup() {
-  unlink keys %tmpfiles;
-  exit 125;
-}
-END { unlink keys %tmpfiles; }
-sub temp_unlink($) {
-  if (exists $tmpfiles{$_[0]}) {
-    unlink $_[0] if $tmpunlink_p;
-    delete $tmpfiles{$_[0]};
-  }
-}
-sub temp_prefix() {
-  my $prog0=$program;
-  $prog0=~y@a-zA-Z0-9@_@c;
-  if ($tmpsig) {
-    $tmpsig=0;
-    $SIG{INT}=$SIG{TERM}=$SIG{HUP}=$SIG{QUIT}=\&cleanup;
-  }
-  return "$tmpdir/$prog0-$$-".int(rand(1<<30))."-"; # 30: nonnegative
-}
-
-#** @return arg rounded down to int
-sub floor($) {
-  # Dat: Perl int() rounds towards zero
-  no integer;
-  $_[0] < 0 ? -int(-$_[0]) : int($_[0])
-}
-
-#** @return arg rounded up to int
-sub ceil($) {
-  no integer;
-  $_[0]==int($_[0]) ? $_[0] : 1+ ($_[0] < 0 ? -int(-$_[0]) : int($_[0]))
-}
-
-
-just::main;
-
-# ---
-
-sub FL_PAGE1_STOP(){1} # is file format single-page?
-sub FL_SET_PAGESIZE_OK(){2}
-sub FL_PDFMARK(){4}
-sub FL_NEED_SHOWPAGE(){8} # does gs -sDEVICE=... need showpage?
-sub FL_SAMPLED(){16} # is it a sampled (raster, pixel-based)
-sub FL_ANY_ORIGIN_OK(){32} # (llx,lly) may be anything, not just (0,0)
-sub FL_HAS_ANTIALIAS(){64}
-sub FL_VIA_SAM2P(){128} # sam2p(1) can convert PNM to such a format
-sub FL_OK_SAM2P(){256}
-
-my %fmts=( # Name=>[flags]
-  'EPS'=>[FL_PAGE1_STOP],
-  'markedEPS'=>[FL_PAGE1_STOP|FL_PDFMARK], # Imp: should we have FL_SET_PAGESIZE_OK?
-  'PDF1'=>[FL_PAGE1_STOP|FL_SET_PAGESIZE_OK|FL_PDFMARK],
-  'PDF'=>[FL_SET_PAGESIZE_OK|FL_PDFMARK|FL_ANY_ORIGIN_OK],
-  'PS'=>[FL_SET_PAGESIZE_OK|FL_ANY_ORIGIN_OK],
-  'markedPS'=>[FL_SET_PAGESIZE_OK|FL_PDFMARK|FL_ANY_ORIGIN_OK],
-  'PCL5'=>[FL_SET_PAGESIZE_OK|FL_ANY_ORIGIN_OK],
-  # ^^^ Dat: no FL_HAS_ANTIALIAS -- would need lj5gray, which is loonger
-  # ^^^ Dat: no FL_SAMPLED, because cannot set resolution
-  'PBM'=> [FL_PAGE1_STOP|FL_SET_PAGESIZE_OK|FL_NEED_SHOWPAGE|FL_SAMPLED|FL_OK_SAM2P], # Dat FL_HAS_ANTIALIAS produces obscure image
-  'PGM'=> [FL_PAGE1_STOP|FL_SET_PAGESIZE_OK|FL_NEED_SHOWPAGE|FL_SAMPLED|FL_HAS_ANTIALIAS|FL_OK_SAM2P],
-  'PPM'=> [FL_PAGE1_STOP|FL_SET_PAGESIZE_OK|FL_NEED_SHOWPAGE|FL_SAMPLED|FL_HAS_ANTIALIAS|FL_OK_SAM2P],
-  # Now come the FileFormats supported via sam2p
-  'PNG'=> [FL_PAGE1_STOP|FL_SET_PAGESIZE_OK|FL_NEED_SHOWPAGE|FL_SAMPLED|FL_HAS_ANTIALIAS|FL_VIA_SAM2P],
-  'XWD'=> [FL_PAGE1_STOP|FL_SET_PAGESIZE_OK|FL_NEED_SHOWPAGE|FL_SAMPLED|FL_HAS_ANTIALIAS|FL_VIA_SAM2P],
-  'BMP'=> [FL_PAGE1_STOP|FL_SET_PAGESIZE_OK|FL_NEED_SHOWPAGE|FL_SAMPLED|FL_HAS_ANTIALIAS|FL_VIA_SAM2P],
-  'TIFF'=>[FL_PAGE1_STOP|FL_SET_PAGESIZE_OK|FL_NEED_SHOWPAGE|FL_SAMPLED|FL_HAS_ANTIALIAS|FL_VIA_SAM2P],
-  'JPEG'=>[FL_PAGE1_STOP|FL_SET_PAGESIZE_OK|FL_NEED_SHOWPAGE|FL_SAMPLED|FL_HAS_ANTIALIAS|FL_VIA_SAM2P],
-  'GIF'=> [FL_PAGE1_STOP|FL_SET_PAGESIZE_OK|FL_NEED_SHOWPAGE|FL_SAMPLED|FL_HAS_ANTIALIAS|FL_VIA_SAM2P], # Imp: disable antialias for few colors?
-  'XPM'=> [FL_PAGE1_STOP|FL_SET_PAGESIZE_OK|FL_NEED_SHOWPAGE|FL_SAMPLED|FL_HAS_ANTIALIAS|FL_VIA_SAM2P], # Imp: disable antialias for few colors?
-);
-my %fmt_aliases=qw(MARKEDPS markedPS  MARKEDEPS markedEPS  PCL PCL5
-  UNMARKEDPS PS  UNMARKEDEPS EPS  EPDF PDF1  MEPS markedEPS);
-# Dat: .ps will be unmarked PS
-# Imp: sometimes markedEPS for .eps?
-my %fmt_exts=qw(eps EPS  epsi EPS  epsf EPS  eps2 EPS  ps PS  ps2  PS
-  pcl PCL5  pcl5 PCL5  pbm PBM  pgm PGM  pnm PPM  ppm PPM  pdf PDF  png PNG
-  xwd XWD  bmp  BMP  rle BMP  tif TIFF  tiff TIFF  jpg JPEG  jpe JPEG
-  jpg JPEG  gif GIF  xpm XPM);
-
-### usage
-# vvv deprecated options:
-#   --outfile=<file>: write result to <file>
-#   --debug:          verbose debug informations       (default: $bool[$::opt_verbose])
-#   --(no)filter:     d. read standard input           (default: false)
-#   --(no)gs        d. run Ghostscript to create PDF
-my $usage=
-"${title}Usage:  $program [options] <inputfile> [[<outformat>:] <outputfile>]
-Run with --doc to read documentation as a UNIX man(1) page.
-Options: --help print this help message
---(no)compress  use compression                   (def: best)
---(no)hires     scan HiResBoundingBox             (def: yes)
---(no)exact     scan ExactBoundingBox             (def: no)
---(no)verbose   verbose debug informations        (def: no)
---(no)below     allow below+left_from baseline    (def: no)
---(no)tmpunlink unlink temporary files            (def: yes)
---(no)antialias render shades at outlines (def: scale3no) (=scale3yes =no =yes)
---gs-cmd=       path to Ghostscript               (def: gs or gswin32c)
---gs-ccmd=      path to Ghostscript, 4 bbox calc  (def: gs or gswin32c)
---gsextra=      extra arg to gs
---extra=        extra arg to external prg (i.e pdftops)
---bboxfrom=     adsc|compute-gs|pagesize          (def: guess)
---papersize=    unchanged|force-unknown|600bpx5cm (def: default) (bp)
---threshold=    min color for 1 in 8->1 bit conv  (def: 128)
-Possible input formats: PS EPS PDF JPEG GIF TIFF PNG PNM PCX BMP LBM XPM TGA
-Possible output formats: @{[sort keys %fmts]}
-Examples for producing 'test.pdf':
-  * $program test.eps
-  * produce postscript | $program -v - test.pdf
-Example: look for HiResBoundingBox and produce corrected PostScript:
-  * $program -d --nogs -hires test.ps>testcorr.ps
-";
-sub errorUsage {
-  die "$usage\U!\E!\U!\E Error: @_\n";
-}
-
-# --- @ARGV parsing
-
-### default option values
-my @extra=();
-my @gsextra=();
-#** Output file format (string)
-my $FileFormat=undef;
-$::opt_help=0;
-$::opt_verbose=0;
-my %vals_compression=map{$_=>1} qw(best none flate zip);
-$::opt_compression='best';
-#** Prefer %%HiResBoundingBox over %%BoundingBox, but emit both
-$::opt_hires=1;
-$::opt_exact=0;
-# $::opt_filter=0; # deprecated
-# $::opt_outputfile=undef; # deprecated
-$::opt_below=undef;
-$::opt_antialias=undef; # render shades at path outlines for better readability
-$::opt_gs_cmd=undef;
-$::opt_extra="";
-$::opt_duplex="default";
-$::opt_threshold=128;
-my %vals_antialias=map{$_=>1} qw(no yes scale3yes scale3no);
-my %vals_duplex=map{$_=>1} qw(force-unknown force-simplex force-long
-  force-short unchanged default-simplex default-long default-short);
-# ^^^ short: duplex printing, will bind short edge of paper (ideal for
-#     duplexing psnup -2)
-#** Dat: force-unknown is forced by /setpagedevice/load def
-$::opt_resolution="default"; # unchanged force-unknown 600x600 (DPI)
-$::opt_papersize="default"; # unchanged force-unknown 600bpx600cm (bp)
-#** --bboxfrom=adsc sets %%BoundingBox from the 1st page if no ADSC comment in non-EPS ps
-my %vals_bboxfrom=map{$_=>1} qw(adsc compute-gs guess pagesize);
-$::opt_bboxfrom="guess";
-my $InputFilename;
-my $OutputFilename;
-
-sub is_page1_stop() { 0!=($fmts{$FileFormat}[0]&FL_PAGE1_STOP) }
-sub is_set_pagesize_ok() { 0!=($fmts{$FileFormat}[0]&FL_SET_PAGESIZE_OK) }
-sub is_pdfmark() { 0!=($fmts{$FileFormat}[0]&FL_PDFMARK) }
-sub is_need_showpage() { 0!=($fmts{$FileFormat}[0]&FL_NEED_SHOWPAGE) }
-sub is_sampled() { 0!=($fmts{$FileFormat}[0]&FL_SAMPLED) }
-sub is_any_origin_ok() { 0!=($fmts{$FileFormat}[0]&FL_ANY_ORIGIN_OK) }
-sub is_has_antialias() { 0!=($fmts{$FileFormat}[0]&FL_HAS_ANTIALIAS) }
-sub is_via_sam2p() { 0!=($fmts{$FileFormat}[0]&FL_VIA_SAM2P) }
-sub is_ok_sam2p() { 0!=($fmts{$FileFormat}[0]&FL_OK_SAM2P) }
-
-# ---
-
-sub show_doc() {
-  # run `pod2man __FILE__ | man -l -', same as `perldoc __FILE', but perldoc(1)
-  # is missing from some Debian sites that have pod2man.
-  my @path=split/:+/,$ENV{PATH};
-  my $pod2man_='pod2man --center="a2ping: advanced PS, PDF, EPS converter" ';
-  $pod2man_=q~perl -ne 'if($a>1){print}elsif($a&&/^=head1/){$a=2}else{$a=!/\S/}' ~
-    if !grep { -x "$_/pod2man" } @path;
-  my $pager='';
-  for my $pageri ((defined $ENV{PAGER} ? $ENV{PAGER}: ''),'less','most','more','view -  ','vim -R -  ','vi -  ','joe -rdonly -asis -','pager') {
-    next if $pageri!~/^(\S+)/;
-    my $pagert="/$1";
-    if (grep { -x $_.$pagert } @path) { $pager=$pageri; last }
-  }
-  $pager=q~perl -pe 's@\010_@@g;s@.\010@@gs' | ~.$pager
-    if substr($pager,-2)eq'  ' or $pager=~/\A(?:view|vim?|joe|emacs|mcedit|nano|nano-tiny|ae)\b/;
-    # ^^^ Dat: these cannot handle underline/bold backspace directly
-  $ENV{PAGER}=$pager;
-  my $man='';
-  if (substr($pod2man_,0,5)ne 'perl ') {
-    $man=' | man -l -'; # calls $PAGER
-    if ((!grep { -x "$_/man" } @path) or qx(man -l 2>&1)=~/\binvalid option\b/) {
-      $man=' | nroff -Tlatin1 -mandoc'; # Linux, no need for eqn(1), tbl(1) etc.
-      if (!grep { -x "$_/nroff" } @path) { $man='' } # just write it
-    }
-  }
-  my $cmd=$pod2man_.fnq(__FILE__).$man;
-  if ($cmd!~/[|] man -l -\Z(?!\n)/) {
-    if (!length $pager) {
-      die unless open PIPE, "$cmd|";
-      print while sysread PIPE, $_, 4096;
-      die "$0: error showing doc\n" unless close PIPE;
-      exit 0;
-    }
-    $cmd.=' | $PAGER';
-  }
-  ##die $cmd;
-  $ENV{LESS}="" if !defined $ENV{LESS};
-  $ENV{LESS}="$ENV{LESS}R"; # show ANSI escapes
-  die "$0: exec ($cmd) failed: $!\n" if !exec $cmd;
-}
-
-die $usage if !@ARGV or (1==@ARGV and $ARGV[0] eq '-h' or $ARGV[0] eq '--help'
-  or $ARGV[0] eq 'help');
-show_doc() if 1==@ARGV and $ARGV[0] eq '--doc' or $ARGV[0] eq 'doc';
-
-{ my($I,$optname,$optval);
-  my %optmap=qw(o outputfile  outfile outputfile  r resolution  h help
-    f filter  d verbose  v verbose  debug verbose  p papersize
-    c compression  compress compression  h hires  b below  e exact  x extra);
-  #** Options that have a mandatory argument
-  my %argopt1=qw(outputfile 1 duplex 1 resolution 1 extra 1 compression 1 gs-cmd 1
-    gs-ccmd 1
-    papersize 1 paper 1 bboxfrom 1 antialias 1 gsextra 1 threshold 1); # 1 arg
-  my %argnone=qw(help 1 verbose 1 noverbose 1 nocompress 1 noantialias 1); # 0 arg
-  my %argmaybe=qw();  # 0 or 1 arg
-  my %argbool=qw(hires 1 exact 1 below 1 gs 1 filter 1 tmpunlink 1
-    approx 1); # boolean arg
-  # Dat: --noverbose --nocompress
-  my $opts_ok=1;
-  for ($I=0; $I<@ARGV; $I++) {
-    if ($ARGV[$I]eq '--') {
-      $OutputFilename=$InputFilename if defined $InputFilename and
-        !defined $OutputFilename and $opts_ok;
-      $opts_ok=0;
-    } elsif ($opts_ok and $ARGV[$I]=~/\A--+(\w[\w-]*)(?:[:=](.*))?\Z(?!\n)/s) {
-      $optname=lc$1; $optval=$2;
-    } elsif ($opts_ok and $ARGV[$I]=~/\A-(\w)(.*)\Z(?!\n)/s) {
-      $optname=lc$1;
-      if (length($2)==0) { $optval=undef }
-      elsif (index(":=",substr($2,0,1))>=0) { $optval=substr($2,1) }
-      else { $optval=$2 }
-    } elsif ($opts_ok and !defined $FileFormat and defined $InputFilename and $ARGV[$I]=~s@\A(\w+):@@) {
-      my $fmtag=uc$1;
-      # errorUsage "invalid FileFormat tag: $fmtag" if $fmtag!~s@:\Z(?!\n)@@;
-      if (exists $fmts{$fmtag}) { $FileFormat=$fmtag }
-      elsif (exists $fmt_aliases{$fmtag}) { $FileFormat=$fmt_aliases{$fmtag} }
-      else { errorUsage "Unknown FileFormat tag: $fmtag" }
-      if (0!=length($ARGV[$I])) {
-        errorUsage "Multiple output filenames" if defined $OutputFilename;
-        $OutputFilename=$ARGV[$I];
-      }
-      next
-    } elsif (!defined $InputFilename) { $InputFilename=$ARGV[$I]; next }
-    elsif (!defined $OutputFilename) { $OutputFilename=$ARGV[$I]; next }
-    else { errorUsage "Too many arguments (multiple input/output files?)" }
-    $optname=$optmap{$optname} if exists $optmap{$optname};
-    if (exists $argopt1{$optname} and !defined $optval) {
-      errorUsage "Argument expected for --$optname" if $I==@ARGV;
-      $optval=$ARGV[++$I];
-    }
-    # Dat: $optname and $optval are now correct
-    errorUsage "No argument expected for --$optname=$optval" if exists $argnone{$optname} and defined $optval;
-    if (substr($optname,0,2)eq"no" and exists $argbool{substr($optname,2)}) {
-      $optname=substr($optname,2);
-      errorUsage "No argument expected for no --no$optname=$optval" if defined $optval;
-      $optval="no";
-    }
-    if (exists $argbool{$optname}) {
-      # same as sam2p GenBuffer::parseBool, understands:
-      #   on  true  yes ja   igen oui enable  1 true  vrai? right sure allowed
-      #   off false no  nein nem  non disable 0 false faux? wrong nope disallowed
-      $optval=(!defined($optval) or 0==length($optval)
-               or $optval=~/\Ao[nu]/i or $optval!~/\A[fndw0]/i) ? 1 : 0;
-    } elsif (!exists $argopt1{$optname} and !exists $argnone{$optname} and !exists $argmaybe{$optname}) {
-      errorUsage "Unknown option --$optname, see --help"
-    }
-    # vvv application-specific
-       if ($optname eq "help") { die $usage }
-    elsif ($optname eq "help") { show_doc() }
-    elsif ($optname eq "noverbose") { $::opt_verbose=0 }
-    elsif ($optname eq "nocompress") { $::opt_compression='none' }
-    elsif ($optname eq "verbose") { $::opt_verbose++ }
-    elsif ($optname eq "hires")  { $::opt_hires =$optval }
-    elsif ($optname eq "exact")  { $::opt_exact =$optval }
-    elsif ($optname eq "below")  { $::opt_below =$optval }
-    elsif ($optname eq "approx") { $::opt_approx=$optval }
-    elsif ($optname eq "threshold")  { $::opt_threshold=$optval+0 } # Imp: accept only int 0..256
-    elsif ($optname eq "filter") {
-      # errorUsage "Multiple input filenames" if defined $InputFilename;
-      # $InputFilename='-';
-      errorUsage "Multiple output filenames" if defined $OutputFilename;
-      $OutputFilename='-';
-    } elsif ($optname eq "tmpunlink") { $tmpunlink_p=$optval }
-    elsif ($optname eq "gs")     { $FileFormat=$optval ? 'PDF1' : 'markedEPS' }
-    elsif ($optname eq "compression") {
-      errorUsage "--$optname expects one of: @{[keys%vals_compression]}" if !exists $vals_compression{$optval};
-      $::opt_compression=$optval;
-      $::opt_compression='zip' if $::opt_compression eq 'flate';
-    } elsif ($optname eq "outputfile") {
-      errorUsage "Multiple output filenames" if defined $OutputFilename;
-      $OutputFilename=$optval;
-    } elsif ($optname eq "gs-cmd") {
-      errorUsage "Multiple --gs-cmd" if defined $::opt_gs_cmd;
-      $::opt_gs_cmd=$optval;
-    } elsif ($optname eq "gs-ccmd") {
-      errorUsage "Multiple --gs-ccmd" if defined $::opt_gs_ccmd;
-      $::opt_gs_ccmd=$optval;
-    } elsif ($optname eq "extra") { push @extra, $optval }
-    elsif ($optname eq "gsextra") { push @gsextra, $optval }
-    elsif ($optname eq "duplex") {
-      errorUsage "--$optname expects one of: @{[keys%vals_duplex]}" if !exists $vals_duplex{$optval};
-      $::opt_duplex=$optval
-    } elsif ($optname eq "bboxfrom") {
-      errorUsage "--$optname expects one of: @{[keys%vals_bboxfrom]}" if !exists $vals_bboxfrom{$optval};
-      $::opt_bboxfrom=$optval
-    } elsif ($optname eq "noantialias") {
-      $::opt_antialias='no'
-    } elsif ($optname eq "antialias") {
-      errorUsage "--$optname expects one of: @{[keys%vals_antialias]}" if !exists $vals_antialias{$optval};
-      $::opt_antialias=$optval
-    } elsif ($optname eq "resolution") {
-      if ($optval eq "unchanged" or $optval eq "force-unknown") { }
-      elsif ($optval=~/^(\d+(?:[.]\d+)?)\Z(?!\n)/) { $optval="$1x$1" }
-      elsif ($optval=~/^(\d+(?:[.]\d+)?[x,]\d+(?:[.]\d+)?)\Z(?!\n)/) { }
-      else { errorUsage "--Resultion expects unchanged | force-unknown | DPI | XDPIxYDPI" }
-      $::opt_resolution=$optval
-    } elsif ($optname eq "papersize" or $optname eq"paper") {
-      if ($optval eq "unchanged" or $optval eq "force-unknown") { $::opt_papersize=$optval }
-      else {
-        my @L=Htex::papers::any($optval);
-        errorUsage "invalid or unknown for --papersize" if !@L;
-        $::opt_papersize="$L[1],$L[2]" # width, height
-      }
-    } else { die } # unreachable    
-  } # NEXT opt
-  errorUsage "Too many arguments (multiple input/output files?)" if $I!=@ARGV;
-  # splice @ARGV, 0, $I;
-}
-
-$GS=$::opt_gs_cmd if defined $::opt_gs_cmd;
-my $CGS=$GS;
-$CGS=$::opt_gs_ccmd if defined $::opt_gs_ccmd;
-$GS.= " -dSAFER"; # -dWRITESYSTEMDICT
-$CGS.=" -dSAFER"; # -dWRITESYSTEMDICT
-
-### get input and output filename
-if (!defined $InputFilename and defined $OutputFilename) { # --filter
-  $InputFilename='-';
-} elsif (!defined $InputFilename) {
-  errorUsage "Input filename missing"
-} elsif (!defined $OutputFilename) {
-  $FileFormat='PDF1' if !defined $FileFormat;
-  if ($FileFormat eq 'PDF1' or $FileFormat eq 'PDF') {
-    if (($OutputFilename=$InputFilename) ne '-') {
-      $OutputFilename =~ s/\.[^\.]*$//;
-      $OutputFilename .= ".pdf";
-    }
-  } else {
-    $OutputFilename = '-'; # standard output
-  }
-}
-print STDERR $title if $::opt_verbose;
-$title="";
-
-# Dat: no more @ARGV
-errorUsage "please specify <outformat>" if
-  !defined $FileFormat and ($OutputFilename!~m@[.]([^/.]+)\Z(?!\n)@ or
-  !defined($FileFormat=$fmt_exts{lc$1}));
-$::opt_below=is_any_origin_ok() if !defined $::opt_below;
-error "--below=1 invalid for FileFormat $FileFormat" if $::opt_below and
-  !is_any_origin_ok() and $FileFormat ne 'PDF1' and $FileFormat ne 'EPS' and
-  $FileFormat ne 'markedEPS';
-error "--below=0 invalid for FileFormat $FileFormat" if !$::opt_below and
-  is_any_origin_ok();
-$::opt_antialias=is_has_antialias() ?
-  (is_sampled() ? 'scale3no' : 'yes') : 'no' if
-  !defined $::opt_antialias;
-
-if ($FileFormat eq 'PBM' and ($::opt_antialias eq 'scale3yes' or
-  $::opt_antialias eq 'scale3no')) {
-} elsif ($::opt_antialias ne 'no' and !is_has_antialias()) {
-  $::opt_antialias='no';
-  warning "--AntiAlias ignored for FileFormat $FileFormat"
-}
-if ($::opt_antialias eq 'scale3no' or $::opt_antialias eq 'scale3yes') {
-  $::opt_resolution="72,72" if $::opt_resolution eq 'unchanged' or $::opt_resolution eq 'force-unknown' or $::opt_resolution eq 'default';
-  # ^^^ GS raster default
-  my @L=split/[,x]/,$::opt_resolution;
-  @L=(@L,@L); # Imp: ..
-  $L[0]*=3; $L[1]*=3;
-  $::opt_resolution="$L[0],$L[0]";
-}
-
-### option compress
-my $GSOPTS=join("  ",map{fnq$_}@gsextra);
-# $GSOPTS.=" -r72 -sPAPERSIZE=a4 "; # default -- will be overridden by `setpagedevice'
-# ^^^ Dat: default does only harm; user should specify on command line
-
-### option BoundingBox types
-#**** pts ****
-# scan all of them and find the best
-{ my $BBprint = "%%BoundingBox:";
-  $BBprint = "%%HiResBoundingBox:" if $::opt_hires;
-  $BBprint = "%%ExactBoundingBox:" if $::opt_exact;
-  debug "Strongest BoundingBox comment:", $BBprint;
-}
-my $BBregex='%%(Hi[Rr]es|Exact|)BoundingBox:';
-
-if (!is_set_pagesize_ok()) {
-  if ($::opt_papersize ne'default' and $::opt_papersize ne'force-unknown') {
-    error "Cannot set --PaperSize for FileFormat $FileFormat"
-  } else { $::opt_papersize='force-unknown' }
-} elsif ($::opt_papersize eq'default') { $::opt_papersize='unchanged' }
-
-if ($::opt_resolution eq'default') { $::opt_resolution='force-unknown' }
-error "Cannot set --Resolution for FileFormat $FileFormat (must be markedPS or sampled)"
-  if $FileFormat ne 'markedPS' and !is_sampled()
-  and $::opt_resolution ne'force-unknown';
-error "Bad --Resolution=$::opt_resolution" if $::opt_resolution ne 'unchanged'
-  and $::opt_resolution ne 'force-unknown' and $::opt_resolution!~/\A(\d+)+[,x](\d+)\Z(?!\n)/;
-
-if ($FileFormat ne 'markedPS' and $FileFormat ne 'PCL5') {
-  if ($::opt_duplex ne'default' and $::opt_duplex ne'force-unknown') {
-    error "Cannot set --Duplex for FileFormat $FileFormat (must be markedPS or PCL5)"
-  } else { $::opt_duplex='force-unknown' }
-} elsif ($::opt_duplex eq'default') { $::opt_duplex='force-unknown' }
-
-debug "Doing --PaperSize $::opt_papersize" if $::opt_papersize ne 'force-unknown';
-debug "Doing --Duplex $::opt_duplex" if $::opt_duplex ne 'force-unknown';
-debug "Doing --Resolution $::opt_resolution" if $::opt_resolution ne 'force-unknown';
-debug "Doing --AntiAlias=$::opt_antialias" if $::opt_antialias ne 'no';
-
-### option outfile
-if ($OutputFilename eq '-') {
-  debug "Output file: standard output";
-} else {
-  debug "Output filename: $OutputFilename";
-  #error "$OutputFilename: won't overwrite input file with itself"
-  #  if $OutputFilename eq $InputFilename;
-}
-
-### option gs
-debug "Output FileFormat: $FileFormat";
-$::opt_compression='zip' if $::opt_compression ne 'none';
-if ($FileFormat eq 'PDF' or $FileFormat eq 'PDF1') {
-  debug "Ghostscript ps2pdf command: $GS  $GSOPTS";
-  debug "Compression: $::opt_compression";
-} elsif ($FileFormat eq 'PCL5') {
-  debug "Ghostscript ps2ljet command: $GS  $GSOPTS";
-} elsif (is_sampled()) {
-  debug "Ghostscript ps2sampled command: $GS  $GSOPTS";
-}
-
-#**** pts ****
-sub read_error() { error "read $InputFilename: $!" }
-my $bytes_left=-1; # -1==unlimited
-my $already_read=0;
-sub dem1($){defined$_[0]?$_[0]:-1}
-#** @param $_[0] number of bytes to read, or undef to read a line
-#** @return the string read
-sub readIN(;$) {
-  my $S;
-  ## return "" if $bytes_left==0;
-  ## print STDERR "READ($_[0])\n";
-  if (defined $_[0]) { read_error if 0>dem1 read IN, $S, $_[0] }
-  else {
-    $!=0; # clean up error code
-    $S=<IN>;
-    read_error if !defined($S) and $!;
-    $S="" if !defined $S; # EOF
-  }
-  if ($bytes_left<0) { # unlimited
-  } elsif (length($S)>=$bytes_left) {
-    $S=substr($S, 0, $bytes_left);
-    $bytes_left=0;
-  } else { $bytes_left-=length($S) }
-  $already_read+=length($S);
-  $S
-}
-
-sub open_OUT() {
-  error "Cannot write outfile '$OutputFilename'" unless
-    open(OUT, $OutputFilename eq '-' ? ">-" : "> $OutputFilename")
-}
-
-#** @param $_[0] temp file extension (e.g ".img")
-#** @param $_[1] preprint
-#** @param $_[2] bool: force pipe even if seekable?
-sub fix_pipe_in($$$) {
-  my $c="";
-  if ($_[2] or (length($c=readIN(1))!=0 and !seek IN,-1,1)) { # we cannot seek back
-    # Dat: ^^^ test seekability instead of $InputFilename eq '-'
-    my($ext,$preprint)=@_;
-    my $tifn;
-    # $ext=$1 if $InputFilename=~/[.](\w+)\Z(?!\n)/; # never true
-    $tifn=temp_prefix()."M$ext";
-    error "Cannot open temp input: $tifn" unless open TI, "> $tifn";
-    $tmpfiles{$tifn}=1;
-    die unless print TI $preprint, $c;
-    print TI or die while length($_=readIN 4096);
-    die unless close TI;
-    $InputFilename=$tifn;
-    debug "Temp input file: $InputFilename";
-    die unless open IN, "< $tifn";
-    die unless seek IN, length($preprint), 0;
-    $already_read=length($preprint);
-    $bytes_left=-1; # unlimited, since readIN() has copied only part
-    # $bytes_left++ if $bytes_left>=0; # ungetc($c)
-    # temp_unlink $tifn; # do it later (at END{})
-  } else {
-    $already_read--; $bytes_left++ if $bytes_left>=0; # BUGFIX at Fri May 14 00:21:18 CEST 2004
-  }
-}
-
-my $temp_out_fn;
-
-#** Does overwrite $temp_out_fn. Fine.
-sub fix_force_out($) {
-  my($ext)=$_[0];
-  # $ext=$1 if $InputFilename=~/[.](\w+)\Z(?!\n)/; # never true
-  $temp_out_fn=temp_prefix()."O$ext";
-  # error "Cannot save output: $!" unless open SAVEOUT, ">&OUT"; # always STDOUT; maybe not open yet
-  error "Cannot open temp output: $temp_out_fn" unless open OUT, "> $temp_out_fn";
-  $tmpfiles{$temp_out_fn}=1;
-  # $OutputFilename=$temp_out_fn;
-  debug "Temp output file: $temp_out_fn";
-  # temp_unlink $temp_out_fn; # do it later (at END{})
-  return $temp_out_fn;
-}
-
-#** @param $_[0] temp file extension (e.g ".img")
-#** @return new output filename
-sub fix_pipe_out($) {
-  if (!defined $temp_out_fn) {
-    return $OutputFilename if $OutputFilename ne '-';
-    return fix_force_out($_[0]);
-  }
-  $temp_out_fn
-}
-sub fix_close_out() {
-  # error "closing filter out: $? $!" unless close OUT;
-  if (defined $temp_out_fn) {
-    my $buf;
-    die unless open FCO, "< $temp_out_fn";
-    print STDOUT $buf while sysread FCO, $buf, 4096;
-    die unless close FCO;
-    temp_unlink $temp_out_fn;
-    undef $temp_out_fn;
-  }
-}
-
-sub do_system {
-  my($progname)=splice@_,0,1;
-  debug "Running: $progname  @extra @_";
-  error "prog $progname failed: $? $!"
-    if 0!=system $progname, @extra, @_; # Dat: non-zero exit() or not found
-}
-
-sub do_exec {
-  my($progname)=splice@_,0,1;
-  if (scalar keys %tmpfiles) {
-    # Cannot exec() right now, because we have to unlink some temporary files
-    # later.
-    do_system $progname, @_;
-  } else {
-    debug "Execing: $progname  @extra @_";
-    1 if exec $progname, @extra, @_;
-    # ^^^ Dat: $OutputFilename eq '-' should be OK
-    error "exec failed: $!";
-  }
-  exit(0);
-}
-
-#sub shq($) {
-#  my $S=$_[0];
-#  return $S if $S!~y@A-Za-z0-9_,:./-@@c and length($S)>0;
-#  $S=~s@'@'\\''@g;
-#  return "'$S'"
-#}
-
-### open input file
-if ($InputFilename eq '-') {
-  debug "Input file: standard input";
-  open(IN, "<&STDIN") or error "cannot open standard input";
-} else {
-  # -f $InputFilename or error "input file missing: $InputFilename"; # Imp: named pipe?
-  open(IN,"< $InputFilename") or error "cannot open input file: $InputFilename";
-  debug "Input filename:", $InputFilename;
-  if ($InputFilename eq $OutputFilename) {
-    # error "same input and output file: $InputFilename";
-    my $ext=$InputFilename=~m@([.][^./]+)\Z(?!\n)@ ? $1 : "";
-    binmode IN; $bytes_left=-1;
-    fix_pipe_in($ext, "", 1); # Dat: defined later
-  }
-}
-binmode IN;
-
-### scan first line, check for DOS EPSF (and remove DOS headers)
-my $header;
-{ SCAN_AGAIN:
-  my $S;
-  $_=$header="";
-  read_error if 0>read IN, $S, 4;
-  error "$InputFilename: empty file" if 0==length($S);
-  $already_read+=length($S);
-  ##print tell(IN)." bar=$already_read\n";
-  my $iff="?"; # Input File Format
-  # vvv be permissive, since we have only 4 chars
-  if ($S eq "\211PNG") { $iff="PNG" }
-  elsif ($S=~/\A(\377+\330)\377/) { $iff="JPEG" }
-  elsif ($S eq "MM\000\052" or $S eq "II\052\000") { $iff="TIFF" }
-  elsif ($S=~m@\AP([1-6])[\s#]@) { $iff="PNM" }
-  elsif ($S=~/\ABM/) { $iff="BMP" }
-  elsif ($S eq "GIF8") { $iff="GIF" }
-  elsif ($S eq "FORM") { $iff="LBM" }
-  elsif ($S eq "/* X" or $S eq "/*XP") { $iff="XPM" }
-  elsif ($S=~/\A\12[\0-\005]\001[\001-\10]/) { $iff="PCX" }
-  elsif ($S=~/\A[\36-\77](?:\001[\001\11]|\0[\002\12\003\13])\0/) { $iff="TGA" }
-  elsif ($S eq "\305\320\323\306") { $iff="DOS-EPSF" }
-  elsif ($S eq "\033%-1") { $iff="UEL" }
-  elsif (substr($S,0,1)eq'%') { $iff="P" } # PS, EPS or PDF
-  
-   # PNG JPEG TIFF PNM BMP GIF LBM XPM PCX TGA
-  if ($iff eq "DOS-EPSF") { # DOS EPSF header
-    read_error if 30-4>read IN, $S, 30-4, 4;
-    my ($eheader,$ps_ofs,$ps_len,$wmf_ofs,$wmf_len,$tif_ofs,$tif_len,$checksum)=
-      unpack"A4VVVVVVv", $S;
-    $already_read+=30-4;
-    error "$InputFilename: bad DOS EPS" if $eheader ne "\305\320\323\306" or $ps_ofs<30;
-    my($ps_end, $wmf_end, $tif_end)=($ps_ofs+$ps_len, $wmf_ofs+$wmf_len, $tif_ofs+$tif_len);
-    $ps_ofs-=30;
-    if (!seek IN, $ps_ofs, 1) {
-      while ($ps_ofs>4096) { $ps_ofs-=4096; readIN 4096 }
-      read_in $ps_ofs if $ps_ofs>0;
-    }
-    $bytes_left=($ps_end>$wmf_end and $ps_end>$tif_end) ? -1 : $ps_len;
-    $S=readIN(1);
-  } elsif ($iff eq "UEL") { # HP PJL UEL, untested
-    $S.=readIN;
-    $S=substr($S,1);
-    error "$InputFilename: bad HP PJL UEL header: ".(~chomp($S)&&$S)
-      if $S!~/\A%-12345X\@PJL ENTER LANGUAGE\s*=\s*POSTSCRIPT\s*\r?$/i;
-    1 while length($S=readIN())!=0 and substr($S,0,4)ne'%!PS';
-    die "$InputFilename: premature HP PJL UEL header" if length($S)==0;
-  } elsif ($iff eq "P") {
-    # no-op yet, see later
-  } elsif ($iff eq "?") {
-    error "unknown input image format: $InputFilename";
-  } else { # some vector graphics format
-    # Imp: why isn't sam2p(1) PNG -> PNG idempotent?
-    my $sfmt=$FileFormat eq'markedEPS' || $FileFormat eq 'EPS' ? 'EPS'
-           : $FileFormat eq'markedPS' || $FileFormat eq 'PS' ? 'PS' # Dat: emits no /PageSize
-           : $FileFormat eq'PDF1' || $FileFormat eq 'PDF' ? 'PDF'
-           : undef;
-    if (defined $sfmt) {}
-    elsif (is_via_sam2p() or is_ok_sam2p()) {$sfmt=$FileFormat; $::opt_approx=1}
-    else { error "sam2p doesn't support our FileFormat $FileFormat" }
-    fix_pipe_in ".img", $S, 0;
-    if ($::opt_approx) {
-      do_exec('sam2p', ("$sfmt:", '--', $InputFilename, $OutputFilename));
-    } else {
-      warning "post-processing of sam2p PDF output increases file size" if $sfmt eq 'PDF';
-      $sfmt='EPS' if $sfmt eq 'PDF'; # Imp: PDF1<->PDF
-      close IN;
-      my $tpfn=temp_prefix()."Psimg";
-      error "Cannot open temp pipe dest: $tpfn" unless open TP, "> $tpfn";
-      $tmpfiles{$tpfn}=1;
-      die unless close TP;
-      do_system('sam2p', ("$sfmt:", '--', $InputFilename, $tpfn));
-      error "Cannot open temp pipe src: $tpfn" unless open IN, "< $tpfn";
-      $already_read=0; $bytes_left=-1;
-      $InputFilename=$tpfn; # '-'
-      goto SCAN_AGAIN
-    }
-  }
-
-  # now deal with PS, EPS and PDF
-  if (substr($S,0,1) eq '%') {
-    $S.=readIN;
-    if (substr($S,0,4)eq'%PDF') {
-      # error "$InputFilename: won't read a PDF file";
-      if ($FileFormat eq 'PDF') { # convert PDF to PDF
-        # !! PDF->PS->PDF
-        open_OUT();
-        $_=$S;
-        debug "Doing a bit-by-bit copy";
-        do {
-          error "input error: $!" unless print OUT;
-        } while (length($_=readIN 4096));
-        close OUT; close IN;
-        exit 0;
-      } elsif ($FileFormat eq 'PDF1') { # Dat: remove extra pages by running pdftops and gs -sDEVICE=pdfwrite
-        # !! Imp: possibly Run MetaPost output through full dvips (texc.pro) when prologues:=0
-        # !! Imp: add full dvips %* font comment when prologues:=1 (design sizes missing :-()
-	# Dat: no way to use $::opt_approx, because it doesn't remove extra pages
-        fix_pipe_in ".pdf", $S, 0; # in case of stdin
-        # Imp: option to open pdftops pipe instead of temp file
-        # Dat: we rather use a temp file here for safety and early error detection
-       do_input_pdftops: # come from EPS: and markedEPS:
-        close IN; # after fix_pipe_in()
-	my $tpfn=temp_prefix()."Peps";
-        error "Cannot open temp pipe dest: $tpfn" unless open TP, "> $tpfn";
-        $tmpfiles{$tpfn}=1;
-        die unless close TP;
-        do_system qw(pdftops -f 1 -l 1 -eps -- ), $InputFilename, $tpfn;
-        error "Cannot open temp pipe src: $tpfn" unless open IN, "< $tpfn";
-	$already_read=0; $bytes_left=-1;
-        $InputFilename=$tpfn; # '-'
-        goto SCAN_AGAIN
-      } elsif ($FileFormat eq 'EPS' or $FileFormat eq 'markedEPS') { # convert PDF to EPS
-        # Dat: limitation: markedEPS and EPS are treated the same
-        # vvv Dat: pdftops(1) is part of the xpdf package
-	# vvv Dat: pdftops(1) can emit to stdout
-        fix_pipe_in ".pdf", $S, 0;
-	if ($::opt_approx) {
-          do_exec qw(pdftops -f 1 -l 1 -eps --), $InputFilename, $OutputFilename;
-	} else { goto do_input_pdftops }
-      } elsif ($FileFormat eq 'PS' or $FileFormat eq 'markedPS') {
-        # Dat: limitation: markedEPS and EPS are treated the same
-        fix_pipe_in ".pdf", $S, 0;
-	close IN;
-        # vvv we must query the BoundingBox first
-        my $cmd="pdftops -f 1 -l 1 -eps ".fnq($InputFilename)." -";
-        debug "pdftops bbox pipe: $cmd";
-        error "pipe: $!" unless open PIPE, "$cmd |";
-        my $line;
-        error "expected PS document" if !defined($line=<PIPE>) or $line!~/^%!PS-Adobe-\d.*EPSF-\d/;
-        my @L; # $papersize_x, $papersize_y
-        while (<PIPE>) {
-          last if /^%%EndComments/ or !/^%/;
-          @L=($1,$2) if /^%%(?:Hires|Exact)BoundingBox:\s*\S+\s*\S+\s*(\S+)\s*(\S+)\s*$/i;
-          @L=($1,$2) if /^%%BoundingBox:\s*\S+\s*\S+\s*(\S+)\s*(\S+)\s*$/i and !@L;
-          # ^^^ Dat: HiRes has priority
-          # ^^^ Dat: ignore llx and lly coordinates
-        }
-        1 while read PIPE, $line, 4096;
-        error "closing PIPE: $?" unless close PIPE;
-        error "BoundingBox not found in pdftops output" if !@L;
-        debug "Got PaperSize: @L";
-        $L[0]=ceil $L[0]; $L[1]=ceil $L[1]; # Dat: pdftops expects integer papersize :-( )
-	if ($::opt_approx) {
-          do_exec 'pdftops', '-paperw', $L[0], '-paperh', $L[1], $InputFilename, $OutputFilename;
-	} else {
-	  my $tpfn=temp_prefix()."Pps";
-	  error "Cannot open temp pipe dest: $tpfn" unless open TP, "> $tpfn";
-	  $tmpfiles{$tpfn}=1;
-	  die unless close TP;
-          do_system 'pdftops', '-paperw', $L[0], '-paperh', $L[1], $InputFilename, $tpfn;
-	  error "Cannot open temp pipe src: $tpfn" unless open IN, "< $tpfn";
-	  $already_read=0; $bytes_left=-1;
-	  $InputFilename=$tpfn; # '-'
-	  goto SCAN_AGAIN
-	}
-      }
-      error "cannot create from PDF: FileFormat $FileFormat";
-     OK:
-    }
-    error "$InputFilename: EPS DSC must be %!PS-Adobe" if substr($S,0,4)ne'%!PS';
-    # ^^^ Dat: mpost outputs "%!PS\n"
-  } else {
-    warning "$InputFilename: no PS ADSC header, BoundingBox not found\n"
-  }
-  $header=$S;
-}
-
-# Dat: Now we are converting from PS|EPS to EPS|markedEPS|PDF|PCL5|PGM
-#      So we're converting from PS|EPS with Ghostscript 
-
-### variables and pattern for BoundingBox search
-my $bbxpatt = '[0-9eE\.\-]';
-my $BBValues = "\\s*($bbxpatt+)\\s+($bbxpatt+)\\s+($bbxpatt+)\\s+($bbxpatt+)"; # protect backslashes: "\\" gets '\'
-
-my $ll_zero=0; # ($llx,$lly)==(0,0) in the output file
-my $need_grestore=0; # 0 v 1
-#** Applies %%*BoundingBox, %%EndComments, special setpagedevice, gsave..translate
-#** @param $_[0] llx, may be undef to signify that bbox is undetected
-#** @param $_[1] lly
-#** @param $_[2] urx
-#** @param $_[3] ury
-#** @param $_[4] after_correct PostScript code (resolution, page size)
-#** @return PostScript code to be printed after the header
-sub CorrectBoundingBox($$$$$$$) {
-  no integer;
-  my $bbx="";
-  my $pagedev_mark="";
-  my $translate="";
-  my ($llx, $lly, $urx, $ury, $after_correct, $fontsdefs, $is_restored) = @_;
-  if (defined $llx) {
-    my ($xoffset, $yoffset) = (0, 0);
-    my $old_bbox="$llx $lly $urx $ury"; # debug "Old BoundingBox: $old_bbox";
-    # my ($width, $height) = ($urx - $llx, $ury - $lly);
-    ($xoffset, $yoffset) = (-$llx, -$lly);
-    # $::opt_below=0 if $lly>=0; # always move to (0,0)
-    # my ($urxh,$uryh)=($urx,$ury);
-    # my $no_translate=$::opt_below;
-    #die $no_translate;
-    ($llx,$lly,$urx,$ury)=(0,0,$urx-$llx,$ury-$lly) if !$::opt_below;
-    $urx=1 if $urx<=0; # Dat: GS dislikes empty image; fix also negative image
-    $ury=1 if $ury<=0;
-    my($px,$py)=($urx,$ury);
-    ($px,$py)=($1+0,$2+0) if $after_correct=~m@/PageSize\s*\[(\S+)\s+(\S+)+\]@;
-    my @paper=Htex::papers::any("$px,$py");
-    $paper[0]=defined $paper[0] ? "%%DocumentPaperSizes: $paper[0]\n" : "";
-    $bbx.="%%BoundingBox: ".floor($llx)." ".floor($lly)." ".
-                             ceil($urx)." ". ceil($ury)."\n";
-    $bbx.="%%HiResBoundingBox: $llx $lly $urx $ury\n".
-          "%%ExactBoundingBox: $llx $lly $urx $ury\n" if floor($llx)!=$llx
-      or floor($lly)!=$lly or ceil($urx)!=$urx or ceil($ury)!=$ury;
-    $bbx.="%%DocumentMedia: plain $px $py 0 () ()\n". # like pdftops(1)
-          "$paper[0]";
-    # ^^^ Imp: can DocumentMedia be non-integer? As of us, it can.
-    # vvv we output a second /MediaBox here, and we'll remove the first one
-    #     (written by GS) later
-    # vvv Dat: old version of Ghostscript insisted on an integer /CropBox (??).
-    #          we do not force it now
-    $pagedev_mark.="mark /CropBox [$llx $lly $urx $ury] /PAGE pdfmark\n" if is_pdfmark();
-    # die "$xoffset $yoffset $::opt_below";
-    if ($xoffset==0 and $yoffset==0) { #**** pts ****
-      $need_grestore=0;
-      $ll_zero=1; # Dat: we do not insert extra /MediaBox here, gs -sDEVICE=pdfwrite will do
-    } elsif ($::opt_below) {
-      # Do not translate (set (0,0) to the origin) with --below or multi-page
-      # file formats.
-      $need_grestore=0;
-      $ll_zero=0; # fix /MediaBox because it become non-(0,0)-based
-      $pagedev_mark.="mark /MediaBox [$llx $lly $urx $ury] /PAGE pdfmark\n" if
-        is_pdfmark(); # $FileFormat eq 'markedEPS' or $FileFormat eq 'markedPS';
-      # Dat: markedPS and contains pdfmark!
-    } else {
-      # debug "Offset:", $xoffset, $yoffset; # no new information, see -$llx, -$lly
-      $xoffset=0 if $xoffset==0; # get rid of `-0'
-      $yoffset=0 if $yoffset==0; # get rid of `-0'
-      if ($is_restored) { $translate="" } # save..restore does gsave..grestore
-                   else { $translate="gsave "; $need_grestore=1 }
-      $ll_zero=0;
-      # vvv the /MediaBox is different from what gs dumps
-      # $pagedev_mark=~s@/PageSize\s*\[[^\]]*]@/PageSize [$urx $ury]@; # BUGFIX at Tue Apr 22 10:08:17 CEST 2003
-      $pagedev_mark.="mark /MediaBox [$llx $lly $urx $ury] /PAGE pdfmark\n" if is_pdfmark();
-      $translate.="$xoffset $yoffset translate\n"
-    }
-    my $new_bbox="$llx $lly $urx $ury";
-    if ($old_bbox eq $new_bbox) {
-      debug "Final BoundingBox: $new_bbox";
-    } else {
-      debug "Old BoundingBox: $old_bbox";
-      debug "Final corrected BoundingBox: $new_bbox";
-    }
-    $pagedev_mark="/pdfmark where{pop}{/pdfmark/cleartomark load def}ifelse\n$pagedev_mark"
-      if length($pagedev_mark)!=0;
-  }
-  # vvv Imp: `<<' -> `dict'
-  # Dat: it is inherently impossible to tell GS that it shouldn't
-  #      recompress the images already compressed in the EPS file, but keep
-  #      them in their original, compressed form. So we rather instruct GS to
-  #      recompress
-  my $markpagedevices="";
-  if (is_pdfmark()) {
-    $markpagedevices="
-/CompatibilityLevel 1.2 %PDF-1.2
-/EmbedAllFonts true
-/Optimize true % ignored by gs-6.70
-/AutoRotatePages /None
-/UseFlateCompression ".($::opt_compression ne 'none'?"true":"false")."
-/AutoPositionEPSFiles false
-/AutoFilterGrayImages false
-/ConvertImagesToIndexed false
-/DownsampleMonoImages false
-/DownsampleGrayImages false
-/DownsampleColorImages false
-/AutoFilterColorImages false
-/EncodeMonoImages true
-/EncodeGrayImages true
-/EncodeColorImages true
-/AntiAliasMonoImages false
-/AntiAliasGrayImages false
-/AntiAliasColorImages false\n";
-    $markpagedevices=(length($markpagedevices)!=0 ? "<< $markpagedevices >> setpagedevice\n" : "");
-    $markpagedevices.="1 dict dup /ImagingBBox null put setpagedevice\n";
-    $markpagedevices.="1 dict dup /Policies 1 dict dup /PageSize 3 put put setpagedevice\n"; # ripped from pdftops(1)
-  }
-  my $setpagesize="";
-  # die defined $urx;
-  # die is_set_pagesize_ok();
-  # die $after_correct;
-  if (defined $urx and is_set_pagesize_ok()
-  and $::opt_papersize ne'force-unknown'
-  and $after_correct!~m@/PageSize\s*\[@) { # Imp: m@/Pagesize ugly
-    # Dat: true for FileFormat PGM
-    # Dat: emit /PageSize even for PDF1
-    # Dat: Ghostscript 6.70 rounds /PageSize down, but we need up when creating /MediaBox for PDF
-    $setpagesize="2 dict dup /PageSize [".ceil($urx)." ".ceil($ury)."] put setpagedevice\n";
-    # ^^^ Dat: PLRM.pdf doesn't forbid a non-integer /PageSize
-  }
-  my $bsetup=is_page1_stop()?"":"%%BeginSetup\n%%EndSetup\n";
-  # ^^^ Dat: CUPS inserts its setpagedevice calls for /Duplex and /PageSize
-  #     etc. just after the %%BeginSetup line (or, if missing, puts it in
-  #     front of the first %%Page). We'd like this execution order: CUPS,
-  #     ours, PStoPS (or psnup). (When we come after CUPS, we'll have a
-  #     chance to override its settings.) So we emit a fake
-  #     %%BeginSetup..%%EndSetup pair just before our code doing
-  #     `setpagedevice'.
-  # !! ?? run pstops first, and then a2ping.pl
-  my $save=$is_restored?"save\n":"";
-  $bbx.$fontsdefs."%%EndComments\n".$bsetup.$setpagesize.$markpagedevices.$pagedev_mark.$after_correct.$save.$translate
-}
-
-### scan header
-my $to_OUT="";
-my $after_code="";
-my $do_fix_tumble=0;
-my $is_restored=0;
-if (1<length($header)) {
-  my($llx,$lly,$urx,$ury);
-  my($bbtype)='-'; # None
-  my $allow_adsc_bb=1;
-  my $after_correct="";
-  my $do_bb_line=sub { # sub do_bbline($$)
-    no integer;
-    # Decreasing precedence of various BoundingBoxes:
-    # The last valid *bbox entry has effect.
-    # Active policy:
-    #   normal mode : BoundingBox ExactBoundingBox HiResBoundingBox
-    #   --hires mode: HiResBoundingBox BoundingBox ExactBoundingBox
-    #   --exact mode: ExactBoundingBox BoundingBox HiResBoundingBox
-    #   -hi -ex mode: ExactBoundingBox HiResBoundingBox BoundingBox
-    # Another possible policy:
-    #   normal mode : BoundingBox HiResBoundingBox==ExactBoundingBox
-    #   --hires mode: HiResBoundingBox ExactBoundingBox BoundingBox
-    #   --exact mode: ExactBoundingBox HiResBoundingBox BoundingBox
-    #   -hi -ex mode: ExactBoundingBox==HiResBoundingBox BoundingBox
-    my($S,$from)=@_;
-    return if $S!~/^(?:$BBregex|set)$BBValues/oi;
-    # print STDERR "($S)\n";
-    my $E1=defined$1 ? $1 : "+";
-    my $T=!defined($1) ? 'S' : uc substr $1,0,1; # '' || 'H' || 'E'
-    # debug "Trying BoundingBox T-$bbtype: $llx $lly $urx $ury";
-    if ($T eq 'S'
-     or !$::opt_hires and !$::opt_exact and ($T eq '' or ($bbtype ne '' and ($T eq 'E' or $bbtype ne 'E')))
-     or  $::opt_hires and !$::opt_exact and ($T eq 'H' or ($bbtype ne 'H' and ($T eq '' or $bbtype ne '')))
-     or  $::opt_exact and !$::opt_hires and ($T eq 'E' or ($bbtype ne 'E' and ($T eq '' or $bbtype ne '')))
-     or  $::opt_exact and  $::opt_hires and ($T eq 'E' or ($bbtype ne 'E' and ($T eq 'H' or $bbtype ne 'H')))
-       ) {
-      # if ($allow_bb) {
-        ($bbtype,$llx,$lly,$urx,$ury)=($T,$2+0,$3+0,$4+0,$5+0);
-        debug "Applying ${E1}BoundingBox$from T-$bbtype: $llx $lly $urx $ury";
-      # }
-    } else {
-      my @L=($2+0,$3+0,$4+0,$5+0); # convert 0.00 to 0
-      debug "Ignoring ${E1}BoundingBox$from T-$bbtype: @L";
-    }
-    # Dat: don't do $do_bb_line=sub{};# same as $allow_bb=0;
-  };
-  $header=~s@\r\n?\Z(?!\n)@@;
-  my $after_comments=""; # after %%EndComments
-  # my $res;
-  { my $headEPSF;
-    my $headPS="PS-Adobe-3.0";
-    # vvv Imp: run this correction even w/o input EPS header
-    if ($header!~s/\s+(EPSF-[.\d]+)$// or $::opt_bboxfrom ne 'guess') { # a PS not an EPS already
-      # This is the compute-pipe routine.
-      # To convert an [E]PS to an EPS:
-      # -- find the end of the 1st page in the code, and remove everything after it
-      # -- `pop' off the execution stack after the 1st page
-      # -- `end' the dictionary stack after the 1st page
-      # -- change the ADSC magic `%!PS-Adobe-...' to `%!PS-Adobe-3.0 EPSF-3.0'
-      # -- remove the `%%Pages', `%%DocumentPaperSizes', `%%PageOrder:'
-      #    (Ascending) comment from the ADSC header
-      # -- possibly remove the `%%Page' ADSC comment [no]
-      # -- ignore calls to = setpage setpagemargin setpageparams .setpagesize
-      #    setpagedevice setpagetype setprintername setresolution a4 letter ...
-      # -- surround the code by save ... pop* end* restore (implies gsave ... grestore)
-      # -- possibly ignore calls to showpage [showpage is forced]
-      $headEPSF=" EPSF-3.0";
-      debug "Computing BBox info from non-EPS PS file";
-      fix_pipe_in 'i.ps', "%!$headPS\n", 0;
-      my $tfn=temp_prefix()."c.tgs";
-      error "temp open $tfn: $!" unless open F, "> $tfn";
-      $tmpfiles{$tfn}=1;
-      ##print tell(IN)." car=$already_read\n";
-      die "$0: $!\n" unless print F "% this is temporary gs command file created by $program".'
-/DOCUT true def
-/MAINFILE FN (r) file def
-/DICTCOUNT countdictstack def
-count /OPCOUNT exch def
-<</BeginPage { % <PageCount> BeginPage -
-    dup 1 eq {
-      count OPCOUNT sub 1 sub (pop-count==) ..print ===
-      countdictstack DICTCOUNT sub (end-count==) ..print ===
-      DOCUT { (cut-offset==) ..print MAINFILE fileposition === flush } if
-      (bbox-success\n) ..print
-      quit
-    } if
-    .callbeginpage
-  }
->> setpagedevice
-
-% vvv do these after our call to /setpagedevice
-.currentglobal true .setglobal
-systemdict begin
-/..paper.redef<< >>def
-/..print/print load def
-/setpageparams{pop pop pop pop (\nset-called-4==/setpageparams\n) ..print flush}def
-/setpage{pop pop pop (\nset-called-3==/setpage\n) ..print flush}def
-/setpagesize{pop pop (\nset-called-2==/setpagesize\n) ..print flush}def
-/.setpagesize{pop pop (\nset-called-2==/.setpagesize\n) ..print flush}def
-/setpagemargin{pop (\nset-called-1==/setpagemargin\n) ..print flush}def
-{% anti-Windows-printer-driver `%%[ ProductName:` etc.
-  dup type/stringtype eq{
-    dup length 3 ge{
-      dup 0 3 getinterval (%%[) eq{
-        (\nset-called-1==/=\n) ..print flush
-        (\nset-called-1==/print\n) ..print flush
-  }if}if}if
-  pop
-}
-dup/= exch def /print exch def
-/setpagedevice{pop (\nset-called-1==/setpagedevice\n) ..print flush}def
-/..sdict <<
-  /PageSize { % [. .] PageSize -
-    dup type /arraytype eq {
-      dup length 2 ge {
-        dup 0 get type dup /integertype eq exch /realtype eq or {
-          dup 1 get type dup /integertype eq exch /realtype eq or {
-            (\npapersize-x==) ..print dup 0 get ===
-            (\npapersize-y==) ..print dup 1 get === (\n) ..print
-          } if
-        } if
-      } if
-    } if
-    pop
-  }
-  /HWResolution { % [. .] PageSize -
-    dup type /arraytype eq {
-      dup length 2 ge {
-        dup 0 get type dup /integertype eq exch /realtype eq or {
-          dup 1 get type dup /integertype eq exch /realtype eq or {
-            (\nresolution-x==) ..print dup 0 get ===
-            (\nresolution-y==) ..print dup 1 get === (\n) ..print
-          } if
-        } if
-      } if
-    } if
-    pop
-  }
-  /Duplex { % [. .] PageSize -
-    dup type /booleantype eq {
-      (\nsides-duplex==) ..print dup === (\n) ..print
-    } if
-    pop
-  }
-  /Tumble { % [. .] PageSize -
-    dup type /booleantype eq {
-      (\nsides-tumble==) ..print dup === (\n) ..print
-    } if
-    pop
-  }
->> def
-%/.setpagesize{pop pop (hehehe\n) print} def
-% /a4{(hehehe\n) ..print} def % doesn"t work, has to be put into userdict
-/setpagedevice{
-  { % <key> <val>
-    exch dup ..sdict exch known { % run all keys known in ..sdict
-      ..sdict exch get exec
-    } {pop pop} ifelse
-  } forall
-  (\nset-called-1==/setpagedevice\n) ..print flush
-}def
-/setpagetype{pop (\nset-called-1==/setpagetype\n) ..print flush}def
-/setprintername{pop (\nset-called-1==/setprintername\n) ..print flush}def
-/setresolution{pop (\nset-called-1==/setresolution\n) ..print flush}def
-[ % Dat: fixed at Mon May 19 14:32:31 CEST 2003
-  statusdict /.pagetypenames 2 copy known {get}{pop pop{}}ifelse
-  % ^^^ Dat: may be {/a4 STRICT {(%END SIZES) .skipeof} if /a5}
-  { /11x17/a3/a4/a4small/b5/ledger/legal/letter % GS 7.04
-    /lettersmall/note/a0/a1/a2/a5/a6/a7/a8/a9/c0/c1/c2/c3/c4/c5/c6
-    /a10/b0/b1/b2/b3/b4/b5/b6
-    /isob0/isob1/isob2/isob3/isob4/isob5/isob6
-    /jisb0/jisb1/jisb2/jisb3/jisb4/jisb5/jisb6
-    /archE/archD/archC/archB/archA/flsa/flse/halfletter
-    /tabloid/csheet/dsheet/esheet/executivepage/com10envelope
-    /monarchenvelope/c5envelope/dlenvelope/folio/quarto
-  }
-]{{
-  dup type /nametype eq { dup xcheck not { % Dat: fixed
-    % dup ===
-    dup ..paper.redef exch known {pop} {
-      dup ..paper.redef exch null put
-      dup userdict exch 2 copy known { 2 copy get
-        1 index userdict exch undef
-        % Stack: /a4 userdict /a4 {...}
-        % 3 copy pop undef
-        4 2 roll exch undef
-      } { exch pop pop {} } ifelse
-      % Stack: /a4 {595 842 //.setpagesize --exec--}
-      % Stack: /a4 {595 842 {/statusdict --.systemvar-- --begin-- .setpagesize --end--} --exec--}
-      { /get exec /pop (\nset-called-0==) ..print === flush } % dump
-      dup length array copy cvx % make a copy for subsequent invocations
-      2 copy exch 0 exch put exch pop % change /get to {...}
-      2 copy exch 2 exch put % change /pop to /a4
-      def % overwrite it in systemdict
-    } ifelse
-    true
-  } if } if
-  pop
-}forall} forall
-end % systemdict
-.setglobal
-systemdict readonly pop
-
-(bbox-begin\n) ..print
-MAINFILE cvx exec
-(add-showpage==1\n) ..print
-/DOCUT false def
-showpage quit
-';
-      die unless close F;
-      # vvv Imp: make it work on Win32 (no >&1 redirection)
-      my $gs3=$CGS. # "-dPAGE1QUIT=".($FileFormat eq 'EPS' or $FileFormat eq 'markedEPS' ? 'quit' : '{}').
-        " -dWRITESYSTEMDICT -dNOPAUSE -sDEVICE=bbox -sFN=".fnq($InputFilename)." ".fnq($tfn)." 2>&1";
-      debug "Ghostscript compute pipe: $gs3";
-      my $res=`$gs3`;
-      ## die $res;
-      temp_unlink $tfn;
-      ## print STDERR $res;
-      error "not a GS output from $GS"
-        if !defined $res # BUGFIX at Sun Mar  7 18:51:34 CET 2004
-        or $res!~s/\A\w+ Ghostscript \d.*\n// # AFPL Ghostscript 6.50 (2000-12-02)
-        or $res!~s/.*?^bbox-begin\n//m;
-      if ($res!~s/\nbbox-success\n\Z(?!\n)/\n/) {
-        warning # not `error', mpost(1) `prologues:=0; ... btex fonts' output won't compile 
-          "BBox discovery was not successful";
-        # !! continue only if MetaPost output?
-        goto SKIP_BBOX_DISC;
-      }
-      #: Copyright (C) 2000 Aladdin Enterprises, Menlo Park, CA.  All rights reserved.
-      #: This software comes with NO WARRANTY: see the file PUBLIC for details.
-      #: set-called-0==/a4
-      #: %%BoundingBox: 56 41 539 783
-      #: %%HiResBoundingBox: 56.645998 41.849999 538.811984 782.351976
-      #: pop-count==0
-      #: end-count==1
-      #: cut-offset==81898
-      my $pop_count=0;
-      my $end_count=0;
-      my $cut_offset=-1;
-      my $papersize_x=undef; # page_width
-      my $papersize_y=undef; # page_height
-      my $resolution_x=undef;
-      my $resolution_y=undef;
-      my $duplexi=0;
-      my $tumblei=0;
-      my %H;
-      my $undefs="";
-      my $bbc=0; # required
-      for my $line (split/\n/, $res) {
-        if ($line=~/^$BBregex$BBValues/oi) { $do_bb_line->($line," from Compute-GS"); $bbc++ }
-        elsif ($line=~m@^set-called-(\d+)==/(\S+)$@) {
-          if (not exists $H{$2}) {
-            $H{$2}=1;
-            $undefs.="/$2".(
-              $1==0 ? "{}def\n" :
-              $1==1 ? "/pop load def\n" :
-                      "{".("pop "x$1)."}bind def\n"
-            );
-          }
-          # Dat: Safe, restorable, EPS-wise: /setpagedevice {pop} def
-          # Dat: Smart, documentwise /a4 dup where{dup wcheck{exch{}put}{pop{}def}ifelse}{pop}ifelse
-        }
-        elsif ($line=~/^pop-count==(\d+)$/) { $pop_count=$1+0 }
-        elsif ($line=~/^end-count==(\d+)$/) { $end_count=$1+0 }
-        elsif ($line=~/^cut-offset==(\d+)$/) { $cut_offset=$1+0 }
-        elsif ($line=~/^papersize-x==([-+0-9eE.]+)$/) { no integer; $papersize_x=$1+0 }
-        elsif ($line=~/^papersize-y==([-+0-9eE.]+)$/) { no integer; $papersize_y=$1+0 }
-        elsif ($line=~/^resolution-x==([-+0-9eE.]+)$/) { no integer; $resolution_x=$1+0 }
-        elsif ($line=~/^resolution-y==([-+0-9eE.]+)$/) { no integer; $resolution_y=$1+0 }
-        elsif ($line=~/^sides-duplex==true$/) { $duplexi=1 }
-        elsif ($line=~/^sides-dumplex==false$/) { $duplexi=2 }
-        elsif ($line=~/^sides-tumble==true$/) { $tumblei=1 }
-        elsif ($line=~/^sides-tumble==false$/) { $tumblei=2 }
-        elsif (length($line)==0 or $line=~/^(?:Copyright |This software )/) {}
-        elsif ($line=~/^Loading (\S+) font from.*[.][.][.]/) { debug "GS builtin font used: $1" }
-        else { debug "unknown line ($line)" }
-      }
-      undef $papersize_y if !defined $papersize_x;
-      die unless $allow_adsc_bb==1;
-      # Dat: This only applies when converting fron non-EPS PS:
-      #      Setting $allow_adsc_bb=0|1 now would disallow/allow the %%BoundingBox
-      #      etc. ADSC comment override the bbox computed by -sDEVICE=bbox.
-      #      When converting PS -> EPS, the PS file usually contains
-      #      `%%BoundingBox: 0 0 paperwidth paperheight', but the figure
-      #      itself is smaller.
-      $bbtype='-';
-      ## die "$papersize_x;;"; # PDF -sPAPERSIZE=a4
-      #if ($::opt_papersize ne 'force-unknown' and $::opt_papersize ne 'unchanged') {
-      #  # override bbox
-      #  ($llx,$lly)=(0,0);
-      #  ($urx,$ury)=split/,/,$::opt_papersize;
-      #} elsif (!is_page1_stop() and defined $papersize_x and defined $papersize_y) {
-      #}
-      debug "PaperSize wd=${papersize_x}bp ht=${papersize_y}bp" if defined $papersize_x;
-      if ($::opt_papersize eq 'force-unknown' or ($::opt_papersize eq 'unchanged' and !defined $papersize_x)) {}
-      elsif ($::opt_papersize ne 'unchanged') {
-        die if is_page1_stop();
-        ($papersize_x,$papersize_y)=split/,/,$::opt_papersize;
-        goto do_force_papersize
-      } else {
-        # Dat: no $do_bb_line here, because we've done it with $bbc++, and we'll also do it later
-       do_force_papersize:
-        die if is_page1_stop();
-        # vvv ($llx,$lly,$urx,$ury)=(0,0,$papersize_x,$papersize_y);
-        # $do_bb_line->("set 0 0 $papersize_x $papersize_y"," from /PageSize");
-        $after_correct.="1 dict dup /PageSize [".ceil($papersize_x)." ".ceil($papersize_y)."] put setpagedevice\n";
-        # ^^^ Dat: both PS and markedPS would benefit from /PaperSize
-        # ^^^ Dat: will be put after CorrectBoundingBox
-        # Dat: unneeded: $allow_adsc_bb=0 if $FileFormat eq 'PDF'; # force this into /CropBox (otherwise only /MediaBox)
-      }
-      if (defined $papersize_x and ($::opt_bboxfrom eq 'papersize' or ($::opt_bboxfrom eq 'guess' and is_set_pagesize_ok()))) {
-        $allow_adsc_bb=0;
-        $do_bb_line->("set 0 0 $papersize_x $papersize_y"," from /PageSize"); # does ($llx,$lly,$urx,$ury)=(0,0,$papersize_x,$papersize_y);
-      }        
-      $allow_adsc_bb=0 if ($::opt_bboxfrom eq 'compute-gs') ? ($bbc!=0)
-                        : ($::opt_bboxfrom eq 'guess') ? ($bbc!=0 and is_page1_stop()) # Imp: is is_page1_stop() OK here?
-                        : 0;
-      if (!is_page1_stop()) {
-        $pop_count=$end_count=0; # assume PS is correct
-        $cut_offset=-1;
-      }
-      # if ($FileFormat ne 'EPS' and $FileFormat ne 'PS') { # device-specific (marked)
-      # ^^^ Dat: $::opt_resolution and $::opt_duplex are already 'force-unknown' if $FileFormat is appropriate
-      {
-	$::opt_resolution=$resolution_x.','.$resolution_y if
-	  $::opt_resolution eq 'unchanged' and defined $resolution_x and defined $resolution_y;
-
-        # vvv Imp: move down like $::opt_resolution
-	if ($::opt_duplex eq 'force-unknown' or ($::opt_duplex eq 'unchanged' and $duplexi==0)) { $do_fix_tumble=($duplexi==1 && $tumblei==1) }
-        elsif ($::opt_duplex eq 'force-simplex') { do_simplex: $after_correct.="1 dict dup /Duplex false put setpagedevice\n" }
-        elsif ($::opt_duplex eq 'force-long' ) { do_long: $after_correct.="2 dict dup /Duplex true put dup /Tumble false put setpagedevice\n" }
-        elsif ($::opt_duplex eq 'force-short') { do_short: $do_fix_tumble=1; $after_correct.="2 dict dup /Duplex true put dup /Tumble true put setpagedevice\n" }
-        else {
-          $duplexi ||= $::opt_duplex eq 'default-simplex' ? 2 : 1;
-          $tumblei ||= $::opt_duplex eq 'default-short'   ? 1 : 2;
-          goto do_simplex if $duplexi!=1;
-          goto do_long if $tumblei!=1;
-          goto do_short;
-        }
-      }
-      # vvv Dat: save...restore is _always_ necessary to undo the changes made
-      #     in the file itself
-      $is_restored=1; # $after_comments.="save\n"; 
-      $after_comments.=$undefs; # after our precious setpagedevice calls
-      # debug "pop_count=$pop_count;";
-      # debug "end_count=$end_count;";
-      # debug "cut_offset=$cut_offset;";
-      $after_code.=("pop\n"x$pop_count).("end\n"x$end_count);
-      if ($cut_offset>=0 and ($bytes_left==-1 or $cut_offset<$bytes_left)) {
-        $bytes_left=$cut_offset-$already_read;
-        ##print tell(IN)." ar=$already_read\n";
-        debug "Cutting after showpage at $cut_offset -> $bytes_left";
-        # ^^^ Dat: cutting after `showpage' makes PS -> EPS conversion easy
-        # sleep 1000;
-      }
-      # Dat: don't unlink $tifn yet, we'll continue scanning it
-      # Imp: verify EPS created
-    } else { $headEPSF=" $1" }
-   SKIP_BBOX_DISC:
-    if ($::opt_resolution eq 'force-unknown' or $::opt_resolution eq 'unchanged') {}
-    else { $after_correct.="1 dict dup /HWResolution [@{[split/[x,]/,$::opt_resolution]}] put setpagedevice\n" }
-    # ^^^ Dat: syntax already ok for $::opt_resolution
-    $after_correct.="2 dict dup /TextAlphaBits 4 put dup /GraphicsAlphaBits 4 put setpagedevice\n" if
-      $::opt_antialias eq 'yes' or $::opt_antialias eq 'scale3yes';
-
-    $headEPSF="" if $FileFormat ne 'EPS' and $FileFormat ne 'markedEPS';
-    $headPS=$1 if $header=~s/(PS-Adobe-[.\d]+)$//;
-    $to_OUT.="%!$headPS$headEPSF\n";
-  }
-
-  debug "Scanning header for BoundingBox";
-  my $do_atend=0;
-  my $doing_atend=0;
-  my $saved_pos;
-  my $saved_bytes_left;
-  my $creator_metapost_p=0; # HiResBoundingBox: after EndProlog
-  my $creator_adobeps_p=0;
-  my $had_pages=is_page1_stop(); # Dat: don't put `Pages:' to target EPS
-  my $fontsdefs="";
-  my %fontsnames;
-  my @creator;
-  read_again: while (length($_=readIN)) {
-    ##print STDERR "(($_))\n";
-    ### end of header
-    next unless /\S/;
-    y@\r@@d; chomp;
-    if (!$doing_atend) {
-      if (/^%%EndComments\b/i) {
-        # Dat: EPSI created by ImageMagick has BeginDefaults+EndDefaults+BeginPreview
-        # Dat: PS output by ADOBEPS4.DRV has BeginDefaults+PageBoundingBox+ViewingOrientation+PageFeatures+EndDefaults
-        1 while length($_=readIN) and !/\S/;
-        if (!/^%%BeginDefaults\b/i) { y@\r@@d; chomp; $after_comments.="$_\n"; last }
-        1 while length($_=readIN) and !/\S/;
-        if (!/^%%EndDefaults\b/i) { y@\r@@d; chomp; $after_comments.="%%BeginDefaults\n$_\n"; last }
-        next
-      } elsif (/^%%EndDefaults\b/i) { # EPSI created by ImageMagick
-      } elsif (/^%%Creator:\s*ADOBEPS/i) { # ADOBEPS4.DRV
-        # Emits ``%%BoundingBox 1 1 ...' instead of `0 0'
-        $creator_adobeps_p=1;
-      } elsif (/^%%Creator:\s*MetaPost\b/i) {
-        $creator_metapost_p=1;
-      } elsif ((substr($_,0,2)ne'%%' and substr($_,0,7)ne'%*Font:')
-       and substr($_,0,5)ne'%EPS ' # epsincl.mp
-       or !$creator_metapost_p and substr($_,0,5)eq'%%End'
-       or /^%%Begin(?:Prolog|Setup)\b/i
-         ) { $after_comments.="$_\n"; last }
-    }
-    if (/^%%BeginPreview\b/i) { # remove EPSI preview ballast ****pts****
-      while (1) {
-        error "Missing EPSI %%EndPreview" if !length($_=readIN);
-        last if /^%%EndPreview\b/;
-        y@\r@@d; chomp
-      }
-    } elsif (/^%%Creator:\s*(.*)/i) {
-      push @creator, $1;
-      $creator[-1]=~s@\s+\Z(?!\n)@@;
-      $creator[-1]=~s@, a2ping .*@@; # remove old
-    } elsif (/^%%(?:DocumentPaperSizes|PageOrder|DocumentMedia):/i) {
-      # silently ignore these -- will be recalculated
-    } elsif (/^%%Pages:\s+(\d+)\s*/i and !$had_pages) { # Not `%%Pages: (atend)'
-      # Dat: don't `$do_atend=1' only for %%Pages
-      $to_OUT.="$_\n"; $had_pages=1
-    } elsif (/^%%Pages:/i) {
-      # silently ignore these -- not significant for EPS
-    } elsif (/^$BBregex$BBValues/oi) { ### BoundingBox with values
-      s@($BBregex)\s*1\s+1\s+@$1 0 0 @ if $creator_adobeps_p;
-      # vvv $bbtype may be possibly already set by compute-gs
-      $do_bb_line->($_," from ADSC") if $allow_adsc_bb;
-    } elsif (/^$BBregex\s*\(atend\)/oi) {
-      ### BoundingBox with (atend)
-      debug "At end $1BoundingBox";
-      # warning "Cannot look for BoundingBox in the trailer with option --filter" if $::opt_filter;
-      # ^^^ Dat: may be seekable anyway, omit warning
-      $do_atend=1
-    } elsif (/^%%Page:/i and !$creator_metapost_p) { # at Thu Sep 25 15:59:52 CEST 2003
-      $after_comments.="$_\n"; last
-    } elsif (/^%\*Font:\s+(\S+)\s+/) { # mpost(1) output
-      ## debug $_;
-      $fontsdefs.="$_\n"; # put in front (before `gsave ... translate')
-      $fontsnames{$1}=1;
-    } elsif (substr($_,0,5) eq '%EPS ') { # epsincl.mp
-      $after_correct.="$_\n" if !$doing_atend; # before `gsave'
-    } elsif ($doing_atend or /^%%End/) {
-      # we might be in mid-line
-    } else {
-      $to_OUT.="$_\n"
-    }
-  }
-  if ($doing_atend) { # already read (atend); restore file position
-    seek(IN, $saved_pos, 0) or error "Input unseekable, cannot go back to line `: (atend)'";
-    $bytes_left=$saved_bytes_left;
-  } elsif ($do_atend) { # seek to near EOF and try again
-    # error "Cannot leave line `: (atend)'" if ($saved_pos=tell IN)<0 or !seek(IN,0,1);
-    fix_pipe_in "j.ps", $to_OUT, 0;
-    die if ($saved_pos=tell IN)<0;
-    $saved_bytes_left=$bytes_left;
-    # vvv get the very last *BoundingBox entry from the last 4096 bytes
-    if ($bytes_left>4096) {
-      die unless seek(IN, $bytes_left-4096, 1);
-      $bytes_left=4096;
-    } elsif ($bytes_left<0) {
-      die unless seek(IN, -4096, 2) or seek(IN, 0,0); # Dat: 0,0 for short files
-    }
-    $doing_atend=1; goto read_again;
-  }
-  # if (!$had_pages) { debug "Lying %%Pages: 1"; $to_OUT.="%%Pages: 1\n" }
-  # ^^^ Dat: rather not lie !! go to (atend) if command line
-  # vvv Dat: $bbtype ne'-' would be a bad idea
-  warning "BoundingBox not found, try --bboxfrom=compute-gs" if !defined $llx; # !! compute-gs
-  push @creator, "$program $Htex::a2ping::VERSION"; # if "@creator"!~/\ba2ping\b/;
-  $to_OUT.="%%Creator: ".join(", ",@creator)."\n"; # before CorrectBoundingBox to be before `gsave' etc.
-  $to_OUT.=CorrectBoundingBox $llx, $lly, $urx, $ury, $after_correct, $fontsdefs, $is_restored;
-  $to_OUT.=$after_comments;
-  if (%fontsnames) { # !! save .. restore
-    $to_OUT.="{@{[sort keys%fontsnames]}}{\ndup where{pop pop}{cvlit dup def}ifelse}forall\n";
-    $to_OUT.="/fshow where{pop}{/fshow{exch findfont exch scalefont setfont show}bind def}ifelse\n";
-  }
-}
-
-### open output file or pipe (do this as late as possible)
-my $do_scale3_pnm=0;
-my $scale3_pnm_fn;
-my @pnm2sampled_cmd;
-if ($FileFormat eq 'PDF' or $FileFormat eq 'PDF1') {
-  my $ofn=$ll_zero ? $OutputFilename : fix_pipe_out('.pdf');
-  my $pipe = "$GS -q -dBATCH -sDEVICE=pdfwrite $GSOPTS -sOutputFile=".fnq($ofn)." -";
-  debug "Ghostscript ps2pdf pipe:", $pipe;
-  open(OUT, "| $pipe") or error "Cannot open Ghostscript pipe";
-} elsif ($FileFormat eq 'PCL5') {
-  my $ofn=$do_fix_tumble ? fix_pipe_out('.pcl5') : $OutputFilename;
-  # vvv ljet4 cannot do duplex, ljet4d can
-  my $pipe = "$GS -q -dBATCH -sDEVICE=ljet4d $GSOPTS -sOutputFile=".fnq($ofn)." -";
-  debug "Ghostscript ps2ljet pipe:", $pipe;
-  open(OUT, "| $pipe") or error "Cannot open Ghostscript pipe";
-} elsif ($FileFormat eq 'PBM' or $FileFormat eq 'PGM' or $FileFormat eq 'PPM'
-  or is_via_sam2p()) {
-  $do_scale3_pnm=($::opt_antialias eq'scale3no' or $::opt_antialias eq 'scale3yes');
-  my $device=$FileFormat eq 'PPM' || is_via_sam2p() ? 'ppmraw' :
-    $FileFormat eq 'PBM' && $::opt_antialias eq 'no' ? 'pbmraw' : 'pgmraw';
-  # Dat: -sDEVICE=pgm is ASCII, pgmraw is binary
-  my $pipe ="$GS -q -dBATCH -sDEVICE=$device ";
-  # $pipe.="-dTextAlphaBits=4 -dGraphicsAlphaBits=4 " if $::opt_antialias; # Dat: already done
-  my $ofn=$OutputFilename;
-  if (is_via_sam2p()) {
-    # Dat: fortunately the following file format names are commin in sam2p(1)
-    #      and a2ping.pl: PNG XWD BMP TIFF JPEG GIF XPM
-    @pnm2sampled_cmd=('sam2p',"$FileFormat:",'--'); # Imp: use convert(1) if no sam2p(1)
-    $ofn=fix_force_out('SS.pnm');
-    push @pnm2sampled_cmd, $ofn, $OutputFilename;
-  }
-  if ($do_scale3_pnm) {
-    $scale3_pnm_fn=$ofn;
-    $ofn=fix_force_out('S3.pnm') if $do_scale3_pnm;
-    # ^^^ Dat: this must be the last call to fix_force_out()
-  }  
-  $pipe.="$GSOPTS -sOutputFile=".fnq($ofn)." -";
-  debug "Ghostscript ps2raster pipe:", $pipe;
-  open(OUT, "| $pipe") or error "Cannot open Ghostscript pipe";
-} else { open_OUT() }
-
-my $unlink_OutputFilename;
-END { unlink $unlink_OutputFilename if defined $unlink_OutputFilename }
-$unlink_OutputFilename=$OutputFilename;
-
-die unless binmode OUT;
-#die $to_OUT;
-# !! remove setpagedevice from EPS->EPS, but keep EPS->PGM
-# vvv needed by EPS->PGM conversion !!
-if (is_need_showpage() and is_page1_stop()) {
-  $to_OUT.="/showpage{showpage quit}bind def\n"; # don't call showpage twice
-  $after_code.="showpage\n";
-}  
-error "write OUT" if !print OUT $to_OUT;
-$to_OUT="";
-
-### print rest of file
-sub OVERLAP_LENGTH(){4096} # `%%TrailerLength: 1162' by ADOBEPS4.DRV
-my $extra_trailer="%%Trailer\n";
-##undef $unlink_OutputFilename; die;
-{ my $overlap=""; # keeps OVERLAP_LENGTH chars
-  my $S;
-  # print OUT while length($_=readIN 4096);
-  while (length($S=readIN 4096)) { # Dat: 4096>=OVERLAP_LENGTH
-    #if (length($S)<OVERLAP_LENGTH) { $S="$overlap$S"; $overlap=""; }
-    #die if length($S)<OVERLAP_LENGTH; # happens sometimes
-    #print OUT $overlap, substr($S,0,length($S)-OVERLAP_LENGTH());
-    #$overlap=substr($S,-OVERLAP_LENGTH(),OVERLAP_LENGTH);
-    next if length($overlap.=$S)<OVERLAP_LENGTH;
-    print OUT substr($overlap,0,length($overlap)-OVERLAP_LENGTH());
-    $overlap=substr($overlap,-OVERLAP_LENGTH());
-  }
-  if ($overlap=~s@\r?\n%%Trailer\r?\n(.*?)\Z(?!\n)@\n%%Trailer\n@s) {
-    my $S=$1;
-    $S=~y@\r@@d;
-    $S=~s@\n%%TrailerLength:.*$@@m; # ADOBEPS4.DRV
-    $overlap.=$S;
-    $extra_trailer="";
-  }
-  $overlap=~s@(?:[\n\r\0\f]+%%EOF)?[\n\r\0\f]*\Z(?!\n)@@;
-  # vvv Dat: would move %%Trailer after dvips output `end userdict /end-hook known{end-hook}if'
-  # $overlap=~s@(?:[\n\r\0\f]+%%Trailer)?(?:[\n\r\0\f]+%%EOF)?[\n\r\0\f]+\Z(?!\n)@@;
-  print OUT $overlap;
-}
-
-### close files
-error "closing IN: $?" unless close IN;
-# ^^^ SUXX: gs always exit(0), if exists
-# vvv Dat: $after_code is pop+end
-print OUT "\n$extra_trailer$after_code",
-  ("grestore\n"x$need_grestore),
-  ("restore\n"x$is_restored),
-  "%%EOF\n";
-error "closing gs filter: $? $!" unless close OUT;
-
-# --- PNM scaling routines for --antialias=scale3*
-
-sub pnm_gettok($) {
-  my ($fh,$S,$C)=($_[0],"");
-  while (1) {
-    die "unexpected EOF" if !defined($C=getc($fh));
-    if ($C eq'#') { <$fh> } # ignore rest of line
-    elsif ($C=~y@ \n\r\t@@) { last if length($S)!=0 }
-    else { $S.=$C }
-  }
-  $S
-}
-
-my @div9=(0,0,0,0,0,map { $_, $_, $_, $_, $_, $_, $_, $_, $_ } 1..255, 255);
-
-#** @param $_[0] length always divisible by 3
-sub p5_avg_lines($$$$) {
-  use integer;
-  my $len=length($_[0]);
-  my $olen=$len/3;
-  while ($len>0) {
-    vec($_[3],--$olen,8)=$div9[
-      vec($_[0],$len-1,8)+vec($_[0],$len-2,8)+vec($_[0],$len-3,8)+
-      vec($_[1],$len-1,8)+vec($_[1],$len-2,8)+vec($_[1],$len-3,8)+
-      vec($_[2],$len-1,8)+vec($_[2],$len-2,8)+vec($_[2],$len-3,8)];
-    $len-=3;
-  }
-}
-
-#** @param $_[0] length always divisible by 9
-sub p6_avg_lines($$$$) {
-  # Imp: why is it lighter than: convert -scale '33.3333%' a3.pbm a3r.pgm
-  use integer;
-  my $len=length($_[0]);
-  my $olen=$len/3;
-  while ($len>0) {
-    vec($_[3],--$olen,8)=$div9[
-      vec($_[0],$len-1,8)+vec($_[0],$len-4,8)+vec($_[0],$len-7,8)+
-      vec($_[1],$len-1,8)+vec($_[1],$len-4,8)+vec($_[1],$len-7,8)+
-      vec($_[2],$len-1,8)+vec($_[2],$len-4,8)+vec($_[2],$len-7,8)];
-    $len-=6 if 0==--$len%3;
-  }
-}
-
-# ---
-
-if (!$ll_zero and ($FileFormat eq 'PDF' or $FileFormat eq 'PDF1')) { # correct /MediaBox if not (0,0)-based
-  ### ****pts**** remove incorrect /MediaBox produced by gs
-  my $tfn=temp_prefix()."p.tgs";
-  error "temp open $tfn: $!" unless open F, "> $tfn";
-  $tmpfiles{$tfn}=1;
-  die unless print F "% this is temporary gs command file created by $program".'
-  GS_PDF_ProcSet begin
-  pdfdict begin
-  FN (r) file pdfopen begin
-  % vvv keep file offsets, because `pdffindpageref` overrides it with contents
-  /OFT Objects 0 get dup length array copy def
-  % vvv Dat: the generation number is assumed to be 0
-  % vvv Dat: modifies Objects[0]
-  1 pdffindpageref 0 get
-  Objects 0 OFT put
-  readxrefentry ===
-  currentdict pdfclose end end end
-  ';
-  die unless close F;
-  
-  my $gs2="$GS -dNODISPLAY -dBATCH -sFN=".fnq(fix_pipe_out(undef))." -q ".fnq($tfn);
-  debug "Ghostscript dup pipe: $gs2";
-  my $offset=`$gs2`;
-  chomp $offset;
-  temp_unlink $tfn;
-  if ($offset=~/\A\d+\Z(?!\n)/) {
-    # Dat: now $offsets is a file position containing our /Page object
-    die unless open F, "+< ".fix_pipe_out(undef);
-    die unless binmode F;
-    die unless seek F, $offset+=0, 0;
-    my $pageobj;
-    die unless 32<read F, $pageobj, 4096;
-    if ($pageobj=~m@\A(.*?/Type\s*/Page\b.*?)(/MediaBox\s*\[0 0 [^\]]*\]).*?/MediaBox\b@s) {
-      substr($pageobj, length($1), length($2))=" "x length($2);
-      # ^^^ overwrite first buggy /MediaBox definition with spaces
-      die unless seek F, $offset, 0;
-      die unless print F $pageobj;
-      debug "old /MediaBox destroyed.";
-    } else {
-      debug "warning: double /MediaBox not found at $offset";
-    }
-    die unless close F;
-  } else {
-    debug "warning: gs failed to locate double /MediaBox";
-  }
-}
-if ($FileFormat eq 'PCL5' and $do_fix_tumble) {
-  # stupid Ghostscript ignores /Tumble true with -sDEVICE=ljet4
-  #  2 dict dup /Duplex true  /Tumble false put setpagedevice % long     HP PCL5e "\033&l1S"
-  #  2 dict dup /Duplex true  /Tumble true  put setpagedevice % short    HP PCL5e "\033&l2S"
-  #  2 dict dup /Duplex false /Tumble false put setpagedevice % simplex  HP PCL5e "\033&l0S"
-  # HP PCL5e gs header "\033E\033&l2A\033&l1S\033&l0o0l0E\033&l-180u36Z"
-  die unless open F, "+< ".fix_pipe_out(undef);
-  die unless binmode F;
-  my $pageobj;
-  die unless 32<read F, $pageobj, 4096;
-  if ($pageobj=~s@\033&l1S.*@\033&l2S@s) {
-    die unless seek F, 0, 0;
-    die unless print F $pageobj;
-    debug "fixed /Tumble true (short).";
-  } elsif ($pageobj=~m@\033&l0S@) {
-    debug "no need to fix to /Tumble.";
-  } else {
-    debug "warning: /Duplex /Tumble settings not found"
-  }
-  die unless close F;
-}
-if ($do_scale3_pnm) {
-  # Imp: scale down the file in place, ovoid early overwrite
-  # Imp: possibly call an external C program that is faster
-  debug "Scaling down PNM by 3x3";
-  die unless open F, "> $scale3_pnm_fn";
-  die unless binmode F;
-  die unless open FIN, "< ".fix_pipe_out(undef);
-  my $hd;
-  die "PNMraw expected\n" if read(FIN,$hd,2)!=2 or $hd!~/\AP[456]/;
-  my $wd=pnm_gettok(*FIN); die "width expected\n"  if $wd!~/\A(\d+)\Z(?!\n)/;
-  my $wd3=$hd eq 'P4' ? ($wd+7)>>3 : $hd eq 'P5' ? $wd : $wd*3; # bw/grayscale/RGB
-  my $ht=pnm_gettok(*FIN); die "height expected\n" if $ht!~/\A(\d+)\Z(?!\n)/;
-  if ($hd ne 'P4') {
-    my $mx=pnm_gettok(*FIN); die "max==255 expected, got: $mx\n" if $mx ne '255';
-  }
-  $wd+=0; $ht+=0;
-  { use integer;
-    my $phd=($hd eq 'P5' and $FileFormat eq 'PBM') ? "P4 ".(($wd+2)/3)." ".(($ht+2)/3)."\n"
-      : ($hd eq 'P6' ? 'P6' : 'P5')."\n# reduced-3x3\n".
-      (($wd+2)/3)." ".(($ht+2)/3)." 255\n";
-    die if !print F $phd;
-  }
-
-  my($l1,$l2,$l3);
-  my $ret="";
-  if ($hd eq 'P4') {
-    while ($ht>0) {
-      die "full row expected1\n" if $wd3!=read FIN, $l1, $wd3;
-      if (--$ht==0) { $l2=$l1 }
-      else {
-	die "full row expected2\n" if $wd3!=read FIN, $l2, $wd3;
-	if (--$ht==0) { $l3=$l2 } # Imp: adjust 2/3 weight
-	else { $ht--;
-	  die "full row expected3\n" if $wd3!=read FIN, $l3, $wd3;
-	}
-      }
-      $l1=unpack("B$wd",$l1); $l1=~y@10@\000\377@;  $l1.=substr($l1,-3+length($l1)%3) if length($l1)%3!=0;
-      $l2=unpack("B$wd",$l2); $l2=~y@10@\000\377@;  $l2.=substr($l2,-3+length($l2)%3) if length($l2)%3!=0;
-      $l3=unpack("B$wd",$l3); $l3=~y@10@\000\377@;  $l3.=substr($l3,-3+length($l3)%3) if length($l3)%3!=0;
-      p5_avg_lines($l1, $l2, $l3, $ret);
-      die if !print F $ret;
-    }
-  } elsif ($hd eq 'P5') {
-    while ($ht>0) {
-      die "full row expected1\n" if $wd3!=read FIN, $l1, $wd3;
-      $l1.=substr($l1,-3+length($l1)%3) if length($l1)%3!=0;
-      if (--$ht==0) { $l2=$l1 }
-      else {
-	die "full row expected2\n" if $wd3!=read FIN, $l2, $wd3;
-	$l2.=substr($l2,-3+length($l2)%3) if length($l2)%3!=0;
-	if (--$ht==0) { $l3=$l2 } # Imp: adjust 2/3 weight
-	else { $ht--;
-	  die "full row expected3\n" if $wd3!=read FIN, $l3, $wd3;
-	  $l3.=substr($l3,-3+length($l3)%3) if length($l3)%3!=0;
-	}
-      }
-      p5_avg_lines($l1, $l2, $l3, $ret);
-      if ($FileFormat eq 'PBM') {
-        my $I=length($ret);
-	while ($I--) { vec($ret,$I,8)=vec($ret,$I,8)<$::opt_threshold } # [\0\1]
-	# ^^^ grayscale>=$::opt_threshold will be white
-        $ret=pack"B".length($ret),$ret;
-      }
-      die if !print F $ret;
-    }
-  } elsif ($hd eq 'P6') {
-    while ($ht>0) {
-      die "full row expected1\n" if $wd3!=read FIN, $l1, $wd3;
-      $l1.=substr($l1,-9+length($l1)%9) if length($l1)%9!=0;
-      if (--$ht==0) { $l2=$l1 }
-      else {
-	die "full row expected2\n" if $wd3!=read FIN, $l2, $wd3;
-	$l2.=substr($l2,-9+length($l2)%9) if length($l2)%9!=0;
-	if (--$ht==0) { $l3=$l2 } # Imp: adjust 2/3 weight
-	else { $ht--;
-	  die "full row expected3\n" if $wd3!=read FIN, $l3, $wd3;
-	  $l3.=substr($l3,-9+length($l3)%9) if length($l3)%9!=0;
-	}
-      }
-      p6_avg_lines($l1, $l2, $l3, $ret);
-      die if !print F $ret;
-    }
-  }
-  die unless close F;
-  temp_unlink $temp_out_fn;
-  undef $temp_out_fn;
-}
-if (@pnm2sampled_cmd) { # $scale3_pnm_fn -> $OutputFilename
-  do_system @pnm2sampled_cmd; # Dat: uses @extra -- really share that?
-  temp_unlink $scale3_pnm_fn;
-}
-fix_close_out();
-undef $unlink_OutputFilename;
-if ($OutputFilename eq '-') {
-  debug "Done OK, stdout is $FileFormat"
-} elsif (-f $OutputFilename) {
-  debug "Done OK, created $FileFormat file $OutputFilename (".(-s _)." bytes)";
-} else {
-  error "missing $OutputFilename"
-}
-just::end __END__
-
-Dat: `=item * foo' is wrong, puts big space between `*' and `foo'
-
-=begin man
-
-.ds pts-dev \*[.T]
-.do if '\*[.T]'ascii'  .ds pts-dev tty
-.do if '\*[.T]'ascii8' .ds pts-dev tty
-.do if '\*[.T]'latin1' .ds pts-dev tty
-.do if '\*[.T]'nippon' .ds pts-dev tty
-.do if '\*[.T]'utf8'   .ds pts-dev tty
-.do if '\*[.T]'cp1047' .ds pts-dev tty
-.do if '\*[pts-dev]'tty' \{\
-.ll 79
-.pl 33333v
-.nr IN 2n
-.\}
-.ad n
-
-=end
-
-=head1 NAME
-
-a2ping.pl -- convert between PS, EPS and PDF and other page description
-formats
-
-=head1 SYNOPSIS
-
-Z<> B<a2ping.pl> [B<-->]B<help>
- B<a2ping.pl> [B<-->]B<doc>
- B<a2ping.pl> [I<options>] <I<inputfile>> [[I<outformat>:] I<outputfile>]
-
-=head1 DESCRIPTION
-
-B<a2ping> is a UNIX command line utility written in Perl that
-converts many raster image and vector graphics formats to EPS or PDF and
-other page description formats. Accepted input file formats are: PS
-(PostScript), EPS, PDF, PNG, JPEG, TIFF, PNM, BMP, GIF, LBM, XPM, PCX,
-TGA. Accepted output formats are: EPS, PCL5, PDF, PDF1, PBM, PGM, PPM,
-PS, markedEPS, markedPS, PNG, XWD, BMP, TIFF, JPEG, GIF, XPM.
-B<a2ping> delegates the low-level work to
-Ghostscript (GS), B<pdftops> and B<sam2p>. B<a2ping> fixes many glitches
-during the EPS to EPS conversion, so its output is often more compatible
-and better embeddable than its input.
-
-Without the C<--below> option, it is guarenteed to start at the 0,0
-coordinate. C<--below>, C<--hires> and C<-v> are recommended options.
-
-The page size is set exactly corresponding to the BoundingBox.
-This means that when Ghostscript renders it, the result needs no
-cropping, and the PDF MediaBox is correct.
-
-If the bounding box is not right, of course, you have problems. If you
-feed crap in, you get crap. But you can supply the
-B<--bboxfrom=compute-gs> option to make GS recompute the bounding box.
-
-The name of the input file doesn't matter -- B<a2ping> detects the file
-format based on the first few bytes of the file. The name of the output
-file matters if I<outformat> is missing from the command line: then the
-extension of the output file determines the FileFormat (I<outformat>).
-
-=head1 EXTERNAL PROGRAMS
-
-The internal file format of B<a2ping.pl> is PS/EPS. Everything read is
-first converted to PS or EPS, then processed by B<a2ping.pl>, then
-converted to the output format.
-
-To analyse the bounding box and other properties of non-EPS PS files
-(and EPS files with option B<--bboxfrom> other than B<=guess>), GS is
-used. Converting PS to EPS involves this analysis.
-
-To write PDF files, GS is used.
-
-To read PDF files, B<pdftops> from the B<xpdf> package is used.
-
-Sampled input formats are PNG, JPEG, TIFF, PNM, BMP, GIF, LBM, XPM, PCX
-and TGA. To read sampled input formats, B<sam2p> is used. B<sam2p> is
-a raster image converter written in C++ by the author of B<a2ping.pl>.
-
-Extra output formats are PNG, XWD, BMP, TIFF, JPEG, GIF and XPM. To
-write extra output formats, B<sam2p> and GS are used.
-
-PNM output formats are PGM, PGM and PPM. To write PNM output formats, GS
-is used.
-
-
-=head1 TIPS AND TRICKS
-
-=over 2
-
-=item *
-
-Call with the B<-v> option to see progress and debug messages.
-
-=item *
-
-If your EPS contains a wrong bounding box, you can fix it by running
-C<a2ping.pl -v --bboxfrom=compute-gs thefile.eps -->
-
-=item *
-
-You can specify B<-> as I<inputfile> to get stdin and as I<outputfile>
-to get stdout. This works even for PDF files (which must be seekable),
-because B<a2ping> copies them to a temporary file automatically.
-
-=item *
-
-If I<inputfile> and I<outputfile> are the same, B<a2ping> copies the
-I<inputfile> to a temporary location first. However, this usage is
-recommended only if there is a backup of the file to be restored in case
-B<a2ping> doesn't produce the desired result.
-
-=item *
-
-If you specify B<--> as I<outputfile>, it will be the same as I<inputfile>.
-
-=item *
-
-B<a2ping> respects B<--Duplex> for FileFormat PCL5, even though GS doesn't.
-
-=item *
-
-If you have an incompatible PS that GS can read but your printer cannot print,
-just run C<a2ping.pl foo.ps PDF: - | a2ping.pl - PS: foo.ps>
-
-=item *
-
-If you have a PS coming from Win32 (often with extension C<.prn>), run
-it through B<a2ping>. It will remove the resolution changes and the
-progress text printed to the terminal (which confuses gv(1) and makes
-some filters in the print queue emit incorrect output).
-
-=item *
-
-B<a2ping> does antialiasing (B<--antialias=scale3no>) of glyphs and
-curves when emitting a sampled image (FileFormats such as PGM and PPM).
-This improves readability of the glyphs. B<=yes> instructs GS to do
-internal antialiasing, but it usually doesn't improve much. B<=scale3no>
-turns off GS internal antialiasing, but makes it render everything 3x3
-as big, and then scales it back down. B<=scale3no> turns on both 3x3
-scaling and GS internal antialiasing, which results in thicker lines and
-worse quality in general.
-
-=item *
-
-When creating a PBM file, antialiasing usually doesn't improve the
-quality, so it is switched off by default. But if you set
-B<--antialias=scale3no> or B<--antialias=scale3yes>, GS will render a PGM file,
-and the value of B<--threshold> determines the minimum intensity for white in
-the final PBM.
-
-=item *
-
-If you need a bigger sampled output file, specify a larger
-B<--Resolution>. The default is B<--Resolution=72>. If your sampled output file
-is going to be really big, you should specify B<--AntiAlias=yes> instead of
-the default B<--AntiAlias=scale3no> to speed up conversion.
-
-=back
-
-
-=head1 MISC
-
-=over 2
-
-=item *
-
-Doesn't depend on the filename or extension of the input file.
-
-=item *
-
-Conversion from EPS to PDF: fixes glitches etc., calls gs
--sDEVICE=pdfwrite
-
-=item *
-
-Conversion from EPS to EPS: fixes various glitches, moves (llx,lly) to
-(0,0), removes binary junk from the beginning of the EPS etc.
-
-=item *
-
-Conversion from PDF to PDF: keeps the file intact
-
-=item *
-
-Conversion from PDF to EPS: calls pdftops -eps (of the xpdf package)
-
-=item *
-
-Conversion from PS to EPS: keeps 1st page only, removes setpagedevice etc.
-
-=back
-
-=head1 AUTHORS
-
-The author of B<a2ping> is Szabó Péter <F<pts@fazekas.hu>>.
-
-B<a2ping> is inspired by and historically based on the B<epstopdf> Perl
-script modified by Thomas Esser, Sept. 1998, but his modifications have
-been removed from B<a2ping>, and also B<a2ping> and B<epstopdf> do not
-share common code anymore.  B<epstopdf> is written by Sebastian Rahtz,
-for Elsevier Science. B<epstopdf> contained extra tricks from Hans Hagen's
-texutil.
-
-=head1 HISTORY
-
-=head2 1999/05/06 v2.5 (Heiko Oberdiek)
-
- * New options: --hires, --exact, --filter, --help.
- * Many cosmetics: title, usage, ...
- * New code for debug, warning, error
- * Detecting of cygwin perl
- * Scanning for %%{Hires,Exact,}BoundingBox.
- * Scanning only the header in order not to get a wrong
-   BoundingBox of an included file.
- * (atend) supported.
- * uses strict; (earlier error detecting).
- * changed first comment from '%!PS' to '%!';
- * corrected (atend) pattern: '\s*\(atend\)'
- * using of $bbxpat in all BoundingBox cases,
-   correct the first white space to '...Box:\s*$bb...'
- * corrected first line (one line instead of two before 'if 0;';
-
-=head2 2000/11/05 v2.6 (Heiko Oberdiek)
-
- * %%HiresBoundingBox corrected to %%HiResBoundingBox
-
-=head2 2001/03/05 v2.7 (Heiko Oberdiek)
-
- * Newline before grestore for the case that there is no
-   whitespace at the end of the eps file.
-
-=head2 2003/02/02 (Szabó Péter)
-
- * option --below
- * removes DOS EPSF binary junk correctly
- * adds all 3 BoundingBox DSC comments
- * reads all 3 BoundingBox DSC comments, and picks the best
- * forces BoundingBox to be an integer
- * adds %%EndComments and proper %!PS-Adobe-?-? EPSF-?.? header
- * adds %%Pages:
- * adds invocation syntax: a2ping <infile.eps> <outfile.eps|pdf>
- * can convert PDF to EPS (by calling pdftops(1)) and PDF to PDF
- * emulates work for PDF input
-
-=head2 2003/04/16 (Szabó Péter)
-
- * added PS and sam2p support, renamed to a2ping
- * sam2p and pdftops if $InputFilename eq '-';
- * remove PJL UEL header from the beginning
- * works for PS non-EPS files for input
- * input support for PNG JPEG TIFF PNM BMP GIF LBM XPM PCX TGA via sam2p
- * removes ^L (form feed) from end of EPS file
- * -x=-c:rle to add sam2p options
-
-=head2 2003/04/26 (Szabó Péter)
-
- * omit the unnecessary setpagedevice calls when creating normal eps
- * --noverbose --nocompress supported differently
- * no more option defaults :-(
- * justlib2
- * multi-page output with PS:, PDF:, PCL5:
- * after `a2ping -pa4', file out.pcl says: `HP PCL printer data - A4 page
-   size', instead of `US letter'
- * justlib2-ified doesn't depend on Getopt::Long anymore
- * fully supports filtering (stdin and/or stdout), PDF and PCL5 output to
-   pipe (!$$ll_zero)
- * adds DSC ``%%DocumentMedia: plain 612 792 0 () ()''
- * BoundingBox precedence for EPS input: --PageSize, %%*BoundingBox,
-   setpagedevice. Precedence for other inputs: --PageSize, setpagedevice,
-   %%*BoundingBox
-
-=head2 2003/09/25 (Szabó Péter)
-
- * --bboxfrom=adsc: %%BoundingBox overrides -sDEVICE=bbox
- * improved bbox discovery
- * many bugfixes
- * MetaPost EPS input fixes for prologues:=0;
- * a2ping.pl -v --papersize=50,60 --bboxfrom=compute-gs t.ps t2.ps
- * consistent bbox, --PageSize, /PageSize handling
- * consistent --Resolution and --Duplex handling
-
-=head2 2003/12/02 (Szabó Péter)
-
- * --bboxfrom=compute-gs option to fix PS -> EPS bbox (gs -sDEVICE=bbox), tuzv.eps
-
-=head2 2004/02/10 v2.77 (Szabó Péter)
-
- * the compute-pipe routine is now run unless --bboxfrom=guess with EPS
- * added --gsextra=
- * added --antialias=
- * added FileFormat PBM, PGM, PPM
- * separated FileFormat features to FL_* constants
- * added --doc
- * there is no default FileFormat (PDF) anymore
+../../texmf/scripts/a2ping/a2ping.pl
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/afm2pl b/Master/bin/alpha-linux/afm2pl
index 8545364d424..0f5d04f4e70 100755
--- a/Master/bin/alpha-linux/afm2pl
+++ b/Master/bin/alpha-linux/afm2pl
diff --git a/Master/bin/alpha-linux/afm2tfm b/Master/bin/alpha-linux/afm2tfm
index f54d63b9c7f..1185131ce6e 100755
--- a/Master/bin/alpha-linux/afm2tfm
+++ b/Master/bin/alpha-linux/afm2tfm
diff --git a/Master/bin/alpha-linux/aleph b/Master/bin/alpha-linux/aleph
index cc3134009a9..cc26437df98 100755
--- a/Master/bin/alpha-linux/aleph
+++ b/Master/bin/alpha-linux/aleph
diff --git a/Master/bin/alpha-linux/bbox b/Master/bin/alpha-linux/bbox
index 829bf1db45f..28880c7f4cf 100755
--- a/Master/bin/alpha-linux/bbox
+++ b/Master/bin/alpha-linux/bbox
diff --git a/Master/bin/alpha-linux/bg5conv b/Master/bin/alpha-linux/bg5conv
index 8905431949f..c45a3332f5c 100755
--- a/Master/bin/alpha-linux/bg5conv
+++ b/Master/bin/alpha-linux/bg5conv
diff --git a/Master/bin/alpha-linux/bibtex b/Master/bin/alpha-linux/bibtex
index 4a924d66a1b..965797f7229 100755
--- a/Master/bin/alpha-linux/bibtex
+++ b/Master/bin/alpha-linux/bibtex
diff --git a/Master/bin/alpha-linux/bibtex8 b/Master/bin/alpha-linux/bibtex8
index dd0cd68acc9..a9f81195166 100755
--- a/Master/bin/alpha-linux/bibtex8
+++ b/Master/bin/alpha-linux/bibtex8
diff --git a/Master/bin/alpha-linux/cef5conv b/Master/bin/alpha-linux/cef5conv
index 50f7dd1e1b5..2441d369de4 100755
--- a/Master/bin/alpha-linux/cef5conv
+++ b/Master/bin/alpha-linux/cef5conv
diff --git a/Master/bin/alpha-linux/cefconv b/Master/bin/alpha-linux/cefconv
index 6defbd43e79..5637ed55c6e 100755
--- a/Master/bin/alpha-linux/cefconv
+++ b/Master/bin/alpha-linux/cefconv
diff --git a/Master/bin/alpha-linux/cefsconv b/Master/bin/alpha-linux/cefsconv
index e3fdea6f5c0..30d7171d328 100755
--- a/Master/bin/alpha-linux/cefsconv
+++ b/Master/bin/alpha-linux/cefsconv
diff --git a/Master/bin/alpha-linux/cfftot1 b/Master/bin/alpha-linux/cfftot1
index 2fa4a7eb15e..8f426a5aa1c 100755
--- a/Master/bin/alpha-linux/cfftot1
+++ b/Master/bin/alpha-linux/cfftot1
diff --git a/Master/bin/alpha-linux/ctangle b/Master/bin/alpha-linux/ctangle
index 8f30d63a28e..efa1662cb7b 100755
--- a/Master/bin/alpha-linux/ctangle
+++ b/Master/bin/alpha-linux/ctangle
diff --git a/Master/bin/alpha-linux/ctie b/Master/bin/alpha-linux/ctie
index 6d16db4699d..290d082f2e4 100755
--- a/Master/bin/alpha-linux/ctie
+++ b/Master/bin/alpha-linux/ctie
diff --git a/Master/bin/alpha-linux/cweave b/Master/bin/alpha-linux/cweave
index 66af079449c..43ecc282044 100755
--- a/Master/bin/alpha-linux/cweave
+++ b/Master/bin/alpha-linux/cweave
diff --git a/Master/bin/alpha-linux/detex b/Master/bin/alpha-linux/detex
index 47413306879..78a26ccbc8c 100755
--- a/Master/bin/alpha-linux/detex
+++ b/Master/bin/alpha-linux/detex
diff --git a/Master/bin/alpha-linux/devnag b/Master/bin/alpha-linux/devnag
index 19276e87dd9..04968c7fe17 100755
--- a/Master/bin/alpha-linux/devnag
+++ b/Master/bin/alpha-linux/devnag
diff --git a/Master/bin/alpha-linux/disdvi b/Master/bin/alpha-linux/disdvi
index 665619d1602..f57c89dbcfe 100755
--- a/Master/bin/alpha-linux/disdvi
+++ b/Master/bin/alpha-linux/disdvi
diff --git a/Master/bin/alpha-linux/dmp b/Master/bin/alpha-linux/dmp
index 32a4c0dfd00..0a77e6b2ed2 100755
--- a/Master/bin/alpha-linux/dmp
+++ b/Master/bin/alpha-linux/dmp
diff --git a/Master/bin/alpha-linux/dt2dv b/Master/bin/alpha-linux/dt2dv
index dd99faaed37..89a8e08b5b8 100755
--- a/Master/bin/alpha-linux/dt2dv
+++ b/Master/bin/alpha-linux/dt2dv
diff --git a/Master/bin/alpha-linux/dv2dt b/Master/bin/alpha-linux/dv2dt
index 41bae843ca7..66d5776792f 100755
--- a/Master/bin/alpha-linux/dv2dt
+++ b/Master/bin/alpha-linux/dv2dt
diff --git a/Master/bin/alpha-linux/dvi2tty b/Master/bin/alpha-linux/dvi2tty
index 1919c6f6322..fc0f0384bd4 100755
--- a/Master/bin/alpha-linux/dvi2tty
+++ b/Master/bin/alpha-linux/dvi2tty
diff --git a/Master/bin/alpha-linux/dviasm b/Master/bin/alpha-linux/dviasm
new file mode 120000
index 00000000000..2b15762a267
--- /dev/null
+++ b/Master/bin/alpha-linux/dviasm
@@ -0,0 +1 @@
+../../texmf-dist/scripts/dviasm/dviasm.py
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/dvibook b/Master/bin/alpha-linux/dvibook
index ed20a60bd3c..4d51a86c94d 100755
--- a/Master/bin/alpha-linux/dvibook
+++ b/Master/bin/alpha-linux/dvibook
diff --git a/Master/bin/alpha-linux/dviconcat b/Master/bin/alpha-linux/dviconcat
index f2a367bfe50..88c74194071 100755
--- a/Master/bin/alpha-linux/dviconcat
+++ b/Master/bin/alpha-linux/dviconcat
diff --git a/Master/bin/alpha-linux/dvicopy b/Master/bin/alpha-linux/dvicopy
index 42d4faa77a5..4d618718035 100755
--- a/Master/bin/alpha-linux/dvicopy
+++ b/Master/bin/alpha-linux/dvicopy
diff --git a/Master/bin/alpha-linux/dvidvi b/Master/bin/alpha-linux/dvidvi
index 6d502f635af..54419824917 100755
--- a/Master/bin/alpha-linux/dvidvi
+++ b/Master/bin/alpha-linux/dvidvi
diff --git a/Master/bin/alpha-linux/dvigif b/Master/bin/alpha-linux/dvigif
new file mode 120000
index 00000000000..c1eef0afe05
--- /dev/null
+++ b/Master/bin/alpha-linux/dvigif
@@ -0,0 +1 @@
+dvipng
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/dvilj b/Master/bin/alpha-linux/dvilj
index e170e847cf9..675018dc90a 100755
--- a/Master/bin/alpha-linux/dvilj
+++ b/Master/bin/alpha-linux/dvilj
diff --git a/Master/bin/alpha-linux/dvilj2p b/Master/bin/alpha-linux/dvilj2p
index 6ce50a4d15b..ca9514d1d34 100755
--- a/Master/bin/alpha-linux/dvilj2p
+++ b/Master/bin/alpha-linux/dvilj2p
diff --git a/Master/bin/alpha-linux/dvilj4 b/Master/bin/alpha-linux/dvilj4
index b18fc66b945..4e1673928a3 100755
--- a/Master/bin/alpha-linux/dvilj4
+++ b/Master/bin/alpha-linux/dvilj4
diff --git a/Master/bin/alpha-linux/dvilj4l b/Master/bin/alpha-linux/dvilj4l
index b4a1acd69b8..80e90bfcd35 100755
--- a/Master/bin/alpha-linux/dvilj4l
+++ b/Master/bin/alpha-linux/dvilj4l
diff --git a/Master/bin/alpha-linux/dvipdfm b/Master/bin/alpha-linux/dvipdfm
index 0ebe4f24a98..f45f7e9a460 100755
--- a/Master/bin/alpha-linux/dvipdfm
+++ b/Master/bin/alpha-linux/dvipdfm
diff --git a/Master/bin/alpha-linux/dvipdfmx b/Master/bin/alpha-linux/dvipdfmx
index b9c8610d011..bf929e462c3 100755
--- a/Master/bin/alpha-linux/dvipdfmx
+++ b/Master/bin/alpha-linux/dvipdfmx
diff --git a/Master/bin/alpha-linux/dvipng b/Master/bin/alpha-linux/dvipng
index c5ae20e7b4f..021c3e8615a 100755
--- a/Master/bin/alpha-linux/dvipng
+++ b/Master/bin/alpha-linux/dvipng
diff --git a/Master/bin/alpha-linux/dvipos b/Master/bin/alpha-linux/dvipos
index d6e5a8f7d46..0f87f6b47ad 100755
--- a/Master/bin/alpha-linux/dvipos
+++ b/Master/bin/alpha-linux/dvipos
diff --git a/Master/bin/alpha-linux/dvips b/Master/bin/alpha-linux/dvips
index f7d262f26e7..fe2bf1effd1 100755
--- a/Master/bin/alpha-linux/dvips
+++ b/Master/bin/alpha-linux/dvips
diff --git a/Master/bin/alpha-linux/dviselect b/Master/bin/alpha-linux/dviselect
index 980f5d6708b..90983e3550f 100755
--- a/Master/bin/alpha-linux/dviselect
+++ b/Master/bin/alpha-linux/dviselect
diff --git a/Master/bin/alpha-linux/dvitodvi b/Master/bin/alpha-linux/dvitodvi
index da6ffcc9d90..babffa07e13 100755
--- a/Master/bin/alpha-linux/dvitodvi
+++ b/Master/bin/alpha-linux/dvitodvi
diff --git a/Master/bin/alpha-linux/dvitomp b/Master/bin/alpha-linux/dvitomp
index 32d3763178d..6759023f9ab 100755
--- a/Master/bin/alpha-linux/dvitomp
+++ b/Master/bin/alpha-linux/dvitomp
diff --git a/Master/bin/alpha-linux/dvitype b/Master/bin/alpha-linux/dvitype
index f9dae87a2e5..a968d6b247d 100755
--- a/Master/bin/alpha-linux/dvitype
+++ b/Master/bin/alpha-linux/dvitype
diff --git a/Master/bin/alpha-linux/e2pall b/Master/bin/alpha-linux/e2pall
index 2997f8b1102..47465883225 100755..120000
--- a/Master/bin/alpha-linux/e2pall
+++ b/Master/bin/alpha-linux/e2pall
@@ -1,89 +1 @@
-#!/usr/bin/env perl
-
-# Author: Jody Klymak <jklymak@apl.washington.edu>, publisted by a posting
-#   to the pdftex mailinglist.
-
-# recursively finds all your eps files.  Looks down \input{fname}.
-# CAVEATS:
-# 1) cannot handle \input{fname} split over more than one line.
-#    1.5) cannot handle multiple \input{} or \includegraphics{} on one line.
-# 2) Must be run from same directory as the Latex file.
-# 3) Does not look down $TEXINPUTS or anything fancy like that...
-# 4) Handling of \include is untested (though I guess its trivial)
-# 5) Assumes *all* your graphics inclusions are [e]ps.  But don't
-#    fret, because if they are not epstopdf dies anyhow....
-# 6) Does not distinguish between percent (\%) and comment (%).
-
-# Changelog:
-# 20030103 -- Lachlan Andrew <lha@users.sourceforge.net>
-#	* Only append '.tex' if $fname doesn't exist.
-#	* Correctly handle lines with '}' after the \includegraphics{}
-#	* Allow multiple extensions for graphics files.  .eps -> .ps -> none
-#	  (Should try them in the same order as  \includegraphics  does
-#	   -- given by \DeclareGraphicsExtensions{}?)
-#	* Allow \include the same way as \input
-#	* Allow \includegraphics{} to be split over multiple lines
-#	* Check that commands begin with '\', and allow spaces before arguments
-
-# EDIT these two lines for your system....
-
-$Eps2PdfCom = "epstopdf";
-$ThisFunCom = "e2pall";
-
-$fname=$ARGV[0];
-
-# check for a *.tex at the end...
-if ((-f "$fname")=="" && $fname !~ /.tex$/){
-    $fname = "$fname.tex";
-}
-
-open(TEXFILE,$fname) or die "Cannot open file $fname";
-# print "Finding *.eps files in $fname\n";
-
-$seekingArg = 0;
-while($line=<TEXFILE>){
-    # truncate $line after % sign....
-    $line=~s/%.*//;
-    # check for /input....
-    if ($line=~/\\input *{([^}]*)}/){
-        print `$ThisFunCom $1`;
-    }
-    # check for /include....
-    if ($line=~/\\include *{([^}]*)}/){
-        print `$ThisFunCom $1`;
-    }
-
-    $base = "";
-    if ($line=~/\\includegraphics.*{([^}]*)}/){
-        $base = $1;
-    }
-    elsif ($seekingArg==1 && ($line=~/{([^}]*)}/)){
-        $base = $1;
-    }
-    elsif ($line=~/\\includegraphics/){
-        $seekingArg = 1;
-    }
-    
-    if ($base ne "") {
-        $seekingArg = 0;
-	if ((-f "$base.eps")!="") {
-	    $srcfile = "$base.eps";
-	}
-	elsif ((-f "$base.ps")!=""){
-	    $srcfile = "$base.ps";
-	}
-	else {
-	    $srcfile = $base;
-	}
-        # check that the [e]ps version is newer than the pdf version....
-        if ((-M "$base.pdf")=="" || (-M "$base.pdf") >= (-M "$srcfile")){
-            print "Constructing \t $base.pdf from $srcfile\n";
-            print `$Eps2PdfCom $srcfile`;
-        }
-        else{
-            print "$base.pdf \t is up to date with $srcfile\n";
-        }
-
-    };
-}
-close(TEXFILE);
+../../texmf/scripts/tetex/e2pall.pl
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/ebb b/Master/bin/alpha-linux/ebb
index 730aa5de741..ab4195592f6 100755..120000
--- a/Master/bin/alpha-linux/ebb
+++ b/Master/bin/alpha-linux/ebb
diff --git a/Master/bin/alpha-linux/epsffit b/Master/bin/alpha-linux/epsffit
index c2b3f450191..ef292a17429 100755
--- a/Master/bin/alpha-linux/epsffit
+++ b/Master/bin/alpha-linux/epsffit
diff --git a/Master/bin/alpha-linux/epstopdf b/Master/bin/alpha-linux/epstopdf
index 0fb015d4420..3287ed667d6 100755..120000
--- a/Master/bin/alpha-linux/epstopdf
+++ b/Master/bin/alpha-linux/epstopdf
@@ -1,422 +1 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q'
-  if 0;
-use strict;
-
-# Change by Thomas Esser, Sept. 1998: The above lines allows us to find
-# perl along $PATH rather than guessing a fixed location. The above
-# construction should work with most shells.
-
-# A script to transform an EPS file so that:
-#   a) it is guarenteed to start at the 0,0 coordinate
-#   b) it sets a page size exactly corresponding to the BoundingBox
-# This means that when Ghostscript renders it, the result needs no
-# cropping, and the PDF MediaBox is correct.
-#   c) the result is piped to Ghostscript and a PDF version written
-#
-# It needs a Level 2 PS interpreter.
-# If the bounding box is not right, of course, you have problems...
-#
-# The only thing I have not allowed for is the case of
-# "%%BoundingBox: (atend)", which is more complicated.
-#
-# Sebastian Rahtz, for Elsevier Science
-#
-# now with extra tricks from Hans Hagen's texutil.
-#
-# History
-#  1999/05/06 v2.5 (Heiko Oberdiek)
-#    * New options: --hires, --exact, --filter, --help.
-#    * Many cosmetics: title, usage, ...
-#    * New code for debug, warning, error
-#    * Detecting of cygwin perl
-#    * Scanning for %%{Hires,Exact,}BoundingBox.
-#    * Scanning only the header in order not to get a wrong
-#      BoundingBox of an included file.
-#    * (atend) supported.
-#    * uses strict; (earlier error detecting).
-#    * changed first comment from '%!PS' to '%!';
-#    * corrected (atend) pattern: '\s*\(atend\)'
-#    * using of $bbxpat in all BoundingBox cases,
-#      correct the first white space to '...Box:\s*$bb...'
-#    * corrected first line (one line instead of two before 'if 0;';
-#  2000/11/05 v2.6 (Heiko Oberdiek)
-#    * %%HiresBoundingBox corrected to %%HiResBoundingBox
-#  2001/03/05 v2.7 (Heiko Oberdiek)
-#    * Newline before grestore for the case that there is no
-#      whitespace at the end of the eps file.
-#  2002/02/18 v2.8draft (Gerben Wierda)
-#    * Handle different eol styles transparantly
-#    * Applied fix from Peder Axensten for Freehand bug
-#  2002/02/21 v2.8draft (Gerben Wierda)
-#    * Fixed bug where last line of buffer was not copied out (ugh!)
-#  2003/04/22 v2.9draft (Gerben Wierda)
-#    * Fixed bug where with cr-eol files everything up to the first %!
-#    * in the first 2048 bytes was gobbled (double ugh!)
-#  2004/03/17 v2.9.1draft (Gerben Wierda)
-#    * No autorotate page
-#  2005/09/29 v2.9.2draft (Gerben Wierda)
-#    * Quote OutFilename
-#  2005/10/01 v2.9.3draft (Gerben Wierda)
-#    * Quote OutFilename
-#  2005/10/06 v2.9.4gw (Gerben Wierda)
-#    * This has become the official version for now
-#  2005/10/06 v2.9.5gw (Gerben Wierda)
-#    * Fixed a horrendous bug in the (atend) handling code
-#
-
-### program identification
-my $program = "epstopdf";
-my $filedate="2006/01/29";
-my $fileversion="2.9.5gw";
-my $copyright = "Copyright 1998-2006 by Sebastian Rahtz et al.";
-my $title = "\U$program\E $fileversion, $filedate - $copyright\n";
-
-### ghostscript command name
-my $GS = "gs";
-$GS = "gswin32c" if $^O eq 'MSWin32';
-$GS = "gswin32c" if $^O =~ /cygwin/;
-
-### options
-$::opt_help=0;
-$::opt_debug=0;
-$::opt_compress=1;
-$::opt_gs=1;
-$::opt_hires=0;
-$::opt_exact=0;
-$::opt_filter=0;
-$::opt_outfile="";
-
-### usage
-my @bool = ("false", "true");
-my $usage = <<"END_OF_USAGE";
-${title}Syntax:  $program [options] <eps file>
-Options:
-  --help:           print usage
-  --outfile=<file>: write result to <file>
-  --(no)filter:     read standard input   (default: $bool[$::opt_filter])
-  --(no)gs:         run ghostscript       (default: $bool[$::opt_gs])
-  --(no)compress:   use compression       (default: $bool[$::opt_compress])
-  --(no)hires:      scan HiResBoundingBox (default: $bool[$::opt_hires])
-  --(no)exact:      scan ExactBoundingBox (default: $bool[$::opt_exact])
-  --(no)debug:      debug informations    (default: $bool[$::opt_debug])
-Examples for producing 'test.pdf':
-  * $program test.eps
-  * produce postscript | $program --filter >test.pdf
-  * produce postscript | $program -f -d -o=test.pdf
-Example: look for HiResBoundingBox and produce corrected PostScript:
-  * $program -d --nogs -hires test.ps>testcorr.ps
-END_OF_USAGE
-
-### process options
-use Getopt::Long;
-GetOptions (
-  "help!",
-  "debug!",
-  "filter!",
-  "compress!",
-  "gs!",
-  "hires!",
-  "exact!",
-  "outfile=s",
-) or die $usage;
-
-### help functions
-sub debug {
-  print STDERR "* @_\n" if $::opt_debug;
-}
-sub warning {
-  print STDERR "==> Warning: @_!\n";
-}
-sub error {
-  die "$title!!! Error: @_!\n";
-}
-sub errorUsage {
-  die "$usage\n!!! Error: @_!\n";
-}
-
-### option help
-die $usage if $::opt_help;
-
-### get input filename
-my $InputFilename = "";
-if ($::opt_filter) {
-  @ARGV == 0 or
-    die errorUsage "Input file cannot be used with filter option";
-  $InputFilename = "-";
-  debug "Input file: standard input";
-}
-else {
-  @ARGV > 0 or die errorUsage "Input filename missing";
-  @ARGV < 2 or die errorUsage "Unknown option or too many input files";
-  $InputFilename = $ARGV[0];
-  -f $InputFilename or error "'$InputFilename' does not exist";
-  debug "Input filename:", $InputFilename;
-}
-
-### option compress
-my $GSOPTS = "";
-$GSOPTS = "-dUseFlateCompression=false " unless $::opt_compress;
-
-### option BoundingBox types
-my $BBName = "%%BoundingBox:";
-!($::opt_hires and $::opt_exact) or
-  error "Options --hires and --exact cannot be used together";
-$BBName = "%%HiResBoundingBox:" if $::opt_hires;
-$BBName = "%%ExactBoundingBox:" if $::opt_exact;
-debug "BoundingBox comment:", $BBName;
-
-### option outfile
-my $OutputFilename = $::opt_outfile;
-if ($OutputFilename eq "") {
-  if ($::opt_gs) {
-    $OutputFilename = $InputFilename;
-    if (!$::opt_filter) {
-      $OutputFilename =~ s/\.[^\.]*$//;
-      $OutputFilename .= ".pdf";
-    }
-  }
-  else {
-    $OutputFilename = "-"; # standard output
-  }
-}
-if ($::opt_filter) {
-  debug "Output file: standard output";
-}
-else {
-  debug "Output filename:", $OutputFilename;
-}
-
-### option gs
-if ($::opt_gs) {
-  debug "Ghostscript command:", $GS;
-  debug "Compression:", ($::opt_compress) ? "on" : "off";
-}
-
-### open input file
-open(IN,"<$InputFilename") or error "Cannot open",
-  ($::opt_filter) ? "standard input" : "'$InputFilename'";
-binmode IN;
-
-### open output file
-if ($::opt_gs) {
-  my $pipe = "$GS -q -sDEVICE=pdfwrite $GSOPTS -dAutoRotatePages=/None" .
-          " -sOutputFile='$OutputFilename' - -c quit";
-  debug "Ghostscript pipe:", $pipe;
-  open(OUT,"|$pipe") or error "Cannot open Ghostscript for piped input";
-}
-else {
-  open(OUT,">$OutputFilename") or error "Cannot write '$OutputFilename";
-}
-
-# reading a cr-eol file on a lf-eol system makes it impossible to parse
-# the header and besides it will read the intire file into yor line by line
-# scalar. this is also true the other way around.
-
-### scan a block, try to determine eol style
-
-my $buf;
-my $buflen;
-my @bufarray;
-my @parsedbufarray; # for mytell/myseek
-my $bufarraypos;
-
-# We assume 2048 is big enough.
-my $EOLSCANBUFSIZE = 2048;
-
-$buflen = read( IN, $buf, $EOLSCANBUFSIZE);
-if ($buflen > 0) {
-  my $crlfpos;
-  my $lfpos;
-  my $crpos;
-
-  # remove binary junk before header
-  # if there is no header, we assume the file starts with ascii style and
-  # we look for a eol style anyway, to prevent possible loading of the
-  # entire file
-  if ($buf =~ /%!/) {
-    # throw away binary junk before %!
-    $buf =~ s/(.*?)%!/%!/o;
-  }
-  $lfpos = index( $buf, "\n");
-  $crpos = index( $buf, "\r");
-  $crlfpos = index( $buf, "\r\n");
-
-  if ($crpos > 0 and ($lfpos == -1 or $lfpos > $crpos+1)) {
-    # The first eol was a cr and it was not immediately followed by a lf
-    $/ = "\r";
-    debug "The first eol character was a CR ($crpos) and not immediately followed by a LF ($lfpos)";
-  }
-
-  # Now we have set the correct eol-character. Get one more line and add
-  # it to our buffer. This will make the buffer contain an entire line
-  # at the end. Then split the buffer in an array. We will draw lines from
-  # that array until it is empty, then move again back to <IN>
-  $buf .= <IN> unless eof( IN);
-  $buflen = length( $buf);
-  $bufarraypos = 0;
-
-  # Some extra magic is needed here: if we set $/ to \r, Perl's re engine
-  # still thinks eol is \n in regular expressions (not very nice) so we
-  # cannot split on ^, but have to split on \r and reappend those.
-  if ($/ eq "\r") {
-    @bufarray = split( /\r/ms, $buf); # split on \r
-    grep( $_ .= "\r", @bufarray); # re-append \r to each array item
-  }
-  else {
-    @bufarray = split( /^/ms, $buf);
-  }
-}
-
-### getline
-sub getline {
-  if ($#bufarray >= 0) {
-    $_ = shift( @bufarray);
-    unshift( @parsedbufarray, $_); # for myseek and mytell
-    $bufarraypos += length( $_);
-    # debug "getline from array. bufarraypos = $bufarraypos";
-    # debug "*** READ: $_";
-  }
-  else {
-    $_ = <IN>;
-  }
-  return( defined( $_));
-}
-
-### mytell and myseek, work on <IN> only
-sub mytell {
-  if ($#bufarray) {
-    # debug "Telling ARRAY position $bufarraypos";
-    return $bufarraypos;
-  }
-  else {
-    my $pos = tell( IN);
-    # debug "Telling FILE position $pos";
-    return $pos;
-  }
-}
-
-sub myseek {
-  my $pos = shift;
-  # debug "Seeking to position $pos in input";
-  if ($pos < $buflen) {
-    # debug "myseek position $pos < buffer size $buflen";
-    # We were still parsing the array, reset to the end of buf and
-    # move to the right line in the array.
-    # Now, move stuff from the @parsedbufarray back until we are back at $pos
-    my $tmpline;
-    while ($bufarraypos > $pos) {
-      # debug "myseek bufarray position $bufarraypos > position $pos";
-      # we test on parsedbufarray to prevent an infinite loop on
-      # a programming error (DEVELOP only)
-      die "Programming error 1\n" unless $#parsedbufarray;
-      $tmpline = shift( @parsedbufarray);
-      $bufarraypos -= length( $tmpline);
-      unshift( @bufarray, $tmpline);
-      debug "*** UNREAD: $tmpline";
-    }
-    # debug "Returning to ARRAY size position $buflen (bufarraypos = $bufarraypos)";
-    return seek( IN, $buflen, 0);
-  }
-  else {
-    # debug "Seeking to FILE position $pos";
-    return seek( IN, $pos, 0);
-  }
-}
-
-### scan first line
-my $header = 0;
-getline();
-if (/%!/) {
-  # throw away binary junk before %!
-  s/(.*)%!/%!/o;
-}
-$header = 1 if /^%/;
-debug "Scanning header for BoundingBox";
-print OUT;
-
-### variables and pattern for BoundingBox search
-my $bbxpatt = '[0-9eE\.\-]';
-               # protect backslashes: "\\" gets '\'
-my $BBValues = "\\s*($bbxpatt+)\\s+($bbxpatt+)\\s+($bbxpatt+)\\s+($bbxpatt+)";
-my $BBCorrected = 0;
-
-sub CorrectBoundingBox {
-  my ($llx, $lly, $urx, $ury) = @_;
-  debug "Old BoundingBox:", $llx, $lly, $urx, $ury;
-  my ($width, $height) = ($urx - $llx, $ury - $lly);
-  my ($xoffset, $yoffset) = (-$llx, -$lly);
-  debug "New BoundingBox: 0 0", $width, $height;
-  debug "Offset:", $xoffset, $yoffset;
-
-  print OUT "%%BoundingBox: 0 0 $width $height\n";
-  print OUT "<< /PageSize [$width $height] >> setpagedevice\n";
-  print OUT "gsave $xoffset $yoffset translate\n";
-}
-
-### scan header
-if ($header) {
-  HEADER: while (getline()) {
-    ### Fix for freehand bug ### by Peder Axensten
-    next HEADER if(!/\S/);
-
-    ### end of header
-    if (!/^%/ or /^%%EndComments/) {
-      print OUT;
-      last;
-    }
-
-    ### BoundingBox with values
-    if (/^$BBName$BBValues/) {
-      CorrectBoundingBox $1, $2, $3, $4;
-      $BBCorrected = 1;
-      last;
-    }
-
-    ### BoundingBox with (atend)
-    if (/^$BBName\s*\(atend\)/) {
-      debug $BBName, "(atend)";
-      if ($::opt_filter) {
-        warning "Cannot look for BoundingBox in the trailer",
-                "with option --filter";
-        last;
-      }
-      my $pos = mytell();
-      debug "Current file position:", $pos;
-
-      # looking for %%BoundingBox
-      while (getline()) {
-        # skip over included documents
-        if (/^%%BeginDocument/) {
-          while (getline()) {
-            last if /^%%EndDocument/;
-          }
-        }
-        if (/^$BBName$BBValues/) {
-          CorrectBoundingBox $1, $2, $3, $4;
-          $BBCorrected = 1;
-          last;
-        }
-      }
-
-      # go back
-      myseek( $pos) or error "Cannot go back to line '$BBName (atend)'";
-      last;
-    }
-
-    # print header line
-    print OUT;
-  }
-}
-
-### print rest of file
-while (getline()) {
-  print OUT;
-}
-
-### close files
-close(IN);
-print OUT "\ngrestore\n" if $BBCorrected;
-close(OUT);
-warning "BoundingBox not found" unless $BBCorrected;
-debug "Ready.";
-;
+../../texmf/scripts/epstopdf/epstopdf.pl
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/extconv b/Master/bin/alpha-linux/extconv
index 4d2b55ed786..354dbe036cd 100755
--- a/Master/bin/alpha-linux/extconv
+++ b/Master/bin/alpha-linux/extconv
diff --git a/Master/bin/alpha-linux/extractbb b/Master/bin/alpha-linux/extractbb
new file mode 120000
index 00000000000..ab4195592f6
--- /dev/null
+++ b/Master/bin/alpha-linux/extractbb
@@ -0,0 +1 @@
+dvipdfmx
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/getnonfreefonts b/Master/bin/alpha-linux/getnonfreefonts
index 3ab220ee570..26aadc46261 100755..120000
--- a/Master/bin/alpha-linux/getnonfreefonts
+++ b/Master/bin/alpha-linux/getnonfreefonts
@@ -1,299 +1 @@
-#!/usr/bin/env perl
-
-## getnonfreefonts
-## Copyright 2006 Reinhard Kotucha <reinhard.kotucha@web.de>
-#
-# This work may be distributed and/or modified under the
-# conditions of the LaTeX Project Public License, either version 1.3
-# of this license or (at your option) any later version.
-# The latest version of this license is in
-#   http://www.latex-project.org/lppl.txt
-# 
-# The current maintainer is Reinhard Kotucha.
-
-my $TL_version='2007';
-
-my $getfont_url="ftp://tug.org/tex/getnonfreefonts/getfont$TL_version";
-
-use File::Copy;
-use Getopt::Long;
-$Getopt::Long::autoabbrev=0;
-
-$opt_lsfonts=0;
-$opt_force=0;
-
-sub usage {
-    print <<'EOF';
-Usage:
-    getnonfreefonts[-sys] [-a|--all] [-d|--debug] [-f|--force]
-        [-l|--lsfonts] [-v|--verbose] [--version] [font1] [font2] ...
-
-    getnonfreefonts installs fonts in $TEXMFHOME.
-    getnonfreefonts-sys installs fonts in $TEXMFLOCAL.
-
-    Options:
-        -a|--all      Install all fonts.
-
-        -d|--debug    Provide additional messages for debugging.
-
-        -f|--force    Install fonts even if they are installed already.
-
-        -h|--help     Print this message.
-
-        -l|--lsfonts  List all fonts available.
-
-        -v|--verbose  Be more verbose.
-
-        --version     Print version number.
-
-EOF
-;
-}
-
-@ARGS=@ARGV;
-
-GetOptions 
-    "all|a",
-    "debug|d",
-    "force|f",
-    "help|h",
-    "lsfonts|l",
-    "verbose|v",
-    "version",
-    "sys";
-
-$^W=1 if $opt_debug;
-
-my $sys=($0=~/-sys$/)? 1:0;
-$sys=1 if $opt_sys;
-
-@allpackages=@ARGV;
-
-print "$TL_version\n" and exit 0 if $opt_version; 
-
-if ($opt_help or !@ARGS) {
-    print "\nThis is getnonfreefonts";
-    print '-sys' if ($sys);
-    print ", version $TL_version.\n\n";
-    usage; 
-}
-
-
-sub message {
-    my $message=shift;
-    if ($message=~/^\[/) {
-	print "$message\n";
-    } else {
-	printf "%-60s", $message;
-    }
-}
-
-
-sub debug_msg {
-    my $message=shift;
-    if ($opt_debug) {
-	print STDERR "DEBUG: $message.\n";
-    }
-}
-
-
-sub expand_var {
-    my $var=shift;
-
-    if (-d "/usr/bin") {
-	open KPSEWHICH, 'kpsewhich --expand-var=\$' . "$var |";
-    } else {
-	open KPSEWHICH, 'kpsewhich --expand-var=$'  . "$var |";
-    }
-    while (<KPSEWHICH>) {
-	chop;
-	return "$_";
-    }
-    close KPSEWHICH;
-}
-
-
-# get TMP|TEMP|TMPDIR environment variable
-
-if ($opt_debug) {
-    for my $var ("TMP","TEMP","TMPDIR") {
-	if (defined $ENV{$var}) {
-	    debug_msg "Environment variable $var='$ENV{$var}'";
-	} else {
-	    debug_msg "Environment variable $var not set";
-	}
-    }
-}
-
-
-if (defined $ENV{'TMP'}) {
-    $SYSTMP="$ENV{'TMP'}";
-} elsif (defined $ENV{'TEMP'}) {
-    $SYSTMP="$ENV{'TEMP'}";
-} elsif (defined $ENV{'TMPDIR'}) {
-    $SYSTMP="$ENV{'TMPDIR'}";
-} else {
-    $SYSTMP="/tmp";
-}
-
-debug_msg "Internal variable SYSTMP set to '$SYSTMP'";
-
-# Windows usually uses backslashes though forward slashes are probably
-# allowed.  Perl always needs forward slashes.
-
-# We convert backslashes to forward slashes if it looks like a Windows
-# directory.
-$SYSTMP=~s/\\/\//g if ($SYSTMP=~/^.:\\/); # c:\abc\def
-$SYSTMP=~s/\\/\//g if ($SYSTMP=~/^\\\\/); # \\abc\def
-
-debug_msg "Internal variable SYSTMP converted to '$SYSTMP'";
-
-sub check_tmpdir{
-die "! ERROR: The temporary directory '$SYSTMP' doesn't exist.\n"
-    unless (-d "$SYSTMP");
-
-die "! ERROR: The temporary directory '$SYSTMP' is not writable.\n"
-    unless (-w "$SYSTMP");
-}
-
-# Determine INSTALLROOT.
-
-if ($opt_debug) {
-    my @path=split ':', $ENV{PATH};
-    for my $dir (@path) {
-	debug_msg "Search for kpsewhich in '$dir'";
-	opendir DIR, "$dir";
-	my @kpsewichs=grep /^kpsewhich/, readdir DIR;
-	closedir DIR;
-	for (@kpsewichs) {
-	    debug_msg "Found $dir/$_" if /^kpsewhich/;
-	}
-    }
-}
-
-
-$INSTALLROOTNAME=($sys)? 'TEXMFLOCAL':'TEXMFHOME';
-
-$INSTALLROOT=expand_var "$INSTALLROOTNAME";
-
-($sys)? debug_msg "sys=true":debug_msg "sys=false";
-
-debug_msg "INSTALLROOT='$INSTALLROOT'";
-
-$INSTALLROOT=~s/\\/\//g if ($INSTALLROOT=~/^.:\\/); # c:\abc\def
-$INSTALLROOT=~s/\\/\//g if ($INSTALLROOT=~/^\\\\/); # \\abc\def
-
-debug_msg "Internal variable INSTALLROOT converted to '$INSTALLROOT'";
-
-sub check_installroot {
-    die "! ERROR: The variable $INSTALLROOTNAME is not set.\n"
-	unless length ("$INSTALLROOT") > 0;
-
-    die "! ERROR: The install directory '$INSTALLROOT' doesn't " .
-	"exist.\n" .
-	"         If this is the correct path, please create " .
-	"this directory manually.\n" 
-	unless (-d "$INSTALLROOT");
-    
-    die "! ERROR: The install directory '$INSTALLROOT' is not writable.\n"
-	unless (-w "$INSTALLROOT");
-}
-
-if ($opt_help or !@ARGS) {
-    print <<"ENDUSAGE";
-  Directories:
-       temporary: '$SYSTMP/getfont-<PID>'
-       install:   '$INSTALLROOT'
-
-ENDUSAGE
-check_tmpdir;
-check_installroot;
-exit 0;
-}
-
-check_tmpdir;
-check_installroot;
-
-my $tmpdir="$SYSTMP/getfont-$$";
-debug_msg "Internal variable tmpdir set to '$tmpdir'";
-
-mkdir "$tmpdir" or die "! ERROR: Can't mkdir '$tmpdir'.";
-chdir "$tmpdir" or die "! ERROR: Can't cd '$tmpdir'.";
-
-sub remove_tmpdir {
-    chdir "$SYSTMP" or die "! ERROR: Can't cd '$SYSTMP'.\n";
-    opendir TMPDIR, "$tmpdir" 
-	or print "! ERROR: Can't read directory '$tmpdir'.\n";
-
-    @alltmps=readdir TMPDIR;
-    closedir TMPDIR;
-
-    foreach $file (@alltmps) {
-	next if $file=~/^\./;
-	unlink "$tmpdir/$file";
-    }
-    rmdir "$tmpdir" or die "! ERROR: Can't remove directory '$tmpdir'.\n";
-}
-
-# Signal handlers for UNIX, maybe ignored by Windows.
-
-$SIG{INT} =\&remove_tmpdir;
-$SIG{QUIT}=\&remove_tmpdir;
-$SIG{BUS} =\&remove_tmpdir;
-$SIG{PIPE}=\&remove_tmpdir;
-$SIG{TERM}=\&remove_tmpdir;
-$SIG{ABRT}=\&remove_tmpdir;
-$SIG{SEGV}=\&remove_tmpdir;
-
-# Download the script from tug.org.
-
-debug_msg "Running 'wget $getfont_url'";
-
-system ('wget', "$getfont_url");
-
-# Download the fonts.
-
-my @getfont=('perl', "./getfont$TL_version", '--getnonfreefonts');
-push @getfont, "--installroot=$INSTALLROOT";
-push @getfont, '--lsfonts' if $opt_lsfonts;
-push @getfont, '--force' if $opt_force;
-push @getfont, '--debug' if $opt_debug;
-push @getfont, '--verbose' if $opt_verbose;
-push @getfont, '--sys' if $sys;
-push @getfont, '--all' if $opt_all;
-push @getfont, @allpackages;
-
-debug_msg "Running '@getfont'";
-
-system @getfont;
-
-# Evaluate the exit status.  It will be 2 if something had been
-# installed and in this case we need to run texhash/updmap.
-
-my $exit_code=$?;
-my $exit_status=int($exit_code/256);
-
-if ($sys) {		     
-    debug_msg "Info: Execute updmap-sys if exit status is 2";
-} else {
-    debug_msg "Info: Execute updmap if exit status is 2";
-}
-
-debug_msg "Exit status of getfont$TL_version is $exit_status";
-
-if ($exit_status==2) {
-    print "\n";
-    system 'texhash', "$INSTALLROOT";
-    $updmap_command=($sys)? 'updmap-sys':'updmap';
-    @updmap=("$updmap_command");
-    push @updmap, '--quiet' unless $opt_verbose;
-    print "\n";
-    message "Updating map files ($updmap_command)...";
-    system @updmap;
-    
-    message $?? '[failed]':'[done]';
-}
-
-remove_tmpdir;
-
-__END__
+../../texmf/scripts/texlive/getnonfreefonts.pl
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/gftodvi b/Master/bin/alpha-linux/gftodvi
index 2913750aac5..5a6551f413a 100755
--- a/Master/bin/alpha-linux/gftodvi
+++ b/Master/bin/alpha-linux/gftodvi
diff --git a/Master/bin/alpha-linux/gftopk b/Master/bin/alpha-linux/gftopk
index 2f786d49335..604fd8d3e8b 100755
--- a/Master/bin/alpha-linux/gftopk
+++ b/Master/bin/alpha-linux/gftopk
diff --git a/Master/bin/alpha-linux/gftype b/Master/bin/alpha-linux/gftype
index 77e9d2437b5..735089a8192 100755
--- a/Master/bin/alpha-linux/gftype
+++ b/Master/bin/alpha-linux/gftype
diff --git a/Master/bin/alpha-linux/gsftopk b/Master/bin/alpha-linux/gsftopk
index 72f4ab85378..b3a85ccc039 100755
--- a/Master/bin/alpha-linux/gsftopk
+++ b/Master/bin/alpha-linux/gsftopk
diff --git a/Master/bin/alpha-linux/hbf2gf b/Master/bin/alpha-linux/hbf2gf
index caab4fce1c3..540a321dcbf 100755
--- a/Master/bin/alpha-linux/hbf2gf
+++ b/Master/bin/alpha-linux/hbf2gf
diff --git a/Master/bin/alpha-linux/ht b/Master/bin/alpha-linux/ht
index 9336545fb4e..ecd829558cd 100755..120000
--- a/Master/bin/alpha-linux/ht
+++ b/Master/bin/alpha-linux/ht
@@ -1,7 +1 @@
-#!/bin/sh
-$1 $2
-$1 $2
-$1 $2
-tex4ht $2
-t4ht $2  $3     # -d~/WWW/temp/ -m644
-
+../../texmf-dist/scripts/tex4ht/ht.sh
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/htcontext b/Master/bin/alpha-linux/htcontext
index 9e01fa97f66..d2754ae84fc 100755..120000
--- a/Master/bin/alpha-linux/htcontext
+++ b/Master/bin/alpha-linux/htcontext
@@ -1,7 +1 @@
-#!/bin/sh
-        texexec --arg="ht-1=$2" --use=tex4ht --dvi --nobackend $5 $1 
-        tex4ht \dirchar $1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
-        t4ht \dirchar $1 $4 ## -d~/WWW/temp/ -m644 
-
-
-
+../../texmf-dist/scripts/tex4ht/htcontext.sh
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/htlatex b/Master/bin/alpha-linux/htlatex
index ebab47dbaa6..fe0feaa8185 100755..120000
--- a/Master/bin/alpha-linux/htlatex
+++ b/Master/bin/alpha-linux/htlatex
@@ -1,9 +1 @@
-#!/bin/sh
-        latex $5 '\makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode '$2'.a.b.c.\input ' $1
-        latex $5 '\makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode '$2'.a.b.c.\input ' $1
-        latex $5 '\makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode '$2'.a.b.c.\input ' $1
-        tex4ht \dirchar $1  -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
-        t4ht \dirchar $1 $4 ## -d~/WWW/temp/ -m644 
-
-
-
+../../texmf-dist/scripts/tex4ht/htlatex.sh
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/htmex b/Master/bin/alpha-linux/htmex
index 485a7594468..29032d7b670 100755..120000
--- a/Master/bin/alpha-linux/htmex
+++ b/Master/bin/alpha-linux/htmex
@@ -1,9 +1 @@
-#!/bin/sh
-        mex $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode '$2'.a.b.c.\input ' $1
-        mex $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode '$2'.a.b.c.\input ' $1
-        mex $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode '$2'.a.b.c.\input ' $1
-        tex4ht \dirchar $1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
-        t4ht \dirchar $1 $4 ## -d~/WWW/temp/ -m644 
-
-
-
+../../texmf-dist/scripts/tex4ht/htmex.sh
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/httex b/Master/bin/alpha-linux/httex
index 4c184897d13..ece1bd19046 100755..120000
--- a/Master/bin/alpha-linux/httex
+++ b/Master/bin/alpha-linux/httex
@@ -1,9 +1 @@
-#!/bin/sh
-        tex  $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode '$2'.a.b.c.\input ' $1
-        tex  $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode '$2'.a.b.c.\input ' $1
-        tex  $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode '$2'.a.b.c.\input ' $1
-        tex4ht \dirchar $1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
-        t4ht \dirchar $1 $4 ## -d~/WWW/temp/ -m644 
-
-
-
+../../texmf-dist/scripts/tex4ht/httex.sh
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/httexi b/Master/bin/alpha-linux/httexi
index 26427698991..aa6cd5c8561 100755..120000
--- a/Master/bin/alpha-linux/httexi
+++ b/Master/bin/alpha-linux/httexi
@@ -1,10 +1 @@
-#!/bin/sh
-        tex  $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode '$2'.a.b.c.\input ' $1
-        tex  $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode '$2'.a.b.c.\input ' $1
-        tex  $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode '$2'.a.b.c.\input ' $1
-        tex4ht \dirchar $1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
-        t4ht \dirchar $1 $4 ## -d~/WWW/temp/ -m644 
-#        texindex ?
-
-
-
+../../texmf-dist/scripts/tex4ht/httexi.sh
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/htxelatex b/Master/bin/alpha-linux/htxelatex
new file mode 120000
index 00000000000..dcaa0fc882c
--- /dev/null
+++ b/Master/bin/alpha-linux/htxelatex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/tex4ht/htxelatex.sh
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/htxetex b/Master/bin/alpha-linux/htxetex
new file mode 120000
index 00000000000..c6cf37bfae9
--- /dev/null
+++ b/Master/bin/alpha-linux/htxetex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/tex4ht/htxetex.sh
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/info b/Master/bin/alpha-linux/info
index 5f5235072c2..be42c413b32 100755
--- a/Master/bin/alpha-linux/info
+++ b/Master/bin/alpha-linux/info
diff --git a/Master/bin/alpha-linux/infokey b/Master/bin/alpha-linux/infokey
index 8b446c3dbe9..88c5f838553 100755
--- a/Master/bin/alpha-linux/infokey
+++ b/Master/bin/alpha-linux/infokey
diff --git a/Master/bin/alpha-linux/install-info b/Master/bin/alpha-linux/install-info
index 4b6c0d707be..3ff54a92dec 100755
--- a/Master/bin/alpha-linux/install-info
+++ b/Master/bin/alpha-linux/install-info
diff --git a/Master/bin/alpha-linux/kpseaccess b/Master/bin/alpha-linux/kpseaccess
index 6b1672b902f..678c9e30641 100755
--- a/Master/bin/alpha-linux/kpseaccess
+++ b/Master/bin/alpha-linux/kpseaccess
diff --git a/Master/bin/alpha-linux/kpsereadlink b/Master/bin/alpha-linux/kpsereadlink
index c5446e8b868..cae242435ac 100755
--- a/Master/bin/alpha-linux/kpsereadlink
+++ b/Master/bin/alpha-linux/kpsereadlink
diff --git a/Master/bin/alpha-linux/kpsestat b/Master/bin/alpha-linux/kpsestat
index 49acf4ae8a3..c9f5f876d26 100755
--- a/Master/bin/alpha-linux/kpsestat
+++ b/Master/bin/alpha-linux/kpsestat
diff --git a/Master/bin/alpha-linux/kpsewhich b/Master/bin/alpha-linux/kpsewhich
index 94ba4deba1e..849b5599d3b 100755
--- a/Master/bin/alpha-linux/kpsewhich
+++ b/Master/bin/alpha-linux/kpsewhich
diff --git a/Master/bin/alpha-linux/lacheck b/Master/bin/alpha-linux/lacheck
index 331a1d775b0..6d35c4514b5 100755
--- a/Master/bin/alpha-linux/lacheck
+++ b/Master/bin/alpha-linux/lacheck
diff --git a/Master/bin/alpha-linux/luatex b/Master/bin/alpha-linux/luatex
new file mode 100755
index 00000000000..b3e5c3c6e25
--- /dev/null
+++ b/Master/bin/alpha-linux/luatex
diff --git a/Master/bin/alpha-linux/mag b/Master/bin/alpha-linux/mag
index 2475c6ccf99..8577880bb0a 100755
--- a/Master/bin/alpha-linux/mag
+++ b/Master/bin/alpha-linux/mag
diff --git a/Master/bin/alpha-linux/makeglossaries b/Master/bin/alpha-linux/makeglossaries
new file mode 120000
index 00000000000..526413aa3ea
--- /dev/null
+++ b/Master/bin/alpha-linux/makeglossaries
@@ -0,0 +1 @@
+../../texmf-dist/scripts/glossaries/makeglossaries
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/makeindex b/Master/bin/alpha-linux/makeindex
index 9ebcc992acf..5f8cf372e0a 100755
--- a/Master/bin/alpha-linux/makeindex
+++ b/Master/bin/alpha-linux/makeindex
diff --git a/Master/bin/alpha-linux/makeinfo b/Master/bin/alpha-linux/makeinfo
index 0810b42ff91..14f0625cf32 100755
--- a/Master/bin/alpha-linux/makeinfo
+++ b/Master/bin/alpha-linux/makeinfo
diff --git a/Master/bin/alpha-linux/makempx b/Master/bin/alpha-linux/makempx
index 55dca0cbb26..1b35194ff41 100755
--- a/Master/bin/alpha-linux/makempx
+++ b/Master/bin/alpha-linux/makempx
diff --git a/Master/bin/alpha-linux/mf b/Master/bin/alpha-linux/mf
index 688fc388ac4..8bed008181e 100755
--- a/Master/bin/alpha-linux/mf
+++ b/Master/bin/alpha-linux/mf
diff --git a/Master/bin/alpha-linux/mf-nowin b/Master/bin/alpha-linux/mf-nowin
index 327bd9afd00..1b48e4feb38 100755
--- a/Master/bin/alpha-linux/mf-nowin
+++ b/Master/bin/alpha-linux/mf-nowin
diff --git a/Master/bin/alpha-linux/mft b/Master/bin/alpha-linux/mft
index b12730c1153..b2c348b35d0 100755
--- a/Master/bin/alpha-linux/mft
+++ b/Master/bin/alpha-linux/mft
diff --git a/Master/bin/alpha-linux/mk4ht b/Master/bin/alpha-linux/mk4ht
index 2bd1f7e2038..4b7480809ba 100755..120000
--- a/Master/bin/alpha-linux/mk4ht
+++ b/Master/bin/alpha-linux/mk4ht
@@ -1,346 +1 @@
-#!/usr/bin/env perl
-#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-# mk4ht                                 2007-01-04-01:34 %
-# Copyright (C) 2003--2007               Eitan M. Gurari %
-#                                                        %
-#                                                        %
-# This work may be distributed and/or modified under the %
-# conditions of the LaTeX Project Public License, either %
-# version 1.3 of this license or (at your option) any    %
-# later version. The latest version of this license is   %
-# in                                                     %
-#   http://www.latex-project.org/lppl.txt                %
-# and version 1.3 or later is part of all distributions  %
-# of LaTeX version 2003/12/01 or later.                  %
-#                                                        %
-# This work has the LPPL maintenance status "maintained".%
-#                                                        %
-# This Current Maintainer of this work                   %
-# is Eitan M. Gurari.                                    %
-#                                                        %
-#                             gurari@cse.ohio-state.edu  %
-#                 http://www.cse.ohio-state.edu/~gurari  %
-#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-use strict;
-$^W=1; # turn warning on
-my @options = (
- "",     "ht",        "",         "", "", "-cvalidatehtml",
- "ht",   "htlatex",   "latex",    "", "", "-cvalidatehtml",
- "ht",   "httex",     "tex",      "", "", "-cvalidatehtml",
- "ht",   "httexi",    "texi",     "", "", "-cvalidatehtml",
- "ht",   "htcontext", "context",  "", "", "-cvalidatehtml",
- "xh", "xhlatex",  "latex",   "xhtml", "", "-cvalidate",
- "xh", "xhtex",    "tex",     "xhtml", "", "-cvalidate",
- "xh", "xhtexi",   "texi",    "xhtml", "", "-cvalidate",
- "xh", "xhcontext","context",  "xhtml", "", "-cvalidat",
- "uxh", "uxhlatex",  "latex",   "xhtml,uni-html4", " -cunihtf", "-cvalidate",
- "uxh", "uxhtex",    "tex",     "xhtml,uni-html4", " -cunihtf", "-cvalidate",
- "uxh", "uxhtexi",   "texi",    "xhtml,uni-html4", " -cunihtf", "-cvalidate",
- "uxh", "uxhcontext","context",  "xhtml,uni-html4", " -cunihtf", "-cvalidate",
- "xhm", "xhmlatex", "latex",  "xhtml,mathml", " -cunihtf", "-cvalidate",
- "xhm", "xhmtex",   "tex",    "xhtml,mathml", " -cunihtf", "-cvalidate",
- "xhm", "xhmtexi",  "texi",   "xhtml,mathml", " -cunihtf", "-cvalidate",
- "xhm", "xhmcontext","context", "xhtml,mathml", " -cunihtf", "-cvalidate",
- "mz", "mzlatex",   "latex",   "xhtml,mozilla", " -cmozhtf",  "-cvalidate",
- "mz", "mztex",     "tex",     "xhtml,mozilla", " -cmozhtf",  "-cvalidate",
- "mz", "mztexi",    "texi",    "xhtml,mozilla", " -cmozhtf",  "-cvalidate",
- "mz", "mzcontext", "context", "xhtml,mozilla", " -cmozhtf",  "-cvalidate",
- "oo", "oolatex",   "latex",   "xhtml,ooffice", "ooffice/\! -cmozhtf",  "-cooxtpipes -coo",
- "oo", "ootex",     "tex",     "xhtml,ooffice", "ooffice/\! -cmozhtf",  "-cooxtpipes -coo",
- "oo", "ootexi",    "texi",    "xhtml,ooffice", "ooffice/\! -cmozhtf",  "-cooxtpipes -coo",
- "oo", "oocontext", "context", "xhtml,ooffice", "ooffice/\! -cmozhtf",  "-cooxtpipes -coo",
- "es", "eslatex",   "latex",   "xhtml,emspk", " -cemspkhtf -s4es",  "-cemspk",
- "es", "estex",     "tex",     "xhtml,emspk", " -cemspkhtf -s4es",  "-cemspk",
- "es", "estexi",    "texi",    "xhtml,emspk", " -cemspkhtf -s4es",  "-cemspk",
- "es", "escontext", "context", "xhtml,emspk", " -cemspkhtf -s4es",  "-cemspk",
- "js", "jslatex",   "latex",   "xhtml,jsml", " -cjsmlhtf",  "-cjsml",
- "js", "jstex",     "tex",     "xhtml,jsml", " -cjsmlhtf",  "-cjsml",
- "js", "jstexi",    "texi",    "xhtml,jsml", " -cjsmlhtf",  "-cjsml",
- "js", "jscontext", "context", "xhtml,jsml", " -cjsmlhtf",  "-cjsml",
- "jm", "jmlatex",   "latex",   "xhtml,jsmath", " -cmozhtf", "",
- "jm", "jmtex",     "tex",     "xhtml,jsmath", " -cmozhtf", "",
- "jm", "jmtexi",    "texi",    "xhtml,jsmath", " -cmozhtf", "",
- "jm", "jmcontext", "context", "xhtml,jsmath", " -cmozhtf", "",
- "tei",  "teilatex",  "latex",   "xhtml,tei",    " -cunihtf",  "-cvalidate",
- "tei",  "teitex",    "tex",     "xhtml,tei",    " -cunihtf",  "-cvalidate",
- "tei",  "teitexi",   "texi",    "xhtml,tei",    " -cunihtf",  "-cvalidate",
- "tei",  "teicontext","context", "xhtml,tei",    " -cunihtf",  "-cvalidate",
- "teim", "teimlatex", "latex",   "xhtml,tei-mml"," -cunihtf",  "-cvalidate",
- "teim", "teimtex",   "tex",     "xhtml,tei-mml"," -cunihtf",  "-cvalidate",
- "teim", "teimtexi",  "texi",    "xhtml,tei-mml"," -cunihtf",  "-cvalidate",
- "teim", "teimcontext","context","xhtml,tei-mml"," -cunihtf",  "-cvalidate",
- "db",  "dblatex",   "latex",   "xhtml,docbook",     " -cunihtf",  "-cvalidate -cdocbk",
- "db",  "dbtex",     "tex",     "xhtml,docbook",     " -cunihtf",  "-cvalidate -cdocbk",
- "db",  "dbtexi",    "texi",    "xhtml,docbook",     " -cunihtf",  "-cvalidate -cdocbk",
- "db",  "dbcontext", "context", "xhtml,docbook",     " -cunihtf",  "-cvalidate -cdocbk",
- "dbm", "dbmlatex",  "latex",   "xhtml,docbook-mml", " -cunihtf",  "-cdocbk",
- "dbm", "dbmtex",    "tex",     "xhtml,docbook-mml", " -cunihtf",  "-cdocbk",
- "dbm", "dbmtexi",   "texi",    "xhtml,docbook-mml", " -cunihtf",  "-cdocbk",
- "dbm", "dbmcontext","context", "xhtml,docbook-mml", " -cunihtf",  "-cdocbk",
- "w", "wlatex",   "latex",   "xhtml,word", " -csymhtf", "",
- "w", "wtex",     "tex",     "xhtml,word", " -csymhtf", "",
- "w", "wtexi",    "texi",    "xhtml,word", " -csymhtf", "",
- "w", "wcontext", "context", "xhtml,word", " -csymhtf", "",
- "jh", "jhlatex",  "latex",  "html,javahelp,3.2,unicode", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidatehtml",
- "jh", "jhtex",    "tex",    "html,javahelp,3.2,unicode", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidatehtml",
- "jh", "jhtexi",   "texi",   "html,javahelp,3.2,unicode", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidatehtml",
- "jh", "jhcontext","context", "html,javahelp,3.2,unicode", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidatehtml",
- "jh1", "jh1latex",  "latex",  "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp",
- "jh1", "jh1tex",    "tex",    "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp",
- "jh1", "jh1texi",   "texi",   "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp",
- "jh1", "jh1context","context", "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp",
-
-);
-
-sub showInstrucions(){
-  print " option1:  mk4ht #1 \"#2\" \"#3\" \"#4\" \"#5\"\n";
-  print " \n";
-  print "    #1: htlatex, xhlatex, mzlatex, oolatex, dblatex, dbmlatex,\n";
-  print "        jhlatex, eslatex, teilatex, teimlatex, uxhlatex,  \n";
-  print "        wlatex, xhmlatex\n";
-  print " \n";
-  print "        also 'tex', 'texi', and 'context' instead of 'latex'\n";
-  print " \n";
-  print "    #2: file name\n";
-  print "    #3: optional arguments for latex/tex/texi/context \n";
-  print "    #4: optional arguments for tex4ht.c\n";
-  print "    #5: optional arguments for t4ht.c\n";
-  print " \n";
-  print " option2:  mk4ht ht #2 #3 \"#4\" \"#5\"\n";
-  print " \n";
-  print "    #1: ht\n";
-  print "    #2: latex, tex\n";
-  print "    #3: file name\n";
-  print "    #4: optional arguments for tex4ht.c\n";
-  print "    #5: optional arguments for t4ht.c\n";
-  print " \n";
-  print " Within the program, in column three of the options\n";
-  print " variable, the  requests for the commands \"latex\",\n";
-  print " \"tex\", etc. can be replaced with other equivalent\n";
-  print " commands (e.g., \"tex -fmt=latex\").\n";
-
-  print "--------------------------------------------------------------------------\n";
-print "           Private configuration file: mk4ht.cfg\n";
-print "--------------------------------------------------------------------------\n";
-print "\n";
-print "A private configuration file mk4ht.cfg or .mk4ht may be placed at the\n";
-print "work or home directory, to update existing commands and introduce new\n";
-print "ones. The configuration file may contain records of the following\n";
-print "kinds.\n";
-print "\n";
-print "   #  Comment\n";
-print "    \n";
-print "   name = type\n";
-print "          Defines a ht*tex like command, and assocites to it the \n";
-print "          TeX compiler of the specified type. Examples of TeX \n";
-print "          types: latex, tex, texi, and context.\n";
-print "    \n";
-print "   name.tex = options\n";
-print "          Command line options for the compilation under\n";
-print "          the (la)tex compiler\n";
-print "      \n";
-print "   name.tex4ht = options\n";
-print "          Command line options for tex4ht.c \n";
-print "    \n";
-print "   name.t4ht = options\n";
-print "          Command line options for t4ht.c\n";
-print "    \n";
-print "Each record should appear in a different line.  Variants\n";
-print "`name.tex += options', `name.tex4ht += options',\n";
-print "`name.t4ht += options' of the above records are also allowed.\n";
-print "They append the listed options to the base values.\n";
-print "\n";
-print "Example:\n";
-print "\n";
-print "   foohlatex         = latex\n";
-print "   foohlatex.tex     = xhtml,uni-html4\n";
-print "   foohlatex.tex4ht += -cunihtf\n";
-print "   foohlatex.t4ht    = -cvalidate\n";
-print "   htlatex.t4ht     += -d./\n";
-
-
-  print "--------------------------------------------------------------------------\n";
-print "           Deleting files\n";
-print "--------------------------------------------------------------------------\n";
-print "\n";
-print "The configuration file mk4ht.cfg may also contain requests for\n";
-print "removing files created in the work directory during the compilation.\n";
-print "The requests are to be made through records of the following forms.\n";
-print "\n";
-print "   clean ext1 ext2 ...\n";
-print "     The extensions of the file name to be removed.\n";
-print "   \n";
-print "   clean.name ext1 ext2 ...\n";
-print "     Conditional request. The `name' refers to the ht*tex \n";
-print "     like command in use.\n";
-print "\n";
-print "Example:\n";
-print "  clean             dvi idv\n";
-print "  clean.foohlatex   lg \n";
-print "  clean.htlatex     lg tmp\n";
-
-}
-
-print "mk4ht (2007-01-04-01:34)\n";
-if(  !@ARGV  ){
-  print "improper command\n";
-  showInstrucions(); exit(1);
-}
-my @command=("","","","","");
-my $i=0;
-my $j=0;
-my $param;
-my $name;
-my $compiler;
-my $tex;
-my $tex4ht;
-my $t4ht;
-my $texp;
-my $tex4htp = "";
-my $t4htp = "";
-my @ext;
-
-foreach $param (@ARGV) {
-  if( $i == 0 ){
-    my $inf;
-open $inf, "<mk4ht.cfg"
-or
-(  open $inf, "<.mk4ht"
-   or
-  (
-     open $inf, "<" . $ENV{HOME} . "/mk4ht.cfg"
-     or
-     (
-        open $inf, "<" . $ENV{HOME} . "/.mk4ht"
-        or $inf = ""
-) )  )
-;
-
-if( $inf ){
-   print "(mk4ht cfg)\n";
-   while(<$inf>) {
-     my($line) = $_;
-     chomp($line);      # remove eoln char
-     if ($line =~ m|\s*#.*|) {}
-     elsif($line =~ m|^\s*(\S*)\.(\S*)\s*\+=\s*(.*\S)\s*$|) {
-         if( ($param."tex4ht") eq ($1.$2) ){
-              $tex4htp = $tex4htp . " " . $3;
-         }
-         elsif( ($param."t4ht") eq ($1.$2) ){
-              $t4htp = $t4htp . " " . $3;
-         }
-         elsif( ($param."tex") eq ($1.$2) ){
-              $texp = $texp . "," . $3;
-         }
-     }
-     elsif($line =~ m|^\s*(\S*)\.(\S*)\s*=\s*(.*\S)\s*$|) {
-         if( ($param."tex4ht") eq ($1.$2) ){
-              $tex4ht = $3 . " ";
-              $tex4htp = "";
-         }
-         elsif( ($param."t4ht") eq ($1.$2) ){
-              $t4ht = $3 . " ";
-              $t4htp = "";
-         }
-         elsif( ($param."tex") eq ($1.$2) ){
-              $tex = $3 . ",";
-              $texp = "";
-         }
-     }
-     elsif($line =~ m|^\s*(\S*)\s*=\s*(.*\S)\s*$|) {
-         if( $param eq $1 ){
-              $name = $1;
-              $compiler = $2;
-         }
-     }
-     elsif($line =~ m|^\s*clean\s+(.+)|){
-   my(@array) = split(' ',$1);
-   push(@ext,@array);
-} elsif($line =~ m|^\s*clean\.(\S+)\s+(.+)|){
-   if( $1 eq @ARGV[0] ){
-      my(@array) = split(' ',$2);
-      push(@ext,@array);
-}  }
-
-     elsif ($line) { print "--- Error --- " . $line . "\n"; }
-   }
-   close $inf;
-}
-
-    for( $j=1; $j<$#options; $j+=6 ){
-      if( $param eq $options[$j] ){
-         if( $name ){
-            $command[0] = "ht".$compiler;
-if( $tex    ){ $command[2] = $tex;    } else { $command[2] = ""; }
-if( $tex4ht ){ $command[3] = $tex4ht; } else { $command[3] = ""; }
-if( $t4ht   ){ $command[4] = $t4ht;   } else { $command[4] = ""; }
-
-         } else {
-            if( $options[$j-1] eq "" ){
-  $command[0] = $options[$j];
-} else {
-  $command[0] = "ht".$options[$j+1];
-}
-if( $tex    ){ $command[2] = $tex;    } else { $command[2] = $options[$j+2]; }
-if( $tex4ht ){ $command[3] = $tex4ht; } else { $command[3] = $options[$j+3]; }
-if( $t4ht   ){ $command[4] = $t4ht;   } else { $command[4] = $options[$j+4]; }
-
-         }
-         if( $texp   ){ $command[2] = $command[2] . "," . $texp; }
-if( $tex4htp){ $command[3] = $command[3] . " " . $tex4htp; }
-if( $t4htp  ){ $command[4] = $command[4] . " " . $t4htp; }
-
-         last;
-    } }
-    if( $j>$#options ){
-      if( $name ){ $command[0] = "ht".$compiler;
-if( $tex    ){ $command[2] = $tex;    } else { $command[2] = ""; }
-if( $tex4ht ){ $command[3] = $tex4ht; } else { $command[3] = ""; }
-if( $t4ht   ){ $command[4] = $t4ht;   } else { $command[4] = ""; }
- }
-      else {
-          print "improper command: $param \n";
-          showInstrucions(); exit(1);
-    } }
-  } elsif ( $i== 1 ) {
-    $command[1] = $param;
-  } elsif ( $i== 2 ) {
-    if( $command[2] eq "" ){
-      $command[2] = $param;
-    } else {
-      $command[2] = $param. "," . $command[2];
-    }
-  } elsif ( $i== 3 ) {
-    $command[3] = $param . $command[3];
-  } else {
-    $command[4] = $param. " " .$command[4];
-  }
-  $i++;
-}
-my $commando = $command[0] . " "    . $command[1] . " \"".
-            $command[2] . "\" \"". $command[3] . "\" \"" .
-            $command[4] . "\"";
-print "$commando\n";
-my $rtrn;
-if( $rtrn = system($commando) ){
-   print "--- error --- failed to execute command\n";
-} else {
-   my $file;
-my $ext;
-my(@array) = split('\.',@ARGV[1]);
-my $texFile = @array[0];
-opendir(DIR,".") ;
-while ($file = readdir(DIR) ){
-  if(index($file,$texFile) == 0 ){
-    foreach $ext(@ext){
-    if (index($file,$ext,length($file)-length($ext)) != -1){
-      if( stat($file)){
-         unlink($file);
-         print  "Deleted: ". $file . "\n";
-} } } } }
-closedir(DIR);
-
-   exit( !$rtrn );
-}
-
+../../texmf-dist/scripts/tex4ht/mk4ht.pl
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/mkjobtexmf b/Master/bin/alpha-linux/mkjobtexmf
new file mode 120000
index 00000000000..90b7a69f9f5
--- /dev/null
+++ b/Master/bin/alpha-linux/mkjobtexmf
@@ -0,0 +1 @@
+../../texmf-dist/scripts/mkjobtexmf/mkjobtexmf.pl
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/mktexlsr b/Master/bin/alpha-linux/mktexlsr
index 9f729e4d495..bd9b56b1906 100755
--- a/Master/bin/alpha-linux/mktexlsr
+++ b/Master/bin/alpha-linux/mktexlsr
@@ -13,12 +13,13 @@
 # <te@dbs.uni-hannover.de>, Okt., 1994.
 # Public domain.
 
-version='$Id: mktexlsr,v 1.46 2005/06/21 14:32:26 olaf Exp $'
+version='$Id: mktexlsr 8399 2008-05-28 22:19:34Z karl $'
 progname=`echo $0 | sed 's%.*/%%'`
 usage="Usage: $progname [DIR]...
 
-Only options are --help, --version, and --verbose.  If standard input is
-a terminal, --verbose is on by default.
+The only options are --help, --version, --verbose, --quiet, and --silent.
+If standard input is a terminal, --verbose is on by default.
+--quiet and --silent are synonyms, and cancel --verbose.
 
 Rebuild all necessary ls-R filename databases completely. If one or
 more arguments DIRS are given, these are used as texmf directories to
@@ -55,17 +56,22 @@ if tty -s; then verbose=true; else verbose=false; fi
 
 # A copy of some stuff from mktex.opt, so we can run in the presence of
 # terminally damaged ls-R files.
-if test "x$1" = x--help || test "x$1" = x-help; then
-  echo "$usage"
-  exit 0
-elif test "x$1" = x--version || test "x$1" = x-version; then
-  echo "`basename $0` $version"
-  kpsewhich --version
-  exit 0
-elif test "x$1" = x--verbose || test "x$1" = x-verbose; then
-  verbose=true
+while test $# -gt 0; do
+  if test "x$1" = x--help || test "x$1" = x-help; then
+    echo "$usage"
+    exit 0
+  elif test "x$1" = x--version || test "x$1" = x-version; then
+    echo "`basename $0` $version"
+    kpsewhich --version
+    exit 0
+  elif test "x$1" = x--verbose || test "x$1" = x-verbose; then
+    verbose=true
+  elif test "x$1" = x--quiet || test "x$1" = x--silent \
+       || test "x$1" = x-quiet || test "x$1" = x-silent ; then
+    verbose=false
+  fi
   shift
-fi
+done
 
 # mktexupd and mktexlsr make sure they're coordinated via this.  A copy
 # is found mktex.opt.
@@ -138,18 +144,19 @@ for TEXMFLS_R in "$@"; do
   echo "$ls_R_magic" >"$db_file_tmp"
 
   # The main task. We put ./: in the output, so top-level files can be
-  # found via ls-R. Probably irrelevant in practice.
-  # The sed command inserts the leading ./ for directory names, and
-  # removes ., .., and .svn entries from the list.  Also omit contents
-  # of any .svn directories; sed apparently requires that we do that
-  # operation in a separate invocation.
-  # We do not try to support colons in directory names.
+  # found via ls-R. Probably irrelevant in practice.  The sed command
+  # inserts the leading ./ for directory names, and removes ., .., and
+  # version control entries from the list.  Also omit contents of any
+  # the version directories; sed apparently requires that we do that
+  # operation in a separate invocation.  We do not try to support colons
+  # in directory names.
   # 
   echo "./:" >>"$db_file_tmp"
+  vc_dirs='\.\(bzr\|git\|hg\|svn\)\|CVS\|RCS\|_darcs'
   (cd "$TEXMFLS_R" && \ls -LRa 2>/dev/null) \
-   | sed -e '/^$/{n;s%^\./%%;s%^%./%;}; /^\.$/d; /^\.\.$/d; /^\.svn$/d;' \
-        -e '/^[\.\/]*lsR[0-9]*\.tmp:*$/d' \
-   | sed -e '/\.svn.*:$/,/^$/d' \
+   | sed -e '/^$/{n;s%^\./%%;s%^%./%;}; /^\.$/d; /^\.\.$/d; /^'$vc_dirs'$/d;' \
+         -e '/^[\.\/]*lsR[0-9]*\.tmp:*$/d' \
+   | sed -e /$vc_dirs'.*:$/,/^$/d' \
    >>"$db_file_tmp"
 
   # To be really safe, a loop.
diff --git a/Master/bin/alpha-linux/mktexpk b/Master/bin/alpha-linux/mktexpk
index d2736ea77dc..baed82a83fa 100755
--- a/Master/bin/alpha-linux/mktexpk
+++ b/Master/bin/alpha-linux/mktexpk
@@ -4,7 +4,8 @@
 # (If you change or delete the word `original' on the previous line,
 # installation won't write this script over yours.)
 # 
-# te@dbs.uni-hannover.de, kb@mail.tug.org, and infovore@xs4all.nl.
+# Originally written by Thomas Esser, Karl Berry, and Olaf Weber.
+# Report bugs to tex-k@tug.org.
 # Public domain.
 
 version='$Id: mktexpk,v 1.34 2005/06/21 10:49:10 olaf Exp $'
@@ -119,7 +120,7 @@ if kpsewhich $NAME.mf >/dev/null 2>&1 || mktexmf $NAME >/dev/null 2>&1; then
      360) MODE=epstylus;;
      400) MODE=nexthi;;
      600) MODE=ljfour;;
-     720) MODE=epsczz;;
+     720) MODE=epscszz;;
     1200) MODE=ultre;;
     1270) MODE=linoone;;
     8000) MODE=dpdfezzz;;
@@ -212,7 +213,7 @@ fi
 
 "$MT_MKTEXDIR" "$PKDESTDIR"
 if test ! -d "$PKDESTDIR"; then
-  echo "$progname: mktexdir $PKDESTDIR failed." >&2
+  echo "$progname: $MT_MKTEXDIR $PKDESTDIR failed." >&2
   exit 1
 fi
 
@@ -250,7 +251,7 @@ fi
 # Use cp when mv fails, since DOS will fail mv for deeply-nested directories.
 mv $PKNAME "$PKDESTDIR/pk$$.tmp" 2>/dev/null \
   || cp $PKNAME "$PKDESTDIR/pk$$.tmp" || exit 1
-cd $PKDESTDIR || exit 1
+cd "$PKDESTDIR" || exit 1
 chmod `kpsestat -xst,go-w .` pk$$.tmp
 test -r $PKNAME || mv pk$$.tmp $PKNAME || exit 1
 
diff --git a/Master/bin/alpha-linux/mmafm b/Master/bin/alpha-linux/mmafm
index 4af9b9ba04f..6be54c35441 100755
--- a/Master/bin/alpha-linux/mmafm
+++ b/Master/bin/alpha-linux/mmafm
diff --git a/Master/bin/alpha-linux/mmpfb b/Master/bin/alpha-linux/mmpfb
index b7f25333b74..3f5dd91e0e6 100755
--- a/Master/bin/alpha-linux/mmpfb
+++ b/Master/bin/alpha-linux/mmpfb
diff --git a/Master/bin/alpha-linux/mpost b/Master/bin/alpha-linux/mpost
index 98cca898aeb..ebaf9ac4e32 100755
--- a/Master/bin/alpha-linux/mpost
+++ b/Master/bin/alpha-linux/mpost
diff --git a/Master/bin/alpha-linux/mpto b/Master/bin/alpha-linux/mpto
index b90b94da818..5b45a8f8149 100755
--- a/Master/bin/alpha-linux/mpto
+++ b/Master/bin/alpha-linux/mpto
diff --git a/Master/bin/alpha-linux/musixflx b/Master/bin/alpha-linux/musixflx
index 30c5edefe1b..bd7000559fb 100755
--- a/Master/bin/alpha-linux/musixflx
+++ b/Master/bin/alpha-linux/musixflx
diff --git a/Master/bin/alpha-linux/newer b/Master/bin/alpha-linux/newer
index f61511c89b5..45068cd8d1d 100755
--- a/Master/bin/alpha-linux/newer
+++ b/Master/bin/alpha-linux/newer
diff --git a/Master/bin/alpha-linux/odvicopy b/Master/bin/alpha-linux/odvicopy
index 8ddc0393f99..6c02ce00d23 100755
--- a/Master/bin/alpha-linux/odvicopy
+++ b/Master/bin/alpha-linux/odvicopy
diff --git a/Master/bin/alpha-linux/odvitype b/Master/bin/alpha-linux/odvitype
index f424f740b51..30a8cdb2a51 100755
--- a/Master/bin/alpha-linux/odvitype
+++ b/Master/bin/alpha-linux/odvitype
diff --git a/Master/bin/alpha-linux/omega b/Master/bin/alpha-linux/omega
index 9757febeac2..4ec109c58fe 100755
--- a/Master/bin/alpha-linux/omega
+++ b/Master/bin/alpha-linux/omega
diff --git a/Master/bin/alpha-linux/omfonts b/Master/bin/alpha-linux/omfonts
index b1cb0240880..0cad2254f73 100755
--- a/Master/bin/alpha-linux/omfonts
+++ b/Master/bin/alpha-linux/omfonts
diff --git a/Master/bin/alpha-linux/otangle b/Master/bin/alpha-linux/otangle
index 491bb1294ea..45abb75c179 100755
--- a/Master/bin/alpha-linux/otangle
+++ b/Master/bin/alpha-linux/otangle
diff --git a/Master/bin/alpha-linux/otfinfo b/Master/bin/alpha-linux/otfinfo
index c26216e3e34..8831a5bc10b 100755
--- a/Master/bin/alpha-linux/otfinfo
+++ b/Master/bin/alpha-linux/otfinfo
diff --git a/Master/bin/alpha-linux/otftotfm b/Master/bin/alpha-linux/otftotfm
index d33acd50bb1..9b75f0b2d6c 100755
--- a/Master/bin/alpha-linux/otftotfm
+++ b/Master/bin/alpha-linux/otftotfm
diff --git a/Master/bin/alpha-linux/otp2ocp b/Master/bin/alpha-linux/otp2ocp
index ef7be9dfdd6..4fd121ae517 100755
--- a/Master/bin/alpha-linux/otp2ocp
+++ b/Master/bin/alpha-linux/otp2ocp
diff --git a/Master/bin/alpha-linux/outocp b/Master/bin/alpha-linux/outocp
index bf22d3a6d3f..ce1da3dd3f7 100755
--- a/Master/bin/alpha-linux/outocp
+++ b/Master/bin/alpha-linux/outocp
diff --git a/Master/bin/alpha-linux/patgen b/Master/bin/alpha-linux/patgen
index e288b3e003e..29bfaeb79d1 100755
--- a/Master/bin/alpha-linux/patgen
+++ b/Master/bin/alpha-linux/patgen
diff --git a/Master/bin/alpha-linux/pdfclose b/Master/bin/alpha-linux/pdfclose
index 3757afaa9d4..659e100aecd 100755
--- a/Master/bin/alpha-linux/pdfclose
+++ b/Master/bin/alpha-linux/pdfclose
diff --git a/Master/bin/alpha-linux/pdfcrop b/Master/bin/alpha-linux/pdfcrop
index c7d2319af7a..d5235ebbcb7 100755..120000
--- a/Master/bin/alpha-linux/pdfcrop
+++ b/Master/bin/alpha-linux/pdfcrop
@@ -1,308 +1 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q'
-  if 0;
-use strict;
-$^W=1; # turn warning on
-#
-# pdfcrop.pl
-#
-# Copyright (C) 2002, 2004 Heiko Oberdiek.
-#
-# This program may be distributed and/or modified under the
-# conditions of the LaTeX Project Public License, either version 1.2
-# of this license or (at your option) any later version.
-# The latest version of this license is in
-#   http://www.latex-project.org/lppl.txt
-# and version 1.2 or later is part of all distributions of LaTeX
-# version 1999/12/01 or later.
-#
-# See file "readme.txt" for a list of files that belong to this project.
-#
-# This file "pdfcrop.pl" may be renamed to "pdfcrop"
-# for installation purposes.
-#
-my $file        = "pdfcrop.pl";
-my $program     = uc($&) if $file =~ /^\w+/;
-my $version     = "1.5";
-my $date        = "2004/06/24";
-my $author      = "Heiko Oberdiek";
-my $copyright   = "Copyright (c) 2002, 2004 by $author.";
-#
-# Reqirements: Perl5, Ghostscript
-# History:
-#   2002/10/30 v1.0: First release.
-#   2002/10/30 v1.1: Option --hires added.
-#   2002/11/04 v1.2: "nul" instead of "/dev/null" for windows.
-#   2002/11/23 v1.3: Use of File::Spec module's "devnull" call.
-#   2002/11/29 v1.4: Option --papersize added.
-#   2004/06/24 v1.5: Clear map file entries so that pdfTeX
-#                    does not touch the fonts.
-#
-
-### program identification
-my $title = "$program $version, $date - $copyright\n";
-
-### error strings
-my $Error = "!!! Error:"; # error prefix
-
-### string constants for Ghostscript run
-# get Ghostscript command name
-my $GS = "gs";
-$GS = "gs386"    if $^O =~ /dos/i;
-$GS = "gsos2"    if $^O =~ /os2/i;
-$GS = "gswin32c" if $^O =~ /mswin32/i;
-$GS = "gswin32c" if $^O =~ /cygwin/i;
-
-# Windows detection (no SIGHUP)
-my $Win = 0;
-$Win = 1 if $^O =~ /mswin32/i;
-$Win = 1 if $^O =~ /cygwin/i;
-
-# "null" device
-use File::Spec::Functions qw(devnull);
-my $null = devnull();
-
-### variables
-my $inputfile   = "";
-my $outputfile  = "";
-my $tmp = "tmp-\L$program\E-$$";
-
-### option variables
-my @bool = ("false", "true");
-$::opt_help       = 0;
-$::opt_debug      = 0;
-$::opt_verbose    = 0;
-$::opt_gscmd      = $GS;
-$::opt_pdftexcmd  = "pdftex";
-$::opt_margins    = "0 0 0 0";
-$::opt_clip       = 0;
-$::opt_hires      = 0;
-$::opt_papersize  = "";
-
-my $usage = <<"END_OF_USAGE";
-${title}Syntax:   \L$program\E [options] <input[.pdf]> [output file]
-Function: Margins are calculated and removed for each page in the file.
-Options:                                                    (defaults:)
-  --help              print usage
-  --(no)verbose       verbose printing                      ($bool[$::opt_verbose])
-  --(no)debug         debug informations                    ($bool[$::opt_debug])
-  --gscmd <name>      call of ghostscript                   ($::opt_gscmd)
-  --pdftexcmd <name>  call of pdfTeX                        ($::opt_pdftexcmd)
-  --margins "<left> <top> <right> <bottom>"                 ($::opt_margins)
-                      add extra margins, unit is bp. If only one number is
-                      given, then it is used for all margins, in the case
-                      of two numbers they are also used for right and bottom.
-  --(no)clip          clipping support, if margins are set  ($bool[$::opt_clip])
-  --(no)hires         using `%%HiResBoundingBox'            ($bool[$::opt_hires])
-                      instead of `%%BoundingBox'
-  --papersize <foo>   parameter for gs's -sPAPERSIZE=<foo>,
-                      use only with older gs versions <7.32 ($::opt_papersize)
-Examples:
-  \L$program\E --margins 10 input.pdf output.pdf
-  \L$program\E --margins '5 10 5 20' --clip input.pdf output.pdf
-END_OF_USAGE
-
-### process options
-my @OrgArgv = @ARGV;
-use Getopt::Long;
-GetOptions(
-  "help!",
-  "debug!",
-  "verbose!",
-  "gscmd=s",
-  "pdftexcmd=s",
-  "margins=s",
-  "clip!",
-  "hires!",
-  "papersize=s",
-) or die $usage;
-!$::opt_help or die $usage;
-
-$::opt_verbose = 1 if $::opt_debug;
-
-@ARGV >= 1 or die $usage;
-
-print $title;
-
-@ARGV <= 2 or die "$Error Too many files!\n";
-
-### input file
-$inputfile = shift @ARGV;
-
-if (! -f $inputfile) {
-    if (-f "$inputfile.pdf") {
-        $inputfile .= ".pdf";
-    }
-    else {
-        die "$Error Input file `$inputfile' not found!\n";
-    }
-}
-
-print "* Input file: $inputfile\n" if $::opt_debug;
-
-### output file
-if (@ARGV) {
-    $outputfile = shift @ARGV;
-}
-else {
-    $outputfile = $inputfile;
-    $outputfile =~ s/\.pdf$//i;
-    $outputfile .= "-crop.pdf";
-}
-
-print "* Output file: $outputfile\n" if $::opt_debug;
-
-### margins
-my ($llx, $lly, $urx, $ury) = (0, 0, 0, 0);
-if ($::opt_margins =~
-        /^\s*([\-\.\d]+)\s+([\-\.\d]+)\s+([\-\.\d]+)\s+([\-\.\d]+)\s*$/) {
-    ($llx, $lly, $urx, $ury) = ($1, $2, $3, $4);
-}
-else {
-    if ($::opt_margins =~ /^\s*([\-\.\d]+)\s+([\-\.\d]+)\s*$/) {
-        ($llx, $lly, $urx, $ury) = ($1, $2, $1, $2);
-    }
-    else {
-        if ($::opt_margins =~ /^\s*([\-\.\d]+)\s*$/) {
-            ($llx, $lly, $urx, $ury) = ($1, $1, $1, $1);
-        }
-        else {
-            die "$Error Parse error (option --margins)!\n";
-        }
-    }
-}
-print "* Margins: $llx $lly $urx $ury\n" if $::opt_debug;
-
-### cleanup system
-my @unlink_files = ();
-my $exit_code = 1;
-sub clean {
-    print "* Cleanup\n" if $::opt_debug;
-    if ($::opt_debug) {
-        print "* Temporary files: @unlink_files\n";
-    }
-    else {
-        for (; @unlink_files>0; ) {
-            unlink shift @unlink_files;
-        }
-    }
-}
-sub cleanup {
-    clean();
-    exit($exit_code);
-}
-$SIG{'INT'} = \&cleanup;
-$SIG{'__DIE__'} = \&clean;
-
-### Calculation of BoundingBoxes
-
-my $cmd = "$::opt_gscmd -sDEVICE=bbox -dBATCH -dNOPAUSE ";
-$cmd .= "-sPAPERSIZE=$::opt_papersize " if $::opt_papersize;
-$cmd .= "-c save pop -f " . $inputfile;
-my $cmdpipe = $cmd . " 2>&1 1>$null |";
-
-my $tmpfile = "$tmp.tex";
-push @unlink_files, $tmpfile;
-open(TMP, ">$tmpfile") or
-    die "$Error Cannot write tmp file `$tmpfile'!\n";
-print TMP "\\def\\pdffile{$inputfile}\n";
-print TMP <<'END_TMP_HEAD';
-\csname pdfmapfile\endcsname{}
-\def\page #1 [#2 #3 #4 #5]{%
-  \count0=#1\relax
-  \setbox0=\hbox{%
-    \pdfximage page #1{\pdffile}%
-    \pdfrefximage\pdflastximage
-  }%
-  \pdfhorigin=-#2bp\relax
-  \pdfvorigin=#3bp\relax
-  \pdfpagewidth=#4bp\relax
-  \advance\pdfpagewidth by -#2bp\relax
-  \pdfpageheight=#5bp\relax
-  \advance\pdfpageheight by -#3bp\relax
-  \ht0=\pdfpageheight
-  \shipout\box0\relax
-}
-\def\pageclip #1 [#2 #3 #4 #5][#6 #7 #8 #9]{%
-  \count0=#1\relax
-  \dimen0=#4bp\relax \advance\dimen0 by -#2bp\relax
-  \edef\imagewidth{\the\dimen0}%
-  \dimen0=#5bp\relax \advance\dimen0 by -#3bp\relax
-  \edef\imageheight{\the\dimen0}%
-  \pdfximage page #1{\pdffile}%
-  \setbox0=\hbox{%
-    \kern -#2bp\relax
-    \lower #3bp\hbox{\pdfrefximage\pdflastximage}%
-  }%
-  \wd0=\imagewidth\relax
-  \ht0=\imageheight\relax
-  \dp0=0pt\relax
-  \pdfhorigin=#6pt\relax
-  \pdfvorigin=#7bp\relax
-  \pdfpagewidth=\imagewidth
-  \advance\pdfpagewidth by #6bp\relax
-  \advance\pdfpagewidth by #8bp\relax
-  \pdfpageheight=\imageheight\relax
-  \advance\pdfpageheight by #7bp\relax
-  \advance\pdfpageheight by #9bp\relax
-  \pdfxform0\relax
-  \shipout\hbox{\pdfrefxform\pdflastxform}%
-}%
-END_TMP_HEAD
-
-print "* Running ghostscript for BoundingBox calculation ...\n"
-    if $::opt_verbose;
-print "* Ghostscript pipe: $cmdpipe\n" if $::opt_debug;
-
-my $page = 0;
-open(CMD, $cmdpipe) or
-    die "$Error Cannot call ghostscript!\n";
-while (<CMD>) {
-    my $bb = ($::opt_hires) ? "%%HiResBoundingBox" : "%%BoundingBox";
-    next unless
-        /^$bb:\s*([\.\d]+) ([\.\d]+) ([\.\d]+) ([\.\d]+)/o;
-    $page++;
-    print "* Page $page: $1 $2 $3 $4\n" if $::opt_verbose;
-    if ($::opt_clip) {
-        print TMP "\\pageclip $page [$1 $2 $3 $4][$llx $lly $urx $ury]\n";
-    }
-    else {
-        my ($a, $b, $c, $d) = ($1 - $llx, $2 - $ury, $3 + $urx, $4 + $lly);
-        print TMP "\\page $page [$a $b $c $d]\n";
-    }
-}
-close(CMD);
-
-print TMP "\\csname \@\@end\\endcsname\n\\end\n";
-close(TMP);
-
-### Run pdfTeX
-
-push @unlink_files, "$tmp.log";
-if ($::opt_verbose) {
-    $cmd = "$::opt_pdftexcmd -interaction=nonstopmode $tmp";
-}
-else {
-    $cmd = "$::opt_pdftexcmd -interaction=batchmode $tmp";
-}
-print "* Running pdfTeX ...\n" if $::opt_verbose;
-print "* pdfTeX call: $cmd\n" if $::opt_debug;
-if ($::opt_verbose) {
-    system($cmd);
-}
-else {
-    `$cmd`;
-}
-if ($?) {
-    die "$Error pdfTeX run failed!\n";
-}
-
-### Move temp file to output
-rename "$tmp.pdf", $outputfile or
-    die "$Error Cannot move `$tmp.pdf' to `$outputfile'!\n";
-
-print "==> $page pages written on `$outputfile'.\n";
-
-$exit_code = 0;
-cleanup();
-
-__END__
+../../texmf-dist/scripts/pdfcrop/pdfcrop.pl
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/pdfopen b/Master/bin/alpha-linux/pdfopen
index 66390c00365..ee7095b27a4 100755
--- a/Master/bin/alpha-linux/pdfopen
+++ b/Master/bin/alpha-linux/pdfopen
diff --git a/Master/bin/alpha-linux/pdftex b/Master/bin/alpha-linux/pdftex
index 9665f7a1ea3..eaad8188f29 100755
--- a/Master/bin/alpha-linux/pdftex
+++ b/Master/bin/alpha-linux/pdftex
diff --git a/Master/bin/alpha-linux/pdftexi2dvi b/Master/bin/alpha-linux/pdftexi2dvi
new file mode 100755
index 00000000000..17708e76579
--- /dev/null
+++ b/Master/bin/alpha-linux/pdftexi2dvi
@@ -0,0 +1,19 @@
+#!/bin/sh
+# $Id: pdftexi2dvi,v 1.3 2007/07/05 15:22:26 karl Exp $
+# Written by Thomas Esser.  Public domain.
+# Execute texi2dvi --pdf.
+
+test -f /bin/ksh && test -z "$RUNNING_KSH" \
+  && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
+  && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; }
+unset RUNNING_KSH
+
+test -f /bin/bsh && test -z "$RUNNING_BSH" \
+  && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \
+  && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; }
+unset RUNNING_BSH
+
+# hack around a bug in zsh:
+test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
+
+texi2dvi --pdf ${1+"$@"}
diff --git a/Master/bin/alpha-linux/pdftosrc b/Master/bin/alpha-linux/pdftosrc
index d2e9f20095d..128b68cdfb5 100755
--- a/Master/bin/alpha-linux/pdftosrc
+++ b/Master/bin/alpha-linux/pdftosrc
diff --git a/Master/bin/alpha-linux/perltex b/Master/bin/alpha-linux/perltex
index 9c85ef94500..d135aa6f8e4 100755..120000
--- a/Master/bin/alpha-linux/perltex
+++ b/Master/bin/alpha-linux/perltex
@@ -1,476 +1 @@
-#! /usr/bin/env perl
-
-###########################################################
-# Prepare a LaTeX run for two-way communication with Perl #
-# By Scott Pakin <scott+pt@pakin.org>                     #
-###########################################################
-
-#-------------------------------------------------------------------
-# This is file `perltex.pl',
-# generated with the docstrip utility.
-#
-# The original source files were:
-#
-# perltex.dtx  (with options: `perltex')
-#
-# This is a generated file.
-#
-# Copyright (C) 2007 Scott Pakin <scott+pt@pakin.org>
-#
-# This file may be distributed and/or modified under the conditions
-# of the LaTeX Project Public License, either version 1.3c of this
-# license or (at your option) any later version.  The latest
-# version of this license is in:
-#
-#    http://www.latex-project.org/lppl.txt
-#
-# and version 1.3c or later is part of all distributions of LaTeX
-# version 2006/05/20 or later.
-#-------------------------------------------------------------------
-
-sub top_level_eval ($)
-{
-    return eval $_[0];
-}
-use Safe;
-use Opcode;
-use Getopt::Long;
-use Pod::Usage;
-use File::Basename;
-use Fcntl;
-use POSIX;
-use warnings;
-use strict;
-my $latexprog;
-my $runsafely = 1;
-my @permittedops;
-my $usepipe = 1;
-my $progname = basename $0;
-my $jobname = "texput";
-my $toperl;
-my $fromperl;
-my $toflag;
-my $fromflag;
-my $doneflag;
-my $logfile;
-my $pipe;
-my @latexcmdline;
-my $styfile;
-my @macroexpansions;
-my $sandbox = new Safe;
-my $sandbox_eval;
-my $latexpid;
-my $pipestring = "\%\%\%\%\% Generated by $progname\n\\endinput\n";
-$latexprog = $ENV{"PERLTEX"} || "latex";
-Getopt::Long::Configure("require_order", "pass_through");
-GetOptions("help"       => sub {pod2usage(-verbose => 1)},
-           "latex=s"    => \$latexprog,
-           "safe!"      => \$runsafely,
-           "pipe!"      => \$usepipe,
-           "synctext=s" => \$pipestring,
-           "makesty"    => sub {$styfile = "noperltex.sty"},
-           "permit=s"   => \@permittedops) || pod2usage(2);
-@latexcmdline = @ARGV;
-my $firstcmd = 0;
-for ($firstcmd=0; $firstcmd<=$#latexcmdline; $firstcmd++) {
-    my $option = $latexcmdline[$firstcmd];
-    next if substr($option, 0, 1) eq "-";
-    if (substr ($option, 0, 1) ne "\\") {
-        $jobname = basename $option, ".tex" ;
-        $latexcmdline[$firstcmd] = "\\input $option";
-    }
-    last;
-}
-push @latexcmdline, "" if $#latexcmdline==-1;
-my $separator = "";
-foreach (1 .. 20) {
-    $separator .= chr(ord("A") + rand(26));
-}
-$toperl = $jobname . ".topl";
-$fromperl = $jobname . ".frpl";
-$toflag = $jobname . ".tfpl";
-$fromflag = $jobname . ".ffpl";
-$doneflag = $jobname . ".dfpl";
-$logfile = $jobname . ".lgpl";
-$pipe = $jobname . ".pipe";
-$latexcmdline[$firstcmd] =
-    sprintf '\makeatletter' . '\def%s{%s}' x 7 . '\makeatother%s',
-    '\plmac@tag', $separator,
-    '\plmac@tofile', $toperl,
-    '\plmac@fromfile', $fromperl,
-    '\plmac@toflag', $toflag,
-    '\plmac@fromflag', $fromflag,
-    '\plmac@doneflag', $doneflag,
-    '\plmac@pipe', $pipe,
-    $latexcmdline[$firstcmd];
-foreach my $file ($toperl, $fromperl, $toflag, $fromflag, $doneflag, $pipe) {
-    unlink $file while -e $file;
-}
-open (LOGFILE, ">$logfile") || die "open(\"$logfile\"): $!\n";
-if (defined $styfile) {
-    open (STYFILE, ">$styfile") || die "open(\"$styfile\"): $!\n";
-}
-if (!$usepipe || !eval {mkfifo($pipe, 0600)}) {
-    sysopen PIPE, $pipe, O_WRONLY|O_CREAT, 0755;
-    print PIPE $pipestring;
-    close PIPE;
-    $usepipe = 0;
-}
-defined ($latexpid = fork) || die "fork: $!\n";
-unshift @latexcmdline, $latexprog;
-if (!$latexpid) {
-    exec {$latexcmdline[0]} @latexcmdline;
-    die "exec('@latexcmdline'): $!\n";
-}
-if ($runsafely) {
-    @permittedops=(":browse") if $#permittedops==-1;
-    $sandbox->permit_only (@permittedops);
-    $sandbox_eval = sub {$sandbox->reval($_[0])};
-}
-else {
-    $sandbox_eval = \&top_level_eval;
-}
-while (1) {
-    my $awaitexists = sub {
-      while (!-e $_[0]) {
-          sleep 0;
-          if (waitpid($latexpid, &WNOHANG)==-1) {
-              foreach my $file ($toperl, $fromperl, $toflag,
-                                $fromflag, $doneflag, $pipe) {
-                  unlink $file while -e $file;
-              }
-              undef $latexpid;
-              exit 0;
-          }
-      }
-    };
-    $awaitexists->($toflag);
-    my $entirefile;
-    {
-        local $/ = undef;
-        open (TOPERL, "<$toperl") || die "open($toperl): $!\n";
-        $entirefile = <TOPERL>;
-        close TOPERL;
-    }
-    my ($optag, $macroname, @otherstuff) =
-        map {chomp; $_} split "$separator\n", $entirefile;
-    $macroname =~ s/^[^A-Za-z]+//;
-    $macroname =~ s/\W/_/g;
-    $macroname = "latex_" . $macroname;
-    if ($optag eq "USE") {
-      foreach (@otherstuff) {
-          s/\\/\\\\/g;
-          s/\'/\\\'/g;
-          $_ = "'$_'";
-      }
-    }
-    my $perlcode;
-    if ($optag eq "DEF") {
-        $perlcode =
-            sprintf "sub %s {%s}\n",
-            $macroname, $otherstuff[0];
-    }
-    elsif ($optag eq "USE") {
-        $perlcode = sprintf "%s (%s);\n", $macroname, join(", ", @otherstuff);
-    }
-    elsif ($optag eq "RUN") {
-        $perlcode = $otherstuff[0];
-    }
-    else {
-        die "${progname}: Internal error -- unexpected operation tag \"$optag\"\n";
-    }
-    print LOGFILE "#" x 31, " PERL CODE ", "#" x 32, "\n";
-    print LOGFILE $perlcode, "\n";
-    undef $_;
-    my $result;
-    {
-        my $warningmsg;
-        local $SIG{__WARN__} =
-            sub {chomp ($warningmsg=$_[0]); return 0};
-        $result = $sandbox_eval->($perlcode);
-        if (defined $warningmsg) {
-            $warningmsg =~ s/at \(eval \d+\) line \d+\W+//;
-            print LOGFILE "# ===> $warningmsg\n\n";
-        }
-    }
-    $result = "" if !$result || $optag eq "RUN";
-    if ($@) {
-        my $msg = $@;
-        $msg =~ s/at \(eval \d+\) line \d+\W+//;
-        $msg =~ s/\s+/ /;
-        $result = "\\PackageError{perltex}{$msg}";
-        my @helpstring;
-        if ($msg =~ /\btrapped by\b/) {
-            @helpstring =
-                ("The preceding error message comes from Perl.  Apparently,",
-                 "the Perl code you tried to execute attempted to perform an",
-                 "`unsafe' operation.  If you trust the Perl code (e.g., if",
-                 "you wrote it) then you can invoke perltex with the --nosafe",
-                 "option to allow arbitrary Perl code to execute.",
-                 "Alternatively, you can selectively enable Perl features",
-                 "using perltex's --permit option.  Don't do this if you don't",
-                 "trust the Perl code, however; malicious Perl code can do a",
-                 "world of harm to your computer system.");
-        }
-        else {
-            @helpstring =
-              ("The preceding error message comes from Perl.  Apparently,",
-               "there's a bug in your Perl code.  You'll need to sort that",
-               "out in your document and re-run perltex.");
-        }
-        my $helpstring = join ("\\MessageBreak\n", @helpstring);
-        $helpstring =~ s/\.  /.\\space\\space /g;
-        $result .= "{$helpstring}";
-    }
-    push @macroexpansions, $result if defined $styfile && $optag eq "USE";
-    print LOGFILE "%" x 30, " LATEX RESULT ", "%" x 30, "\n";
-    print LOGFILE $result, "\n\n";
-    $result .= '\endinput';
-    open (FROMPERL, ">$fromperl") || die "open($fromperl): $!\n";
-    syswrite FROMPERL, $result;
-    close FROMPERL;
-    unlink $toflag while -e $toflag;
-    unlink $toperl while -e $toperl;
-    unlink $doneflag while -e $doneflag;
-    open (FROMFLAG, ">$fromflag") || die "open($fromflag): $!\n";
-    close FROMFLAG;
-    if (open (PIPE, ">$pipe")) {
-        print PIPE $pipestring;
-        close PIPE;
-    }
-    $awaitexists->($toperl);
-    unlink $fromflag while -e $fromflag;
-    open (DONEFLAG, ">$doneflag") || die "open($doneflag): $!\n";
-    close DONEFLAG;
-    if (open (PIPE, ">$pipe")) {
-        print PIPE $pipestring;
-        close PIPE;
-    }
-}
-END {
-    close LOGFILE;
-    if (defined $latexpid) {
-        kill (9, $latexpid);
-        exit 1;
-    }
-
-    if (defined $styfile) {
-        print STYFILE <<"STYFILEHEADER1";
-\\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\\ProvidesPackage{noperltex}
-    [2007/09/29 v1.4 Perl-free version of PerlTeX specific to $jobname.tex]
-STYFILEHEADER1
-        ;
-        print STYFILE <<'STYFILEHEADER2';
-\RequirePackage{filecontents}
-
-\let\noperltex@PackageError=\PackageError
-\renewcommand{\PackageError}[3]{}
-\RequirePackage{perltex}
-\let\PackageError=\noperltex@PackageError
-
-\newcount\plmac@macro@invocation@num
-\gdef\plmac@show@placeholder#1#2\@empty{%
-  \ifx#1U\relax
-    \endgroup
-    \advance\plmac@macro@invocation@num by 1\relax
-    \global\plmac@macro@invocation@num=\plmac@macro@invocation@num
-    \input{noperltex-\the\plmac@macro@invocation@num.tex}%
-  \else
-    \endgroup
-  \fi
-}
-STYFILEHEADER2
-        ;
-        foreach my $e (0 .. $#macroexpansions) {
-            print STYFILE "\n";
-            printf STYFILE "%% Invocation #%d\n", 1+$e;
-                printf STYFILE "\\begin{filecontents}{noperltex-%d.tex}\n", 1+$e;
-            print STYFILE $macroexpansions[$e], "\\endinput\n";
-            print STYFILE "\\end{filecontents}\n";
-        }
-        print STYFILE "\\endinput\n";
-        close STYFILE;
-    }
-
-    exit 0;
-}
-
-__END__
-
-=head1 NAME
-
-perltex - enable LaTeX macros to be defined in terms of Perl code
-
-=head1 SYNOPSIS
-
-perltex
-[B<--help>]
-[B<--latex>=I<program>]
-[B<-->[B<no>]B<safe>]
-[B<--permit>=I<feature>]
-[B<--makesty>]
-[I<latex options>]
-
-=head1 DESCRIPTION
-
-LaTeX -- through the underlying TeX typesetting system -- produces
-beautifully typeset documents but has a macro language that is
-difficult to program.  In particular, support for complex string
-manipulation is largely lacking.  Perl is a popular general-purpose
-programming language whose forte is string manipulation.  However, it
-has no typesetting capabilities whatsoever.
-
-Clearly, Perl's programmability could complement LaTeX's typesetting
-strengths.  B<perltex> is the tool that enables a symbiosis between
-the two systems.  All a user needs to do is compile a LaTeX document
-using B<perltex> instead of B<latex>.  (B<perltex> is actually a
-wrapper for B<latex>, so no B<latex> functionality is lost.)  If the
-document includes a C<\usepackage{perltex}> in its preamble, then
-C<\perlnewcommand> and C<\perlrenewcommand> macros will be made
-available.  These behave just like LaTeX's C<\newcommand> and
-C<\renewcommand> except that the macro body contains Perl code instead
-of LaTeX code.
-
-=head1 OPTIONS
-
-B<perltex> accepts the following command-line options:
-
-=over 4
-
-=item B<--help>
-
-Display basic usage information.
-
-=item B<--latex>=I<program>
-
-Specify a program to use instead of B<latex>.  For example,
-C<--latex=pdflatex> would typeset the given document using
-B<pdflatex> instead of ordinary B<latex>.
-
-=item B<-->[B<no>]B<safe>
-
-Enable or disable sandboxing.  With the default of B<--safe>,
-B<perltex> executes the code from a C<\perlnewcommand> or
-C<\perlrenewcommand> macro within a protected environment that
-prohibits ``unsafe'' operations such as accessing files or executing
-external programs.  Specifying B<--nosafe> gives the LaTeX document
-I<carte blanche> to execute any arbitrary Perl code, including that
-which can harm the user's files.  See L<Safe> for more information.
-
-=item B<--permit>=I<feature>
-
-Permit particular Perl operations to be performed.  The B<--permit>
-option, which can be specified more than once on the command line,
-enables finer-grained control over the B<perltex> sandbox.  See
-L<Opcode> for more information.
-
-=item B<--makesty>
-
-Generate a LaTeX style file called F<noperltex.sty>.  Replacing the
-document's C<\usepackage{perltex}> line with C<\usepackage{noperltex}>
-produces the same output but does not require PerlTeX, making the
-document suitable for distribution to people who do not have PerlTeX
-installed.  The disadvantage is that F<noperltex.sty> is specific to
-the document that produced it.  Any changes to the document's PerlTeX
-macro definitions or macro invocations necessitates rerunning
-B<perltex> with the B<--makesty> option.
-
-=back
-
-These options are then followed by whatever options are normally
-passed to B<latex> (or whatever program was specified with
-C<--latex>), including, for instance, the name of the F<.tex> file to
-compile.
-
-=head1 EXAMPLES
-
-In its simplest form, B<perltex> is run just like B<latex>:
-
-    perltex myfile.tex
-
-To use B<pdflatex> instead of regular B<latex>, use the B<--latex>
-option:
-
-    perltex --latex=pdflatex myfile.tex
-
-If LaTeX gives a ``C<trapped by operation mask>'' error and you trust
-the F<.tex> file you're trying to compile not to execute malicious
-Perl code (e.g., because you wrote it yourself), you can disable
-B<perltex>'s safety mechansisms with B<--nosafe>:
-
-    perltex --nosafe myfile.tex
-
-The following command gives documents only B<perltex>'s default
-permissions (C<:browse>) plus the ability to open files and invoke the
-C<time> command:
-
-    perltex --permit=:browse --permit=:filesys_open
-      --permit=time myfile.tex
-
-=head1 ENVIRONMENT
-
-B<perltex> honors the following environment variables:
-
-=over 4
-
-=item PERLTEX
-
-Specify the filename of the LaTeX compiler.  The LaTeX compiler
-defaults to ``C<latex>''.  The C<PERLTEX> environment variable
-overrides this default, and the B<--latex> command-line option (see
-L</OPTIONS>) overrides that.
-
-=back
-
-=head1 FILES
-
-While compiling F<jobname.tex>, B<perltex> makes use of the following
-files:
-
-=over 4
-
-=item F<jobname.lgpl>
-
-log file written by Perl; helpful for debugging Perl macros
-
-=item F<jobname.topl>
-
-information sent from LaTeX to Perl
-
-=item F<jobname.frpl>
-
-information sent from Perl to LaTeX
-
-=item F<jobname.tfpl>
-
-``flag'' file whose existence indicates that F<jobname.topl> contains
-valid data
-
-=item F<jobname.ffpl>
-
-``flag'' file whose existence indicates that F<jobname.frpl> contains
-valid data
-
-=item F<jobname.dfpl>
-
-``flag'' file whose existence indicates that F<jobname.ffpl> has been
-deleted
-
-=item F<noperltex-#.tex>
-
-file generated by F<noperltex.sty> for each PerlTeX macro invocation
-
-=back
-
-=head1 NOTES
-
-B<perltex>'s sandbox defaults to what L<Opcode> calls ``C<:browse>''.
-
-=head1 SEE ALSO
-
-latex(1), pdflatex(1), perl(1), Safe(3pm), Opcode(3pm)
-
-=head1 AUTHOR
-
-Scott Pakin, I<scott+pt@pakin.org>
+../../texmf-dist/scripts/perltex/perltex.pl
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/pfb2pfa b/Master/bin/alpha-linux/pfb2pfa
index 4ed200322fa..30c92e5acf4 100755
--- a/Master/bin/alpha-linux/pfb2pfa
+++ b/Master/bin/alpha-linux/pfb2pfa
diff --git a/Master/bin/alpha-linux/pk2bm b/Master/bin/alpha-linux/pk2bm
index 3d5e8536b38..07dd2fa3001 100755
--- a/Master/bin/alpha-linux/pk2bm
+++ b/Master/bin/alpha-linux/pk2bm
diff --git a/Master/bin/alpha-linux/pkfix b/Master/bin/alpha-linux/pkfix
index 1429889b9ec..7d1c767c21f 100755..120000
--- a/Master/bin/alpha-linux/pkfix
+++ b/Master/bin/alpha-linux/pkfix
@@ -1,860 +1 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q'
-  if 0;
-use strict;
-$^W=1; # turn warning on
-#
-# pkfix.pl
-#
-# Copyright (C) 2001, 2005 Heiko Oberdiek.
-#
-# This work may be distributed and/or modified under the
-# conditions of the LaTeX Project Public License, either version 1.3
-# of this license or (at your option) any later version.
-# The latest version of this license is in
-#   http://www.latex-project.org/lppl.txt
-# and version 1.3 or later is part of all distributions of LaTeX
-# version 2003/12/01 or later.
-# This work has the LPPL maintenance status "maintained".
-# This Current Maintainer of this work is Heiko Oberdiek.
-#
-# See file "README" for a list of files that belongs to this project.
-#
-# This file "pkfix.pl" may be renamed to "pkfix"
-# for installation purposes.
-#
-my $file        = "pkfix.pl";
-my $program     = uc($&) if $file =~ /^\w+/;
-my $project     = lc($program);
-my $version     = "1.3";
-my $date        = "2005/02/25";
-my $author      = "Heiko Oberdiek";
-my $copyright   = "Copyright (c) 2001, 2005 by $author.";
-#
-# Reqirements: Perl5, dvips
-# History:
-#   2001/04/12 v0.1:
-#     * First try.
-#   2001/04/13 v0.2:
-#     * TeX/dvips is called for each font for the case of errors.
-#     * First release.
-#   2001/04/15 v0.3:
-#     * Call of kpsewhich with option --progname.
-#     * Extracting of texps.pro from temporary PostScript file,
-#       if kpsewhich failed.
-#     * Option -G0 for dvips run added.
-#   2001/04/16 v0.4:
-#     * Support for merging PostScript fonts added.
-#     * \special{!...}/@fedspecial detection added.
-#     * Bug fix: I detection.
-#   2001/04/17 v0.5:
-#     * Redirection of stderr (dvips run) if possible.
-#   2001/04/20 v0.6:
-#     * Bug fix: dvips font names can contain numbers.
-#   2001/04/21 v0.7:
-#     * Bug fix: long dvi file name in ps file.
-#   2001/04/23 v0.8:
-#     * Bug fix: post string parsing.
-#   2001/04/26 v0.9:
-#     * Check of version number of dvips in PostScript file.
-#   2001/06/30 v1.0:
-#     * Problem with DOS line endings fixed.
-#   2005/01/28 v1.1:
-#     * Bug fix: encoding files are now included also.
-#     * The intermediate DVI files are written directly.
-#     * LPPL 1.3
-#   2005/01/29 v1.2:
-#     * Merging is now based on type 1 names. This solves
-#       the problem, if different bitmap fonts maps to the
-#       same type 1 font, eg. (ecrm1000, larm1000) -> SFRM1000.
-#     * Suppression of PK generation, if environment variable
-#       MKTEXPK is supported.
-#     * If output file is "-" (standard output) then messages of
-#       pkfix are written to standard error output.
-#   2005/02/25 v1.3:
-#     * Bug fix: Detection of "@fedspecial end" improved.
-#     * Bug fix: Typo corrected (PRT -> $PRT).
-#
-
-### program identification
-my $title = "$program $version, $date - $copyright\n";
-
-### error strings
-my $Error = "!!! Error:"; # error prefix
-my $Warning = "!!! Warning:"; # warning prefix
-
-### variables
-my $envvar    = uc($project);
-my $infile    = "";
-my $outfile   = "";
-my $texpsfile = "texps.pro";
-my $prefix    = "_${project}_$$";
-# my $prefix    = "_${project}_";
-my $tempfile  = "$prefix";
-my $texfile   = "$tempfile.tex";
-my $dvifile   = "$tempfile.dvi";
-my $logfile   = "$tempfile.log";
-my $psfile    = "$tempfile.ps";
-my $missfile  = "missfont.log";
-my @cleanlist = ($dvifile, $psfile);
-push(@cleanlist, $missfile) unless -f $missfile;
-
-my $err_redirect = " 2>&1";
-$err_redirect = "" if $^O =~ /dos/i ||
-                      $^O =~ /os2/i ||
-                      $^O =~ /mswin32/i ||
-                      $^O =~ /cygwin/i;
-
-my $x_resolution    = 0;
-my $y_resolution    = 0;
-my $blocks_found    = 0;
-my $fonts_converted = 0;
-my $fonts_merged    = 0;
-my $fonts_misses    = 0;
-my $PRT = \*STDOUT;
-
-### option variables
-my @bool = ("false", "true");
-$::opt_tex        = "tex";
-$::opt_dvips      = "dvips";
-$::opt_kpsewhich  = "kpsewhich --progname $project";
-$::opt_options    = "-Ppdf -G0";
-$::opt_usetex     = 0;
-$::opt_help       = 0;
-$::opt_quiet      = 0;
-$::opt_debug      = 0;
-$::opt_verbose    = 0;
-$::opt_clean      = 1;
-
-my $usage = <<"END_OF_USAGE";
-${title}Syntax:   \L$program\E [options] <inputfile.ps> <outputfile.ps>
-Function: This program tries to replace pk fonts in <inputfile.ps>
-          by the type 1 versions. The result is written in <outputfile.ps>.
-Options:                                                         (defaults:)
-  --help            print usage
-  --(no)quiet       suppress messages                            ($bool[$::opt_quiet])
-  --(no)verbose     verbose printing                             ($bool[$::opt_verbose])
-  --(no)debug       debug informations                           ($bool[$::opt_debug])
-  --(no)clean       clear temp files                             ($bool[$::opt_clean])
-  --(no)usetex      use TeX for generating the DVI file          ($bool[$::opt_usetex])
-  --tex texcmd      tex command name (plain format)              ($::opt_tex)
-  --dvips dvipscmd  dvips command name                           ($::opt_dvips)
-  --options opt     dvips options                                ($::opt_options)
-END_OF_USAGE
-
-### environment variable PKFIX
-if ($ENV{$envvar}) {
-  unshift(@ARGV, split(/\s+/, $ENV{$envvar}));
-}
-
-### process options
-my @OrgArgv = @ARGV;
-use Getopt::Long;
-GetOptions(
-  "help!",
-  "quiet!",
-  "debug!",
-  "verbose!",
-  "clean!",
-  "usetex!",
-  "tex=s",
-  "dvips=s",
-  "options=s"
-) or die $usage;
-!$::opt_help or die $usage;
-@ARGV < 3 or die "$usage$Error Too many files!\n";
-@ARGV == 2 or die "$usage$Error Missing file names!\n";
-
-$::opt_quiet = 0 if $::opt_verbose;
-$::opt_clean = 0 if $::opt_debug;
-
-push(@cleanlist, $texfile, $logfile) if $::opt_usetex;
-
-### get file names
-$infile = $ARGV[0];
-$outfile = $ARGV[1];
-
-### suppress PK generation
-$ENV{'MKTEXPK'} = "0";
-
-$PRT = \*STDERR if $outfile eq "-";
-
-print $PRT $title unless $::opt_quiet;
-
-print $PRT "*** input file: `$infile'\n" if $::opt_verbose;
-print $PRT "*** output file: `$outfile'\n" if $::opt_verbose;
-
-if ($::opt_debug) {
-  print $PRT <<"END_DEB";
-*** OSNAME: $^O
-*** PERL_VERSION: $]
-*** ARGV: @OrgArgv
-END_DEB
-}
-
-### get texps.pro
-my $texps_data   = 0;
-my $texps_string = get_texps_pro();
-
-### Encoding definitions
-my %encoding_files = ();
-my $encoding_string = "";
-
-### open input and output files
-open(IN, $infile) or die "$Error Cannot open `$infile'!\n";
-open(OUT, ">$outfile") or die "$Error Cannot write `$outfile'!\n";
-
-##################################
-# expected format:
-#   ...
-#   %%DVIPSParameters:... dpi=([\dx]+)...
-#   ...
-#   TeXDict begin \d+ \d+ \d+ \d+ \d+ \(\S+\)
-#   @start ...
-#   ...
-#   %DVIPSBitmapFont: (\S+) (\S+) ([\d\.]+) (\d+)
-#   /(\S+) ...
-#   ...
-#   %EndDVIPSBitmapFont
-#   ...
-#   ... end
-#   %%EndProlog
-#
-# or if \special{!...} was used, the lines with TeXDict:
-#   TeXdict begin @defspecial
-#
-#   ...
-#
-#   @fedspecial end TeXDict begin
-#   \d+ \d+ \d+ \d+ \d+ \(\S+\) @start
-#
-# or
-#   @fedspecial end
-#   ...
-#
-# bitmap font:
-# start:
-#   %%DVIPSBitmapFont: {dvips font} {font name} {at x pt} {chars}
-#   /{dvips font} {chars} {max. char number + 1} df
-# character, variant a:
-#   <{hex code}>{char number} D
-# character, variant b:\
-#   [<{hex code}>{num1} {num2} {num3} {num4} {num5} {char number} D
-# end:
-#   E
-#   %%EndDVIPSBitmapFont
-#
-# type 1 font:
-# before TeXDict line:
-#   %%BeginFont: CMR10
-#   ...
-#   %%EndFont
-# after @start:
-#   /Fa ... /CMR10 rf
-#
-# Font names: /[F-Z][a-zA-Z0-9]
-#
-# Encoding files before texps.pro:
-#   %%BeginProcSet: {file name}.enc 0 0
-#   ...
-#   %%EndProcSet
-###################################
-
-my $x_comment_resolution = 0;
-my $y_comment_resolution = 0;
-my $start_string = "";
-my $post_string = "";
-my $dvips_resolution = "";
-my $texps_found = 0;
-my @font_list = ();
-my %font_txt = ();
-my %font_count = ();
-my %font_entry = ();
-
-sub init {
-  $x_comment_resolution = 0;
-  $y_comment_resolution = 0;
-  $x_resolution = 0;
-  $y_resolution = 0;
-  $start_string = "";
-  $texps_found = 0;
-  @font_list = ();
-  %font_txt = ();
-  %font_count = ();
-  %font_entry = ();
-}
-
-init();
-
-while (<IN>) {
-
-  if (/^%%Creator: (dvips\S*) (\S+)\s/) {
-    print $PRT "*** %%Creator: $1 $2\n" if $::opt_debug;
-    my $foundversion = $2;
-    if ($foundversion =~ /(\d+\.\d+)/) {
-      $foundversion = $1;
-      # 5.62 is ok, 5.58 does not produce font comments
-      if ($foundversion <= 5.58) {
-        print $PRT "$Warning dvips version $1 does not generate " .
-          "the required font comments!\n";
-      }
-    }
-  }
-
-  if (/^%%BeginProcSet:\s*(.+)\.enc/) {
-    $encoding_files{$1} = "";
-  }
-
-  if (/^%DVIPSParameters:.*dpi=([\dx]+)/) {
-    print OUT;
-    my $str = $1;
-    $x_comment_resolution = 0;
-    $y_comment_resolution = 0;
-    if ($str =~ /^(\d+)x(\d+)$/) {
-      $x_comment_resolution = $1;
-      $y_comment_resolution = $2;
-    }
-    if ($str =~ /^(\d+)$/) {
-      $x_comment_resolution = $1;
-      $y_comment_resolution = $1;
-    }
-    print $PRT "*** %DVIPSParameters: dpi=$str " .
-          "(x=$x_comment_resolution, y=$y_comment_resolution)\n"
-      if $::opt_debug;
-    $x_comment_resolution > 0 && $y_comment_resolution > 0 or
-      die "$Error Wrong resolution value " .
-          "($x_comment_resolution x $y_comment_resolution)!\n";
-    next;
-  }
-
-  if (/^%%BeginProcSet: texps.pro/) {
-    $texps_found = 1;
-    print $PRT "*** texps.pro found\n" if $::opt_debug;
-  }
-
-  if (/^TeXDict begin \@defspecial/) {
-    my $saved = $_;
-    print $PRT "*** \@defspecial found.\n" if $::opt_debug;
-    $start_string = $_;
-    while (<IN>) {
-      $start_string .= $_;
-      if (/^\@fedspecial end/) {
-        s/^\@fedspecial end\s*(\S)/$1/;
-        last;
-      }
-    }
-  }
-  elsif (/^TeXDict begin \d+ \d+ \d+ \d+ \d+/) {
-    print $PRT "*** TeXDict begin <5 nums> found.\n" if $::opt_debug;
-    $start_string = $_;
-  }
-  if ($start_string ne "") {
-    # look for @start
-    unless (/\@start/) {
-      while (<IN>) {
-        $start_string .= $_;
-        last if /\@start/;
-      }
-    }
-
-    # divide post part
-    $start_string =~ /^([\s\S]*\@start)\s*([\s\S]*)$/ or
-      die "$Error Parse error (\@start)!\n";
-    $start_string = "$1\n";
-    $post_string = $2;
-    $post_string =~ s/\s*$//;
-    $post_string .= "\n" unless $post_string eq "";
-
-    $start_string =~
-      /\d+\s+\d+\s+\d+\s+(\d+)\s+(\d+)\s+\((.*)\)\s+\@start/ or
-      die "$Error Parse error (\@start parameters)!\n";
-
-    $blocks_found++;
-    print $PRT "*** dvi file: $3\n" if $::opt_debug;
-
-    # get and check resolution values
-    $x_resolution = $1;
-    $y_resolution = $2;
-    print $PRT "*** resolution: $x_resolution x $y_resolution\n"
-      if $::opt_debug;
-    $x_comment_resolution > 0 or
-      die "$Error Missing comment `%DVIPSParameters'!\n";
-    $x_resolution == $x_comment_resolution &&
-    $y_resolution == $y_comment_resolution or
-      die "$Error Resolution values in comment and PostScript " .
-          "does not match!\n";
-    # setting dvips resolution option(s)
-    if ($x_resolution == $y_resolution) {
-      $dvips_resolution = "-D $x_resolution";
-    }
-    else {
-      $dvips_resolution = "-X $x_resolution -Y $y_resolution";
-    }
-
-    while (<IN>) {
-      if (/^%%EndProlog/) {
-        print OUT $encoding_string;
-        $texps_data > 0 or die "$Error File `texps.pro' not found!\n";
-        print OUT $texps_string unless $texps_found;
-        foreach (@font_list) {
-          my $fontname = $_;
-          print $PRT "*** Adding font `$fontname'\n"
-            if $::opt_debug;
-          my ($dummy1, $dummy2, $err);
-          if ($font_count{$fontname} > 1) {
-            $fonts_merged++;
-            print $PRT "*** Merging font `$fontname' ($font_count{$fontname}).\n"
-              unless $::opt_quiet;
-            ($dummy1, $font_txt{$fontname}, $dummy2, $err) =
-              get_font($font_entry{$fontname});
-            $err == 0 or die "$Error Cannot merge font `$fontname'!\n";
-          }
-          print OUT $font_txt{$fontname};
-        }
-        print OUT $start_string,
-                  $post_string,
-                  $_;
-        print $PRT "*** %%EndProlog\n" if $::opt_debug;
-        init();
-        last;
-      }
-
-      if (/^%DVIPSBitmapFont: (\S+) (\S+) ([\d.]+) (\d+)/) {
-        my $bitmap_string = $_;
-        my $dvips_fontname = $1;
-        my $fontname = $2;
-        my $entry = "\\Font\{$1\}\{$2\}\{$3\}\{";
-        print $PRT "*** Font $1: $2 at $3pt, $4 chars\n" if $::opt_verbose;
-        my $line = "";
-        my $num = -1;
-        my $chars = $4;
-        my $count = 0;
-        while (<IN>) {
-          $bitmap_string .= $_;
-          last if /^%EndDVIPSBitmapFont/;
-          s/\r$//; # remove \r of possible DOS line ending
-          chomp;
-          $line .= " " . $_;
-        }
-        $line =~ s/<[0-9A-F ]*>/ /g;
-
-        print $PRT "*** <Font> $line\n" if $::opt_debug;
-
-        while ($line =~ /\s(\d+)\s+D(.*)/) {
-          $num = $1;
-          $count++;
-          $entry .= "$num,";
-          $line = $2;
-          while ($line =~ /^[\s\d\[]*I(.*)/) {
-            $num++;
-            $count++;
-            $entry .= "$num,";
-            $line = $1;
-          }
-        }
-        $chars == $count or
-          die "$Error Parse error, $count chars of $chars found " .
-            "($fontname)!\n";
-
-        $entry =~ s/,$//;
-        $entry .= "\}";
-
-        print $PRT "*** Font conversion of `$fontname' started.\n"
-            if $::opt_verbose;
-        my ($newfontname, $font_part, $start_part, $err) = get_font($entry);
-        if ($err == 0) {
-          print $PRT "*** Font conversion: `$fontname' -> `$newfontname'.\n"
-              unless $::opt_quiet;
-          if (defined($font_count{$newfontname})) {
-            $font_count{$newfontname}++;
-            $font_entry{$newfontname} .= "\n$entry";
-          }
-          else {
-            push @font_list, $newfontname;
-            $font_txt{$newfontname} = $font_part;
-            $font_count{$newfontname} = 1;
-            $font_entry{$newfontname} = $entry;
-          }
-          $start_part =~ s/\/Fa/\/$dvips_fontname/;
-          $start_string .= $start_part;
-          $fonts_converted++;
-        }
-        else {
-          print $PRT "!!! Failed font conversion of `$fontname'!\n";
-          $start_string .= $bitmap_string;
-          $fonts_misses++;
-        }
-
-        next;
-      }
-
-      $post_string .= $_;
-    }
-    next;
-  }
-
-  print OUT;
-}
-
-close(IN);
-close(OUT);
-
-if ($::opt_clean) {
-  print $PRT "*** clear temp files\n" if $::opt_verbose;
-  foreach (@cleanlist) {
-    unlink;
-  }
-}
-
-if (!$::opt_quiet) {
-  if ($blocks_found > 1) {
-    print $PRT "==> $blocks_found blocks.\n";
-  }
-  if ($fonts_misses) {
-    print $PRT "==> $fonts_misses font conversion",
-          (($fonts_misses > 1) ? "s" : ""),
-          " failed.\n";
-  }
-  if ($fonts_converted) {
-    print $PRT "==> ",
-          (($fonts_converted > 0) ? $fonts_converted : "No"),
-          " converted font",
-          (($fonts_converted > 1) ? "s" : ""),
-          ".\n";
-    if ($fonts_merged) {
-      print $PRT "==> $fonts_merged merged font",
-            (($fonts_merged > 1) ? "s" : ""),
-            ".\n";
-    }
-  }
-  else {
-    print $PRT "==> no fonts converted\n";
-  }
-}
-
-
-# get type 1 font
-# param:  $entry: font entry as TeX string
-# return: $name:  type 1 font name
-#         $font:  font file as string
-#         $start: font definition after @start
-#         $err:   error indication
-sub get_font {
-  my $entry = shift;
-  my $name = "";
-  my $font = "";
-  my $start = "";
-  my $err = 0;
-  my @err = ("", "", "", 1);
-  local *OUT;
-  local *IN;
-
-  if ($::opt_usetex) {
-    ### write temp tex file
-    open(OUT, ">$texfile") or die "$Error Cannot write `$texfile'!\n";
-    print OUT <<'TEX_HEADER';
-\nonstopmode
-\nopagenumbers
-\def\Font#1#2#3#4{%
-  \expandafter\font\csname font@#1\endcsname=#2 at #3pt\relax
-  \csname font@#1\endcsname
-  \hbox to 0pt{%
-    \ScanChar#4,\NIL
-    \hss
-  }%
-}
-\def\ScanChar#1,#2\NIL{%
-  \char#1\relax
-  \ifx\\#2\\%
-  \else
-    \ReturnAfterFi{%
-      \ScanChar#2\NIL
-    }%
-  \fi
-}
-\long\def\ReturnAfterFi#1\fi{\fi#1}
-\noindent
-TEX_HEADER
-
-    print OUT "$entry\n\\bye\n";
-    close(OUT);
-
-    ### run tex
-    {
-      print $PRT "*** run TeX\n" if $::opt_verbose;
-
-      my $cmd = "$::opt_tex $tempfile";
-      print $PRT ">>> $cmd\n" if $::opt_verbose;
-      my @capture = `$cmd`;
-      if (!defined(@capture)) {
-        print $PRT "$Warning Cannot execute TeX!\n";
-        return @err;
-      }
-      if ($::opt_verbose) {
-        print $PRT @capture;
-      }
-      else {
-        foreach (@capture) {
-          print $PRT if /^!\s/;
-        }
-      }
-      if ($?) {
-        my $exitvalue = $?;
-        if ($exitvalue > 255) {
-          $exitvalue >>= 8;
-          print $PRT "$Warning Closing TeX (exit status: $exitvalue)!\n";
-          return @err;
-        }
-        print $PRT "$Warning Closing TeX ($exitvalue)!\n";
-        return @err;
-      }
-    }
-  }
-  else {
-    # write dvi directly
-
-    # DVI format description: dvitype.web
-    my $DVI_pre = 247;
-    my $DVI_id_byte = 2;
-    my $DVI_num = 25400000;
-    my $DVI_den = 473628672; # 7227 * 2^16
-    my $DVI_mag = 1000;
-    my @t = localtime(time);
-    my $DVI_comment = "$program $version output "
-        . sprintf("%04d/%02d/%02d %02d:%02d:%02d",
-            ($t[5] + 1900), ($t[4] + 1), $t[3], $t[2], $t[1], $t[0]);
-    my $DVI_comment_len = length($DVI_comment);
-    my $DVI_bop = 139;
-    my $DVI_eop = 140;
-    my $DVI_fontdef1 = 243;
-    my $DVI_fontdef2 = 244;
-    my $DVI_fontdef4 = 246;
-    my $DVI_design_size = 10; # an arbitrary value
-    # A wrong value will trigger a dvips warning
-    # (it can be seen in verbose mode):
-    #   dvips: Design size mismatch in [...].tfm
-    # But other consequences could not be noticed.
-    # Thus a TFM lookup will be saved.
-    my $DVI_checksum = 0; # because of unknown checksum
-    my $DVI_fnt_num_0 = 171;
-    my $DVI_fnt1 = 235;
-    my $DVI_fnt2 = 236;
-    my $DVI_fnt4 = 238;
-    my $DVI_set1 = 128;
-    my $DVI_push = 141;
-    my $DVI_pop = 142;
-    my $DVI_post = 248;
-    my $DVI_u = 67108864; # 1024 pt, an arbitrary value
-    my $DVI_l = 67108864; # 1024 pt, an arbitrary value
-    my $DVI_post_post = 249;
-    my $DVI_trailing = 223;
-
-    open(OUT, ">$dvifile") or die "$Error Cannot write `$dvifile'!\n";
-    binmode(OUT);
-
-    # Preamble (pre)
-    print OUT pack("C2N3Ca$DVI_comment_len",
-        $DVI_pre, $DVI_id_byte, $DVI_num, $DVI_den, $DVI_mag,
-        $DVI_comment_len, $DVI_comment);
-    # Begin of page (bop)
-    my $pos_bop = tell(OUT);
-    print OUT pack("CN1x[N9]l", $DVI_bop, 1, -1);
-
-    my $font_defs = "";
-    my $font_num = 0;
-    foreach(split("\n", $entry)) {
-      my $font_def = "";
-      /\\Font\{[^}]*\}\{([^}]*)\}\{([^}]*)\}\{([^}]*)\}/ or
-          die "!!! Error: Internal parsing error!\n";
-      my $font_name = $1;
-      my $font_name_len = length($font_name);
-      my $font_size = $2;
-      my $font_chars = $3;
-
-      # define font
-      if ($font_num < 256) {
-        $font_def = pack("CC", $DVI_fontdef1, $font_num);
-      }
-      # The other cases are very unlikely, especially there are
-      # more than one font in the merging case only.
-      elsif ($font_num < 65536) {
-        $font_def = pack("Cn", $DVI_fontdef2, $font_num);
-      }
-      else {
-        $font_def = pack("CN", $DVI_fontdef4, $font_num);
-      }
-      $font_def .= pack("x[N]N2xCa$font_name_len",
-          ($font_size * 65536), $DVI_design_size,
-          $font_name_len, $font_name);
-      print OUT $font_def;
-      $font_defs .= $font_def;
-
-      # use font
-      my $fnt_num;
-      if ($font_num < 64) {
-        $fnt_num = pack("C", $DVI_fnt_num_0 + $font_num);
-      }
-      # Other cases are unlikely, see above.
-      elsif ($font_num < 256) {
-        $fnt_num = pack("CC", $DVI_fnt1, $font_num);
-      }
-      elsif ($font_num < 65536) {
-        $fnt_num = pack("Cn", $DVI_fnt2, $font_num);
-      }
-      else {
-        $fnt_num = pack("CN", $DVI_fnt4, $font_num);
-      }
-      print OUT $fnt_num;
-
-      # print characters
-      print OUT pack("C", $DVI_push);
-      foreach (split(",", $font_chars)) {
-        if ($_ < 128) {
-          print OUT pack("C", $_);
-        }
-        else {
-          print OUT pack("CC", $DVI_set1, $_);
-        }
-      }
-      print OUT pack("C", $DVI_pop);
-
-      $font_num++;
-    }
-
-    print OUT pack("C", $DVI_eop);
-
-    # Begin of postamble (post)
-    my $pos_post = tell(OUT);
-    print OUT pack("CN6n2",
-        $DVI_post, $pos_bop, $DVI_num, $DVI_den, $DVI_mag,
-        $DVI_l, $DVI_u, 1, 1);
-    print OUT $font_defs;
-    # End of postamble (post_post)
-    print OUT pack("CNC5",
-        $DVI_post_post, $pos_post, $DVI_id_byte,
-        $DVI_trailing, $DVI_trailing, $DVI_trailing, $DVI_trailing);
-    my $t_num = (4 - (tell(OUT) % 4)) % 4;
-    print OUT pack("C", $DVI_trailing) x $t_num;
-    close(OUT);
-  }
-
-  ### run dvips
-  {
-    print $PRT "*** run dvips\n" if $::opt_verbose;
-
-    my $cmd = "$::opt_dvips $::opt_options $dvips_resolution $tempfile";
-    print $PRT ">>> $cmd\n" if $::opt_verbose;
-    # dvips writes on stderr :-(
-    my @capture = `$cmd$err_redirect`;
-    if ($::opt_verbose) {
-      print $PRT @capture;
-    }
-    if ($?) {
-      my $exitvalue = $?;
-      if ($exitvalue > 255) {
-        $exitvalue >>= 8;
-        print $PRT "$Warning Closing dvips (exit status: $exitvalue)!\n";
-        return @err;
-      }
-      print $PRT "$Warning Closing dvips ($exitvalue)!\n";
-      return @err;
-    }
-  }
-
-  ### get font and start part
-  open(IN, $psfile) or die "$Error Cannot open `$psfile'!\n";
-
-  while (<IN>) {
-    ### get possible encoding files
-    if (/^%%BeginProcSet:\s*(.+)\.enc/) {
-        my $encoding_file = $1;
-        print $PRT "*** encoding file `$encoding_file.enc' found.\n"
-            if $::opt_debug;
-        next if defined($encoding_files{$encoding_file});
-        $encoding_files{$encoding_file} = "";
-        $encoding_string .= $_;
-        while (<IN>) {
-          $encoding_string .= $_;
-          last if /^%%EndProcSet/;
-        }
-        next;
-    }
-
-    ### get texps.pro if get_texps_pro() has failed
-    if ($texps_data == 0 && /^%%BeginProcSet: texps.pro/) {
-      $texps_string = $_;
-      while (<IN>) {
-        $texps_string .= $_;
-        last if /^%%EndProcSet/;
-      }
-      $texps_data = 1;
-      print $PRT "*** texps.pro extracted.\n" if $::opt_debug;
-      next;
-    }
-
-    if (/^%%BeginFont:\s*(\S+)/) {
-      $name = $1;
-      $font .= $_;
-      while (<IN>) {
-        $font .= $_;
-        last if /^%%EndFont/;
-      }
-      next;
-    }
-    if (/^\@start/) {
-      s/^\@start\s*//;
-      $start .= $_;
-      while (<IN>) {
-        last if /^%%EndProlog/;
-        $start .= $_;
-      }
-      if (($start =~ s/\s*end\s*$/\n/) != 1) {
-        $err = 1;
-        print $PRT "$Warning Parse error, `end' not found!\n";
-      }
-      print $PRT "*** start: $start" if $::opt_debug;
-      last;
-    }
-  }
-  close(IN);
-
-  if ($font eq "") {
-    print $PRT "$Warning `%%BeginFont' not found!\n";
-    return @err;
-  }
-  return ($name, $font, $start, $err);
-}
-
-
-# get_texps_pro
-# return: string with content of texps.pro
-sub get_texps_pro {
-  $texps_data = 0;
-  # get file name
-  my $backupWarn = $^W;
-  $^W = 0;
-  my $file = `$::opt_kpsewhich $texpsfile`;
-  $^W = $backupWarn;
-  if (!defined($file) or $file eq "") {
-    print $PRT "$Warning: Cannot find `$texpsfile' with kpsewhich!\n"
-      if $::opt_debug;
-    return "";
-  }
-  chomp $file;
-  print $PRT "*** texps.pro: $file\n" if $::opt_debug;
-
-  # read file
-  local *IN;
-  open(IN, $file) or die "$Error: Cannot open `$file'!\n";
-  my @lines = <IN>;
-  @lines > 0 or die "$Error: Empty file `$file'!\n";
-  chomp $lines[@lines-1];
-  my $str = "%%BeginProcSet: texps.pro\n";
-  $"="";
-  $str .= "@lines\n";
-  $"=" ";
-  $str .= "%%EndProcSet\n";
-  $texps_data = 1;
-  return $str;
-}
-
-__END__
+../../texmf/scripts/pkfix/pkfix.pl
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/pktogf b/Master/bin/alpha-linux/pktogf
index 042ff02a683..47396fd49c9 100755
--- a/Master/bin/alpha-linux/pktogf
+++ b/Master/bin/alpha-linux/pktogf
diff --git a/Master/bin/alpha-linux/pktype b/Master/bin/alpha-linux/pktype
index 20d891c5487..4bf51b7e478 100755
--- a/Master/bin/alpha-linux/pktype
+++ b/Master/bin/alpha-linux/pktype
diff --git a/Master/bin/alpha-linux/pltotf b/Master/bin/alpha-linux/pltotf
index 8f5ff7e2949..4137d354653 100755
--- a/Master/bin/alpha-linux/pltotf
+++ b/Master/bin/alpha-linux/pltotf
diff --git a/Master/bin/alpha-linux/pooltype b/Master/bin/alpha-linux/pooltype
index dad9a738dc6..545a48c6d7c 100755
--- a/Master/bin/alpha-linux/pooltype
+++ b/Master/bin/alpha-linux/pooltype
diff --git a/Master/bin/alpha-linux/ps2eps b/Master/bin/alpha-linux/ps2eps
index aeb0e9a8e43..81d5f53cfde 100755..120000
--- a/Master/bin/alpha-linux/ps2eps
+++ b/Master/bin/alpha-linux/ps2eps
@@ -1,929 +1 @@
-#!/usr/bin/env perl
-# The expression in the previous line replaces the unix specific line 
-# {#!/usr/bin/perl}.   
-# ps2eps - convert PostScript to EPS (Encapsulated PostScript) files
-# -------------------------------------------------------------------
-# $Id: ps2eps,v 1.61 2006/12/28 16:34:06 bless Exp $
-# -------------------------------------------------------
-# (C)opyright 1999-2006 Roland Bless
-#
-# This program is free software; you can redistribute it and/or modify     
-# it under the terms of the GNU General Public License as published by     
-# the Free Software Foundation; either version 2 of the License, or        
-# (at your option) any later version.                                      
-#                                                                          
-# This program is distributed in the hope that it will be useful,          
-# but WITHOUT ANY WARRANTY; without even the implied warranty of           
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            
-# GNU General Public License for more details.                             
-#                                                                          
-# You should have received a copy of the GNU General Public License        
-# along with this program; if not, write to the Free Software              
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-# Author: Roland Bless
-# Send bug reports to roland <at> bless.de
-# -------------------------------------------------------------------
-# Additional filtering is performed when Windows generated PostScript files
-# are processed. Some instructions will otherwise lead to bad output
-# if EPS-file gets embedded into other PostScript files.
-#
-# Requirements:
-# + perl
-# + gs   (ghostscript supporting pbm output)
-# + bbox (a little C program [ANSI-C - should work on every platform]
-#         for calculation of the actual BoundingBox)
-
-use POSIX;
-
-#use warnings;
-
-#use Getopt package
-use Getopt::Long;
-Getopt::Long::Configure("no_ignore_case");
-
-$prgname= "ps2eps";
-
-if (! -d "/usr/bin")
-{ # we assume that we are running under native windows
-  $ghostscriptname = "gswin32c";
-  $NULLDEV = "nul";
-} 
-else 
-{ # Unix or cygwin
-  $ghostscriptname = "gs";
-  $NULLDEV = "/dev/null 2>&1";
-}
-
-$bboxver=`bbox >$NULLDEV -V`;
-$bboxname= ($?== -1) ? "" : "bbox";
-$version= '$Id: ps2eps,v 1.61 2006/12/28 16:34:06 bless Exp $'; #'
-$insertPScode= 1;     # Insert surrounding Postscript code
-$infhandle = STDIN;   # Standard input is the default input file
-$outfhandle = STDOUT; # Standard output is default output if STDIN is input
-$infname= '-';
-$outfname= '-';
-$forceoverwrite=0;    # do not overwrite existing files
-$ignoreBB= 0;         # ignore existing Bounding Box comment
-$removeDSC= 1;        # remove Adobe document structure comments
-$removeADO= 1;        # remove Adobe printer Driver console Output [Page: ...]
-$ignoreEOFDSC= 0;     # ignore %%EOF DSC hint
-$removePreview= 0;    # remove preview
-$quiet= 0;            # write progress to stdout
-$resolution= 144;     # resolution for bounding box calculation is 2x72 dpi
-$trytofixps= 1;       # try to fix postscript code
-$forcefixps= 0;       # fix postscript code unconditionally if eq 1
-$filterorientation= 1;# filter Orientation line
-$looseBB='';          # default: tight bounding box
-$clip=0;              # do not clip
-$warnings=0;          # do not print warnings concerning postscript sanity
-$debuggs=0;           # no debugging of ghostscript call, turn this on if you want to see the gs call
-$inch=2.54;           # one inch is 2.54cm
-$fullcolors= 1;       # use ppm format (24-bit full color)
-$trailerseen= 0;      # Trailer comment seen?
-$PSversion="2.0";     # default Postscript Version
-$PSDSCversion="2.0";  # default Postscript DSC Version
-$translate_x= 0;      # translate by x postscript points
-$translate_y= 0;      # translate by y postscript points
-
-$defaultext = '(ps|prn)';  # default extension
-$defaultoutext = '.eps';   # default output extension
-$envname_size = 'PS2EPS_SIZE';
-$envname_gsbbox = 'PS2EPS_GSBBOX';
-
-$gpar="";
-$known_papersizes="11x17|ledger|legal|letter(small)?|arch[A-E]|a([0-9]|10)|isob[0-6]|b[0-5]|c[0-6]|jisb[0-6]|fls(a|e)|halfletter";
-$papersize_help="11x17,ledger,legal,letter,lettersmall,archA,archB,archC,archD,archE\
-a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,isob0,isob1,isob2,isob3,isob4,isob5,isob6,\
-b0,b1,b2,b3,b4,b5,c0,c1,c2,c3,c4,c5,c6,\
-jisb0,jisb1,jisb2,jisb3,jisb4,jisb5,jisb6,flsa,flse,halfletter\n";
-$trigger= 0;
-$notsane= 0; 
-$dummy="";
-
-@ver= split(/ /,$version);
-
-# filename for temporary files
-if ($^O =~ /MSWin32/i or $^O =~ /cygwin/i) 
-{
-  # it is less trouble to use the current directory if working on
-  # cygwin and nevertheless using gswin32c.
-  $tmpfname= "$prgname.$$";
-  $win=1;
-}
-elsif (defined($ENV{'TMP'}))
-{ 
-  $tmpdir= $ENV{'TMP'};
-  $filesep= ($tmpdir =~ /^?\:\\/) ? '\\' : '/';
-  if ($tmpdir =~ /$filesep$/)  
-  { $tmpfname= $tmpdir . "$prgname.$$"; }
-  else 
-  { $tmpfname= $tmpdir . "$filesep$prgname.$$"; }
-  $win=1;
-}
-else #assume we're on a UNIXBOX
-{ 
-  $tmpfname= "/tmp/" . "$prgname.$$";
-  $win=0;
-}
-
-
-$licensetxt= "\
-    This program is free software; you can redistribute it and/or modify\
-    it under the terms of the GNU General Public License as published by\
-    the Free Software Foundation; either version 2 of the License, or\
-    (at your option) any later version.\
-\
-    This program is distributed in the hope that it will be useful,\
-    but WITHOUT ANY WARRANTY; without even the implied warranty of\
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\
-    GNU General Public License for more details.\
-\
-    You should have received a copy of the GNU General Public License\
-    along with this program; if not, write to the Free Software\
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n";
-
-@prgidtxt= ( "$prgname - convert PostScript to EPS (Encapsulated PostScript) files\n",
-	     "(C)opyright 1998-2006 Roland Bless\n\n" );
-
-@helptxt= ("Version: $ver[2]\n",
-          "Operation:\n",
-          " Without any argument, $prgname reads from standard input\n",
-          " and writes to standard output.\n",
-          " If filenames are given as arguments they are processed\n",
-          " one by one and output files are written to filenames\n",
-          " with extension '$defaultoutext'. If input filenames have the extension\n",
-          " '.ps' or '.prn', this extension is replaced with '$defaultoutext'.\n",
-          " In all other cases '$defaultoutext' is appended to the input filename.\n",
-          " Please note that PostScript files for input should contain\n",
-          " only one single page.\n\n",
-          " If BoundingBox in output seems to be wrong, please try options --size or --ignoreBB.\n\n" );
-
-@usagetxt= ("Syntax:\n",
-            " $prgname [-f] [-q] [-N] [-O] [-n] [-P] [-c] [-C] [-m] [-B] [-E] [-s <pagedim>] [-R +|-|^] [-t <x,y>] [-l] [-g] [-d] [-H] [-h|--help] [-g] [-W] [-L] [-V|--version] [--] [psfile1] [psfile2] [...]\n",
-            "Options:\n",
-            " -f, --force                force overwriting existing files\n",
-            " -q, --quiet                quiet operation (no output while processing files)\n",
-            " -N, --noinsert             do not insert any postscript code\n",
-            " -O, --preserveorientation  do not filter Orientation: header comment\n",
-            " -n, --nofix                do not try to fix postscript code\n",
-            " -P, --removepreview        remove preview image (smaller file, but no preview)\n",
-            " -F, --fixps                fix postscript code unconditionally\n",
-            " -c, --comments             preserve document structure comments\n",
-	    " -C, --clip                 insert postscript code for clipping\n",
-            " -m, --mono                 use black/white bitmap as base for calculation\n",
-            " -s, --size=<pagedim>       page size (a0-a10,letter,...) or in format XxY[cm|in] (default:cm), where X and Y are numbers\n",
-	    "                            use --size=list to list pre-defined page sizes\n",
-	    " -R, --rotate=<direction>   rotate resulting EPS. <direction>: +=+90 (clockw.),-=-90 (counter-clockw.) ^=180 degrees\n",
-	    " -t, --translate            specify x,y offset (may be negative) in postscript points (1/72 dpi)\n",
-	    " -r, --resolution           specify dpi resolution to render with ghostscript (default 144)",
-            " -l, --loose                expand the original bounding box by one point in each direction\n",
-	    " -B, --ignoreBB             do not use existing bounding box as page size for rendering\n",
-	    " -E, --ignoreEOF            do not use %%EOF as hint for end of file\n",
-	    " -g, --gsbbox               use internal bbox device of ghostscript\n",
-	    " -H, --no-hires             do not use a HiResBoundingBox\n",
-            " -h, --help                 help information\n",
-            " -L, --license              show licensing information\n",
-            " -V, --version              show version information\n",
-	    " -d, --debuggs              show ghostscript call\n",
-	    " -W, --warnings             show warnings about sanity of generated eps file\n",  
-            " --     all following arguments are treated as files\n",
-            "        (allows filenames starting with -)\n",
-            "\n",
-            "Arguments:\n",
-            " One or more names of PostScript files for input\n");
-
-## %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-## -- argument checking -- 
-## %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-#environment variable for papersize
-if (defined($ENV{"$envname_size"}))
-{
-    $opt_s= $ENV{"$envname_size"};
-}
-else
-{
-    $opt_s = '';          # for s-option
-}
-
-if (defined($ENV{"$envname_gsbbox"}))
-{
-    $bboxname="";
-}
-
-$opt_t = '';          # for t-option
-$opt_R = '';          # for R-option
-$opt_r = '';          # for r-option
-$stopnow = 0;
-die "Wrong option(s), please check usage with $prgname --help\n" unless 
-GetOptions('f|force'	=> \$forceoverwrite,
-	   'q|quiet'	=> \$quiet,
-	   'm|mono'	=> sub { $fullcolors = 0 },
-	   'n|nofix'	=> sub { $trytofixps = 0 },
-	   'F|fixps'	=> \$forcefixps,
-	   'N|noinsert'	=> sub { $insertPScode = 0 },
-           'O|preserveorientation'  => sub { $filterorientation= 0 },
-	   'P|removepreview'	    => \$removePreview,
-	   'c|comments' => sub { $removeDSC = 0 },
-	   'C|clip'	=> \$clip,
-	   'l|loose'	=> sub { $looseBB = '-l' },
-	   'B|ignoreBB'	=> \$ignoreBB,
-	   'E|ignoreEOF'=> \$ignoreEOFDSC,
-	   's|size=s'	=> \$opt_s,
-	   't|translate=s'	=> \$opt_t,
-	   'r|resolution=s' => \$opt_r,
-	   'R|rotate=s'	=> \$opt_R,
-	   'g|gsbbox'   => sub { $bboxname=""; },
-	   'H|nohires'  => \$nohires,
-	   'h|help'	=> sub { $stopnow = 1; print @prgidtxt,@helptxt,@usagetxt,"\nAuthor: Roland Bless (roland\@bless.de)\n\n"; },
-	   'L|license'	=> sub { $stopnow = 1; print @prgidtxt,$licensetxt,"\nAuthor: Roland Bless (roland\@bless.de)\n\n"; },
-	   'd|debuggs'  => \$debuggs,
-	   'W|warnings' => \$warnings,
-	   'V|version'	=> sub { $stopnow = 1; print @prgidtxt,"Version: $ver[2]\n"; });exit if ($stopnow);
-
-## %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-## -- wildcard processing --
-## %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-## internal wildcard processing for current directory, 
-## only used for non UNIX-based OSs (which may lack shell wildcard expansion)
-@filenames = ();
-foreach $object (@ARGV) {
-    if ($win && $object =~ m/\*/o) # asterisk is present in filename
-    {
-      $wildcard = $object;
-      $wildcard =~ s/\./\\\./g; # replace . in pattern with \.
-      $wildcard =~ s/\*/\(\.\*\)/g; # replace * in pattern with (.*)
-	opendir(DIR,'.') || die 'Unable to open current directory, stopped'; # open current directory
-      print STDERR $wildcard;
-	@fid = grep { /$wildcard(\.$defaultext)?/i } readdir(DIR);
-	foreach (@fid) { push @filenames, $_; }
-	closedir DIR;
-    }
-    else { push @filenames, $object; }
-} # end foreach
-$filenames[0]= '-' if (scalar(@filenames) == 0); # no file arguments, use STDIN as input
-
-print STDERR "Input files: @filenames\n" if (!$quiet);
-
-if ($opt_r ne '') 
-{
-  $resolution=$opt_r;
-}
-
-# papersize stuff
-if ($opt_s ne '') 
-{
-    # if explicit size is given, ignore existing BoundingBox always
-    $ignoreBB = 1; 
-    $pagedimension = $opt_s;
-    if ($opt_s eq "list")
-    {
-	print STDERR "Available paper sizes: $papersize_help";
-	exit 0;
-    }
-
-    #explicit format XxY[cm|in]
-    if ($pagedimension =~ /(\d*\.?\d+)x(\d*\.?\d+)/)
-    {
-	($x_dim, $dummy, $y_dim, $unit)= split(/(x|cm|in)/,$pagedimension);
-	if ( $x_dim !~ /^\d*\.?\d+$/ ) 
-	{ die "$x_dim in $arg is not a valid number, stopped"; } 
-	if ( $y_dim !~ /^\d*\.?\d+$/ ) 
-	{ die "$y_dim in $arg is not a valid number, stopped"; } 
-	
-	#print STDERR "xdim: $x_dim ydim: $y_dim unit:$unit\n" ;
-	if (!defined($unit) )
-	{
-	    $unit='cm';
-	    $opt_s=$opt_s . $unit;
-	}
-	if ( $unit ne 'in' ) # assume centimeters
-	{ # calculate dimension in pixels (remember: resolution is in dpi)
-	    $xpixels= int(($x_dim * $resolution) / $inch)+1;
-	    $ypixels= int(($y_dim * $resolution) / $inch)+1;
-	    $gpar= "-g${xpixels}x${ypixels}";
-	}
-	else
-	{
-	    $xpixels= int($x_dim * $resolution)+1;
-	    $ypixels= int($y_dim * $resolution)+1;
-	    $gpar= "-g${xpixels}x${ypixels}";
-	}
-    } #endif XxY in opt_s
-    else
-    {
-	if ($opt_s =~ /$known_papersizes/)
-	{
-	   $gpar="-sPAPERSIZE=$opt_s";
-	}
-	else
-	{
-	    print STDERR "Error: Unknown paper size: $opt_s\n Acceptable papersizes are:$papersize_help\n";
-	    exit 1;
-	}
-    }
-}
-
-#translate option    
-if ($opt_t ne '')
-{
-  ($translate_x,$translate_y)= split(/\,/,$opt_t);
-}
-
-#rotate
-$rotright='-90 rotate';
-$rotleft='90 rotate';
-$rotupsidedown='180 rotate';
-$rotate='';
-if ($opt_R ne '')
-{
-    if ($opt_R eq '+') { $rotate=$rotright; }
-    elsif ($opt_R eq '-') { $rotate=$rotleft; }
-    elsif ($opt_R eq '^') { $rotate=$rotupsidedown; }
-    else { die "Wrong parameter for option -R: Valid are only +,-,^\n"; };
-}
-
-$device= $fullcolors ? "ppmraw" : "pbmraw";
-
-## %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-## -- iterate over different input files --
-## %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-PROCESSFILE:
-while ($infname= (shift @filenames))
-{
-  # reset filter definitions for each file
-  undef $linefilter; 
-  undef $rangefilter_begin;
-  undef $rangefilter_end;
-  $fixthisps= $trytofixps;
-  $fixmsgprinted= 0;
-
-  if (!$quiet) { print STDERR "Processing: $infname\n"; }
-  unless (open($infhandle,"<$infname"))
-  { # skip over this file 
-    print STDERR "$prgname: Can't open $infname: $!\n";
-    next PROCESSFILE;
-  }
- 
-  # buffer input from stdin into temporary file, because it has to be read twice
-  # one time for ghostscript processing, the second time for generating output
-  if ($infname eq '-') # input is stdin
-  {
-    $tmpfhandle='';
-    open($tmpfhandle,">$tmpfname") or 
-       die "Cannot open temporary file $tmpfname for writing: $!\n";
-  }
-  else # input is not stdin
-  {
-    undef $tmpfhandle;
-    #if filename ends with $defaultext usually .ps or .prn, replace the extension with $defaultoutext
-    if ($infname =~ /\.$defaultext$/i) 
-    { 
-      $outfname= $infname; $outfname =~ s/\.$defaultext$/$defaultoutext/i; 
-    }
-    else # otherwise simply append the extension $defaultoutext
-    {
-        $outfname= $infname . "$defaultoutext";
-    }
-    if (!$forceoverwrite and -s "$outfname") 
-      { 
-        die "$prgname: Sorry, file named $outfname already exists,",
-            " will not overwrite it.\n",
-            " You will have to use the -f option, delete it or rename it",
-            " before running $prgname again.\n";   
-      }
-    else
-    {
-      open($outfhandle,">$outfname") or die "Can't open file $outfname for writing: $!\n";
-    }
-  } #end else input is not stdin
-  
-  ## %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-  ## -- process input file --
-  ## %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-  $linefilter= '^$'; #'# filter empty lines by default 
-  while (<$infhandle>)
-  {
-    # get postscript and DSC version
-    if (/%!PS-Adobe-(\S+).*EPSF-(\S+)/) 
-    {
-      $PSversion=$1;
-      $PSDSCversion=$2;
-      if (! ($PSversion =~ /\d+\.\d+/))
-      {
-        $PSDSCversion="2.0";
-      }
-      if (! ($PSDSCversion =~ /\d+\.\d+/))
-      {
-        $PSDSCversion="2.0";
-      }
-    }
-
-    # check for existing BoundingBox parameters
-    if ( /^%%\s*BoundingBox:\s*(.*)/ && !defined($eBBllx) )
-    {
-      $BBarg= $1;
-      # accept even negative and fractional BBs
-      if ( $BBarg =~ /(\-?\d+\.?\d*\s+){3,}\d+/ ) # ignore %% BoundingBox: (atend) comments
-      {
-	($eBBllx,$eBBlly,$eBBurx,$eBBury,$dummy)= split /\s/,$BBarg;
-	#print STDERR "Existing BB: $eBBllx,$eBBlly,$eBBurx,$eBBury\n";
-	if (int($eBBllx) < 0) { $translate_x= - int($eBBllx-0.5); }
-	if (int($eBBlly) < 0) { $translate_y= - int($eBBlly-0.5); }
-
-	$xpixels= int((($eBBurx-$eBBllx) * $resolution)/72)+1;
-	$ypixels= int((($eBBury-$eBBlly) * $resolution)/72)+1;
-	if (!$ignoreBB)
-	{
-	    $gpar= "-g${xpixels}x${ypixels}";
-	    # check for meaningful values
-	    if (($xpixels <= 1) || ($ypixels <= 1))
-	    {
-		$gpar=""; undef $eBBllx; undef $eBBlly;
-	    }
-	    else
-	    {
-		if (!$quiet) 
-		{
-		    print STDERR "Rendering with existing $_";
-		    if (int($eBBllx) < 0 || int($eBBlly) < 0)
-		    {
-			print STDERR "WARNING: existing Bounding Box shows negative values - shifting\n";
-		    }
-		}
-	    }
-	} #endif !$ignoreBB
-      } #endif $BBarg =~
-  }
-
-
-    if ($fixthisps) # try to fix bad postscript code
-    {
-      # check for Windows 3.x output
-      if ( /^Win.*Dict/ )
-      { 
-        if (!$quiet && !$fixmsgprinted) 
-           { print STDERR "Windows 3.5 generated Postscript file detected, fixing\n"; }
-        $linefilter= '^(EJ|RS)';
-        $rangefilter_begin= '^statusdict';
-        $rangefilter_end= 'cvx\ settransfer$';  #'
-        $fixmsgprinted= 1; # stop printing message
-      }
-      else
-      {
-        if ( /^%%Creator:\s*Wind.U\s*Xprinter/ )
-        { 
-	    if (!$quiet && !$fixmsgprinted) 
-	    { print STDERR "Star/OpenOffice generated Postscript file detected, fixing\n"; }
-	    $linefilter= '^rs';
-	    $fixmsgprinted= 1; # stop printing message
-	}
-      else
-      {
-        if ( $forcefixps || 
-             /^\/NTPS/ || 
-             /Creator:\s*(AdobePS|Pscript|.*Windows)/i ) #check for NT generated output
-        {
-          if (!$quiet && !$fixmsgprinted) 
-          { 
-            if ($forcefixps)
-	    {
-		print STDERR "Postscript filtering requested, fixing\n";
-	    }
-	    else
-	    {
-		print STDERR "Windows generated Postscript file detected, fixing\n"; 
-	    }
-	  }
-	  $rangefilter_begin= '^((\[\{)|(featurebegin\{))$'; #'
-	  $rangefilter_end= '^(\} stopped cleartomark|\}featurecleanup)';
-	  $exclude_rangefilter_begin= '^(?i)%%BeginNonPPDFeature'; #'
-	  $exclude_rangefilter_end= '^(?i)%%EndNonPPDFeature';
-	  #$triggered_rangefilter_begin= ''; #'
-	  #$triggered_rangefilter_end= ''; #'
-	  $fixsearchpat='(^|\s)(initmatrix|initclip|initgraphics)(\s|$)';
-	  $fixreplacepat=' ';
-	  $fixmsgprinted= 1; # stop printing message
-        } # end if NTPS
-      } #end else
-    }
-    } #end if trytofixps
-
-    if (defined($tmpfhandle))
-    { 
-      print $tmpfhandle $_ or die "$prgname: Failure during writing to temporary file $tmpfname";
-    }
-
-    if (/^%%EOF\s*$/) 
-    {
-	$totalEOFDSC++
-    }
-  } #end while <$infhandle>
-  
-  if (defined($tmpfhandle)) 
-  { 
-    close($tmpfhandle); 
-  }
-  else
-  { 
-    $tmpfhandle= $infhandle;
-    $tmpfname= $infname; 
-  }
-  
-  ## %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-  ## -- calculate the bounding box --
-  ## %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-  if ($translate_x!=0 || $translate_y!=0)
-  {
-    $translation="$translate_x $translate_y translate";
-    $translatecmd="-c $translation";
-  }
-  else
-  {
-    $translation="";
-    $translatecmd="";
-  }
-
-  if (!$quiet) 
-  { 
-    print STDERR "Calculating Bounding Box...";
-    if ($opt_s)
-    {
-	print STDERR "using page size $opt_s...";
-    }
-  }
-
-  $rotatecmd='';
-  if ($rotate ne '')
-  {
-     $rotatecmd="-c \"$rotate\""
-  }
-  if ($bboxname ne '')
-  {
-      $cmdline="$ghostscriptname -dSAFER -dNOPAUSE -q $gpar -r$resolution -sDEVICE=$device -sOutputFile=- $translatecmd -f $tmpfname -c showpage -c quit | $bboxname -r $resolution";
-  }
-  else
-  {
-      if (!$quiet) {
-	  print STDERR "...using bbox device of $ghostscriptname...";
-      }
-      $cmdline = "$ghostscriptname -dSAFER -dBATCH -dNOPAUSE -q $gpar -r$resolution -sDEVICE=bbox -sOutputFile=- -c \"/setpagedevice {pop} def\" $translatecmd -f $tmpfname -c quit 2>&1";
-  }
-
-  if ($debuggs) { print STDERR "\nCalling: $cmdline\n"; }
-  
-  # actual ghostscript call
-  $boundingbox=`$cmdline`;
-  if ($debuggs) { print STDERR "Call result: $boundingbox"; }
-
-  # check result of gs call
-  if ($boundingbox !~ /^%%BoundingBox/m)
-  {
-    print STDERR "Error: Could not determine bounding box!\n",
-    "I suppose $ghostscriptname had some trouble interpreting the postscript-file\n";
-  }
-
-  $boundingbox =~ /^%%HiResBoundingBox:\s*(.*)/m;
-  if (defined($1)) # HiResBoundingBox given
-  {
-      ($hcBBllx,$hcBBlly,$hcBBurx,$hcBBury,$dummy)= split(/\s/,$1);
-      $hiresboundingbox="%%HiResBoundingBox: $hcBBllx $hcBBlly $hcBBurx $hcBBury\n";
-      $cBBllx = floor($hcBBllx);
-      $cBBlly = floor($hcBBlly);
-      $cBBurx = ceil($hcBBurx);
-      $cBBury = ceil($hcBBury);
-  }
-  else
-  { #use normal BoundingBox
-      $boundingbox =~ /^%%.*BoundingBox:\s*(.*)/;
-      ($cBBllx,$cBBlly,$cBBurx,$cBBury,$dummy)= split(/\s/,$1);
-  }
-  # if loose BB should be performed by ps2eps
-  # apply changes to resulting bounding box if needed
-  if ($looseBB ne '') 
-  {
-      if ($cBBllx > 0) { $cBBllx--; }
-      if ($cBBlly > 0) { $cBBlly--; }
-      $cBBurx++; $cBBury++;
-  }
-  # extend clipping box by 1 point
-  if ($clip)
-  {
-      if ($cBBllx > 0) { $cBBllx--; }
-      if ($cBBlly > 0) { $cBBlly--; }
-      $cBBurx++; $cBBury++;
-  }
-  if ($cBBllx < 0 || $cBBlly < 0)
-  {
-    if (!$quiet) 
-    {
-      print STDERR "WARNING! Your drawing had a negative Bounding Box which is deprecated and may cause problems!. I'll shift it.\n";
-    }
-    $translate_x= -int($cBBllx);
-    $translate_y= -int($cBBlly);
-    $cBBllx=0;
-    $cBBurx= $cBBurx + $translate_x;
-    $cBBlly=0;
-    $cBBury= $cBBury + $translate_y;
-
-    $hcBBurx= $hcBBurx + $hcBBllx;
-    $hcBBury= $hcBBury + $hcBBlly;
-    $hcBBllx= 0;
-    $hcBBlly= 0;
-
-    $hiresboundingbox="%%HiResBoundingBox: $hcBBllx $hcBBlly $hcBBurx $hcBBury\n";
-
-    $translation="$translate_x $translate_y translate";
-    $translatecmd="-c \'$translation\'";
-  }
-  $boundingbox = "%%BoundingBox: $cBBllx $cBBlly $cBBurx $cBBury\n";
-
-  if (!$quiet) { print STDERR "ready. $boundingbox" };
-  
-  $before_startps= 1;
-  $inserted_prolog= 0;
-  $prolog_passed= 0;
-
-  ## %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-  ## -- Create output file --
-  ## %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-  if (!$quiet) { print STDERR "Creating output file $outfname..."; }
-  
-  open($tmpfhandle,"<$tmpfname") or die "Cannot open file $tmpfname for reading";
-  CREATEOUTPUT: 
-  while (<$tmpfhandle>) 
-  {
-    # check whether we are in a binary section
-
-    $binarysection=(/^(%%BeginBinary)|(beginimage)\r?\n?$/ ... /^(%%EndBinary)|^(endimage)/) || 
-                   (/^(doNimage)|(doclutimage)\r?\n?$/ ... /(^|~> )Z\r?\n?$/) || # Pscript_Win_Dib_L2 5.0 0
-                   (/^beginjpeg / ... /~> endjpeg\r?\n?$/) ||             # Pscript_Win_Dib_L2 5.0 0
-		   (/^pdfIm/ ... /^%-EOD-/);
-
-    if ( !$binarysection )
-    {
-      s/\r?\n?$//;  # remove CR and/or LF at end of line if not in binary section
-    }
-
-    # check where magic Postscript header starts - skip leading binary stuff, e.g., HP PCL/PJL code
-    if ($before_startps)
-    {
-      if ( /%!/ ) # This is usually the smallest magic sequence
-      {           # Note: Adobe Photoshop generated a binary heading, so ^ is not applicable
-	if (! /%!PS-Adobe.*/i) # some strange programs use other magics
-	{
-	   print STDERR "** Warning **: Weird heading line -- ",$_," -- ";
-	}
-	$before_startps= 0; 
-      }
-      next CREATEOUTPUT;
-    }
-    else # we are hopefully in regular postscript code now
-    {
-      # count %%EOFs as we want to know when we got the last EOF
-      if ( /^%%EOF\s*$/ ) 
-      {
-	  $seenEOF++;
-      }
-      
-      # We should insert our own prologue including the newly calculated BoundingBox
-      if (! $inserted_prolog)
-      {
-        print $outfhandle "%!PS-Adobe-$PSversion EPSF-$PSDSCversion\n";
-	# check if we need to rotate
-	$transrotcmd='';
-	if ($rotatecmd)
-	{
-	  if ($rotate eq $rotright)
-	  {
-	      $transrotcmd="-$cBBlly $cBBurx translate";
-	      $boundingbox='%%BoundingBox: 0 0 ' . ($cBBury-$cBBlly) . ' ' . ($cBBurx-$cBBllx) . "\n";
-	      if ($hiresboundingbox ne "")
-	      {
-		  $hiresboundingbox='%%HiResBoundingBox: 0 0 '  . ($hcBBury-$hcBBlly) . ' ' . ($hcBBurx-$hcBBllx) . "\n";
-	      }
-
-	  }
-	  elsif ($rotate eq $rotleft)
-	  {
-	      $transrotcmd="$cBBury -$cBBllx translate";
-	      $boundingbox='%%BoundingBox: 0 0 ' . ($cBBury-$cBBlly) . ' ' . ($cBBurx-$cBBllx) . "\n";
-	      if ($hiresboundingbox ne "")
-	      {
-		  $hiresboundingbox= '%%HiResBoundingBox: 0 0 ' . ($hcBBury-$hcBBlly) . ' ' . ($hcBBurx-$hcBBllx) . "\n";
-	      }
-	  }
-	  elsif ($rotate eq $rotupsidedown)
-	  {
-	      $transrotcmd="$cBBurx $cBBury translate";
-	      $boundingbox='%%BoundingBox: 0 0 ' . ($cBBurx-$cBBllx) . ' ' . ($cBBury-$cBBlly) . "\n";
-	      if ($hiresboundingbox ne "")
-	      {
-		  $hiresboundingbox='%%HiResBoundingBox: 0 0 ' . ($hcBBurx-$hcBBllx) . ' ' . ($hcBBury-$hcBBlly) . "\n";
-	      }
-	  }
-	}
-        print $outfhandle $boundingbox;
-	if (!defined($hiresboundingbox)) 
-	{
-	    $nohires=1;
-	}
-        if (defined($hiresboundingbox) && !defined($nohires)) { print $outfhandle $hiresboundingbox; }
-        $inserted_prolog= 1;
-        redo CREATEOUTPUT;
-      }
-      else # already inserted_prolog
-      {
-        if (! $prolog_passed)
-        {   
-          #ignore the following lines in the prologue
-          if ( /^%%(HiRes)?BoundingBox/ ||
-               /^%%Pages/       ||
-               /^%%BeginProlog/ ||
-               /^%%EndProlog/   ||
-	       ($filterorientation && /^%%Orientation/) ||
-               ($removeDSC && /^%%.*: \(atend\)/) ||
-	       ($removePreview && (/^%%BeginPreview/ ... /^%%EndPreview/)) ) 
-          { 
-	      next CREATEOUTPUT; 
-	  }
-          else
-          {
-            if ( /^[^%].*/ ||
-                 /^%%EndComments/ ) # line is not a comment
-            { 
-              #output postscript code for proper EPS file
-              if ($insertPScode) 
-              { 
-		  print $outfhandle "%%EndComments\n", 
-		                    "% EPSF created by ps2eps $ver[2]\n",
-		                    "%%BeginProlog\n";
-              }
-	      # Insert own postscript code for clipping
-              if ($clip)
-              {
-		 if (!defined($nohires))
-		 {
-		     printf $outfhandle "newpath %f %f moveto %f %f lineto %f %f lineto %f %f lineto closepath clip\n",$hcBBllx-0.1,$hcBBlly-0.1,$hcBBurx+0.1,$hcBBlly-0.1,$hcBBurx+0.1,$hcBBury+0.1,$hcBBllx-0.1,$hcBBury+0.1;
-		 }
-		 else
-		 {
-		     printf $outfhandle "newpath %d %d moveto %d %d lineto %d %d lineto %d %d lineto closepath clip\n",$cBBllx,$cBBlly,$cBBurx,$cBBlly,$cBBurx,$cBBury,$cBBllx,$cBBury;
-		 }
-              } #endif clip
-
-	      if ($rotate ne '')
-	      {
-		  print $outfhandle "$transrotcmd\n";
-		  print $outfhandle "$rotate\n";
-	      }
-	      if ($translation ne '')
-	      {
-		  print $outfhandle "$translation\n";
-	      }
-
-	      #insert surrounding postscript code
-              if ($insertPScode) 
-              {              
-                print $outfhandle  "save\n",
-                                   "countdictstack\n",
-                                   "mark\n",
-                                   "newpath\n",
-                                   "/showpage {} def\n",
-		                   "/setpagedevice {pop} def\n",
-                         	   "%%EndProlog\n",
-                                   "%%Page 1 1\n";
-              }
-              $prolog_passed= 1;
-              if (/^%%EndComments/) { next CREATEOUTPUT; }
-            } #endif line is not a comment
-          } #end else
-        } #endif (we are in the prologue section)
-        else #we are in the main part of postscript file
-        {
-          #end of postscript file reached?
-	  #Usually the DSC %%EOF signifies the end
-          if ( eof($tmpfhandle) || 
-	       ($ignoreEOFDSC == 0 && /^%%EOF\s*$/ && $seenEOF == $totalEOFDSC)
-               || ( $trailerseen && /^II\*\000.*/ )	       
-             ) 
-          { 
-	    #do not forget to print last line if not terminated by LF
-	    if ( eof($tmpfhandle) && !/^$/ && !/^%%EOF\s*$/ ) # do not insert %%EOF twice
-	    {
-		print $outfhandle $_,"\n";
-	    }
-            #add appropriate trailer
-            if ($insertPScode) 
-	    {              
-		print $outfhandle "%%Trailer\n",
-		                  "cleartomark\n", 
-		                  "countdictstack\n", 
-                                  "exch sub { end } repeat\n",
-		                  "restore\n",
-		                  "%%EOF\n"; 
-	    }
-            last CREATEOUTPUT; 
-          } # stop output
-
-	  # Trailer comment seen?
-	  if ( /^%%Trailer\s*$/ )
-	  {
-	    $trailerseen=1;
-	  }
-	  else
-	  {
-	    if (!/^\s*$/) #non empty lines follow
-	    {
-		$trailerseen=0;
-	    }
-	  }
-
-          # check for trigger
-          if (defined($triggerstring) && /^$triggerstring$/)
-          {
-            $trigger= 1;
-          };
-
-          # remove complete lines if one of the expression matches
-          if ( !$binarysection # only when not in binary section
-	       &&
-	       (
-	       ($removePreview && (/^%%BeginPreview/ ... /^%%EndPreview/))
-	       ||                        # no preview
-               (defined($rangefilter_begin) && 
-                 (/$rangefilter_begin/ ... /$rangefilter_end/) &&
-		(!(/$exclude_rangefilter_begin/ ... /$exclude_rangefilter_end/))
-               ) 
-               ||
-               (defined($triggered_rangefilter_begin) && defined($triggered_rangefilter_end) &&
-                $trigger &&
-                (/$triggered_rangefilter_begin/ ... /$triggered_rangefilter_end/)
-               ) 
-	       ||
-               /$linefilter/             # lines by linefilter
-	       ||
-	       ($removeDSC && (/^%( |!)(\w )+/ || /^%%/)) # any type of structured comment
-	       ||
-	       ($removeADO && 
-		(/^statusdict begin.*ProductName.*print product print.*flush end\r?\n?$/ ||
-                 /^\(%%\[\s*(Page:.*|LastPage)\s*\]%%\)\s*=\s*\w*\s*\r?\n?/ ))
-	       ||                    
-	       /^$/                       # empty lines
-               )
-             )
-          { 
-	      next CREATEOUTPUT; 
-	  }
-
-	  # replacement
-	  if ( defined($fixsearchpat) )
-	  {
-	      #if (/$fixsearchpat/) { print STDERR "**filter** before:",$_,"\n"; }
-	      #if (s/$fixsearchpat/$fixreplacepat/) {	      print STDERR "**filter** after:",$_,"\n";}
-              s/$fixsearchpat/$fixreplacepat/;
-	  }
-  
-          # sanity check for potential dangerous commands
-          if ( /(^|\s)(clear|erasepage|initmatrix|initclip|initgraphics|startjob|cleardictstack|setmatrix|setpagedevice|copypage|grestoreall|exitserver|quit)(\s|$)/ )
-          { 
-	      $notsane= 1;
-	      #print STDERR "Warning: dangerous command in line: ",$_,"\n";
-	  }
-        } # end else (this is main part) 
-
-        # Output the postscript line to result file
-        print $outfhandle $_;
-
-	if (!$binarysection)
-	{
-	    print $outfhandle "\n"; # terminate line with LF
-	}
-      } # end else prolog_passed
-    } # end else inserted_prolog
-  } # end while CREATEOUTPUT
-
-  close($tmpfhandle);
-
-  if ($tmpfname ne $infname) { unlink "$tmpfname"; } #remove temporary file
-
-  close ($outfhandle);
-
-  # print warning if magic sequence not found
-  if ( $before_startps ) 
-  {
-    print STDERR "\n ** Error!! **: could not identify begin of postscript code in file $infname, please check header line!\n First line should start with %!. No output generated.\n";
-  }
-
-  if (!$quiet) { print STDERR "ready.\n"; }
-  if ($warnings and $notsane and !$quiet)
-  { 
-    print STDERR "** Warning **: EPS-output for $infname is not sane, at least one\n",
-                 "of the following commands was still present:\n",
-                 "clear erasepage initmatrix initclip initgraphics startjob\n",
-                 "cleardictstack setmatrix setpagedevice copypage grestoreall\n",
-                 "exitserver quit\n";
-  }
-} #end while PROCESSFILE
-
-# ---- end of perl-script -------
+../../texmf/scripts/ps2eps/ps2eps.pl
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/ps2pk b/Master/bin/alpha-linux/ps2pk
index fd230287e9a..a7fa45fcdb0 100755
--- a/Master/bin/alpha-linux/ps2pk
+++ b/Master/bin/alpha-linux/ps2pk
diff --git a/Master/bin/alpha-linux/ps4pdf b/Master/bin/alpha-linux/ps4pdf
index cbdcb022926..7e99e0b8d18 100755..120000
--- a/Master/bin/alpha-linux/ps4pdf
+++ b/Master/bin/alpha-linux/ps4pdf
@@ -1,133 +1 @@
-#!/bin/sh
-
-# Copyright (C) 2004, Thomas Esser. Public domain.
-# 2005-03-08: New option "--crop", Rolf Niepraschk. 
-# dvips call only if the dvi file exist (RN). 
-# 2005-06-27: ps2pdf call only if the ps file exist (RN). 
-# 2006-04-05: "\RequirePackage{pst-pdf}" added to the (pdf)LaTeX calls 
-#             as suggested by Niall Murphy.
-# 2006-07-14: Better temp dir handling (suggested by Karl Berry) (RN).
-# 2006-07-23: New option --Xps2pdf and code cleanup (thanks to Karl Berry) (RN).
-
-# First, work around bugs/limitations in some shells on some systems:
-test -f /bin/sh5 && test -z "$RUNNING_SH5" \
-  && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
-  && { RUNNING_SH5=true; export RUNNING_SH5; exec /bin/sh5 $0 ${1+"$@"}; }
-unset RUNNING_SH5
-
-test -f /bin/bsh && test -z "$RUNNING_BSH" \
-  && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \
-  && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; }
-unset RUNNING_BSH
-
-# hack around a bug in zsh:
-test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
-
-###############################################################################
-# cleanup()
-#   clean up the temp area and exit with proper exit status
-###############################################################################
-cleanup()
-{
-  rc=$?
-  $needsCleanup && test -n "$tmpdir" && test -d "$tmpdir" \
-    && { rm -f "$tmpdir"/*; cd /; rmdir "$tmpdir"; }
-
-  # set exit code in a portable way; see the autoconf manual for details:
-  (exit $rc); exit $rc
-}
-
-###############################################################################
-# setupTmpDir()
-#   set up a temp directory and a trap to remove it
-###############################################################################
-setupTmpDir()
-{
-  $needsCleanup && return
-
-  trap 'cleanup' 1 2 3 7 13 15
-  needsCleanup=true
-  (umask 077; mkdir "$tmpdir") \
-    || abort "could not create directory \`$tmpdir'"
-}
-###############################################################################
-# myexec(args)
-#   execute the command given as "args"; abort on error; redirect messages to
-#   log in "silent" mode; redirect stdin (</dev/null) in silent mode
-###############################################################################
-myexec()
-{
-  if $silent; then
-    echo "$0: running $@"
-    "$@" >$log 2>&1 </dev/null
-    rc=$?
-  else
-    "$@"
-    rc=$?
-  fi
-  if test $rc != 0; then
-    echo "$0: command $@ returned with code $rc"
-    cat <$log
-    (exit $rc) # set return value
-    cleanup
-  fi
-}
-
-# some initializations
-progname=pdflatexps
-silent=true # default setting; change if you like
-crop=false
-needsCleanup=false
-ps2pdf_opts="-dAutoRotatePages=/None"
-tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/.$progname$$
-log=$tmpdir/log
-version="1.0"
-
-# look for optional things first
-while
-  case $1 in
-   --help|-h) echo "$0 [-v|-q|--crop|--version|--Xps2pdf OPT] FILE"
-              echo "Process LaTeX document FILE using the pst-pdf package,"
-              echo "including running latex, dvips, and ps2pdf as necessary."
-              echo "--Xps2pdf OPT passes OPT to ps2pdf."
-              echo " (-dAutoRotatePages=/None is always passed.)"
-              echo "--crop runs pdfcrop on ps2pdf output."
-  		                   exit 0;;
-   --version) echo "$progname version $version"; exit 0;;
-   --crop|-c) crop=true;;
-   --Xps2pdf|-Xps2pdf) shift; ps2pdf_opts="$ps2pdf_opts $1";;
-   -q) silent=true;;
-   -v) silent=false;;
-    -*) echo "$progname: unknown option $1 ignored";;
-    *) break;;
-  esac
-do
-  shift
-done
-
-# remaining option: filename
-file=$1
-if test -z "$file"; then
-  echo "$0: no file to process, try --help for more information." >&2
-  exit 1
-fi
-
-# jobname von TeX: Verzeichnisse entfernen, evtl. vorhandene Extension
-# entfernen.
-job=`echo "x$1" | sed 's@x@@; s@.*/@@; s@\.[^.]*$@@'`
-
-setupTmpDir
-myexec latex \
-    "\AtBeginDocument{\RequirePackage{pst-pdf}} \input{$file}"
-test -f "$job.dvi" && myexec dvips -Ppdf -o "$job-pics.ps" "$job.dvi"
-test -f "$job-pics.ps" && myexec ps2pdf \
-  "$ps2pdf_opts" "$job-pics.ps" "$job-pics.pdf"
-if $crop; then
-  myexec pdfcrop "$job-pics.pdf" "$job-pics-crop.pdf" 
-  mv "$job-pics-crop.pdf" "$job-pics.pdf"
-fi
-myexec pdflatex \
-    "\AtBeginDocument{\RequirePackage{pst-pdf}} \input{$file}"
-true
-cleanup
-
+../../texmf-dist/scripts/pst-pdf/ps4pdf
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/psbook b/Master/bin/alpha-linux/psbook
index 686b0fb8370..f520f1a79f7 100755
--- a/Master/bin/alpha-linux/psbook
+++ b/Master/bin/alpha-linux/psbook
diff --git a/Master/bin/alpha-linux/psnup b/Master/bin/alpha-linux/psnup
index 7f45473f16e..394a5f24615 100755
--- a/Master/bin/alpha-linux/psnup
+++ b/Master/bin/alpha-linux/psnup
diff --git a/Master/bin/alpha-linux/psresize b/Master/bin/alpha-linux/psresize
index dca7b715b14..8a186ed73bd 100755
--- a/Master/bin/alpha-linux/psresize
+++ b/Master/bin/alpha-linux/psresize
diff --git a/Master/bin/alpha-linux/psselect b/Master/bin/alpha-linux/psselect
index cf4381f3d9d..b0f704ce022 100755
--- a/Master/bin/alpha-linux/psselect
+++ b/Master/bin/alpha-linux/psselect
diff --git a/Master/bin/alpha-linux/pstops b/Master/bin/alpha-linux/pstops
index a7e42280628..4843ca4e040 100755
--- a/Master/bin/alpha-linux/pstops
+++ b/Master/bin/alpha-linux/pstops
diff --git a/Master/bin/alpha-linux/rungs b/Master/bin/alpha-linux/rungs
new file mode 120000
index 00000000000..3efeab3b3d4
--- /dev/null
+++ b/Master/bin/alpha-linux/rungs
@@ -0,0 +1 @@
+../../texmf/scripts/texlive/rungs.tlu
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/simpdftex b/Master/bin/alpha-linux/simpdftex
index 86f8ec0e623..e5d5d4218b3 100755
--- a/Master/bin/alpha-linux/simpdftex
+++ b/Master/bin/alpha-linux/simpdftex
@@ -2,8 +2,8 @@
 
 # Created by Gerben Wierda, May 2001
 # Rewritten by Gerben Wierda, January 2002
-
-# Modified by Joachim Kock, May 2003 
+# Modified by Joachim Kock, May 2003
+# Modified by Gerben Wierda, April 2007
 
 # COPYRIGHT Gerben Wierda 2001--2004
 # This file is free software. You are free to use this file in any way you like
@@ -111,19 +111,26 @@
 #		In the future, the old modes (altpdflatex and friends) through
 #		symlinks will disappear from my distribution, though they will
 #		still work.
+# 2007/05/07	Added dvipdfm support with compatibility with the patched version
+#		that is available on the net (simpdftex_dpmx)
+#		Changed version string to date-based string
+# 2007/08/09	Protected echo command against broken builtin versions by running
+#		/bin/echo explicitly. There may exist /bin/echo implementations
+#		that do not support -n and this script will have to be changed
+#		before it works on such a system
 
 # FEATURE: it seems -u +foo.map -u -foo.map does not work. So --extradvipsopts
 # cannot be used to remove a map from the standard list
 
 # BUG: Handling of file name extensions is not completely equialent to TeX
 # i.e. foo.bar.bla gets you foo.bar.pdf not foo.bar.bla.pdf
-# Give all extensions
+# Hint: Give all extensions explicitely on the command line
 
-version='$Revision: 2.18 $'
+version='20070809'
 calledas=`basename "$0"`
 if [ "${calledas}" = "simpdftex" ]
 then
-	argwithoutlead=`echo -n "$1"|sed 's/^--//'`
+	argwithoutlead=`/bin/echo -n "$1"|sed 's/^--//'`
 	if [ "$1" != "" -a "$1" = "${argwithoutlead}" ]
 	then
 		formatname="$1"
@@ -133,6 +140,8 @@ then
 fi
 argvbackup="$*"
 
+dviprogram="dvips" # Might be dvips, dvipdfm or dvipdfmx
+
 # maxpkdvipsopts: use only pfb's for real PS fonts, bitmaps are default for the others
 maxpkdvipsopts="-Ppk"
 # maxpfbdvipsopts: use as many pfb's as possible
@@ -159,33 +168,39 @@ distillerprog="ps2pdf13"
 distillerfilter="no"
 unset outdir
 debug="no"
+dvipdfmoptions=""
 
 usage()
 {
 	cat <<_eof_help
 This is simpdftex, $version
 
-Usage: simpdftex formatname
+Usage: simpdftex formatname [--mode modestring]
 	[--dvipsopts dvipsoptstring] [--extradvipsopts dvipsoptstring] [--pdf]
 	[--default] [--maxpk] [--maxpfb] [--extendedname] [--no-echo-version]
 	[--tex-path dir] [--keep-psfile] [--distiller-path dir] [--debug]
 	[--distiller prog] [--distiller-filter prog] [--help]
-	[--outdir dir] [--extratexopts texoptsstring] tex-or-dvi-file
+	[--outdir dir] [--extratexopts texoptsstring]
+	[--dvipdfmopts dvipdfmoptstring] tex-or-dvi-file
 
 simpdftex is a way to do pdf{e}{la}tex without having pdf{e}{la}tex. It needs a
-working TeX environment and ghostscript. Since pdf{e}{la}tex cannot handle
-insertion of .eps graphics, simpdftex gives an alternative. The output for both
-systems is comparable.
+working TeX environment and one of three ways to turn  DVI file into PDF:
+	- dvips + a distiller like ghostscript
+	- dvipdfm
+	- dvipdfmx
+Since pdf{e}{la}tex cannot handle insertion of .eps graphics, simpdftex gives an
+alternative when using dvips mode. The output for both systems is comparable.
 
 simpdftex compiles the file with {LA}TeX, processes the DVI file with dvips into
-PostScript and uses gs to produce pdf (with ps2pdf). There is finegrained
-control over the resulting filename and the options with which dvips produces
-the PostScript intermediary file.
+PostScript and uses gs to produce pdf (with ps2pdf). Or it uses dvipdfm or
+dvipdfmx to turn the DVI file into PDF. There is finegrained control over the
+resulting filename and the options with which dvips produces the PostScript
+intermediary file.
 
 Dvips will call Metafont to produce bitmaps or include PostScript .pfb files
 depending on the flags. See below.
 
-Default settings is normal name, maximal use of pfb's, just like pdf{la}tex,
+The default setting is normal name, maximal use of pfb's, just like pdf{la}tex,
 in other words, "pdftex file.tex" and "altpdftex file.tex" both produce an
 output file file.pdf. For pdftex, output options are controlled by pdftex.cfg,
 for altpdftext by config.ps (unless --pdf is given).
@@ -195,6 +210,15 @@ Arguments:
 		If a .dvi file is given, skip the TeX process. Otherwise, TeX
 		the input file, dvips the resulting dvi file and ps2pdf the
 		resulting ps file
+	--mode
+		Tell simpdftex how to go from DVI to PDF. There are three modes:
+		- dvips
+		- dvipdfm
+		- dvipdfmx
+	--dpx
+		Compatibility flag with simpdftex_dpmx. Equal to --mode dvipdfmx
+	--dpm
+		Compatibility flag with simpdftex_dpmx. Equal to --mode dvipdfm
 	--help
 		Display this message and exit
 	--no-echo-version
@@ -216,6 +240,7 @@ Arguments:
 		optimal results for the chosen printer.
 		For file contents (not name) equivalent to:
 		--dvipsopts "-Ppk"
+		Not yet functional for the other modes.
 	--maxpfb
 		Use PostScript pfb files whenever possible. This produces
 		optimal results for the screen.
@@ -223,6 +248,7 @@ Arguments:
 		--dvipsopts "-Poutline"
 		If any font is included as TeX pk bitmap, it is rendered
 		at the default resolution.
+		Not yet functional for the other modes.
 	--pdf
 		Select .pdfmode extension for the output file name if
 		--extendedname has been set. Use printer definition
@@ -268,11 +294,13 @@ Arguments:
 		--distiller=/usr/local/alternate/bin/ps2pdf
 		--distiller=pstill
 		Using this flag sets the distiller filter mode to off
+		This flag only makes sense in dvips mode
 	--distiller-filter prog
 		Use a distiller executable or executable script which is
 		called with the PS input as standard input and which writes
 		the PDF output to standard output. E.g.:
 		--distiller-filter=u-psbuild
+		This flag only makes sense in dvips mode
 	--distiller-path
 		Give path needed by the distiller binary. This path is added
 		to the begin of you PATH environment before the distiller is
@@ -282,6 +310,12 @@ Arguments:
 		/usr/local/bin/ps2pdf find another gs than intended. By giving
 		an empty path, the path is not changed before the distiller
 		program is run. The default is empty.
+		This flag only makes sense in dvips mode
+	--dvipdfmopts
+		Give arbitrary arguments to dvipdfm or dvipdfmx, e.g.
+		--dvipdfmopts "-c"
+		Sets extension for --extendedfilename to .custom. --dvipdfmopts
+		overrides other flags that set dvipdfmopts.
 	--outdir dir
 		Write files here *if* our current directory is unwritable. This
 		mimicks the TEXMFOUTPUT environment variable of TeX, but
@@ -313,6 +347,15 @@ do
 		outputpostfix=".custom"
 		dvipsoptions="$1"
 		;;
+	--dvipdfmopts)
+		outputpostfix=".custom"
+		shift
+		dvipdfmoptions="$1"
+		;;
+        --dvipdfopts)	# Compatibility with simpdftex_dpmx
+		shift
+		dvipdfmoptions="$1"
+		;;
 	--extradvipsopts)
 		shift
 		extradvipsoptions="$1"
@@ -360,6 +403,16 @@ do
 		distillerprog="$1"
 		distillerfilter="no"
 		;;
+	--mode)
+		shift
+		if [ "$1" = "dvips" -o "$1" = "dvipdfm" -o "$1" = "dvipdfmx" ]
+		then
+			dviprogram="$1"
+		else
+			/bin/echo "Unknown mode $1"
+			exit 1
+		fi
+		;;
 	--outdir)
 		shift
 		export TEXINPUTS=`pwd`:`kpsewhich --expand-var '$TEXINPUTS'`
@@ -376,8 +429,14 @@ do
 	--no-echo-version)
 		echoversion="no"
 		;;
+        --dpx)	# Compatibility with simpdftex_dpmx
+                dviprogram="dvipdfmx"
+                ;;
+        --dpm)	# Compatibility with simpdftex_dpmx
+                dviprogram="dvipdfm"
+                ;;
 	--*)
-		echo "Unknown option $1"
+		/bin/echo "Unknown option $1"
 		exit 1;;
 	"")
 		;;
@@ -389,15 +448,56 @@ done
 
 if [ "${echoversion}" = "yes" -a "${debug}" = "no" ]
 then
-	echo "### This is $0, Version ${version}"
+	/bin/echo "### This is $0, Version ${version}"
 fi
 
 if [ "${debug}" = "yes" ]
 then
-	echo "##### This is $0, Version ${version}"
-	echo "##### Arguments: ${argvbackup}"
+	/bin/echo "##### This is $0, Version ${version}"
+	/bin/echo "##### Arguments: ${argvbackup}"
 fi
 
+run_dvipdfm()
+{
+	/bin/echo "### ${texpath}/${dviprogram} ${dvipdfmoptions} -o ${pdffile} ${dvifile}"
+	"${texpath}/${dviprogram}" ${dvipdfmoptions} -o "${pdffile}" "${dvifile}" || \
+		{ /bin/echo "### FAILED to generate ${pdffile} (${status})"; \
+		  exit 1; }
+}
+
+run_dvips()
+{
+	/bin/echo "### ${texpath}/${dviprogram} -R ${dvipsoptions} ${extradvipsoptions} -o ${psfile} ${dvifile}"
+	"${texpath}/${dviprogram}" -R ${dvipsoptions} ${extradvipsoptions} -o "${psfile}" "${dvifile}" || \
+		{ /bin/echo "### FAILED to generate ${psfile} (${status})"; \
+		  exit 1; }
+
+	if [ "${keeppsfile}" = "yes" ]; then
+		/bin/echo "### Saving intermediary ps file ${psfile} as ${savedpsfile}"
+		/bin/cp "${psfile}" "${savedpsfile}" || \
+			/bin/echo "### FAILED to save ${psfile} (${status})"
+	fi
+
+	if [ "${distillerpath}" != "" ]; then
+		PATH="${distillerpath}:${PATH}";export PATH
+		if [ "${debug}" = "yes" ]; then
+			/bin/echo "##### PATH set to ${PATH}"
+		fi
+	fi
+
+	if [ "${distillerfilter}" = "yes" ]; then
+		/bin/echo "### ${distillerprog} <${psfile} >${pdffile}"
+		"${distillerprog}" <"${psfile}" >"${pdffile}" || \
+			{ /bin/echo "### FAILED to generate ${pdffile} (${status})"
+			  exit 1; }
+	else
+		/bin/echo "### ${distillerprog} ${psfile} ${pdffile}"
+		"${distillerprog}" "${psfile}" "${pdffile}" || \
+			{ /bin/echo "### FAILED to generate ${pdffile} (${status})"
+			  exit 1; }
+	fi
+}
+
 cleanup()
 {
 	if [ "${tmpdir}" != "" -a "${debug}" = "no" ]
@@ -418,7 +518,7 @@ main()
 {
 	if [ "${file}" = "" ]
 	then
-		echo "simpdftex Empty argument: tex-or-dvi-file-name"
+		/bin/echo "simpdftex Empty argument: tex-or-dvi-file-name"
 		exit 1
 	fi
 
@@ -431,8 +531,8 @@ main()
 
 	startwithdvi="no"
 	basename=`basename "${file}"`
-	nosuffixbasename=`echo -n ${basename}|sed 's/\.[^.]*$//'`
-	nodvisuffixbasename=`echo -n ${basename}|sed 's/\.[dD][vV][iI]$//'`
+	nosuffixbasename=`/bin/echo -n ${basename}|sed 's/\.[^.]*$//'`
+	nodvisuffixbasename=`/bin/echo -n ${basename}|sed 's/\.[dD][vV][iI]$//'`
 	if [ "${nodvisuffixbasename}" = "${nosuffixbasename}" -a \
 		"${basename}" != "${nosuffixbasename}" ]
 	then
@@ -454,14 +554,14 @@ main()
 
 			fi
 		else
-			echo "### Cannot write in current directory and no redirect found. Bailing out..."
+			/bin/echo "### Cannot write in current directory and no redirect found. Bailing out..."
 			exit 1
 		fi
 	fi
 
 	# Assume the command is called altpdf* where the rest is the actual tex
 	# program to be run
-	texprogram=`echo ${calledas}|sed 's/altpdf//'`
+	texprogram=`/bin/echo ${calledas}|sed 's/altpdf//'`
 	if [ "${texprogram}" = "omega" -o "${texprogram}" = "lambda" ]
 	then
 		dvips="odvips"
@@ -492,72 +592,56 @@ main()
 
 	if [ "${debug}" = "yes" ]
 	then
-		echo "##### TeX file: $texfile"
-		echo "##### DVI file: $dvifile"
-		echo "##### PS file: $psfile"
-		echo "##### Saved PS file: $savedpsfile"
-		echo "##### Created PDF file: $pdffile"
-		echo "##### Final PDF file: $savedpdffile"
-		echo "##### Environment:"
+		/bin/echo "##### TeX file: $texfile"
+		/bin/echo "##### DVI file: $dvifile"
+		if [ "${dviprogram}" = "dvips" ]
+		then
+			/bin/echo "##### PS file: $psfile"
+			/bin/echo "##### Saved PS file: $savedpsfile"
+		fi
+		/bin/echo "##### Created PDF file: $pdffile"
+		/bin/echo "##### Final PDF file: $savedpdffile"
+		/bin/echo "##### Environment:"
 		env | sed 's/^/##### /g'
 	fi
 
 	if [ "${startwithdvi}" = "yes" ]; then
-		echo "### Skipping ${texprogram} ${texfile} [dvi->pdf only]"
+		/bin/echo "### Skipping ${texprogram} ${texfile} [dvi->pdf only]"
 	else
-		echo "### ${texpath}/${texprogram} ${texfile}"
+		/bin/echo "### ${texpath}/${texprogram} ${texfile}"
 		"${texpath}/${texprogram}" ${extratexoptions} "${texfile}" || \
-			echo "### WARNING: TeX returned non zero exit status ${status}"
-	fi
-
-	echo "### ${texpath}/${dvips} -R ${dvipsoptions} ${extradvipsoptions} -o ${psfile} ${dvifile}"
-	"${texpath}/${dvips}" -R ${dvipsoptions} ${extradvipsoptions} -o "${psfile}" "${dvifile}" || \
-		{ echo "### FAILED to generate ${psfile} (${status})"; \
-		  exit 1; }
-
-	if [ "${keeppsfile}" = "yes" ]; then
-		echo "### Saving intermediary ps file ${psfile} as ${savedpsfile}"
-		/bin/cp "${psfile}" "${savedpsfile}" || \
-			echo "### FAILED to save ${psfile} (${status})"
+			/bin/echo "### WARNING: TeX returned non zero exit status ${status}"
 	fi
 
-	if [ "${distillerpath}" != "" ]; then
-		PATH="${distillerpath}:${PATH}";export PATH
-		if [ "${debug}" = "yes" ]; then
-			echo "##### PATH set to ${PATH}"
-		fi
-	fi
-
-	if [ "${distillerfilter}" = "yes" ]; then
-		echo "### ${distillerprog} <${psfile} >${pdffile}"
-		"${distillerprog}" <"${psfile}" >"${pdffile}" || \
-			{ echo "### FAILED to generate ${pdffile} (${status})"
-			  exit 1; }
-	else
-		echo "### ${distillerprog} ${psfile} ${pdffile}"
-		"${distillerprog}" "${psfile}" "${pdffile}" || \
-			{ echo "### FAILED to generate ${pdffile} (${status})"
-			  exit 1; }
-	fi
+	case "${dviprogram}" in
+	"dvips")
+		run_dvips;;
+	"dvipdfm")
+		run_dvipdfm;;
+	"dvipdfmx")
+		run_dvipdfm;;
+	*)
+		/bin/echo "### ERROR: wrong dvipdf mode ${dviprogram}"
+	esac
 
-	echo "### Copying/moving pdf file ${pdffile} to ${savedpdffile}"
+	/bin/echo "### Copying/moving pdf file ${pdffile} to ${savedpdffile}"
 	/bin/cp "${pdffile}" "${savedpdffile}.${tmpext}" || \
-		echo "### FAILED to copy ${pdffile} (${status})"
+		/bin/echo "### FAILED to copy ${pdffile} (${status})"
 	/bin/rm -f "${savedpdffile}"
 	/bin/mv "${savedpdffile}.${tmpext}" "${savedpdffile}" || \
-		echo "### FAILED to rename ${savedpdffile}.${tmpext} (${status})"
+		/bin/echo "### FAILED to rename ${savedpdffile}.${tmpext} (${status})"
 
 	if [ "${startwithdvi}" = "yes" ]; then
 		if [ "${keeppsfile}" = "yes" ]; then
-			echo "### Succesfully generated ${savedpdffile} and ${savedpsfile}"
+			/bin/echo "### Succesfully generated ${savedpdffile} and ${savedpsfile}"
 		else
-			echo "### Succesfully generated ${savedpdffile}"
+			/bin/echo "### Succesfully generated ${savedpdffile}"
 		fi
 	else
 		if [ "${keeppsfile}" = "yes" ]; then
-			echo "### Succesfully generated ${dvifile}, ${savedpdffile} and ${savedpsfile}"
+			/bin/echo "### Succesfully generated ${dvifile}, ${savedpdffile} and ${savedpsfile}"
 		else
-			echo "### Succesfully generated ${dvifile} and ${savedpdffile}"
+			/bin/echo "### Succesfully generated ${dvifile} and ${savedpdffile}"
 		fi
 	fi
 
diff --git a/Master/bin/alpha-linux/sjisconv b/Master/bin/alpha-linux/sjisconv
index 27d892f923f..ffd8951289a 100755
--- a/Master/bin/alpha-linux/sjisconv
+++ b/Master/bin/alpha-linux/sjisconv
diff --git a/Master/bin/alpha-linux/synctex b/Master/bin/alpha-linux/synctex
new file mode 100755
index 00000000000..a84674b8667
--- /dev/null
+++ b/Master/bin/alpha-linux/synctex
diff --git a/Master/bin/alpha-linux/t1ascii b/Master/bin/alpha-linux/t1ascii
index bdda5342b4d..ca079c7daf4 100755
--- a/Master/bin/alpha-linux/t1ascii
+++ b/Master/bin/alpha-linux/t1ascii
diff --git a/Master/bin/alpha-linux/t1asm b/Master/bin/alpha-linux/t1asm
index 18defcd7ee0..ccace92ba70 100755
--- a/Master/bin/alpha-linux/t1asm
+++ b/Master/bin/alpha-linux/t1asm
diff --git a/Master/bin/alpha-linux/t1binary b/Master/bin/alpha-linux/t1binary
index 3d7446178fd..5c6f3dc1cce 100755
--- a/Master/bin/alpha-linux/t1binary
+++ b/Master/bin/alpha-linux/t1binary
diff --git a/Master/bin/alpha-linux/t1disasm b/Master/bin/alpha-linux/t1disasm
index fa68ba7b347..5f8ce19b2ed 100755
--- a/Master/bin/alpha-linux/t1disasm
+++ b/Master/bin/alpha-linux/t1disasm
diff --git a/Master/bin/alpha-linux/t1dotlessj b/Master/bin/alpha-linux/t1dotlessj
index 789dd27f343..6d14d0e6a4c 100755
--- a/Master/bin/alpha-linux/t1dotlessj
+++ b/Master/bin/alpha-linux/t1dotlessj
diff --git a/Master/bin/alpha-linux/t1lint b/Master/bin/alpha-linux/t1lint
index 97788f61492..884642ea19c 100755
--- a/Master/bin/alpha-linux/t1lint
+++ b/Master/bin/alpha-linux/t1lint
diff --git a/Master/bin/alpha-linux/t1mac b/Master/bin/alpha-linux/t1mac
index 3358987299a..9c33d3553c3 100755
--- a/Master/bin/alpha-linux/t1mac
+++ b/Master/bin/alpha-linux/t1mac
diff --git a/Master/bin/alpha-linux/t1reencode b/Master/bin/alpha-linux/t1reencode
index 829546b7852..6a67e60b4be 100755
--- a/Master/bin/alpha-linux/t1reencode
+++ b/Master/bin/alpha-linux/t1reencode
diff --git a/Master/bin/alpha-linux/t1testpage b/Master/bin/alpha-linux/t1testpage
index 2455b673b4d..3e31e8d725e 100755
--- a/Master/bin/alpha-linux/t1testpage
+++ b/Master/bin/alpha-linux/t1testpage
diff --git a/Master/bin/alpha-linux/t1unmac b/Master/bin/alpha-linux/t1unmac
index 991a94ae067..d05056874ab 100755
--- a/Master/bin/alpha-linux/t1unmac
+++ b/Master/bin/alpha-linux/t1unmac
diff --git a/Master/bin/alpha-linux/t4ht b/Master/bin/alpha-linux/t4ht
index 1ae00c980db..28eb4893f86 100755
--- a/Master/bin/alpha-linux/t4ht
+++ b/Master/bin/alpha-linux/t4ht
diff --git a/Master/bin/alpha-linux/tangle b/Master/bin/alpha-linux/tangle
index 44d5620a7be..2b5ae1ebab7 100755
--- a/Master/bin/alpha-linux/tangle
+++ b/Master/bin/alpha-linux/tangle
diff --git a/Master/bin/alpha-linux/tcdialog b/Master/bin/alpha-linux/tcdialog
index 3dec7c4b86e..cd65f6408c7 100755
--- a/Master/bin/alpha-linux/tcdialog
+++ b/Master/bin/alpha-linux/tcdialog
diff --git a/Master/bin/alpha-linux/tex b/Master/bin/alpha-linux/tex
index 6a15505c342..e3a8dde8de2 100755
--- a/Master/bin/alpha-linux/tex
+++ b/Master/bin/alpha-linux/tex
diff --git a/Master/bin/alpha-linux/tex2xindy b/Master/bin/alpha-linux/tex2xindy
new file mode 100755
index 00000000000..7f64f054854
--- /dev/null
+++ b/Master/bin/alpha-linux/tex2xindy
diff --git a/Master/bin/alpha-linux/tex4ht b/Master/bin/alpha-linux/tex4ht
index 46972fc9fe8..728bd81af6e 100755
--- a/Master/bin/alpha-linux/tex4ht
+++ b/Master/bin/alpha-linux/tex4ht
diff --git a/Master/bin/alpha-linux/texconfig b/Master/bin/alpha-linux/texconfig
index 922dc7939e2..b2129f8814a 100755
--- a/Master/bin/alpha-linux/texconfig
+++ b/Master/bin/alpha-linux/texconfig
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# TeX-Config version 3.0
+# TeXConfig version 3.0
 # Thomas Esser, te@dbs.uni-hannover.de. Public domain.
 
 # invoke the right shell:
@@ -24,8 +24,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 progname=texconfig
 
 # the version string
-version=1168907609 # seconds since `00:00:00 1970-01-01 UTC'
-                   # date '+%s' (with GNU date)
+version=20080505.2038
 
 envVars="
   AFMFONTS BIBINPUTS BSTINPUTS CMAPFONTS CWEBINPUTS ENCFONTS GFFONTS
@@ -41,10 +40,10 @@ tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/tctmp.$$
 needsCleanup=false
 lastUpdatedFile=
 
+# 
 ###############################################################################
-# setupFMT(void)
-#   find a suitable version of fmt / adjust
-###############################################################################
+# setupFMT(void) - find a suitable version of fmt / adjust
+#
 setupFMT()
 {
   case $FMT in
@@ -60,9 +59,8 @@ setupFMT()
 }
 
 ###############################################################################
-# myFmt(args)
-#   run $FMT
-###############################################################################
+# myFmt(args) - run $FMT
+#
 myFmt()
 {
   setupFMT
@@ -72,7 +70,7 @@ myFmt()
 ###############################################################################
 # echoShowVariable(args ...)
 #   show environment variables which names are as args and their values
-###############################################################################
+#
 echoShowVariable()
 {
   for esv
@@ -86,7 +84,7 @@ echoShowVariable()
 ###############################################################################
 # echoShowKpseVariable(args ...)
 #   show kpathsea variables which names are as args and their values
-###############################################################################
+#
 echoShowKpseVariable()
 {
   for eskv
@@ -98,25 +96,27 @@ echoShowKpseVariable()
 }
 
 ###############################################################################
-# echoLocateBinary(args ...)
-#   show where programs actually exist
-###############################################################################
+# echoLocateBinary(args ...) - show where programs actually exist
+#
 echoLocateBinary()
 {
   for elb
   do
     elbLoc=`checkForBinary "$elb"`
-    case $elbLoc in
-      "") echo "$elb: not found";;
-      *)  echo "$elb: $elbLoc";;
-    esac
+    if test -n "$ELB_PATH_ONLY"; then
+      test -n "$elbLoc" && echo "$elbLoc"
+    else
+      case $elbLoc in
+        "") echo "$elb: not found";;
+        *) echo "$elb: $elbLoc";;
+      esac
+    fi
   done
 }
 
 ###############################################################################
-# echoLocateCfgfile(args ...)
-#   show where programs actually exist
-###############################################################################
+# echoLocateCfgfile(args ...) - show where files actually exist
+#
 echoLocateCfgfile()
 {
   for elc
@@ -133,9 +133,8 @@ echoLocateCfgfile()
 }
 
 ###############################################################################
-# checkForBinary(prog)
-#   echo full path of prog
-###############################################################################
+# checkForBinary(prog) - echo full path of prog
+#
 checkForBinary()
 {
   cfbBinary=$1
@@ -159,43 +158,8 @@ checkForBinary()
 }
 
 ###############################################################################
-# findDialogProg(void)
-#   Some systems have their own dialog. Use it then and do not use
-#   faked TERM and TERMINFO variables when calling that dialog.
-###############################################################################
-findDialogProg()
-{
-  { u=`uname -s`; } 2>/dev/null
-  case "$u" in
-    FreeBSD|Linux|cygwin*|CYGWIN*)
-      test -f /usr/bin/whiptail && DIALOG_PROG=/usr/bin/whiptail
-      test -f /usr/bin/dialog && DIALOG_PROG=/usr/bin/dialog
-      test -f /bin/dialog && DIALOG_PROG=/bin/dialog
-      ;;
-  esac
-}
-
-###############################################################################
-# runDialog(args)
-#   call either tcdialog or $DIALOG_PROG
-###############################################################################
-runDialog()
-{
-  test -z "$NO_CLEAR" && tty -s && clear
-  case "$DIALOG_PROG" in
-    "")
-      TERM=$DIALOG_TERM TERMINFO=$DIALOG_TERMINFO \
-        tcdialog --title "$progname setup utility" ${1+"$@"};;
-    *)
-      $DIALOG_PROG --title "$progname setup utility" ${1+"$@"};;
-  esac
-}
-
-
-###############################################################################
-# cleanup()
-#   clean up the temp area and exit with proper exit status
-###############################################################################
+# cleanup() - clean up the temp area and exit with proper exit status
+#
 cleanup()
 {
   rc=$1
@@ -205,9 +169,8 @@ cleanup()
 }
 
 ###############################################################################
-# setupTmpDir()
-#   set up a temp directory and a trap to remove it
-###############################################################################
+# setupTmpDir() - set up a temp directory and a trap to remove it
+#
 setupTmpDir()
 {
   case $needsCleanup in
@@ -221,9 +184,8 @@ setupTmpDir()
 }
 
 ###############################################################################
-# setupTexmfmain()
-#   get value for MT_TEXMFMAIN (with caching)
-###############################################################################
+# setupTexmfmain() - get value for MT_TEXMFMAIN (with caching)
+#
 setupTexmfmain()
 {
   case $MT_TEXMFMAIN in
@@ -233,9 +195,8 @@ setupTexmfmain()
 }
 
 ###############################################################################
-# setupTexmfmain()
-#   get value for MT_TEXMFMAIN (with caching)
-###############################################################################
+# setupTexmfmain() - get value for MT_TEXMFDIST (with caching)
+#
 setupTexmfdist()
 {
   case $MT_TEXMFDIST in
@@ -245,9 +206,8 @@ setupTexmfdist()
 }
 
 ###############################################################################
-# setupTexmfvar()
-#   get value for MT_TEXMFVAR (with caching)
-###############################################################################
+# setupTexmfvar() - get value for MT_TEXMFVAR (with caching)
+#
 setupTexmfvar()
 {
   case $MT_TEXMVAR in
@@ -257,9 +217,8 @@ setupTexmfvar()
 }
 
 ###############################################################################
-# setupSystexmf()
-#   get value for MT_SYSTEXMF (with caching)
-###############################################################################
+# setupSystexmf() - get value for MT_SYSTEXMF (with caching)
+#
 setupSystexmf()
 {
   case $MT_SYSTEXMF in
@@ -271,7 +230,7 @@ setupSystexmf()
 ###############################################################################
 # abort(errmsg)
 #   print `errmsg' to stderr and exit with error code 1
-###############################################################################
+#
 abort()
 {
   echo "$progname: $1." >&2
@@ -281,7 +240,7 @@ abort()
 ###############################################################################
 # mktexdir(args)
 #   call mktexdir script, disable all features (to prevent sticky directories)
-###############################################################################
+#
 mktexdir()
 {
   setupTexmfmain
@@ -289,9 +248,8 @@ mktexdir()
 }
 
 ###############################################################################
-# tcfmgr(args)
-#   call tcfmgr script
-###############################################################################
+# tcfmgr(args) - call tcfmgr script
+#
 tcfmgr()
 {
   setupTexmfmain
@@ -299,9 +257,8 @@ tcfmgr()
 }
 
 ###############################################################################
-# mktexupd(args)
-#   call mktexupd script
-###############################################################################
+# mktexupd(args) - call mktexupd script
+#
 mktexupd()
 {
   setupTexmfmain
@@ -312,7 +269,7 @@ mktexupd()
 # getRelDir(file)
 #   matches file against SYSTEXMF. Returns relative directory of file within
 #   a texmf tree in variable relPart.
-###############################################################################
+#
 getRelDir()
 {
   file=$1
@@ -353,10 +310,10 @@ getRelDir()
 }
 
 ###############################################################################
-# configReplace(file, pattern, line)
+# configReplace(file pattern line)
 #   The first line in file that matches pattern gets replaced by line.
 #   line will be added at the end of the file if pattern does not match.
-###############################################################################
+#
 configReplace()
 {
   configReplaceFile=$1; configReplacePat=$2; configReplaceLine=$3
@@ -377,7 +334,7 @@ eof
 ###############################################################################
 # fmgrConfigReplace (file regex value)
 #   replaces line matching regex by value in file
-###############################################################################
+#
 fmgrConfigReplace()
 {
   fmgrConfigReplaceChanged=false
@@ -421,7 +378,7 @@ fmgrConfigReplace()
 ###############################################################################
 # setupDvipsPaper(paper)
 #   rearranges config.ps to make paper the first paper definition
-###############################################################################
+#
 setupDvipsPaper()
 {
   setupDvipsPaperChanged=false
@@ -465,9 +422,8 @@ eof
 }
 
 ###############################################################################
-# setupModesMfFile(void)
-#   find modes.mf file (with caching)
-###############################################################################
+# setupModesMfFile(void) - find modes.mf file (with caching)
+#
 setupModesMfFile()
 {
   case $modesMfFile in
@@ -481,9 +437,8 @@ setupModesMfFile()
 }
 
 ###############################################################################
-# locateConfigPsFile(void)
-#   find config.ps file (with caching)
-###############################################################################
+# locateConfigPsFile(void) - find config.ps file (with caching)
+#
 locateConfigPsFile()
 {
   case $configPsFile in
@@ -497,9 +452,8 @@ locateConfigPsFile()
 }
 
 ###############################################################################
-# listMfModes(file)
-#   list modes from modes.mf file
-###############################################################################
+# listMfModes(file) - list modes from modes.mf file
+#
 listMfModes()
 {
   grep mode_def "$modesMfFile" |
@@ -510,9 +464,8 @@ listMfModes()
 }
 
 ###############################################################################
-# listDvipsPapers(void)
-#   list paper definitions from config.ps
-###############################################################################
+# listDvipsPapers(void) - list paper definitions from config.ps
+#
 listDvipsPapers()
 {
   grep '@ ' $configPsFile | sed "s/..//;s/ / '/;s/\$/' /"
@@ -521,16 +474,15 @@ listDvipsPapers()
 ###############################################################################
 # getFormatsForHyphen(void)
 #   list all formats which have customizable hyphenation
-###############################################################################
+#
 getFormatsForHyphen()
 {
   fmtutil --catcfg | awk '$3 != "-" {print $1}' | sort
 }
 
 ###############################################################################
-# getRes(mode)
-#   print resolution (both X and Y axis) to metafont mode
-###############################################################################
+# getRes(mode) - print resolution (both X and Y axis) to metafont mode
+#
 getRes()
 {
   getResMode=$1
@@ -577,38 +529,64 @@ checkElemInList()
 }
 
 
+# show version information from the distribution, if we have any.
+showDistVersionInfo()
+{
+  # TeX Live file.
+  test -f $MT_TEXMFMAIN/../release-texlive.txt \
+  && sed 1q $MT_TEXMFMAIN/../release-texlive.txt
+
+  # no harm in continuing to look for the teTeX files.
+  test -f $MT_TEXMFMAIN/release-tetex-src.txt \
+  && "teTeX-src release:   `cat $MT_TEXMFMAIN/release-tetex-src.txt`"
+  test -f $MT_TEXMFDIST/release-tetex-texmf.txt \
+  && "teTeX-texmf release: `cat $MT_TEXMFDIST/release-tetex-texmf.txt`"
+}
+
+# 
 ###############################################################################
 # tcBatch(args)
 #   handle batch mode
 ###############################################################################
 tcBatch()
 {
-  help="Usage: $progname conf
-       $progname dvipdfmx paper PAPER
-       $progname dvipdfm paper PAPER
-       $progname dvips [options]
-       $progname faq
+  help="texconfig supports adjusting and updating many aspects of
+the TeX installation.
+
+Usage: $progname conf                  (show configuration information)
+       $progname dvipdfmx paper PAPER  (dvipdfmx paper size)
+       $progname dvipdfm paper PAPER   (dvipdfm paper size)
+       $progname dvips [OPTION...]     (dvips options)
+       $progname faq                   (show teTeX faq)
+       $progname findprog PROG...      (show locations of PROGs, a la which)
        $progname font vardir DIR
        $progname font ro
        $progname font rw
-       $progname formats
-       $progname hyphen FORMAT
-       $progname init [formats]
-       $progname mode MODE
-       $progname paper PAPER
-       $progname pdftex [options]
-       $progname rehash
-       $progname xdvi paper PAPER
-
-Get more help with
-       $progname dvipdfmx paper
-       $progname dvipdfm paper
+       $progname formats               (edit fmtutil.cnf)
+       $progname help                  (or --help; show this help)
+       $progname hyphen FORMAT         (edit hyphenation config for FORMAT)
+       $progname init [FORMAT]...      (rebuild FORMATs, or all formats
+                                        plus run texlinks and updmap)
+       $progname mode MODE             (set Metafont MODE)
+       $progname paper PAPER           (set default paper size to PAPER)
+       $progname pdftex [OPTION]...    (pdftex options)
+       $progname rehash                (rebuild ls-R files with mktexlsr)
+       $progname version               (or --version; show version info)
+       $progname xdvi paper PAPER      (xdvi paper size)
+
+Get more help with:
+       $progname dvipdfmx
+       $progname dvipdfm
        $progname dvips
        $progname font
+       $progname hyphen
        $progname mode
        $progname paper
        $progname pdftex
-       $progname xdvi paper"
+       $progname xdvi
+
+See http://tug.org/texlive/ for other documentation, etc.
+Report bugs to <tex-k@tug.org>."
 
   case $1 in
     # texconfig conf
@@ -616,16 +594,7 @@ Get more help with
       setupTexmfmain
       setupTexmfdist
       echo '=========================== version information =========================='
-      if test -f $MT_TEXMFMAIN/release-tetex-src.txt; then
-        echo "teTeX-src release:   `cat $MT_TEXMFMAIN/release-tetex-src.txt`"
-      else
-        echo "teTeX-src release:   (info not available)"
-      fi
-      if test -f $MT_TEXMFDIST/release-tetex-texmf.txt; then
-        echo "teTeX-texmf release: `cat $MT_TEXMFDIST/release-tetex-texmf.txt`"
-      else
-        echo "teTeX-texmf release: (info not available)"
-      fi
+      showDistVersionInfo
       echo
       echo '==================== binaries found by searching $PATH ==================='
       echo "PATH=$PATH"
@@ -643,7 +612,7 @@ Get more help with
       echoShowKpseVariable TEXMFMAIN TEXMFDIST TEXMFLOCAL TEXMFSYSVAR TEXMFSYSCONFIG TEXMFVAR TEXMFCONFIG TEXMFHOME VARTEXFONTS TEXMF SYSTEXMF TEXMFDBS WEB2C TEXPSHEADERS TEXCONFIG ENCFONTS TEXFONTMAPS
 
       echo
-      echo '==== kpathsea variables (from environment only; ok if no output here) ===='
+      echo '==== kpathsea variables from environment only (ok if no output here) ===='
       echoShowVariable $envVars
       ;;
 
@@ -927,6 +896,11 @@ Valid MODE settings:"
       fi
       ;;
 
+    findprog)
+      shift
+      ELB_PATH_ONLY=1 echoLocateBinary "$@"
+      ;;
+
     # handle "texconfig font"
     font)
       help="Usage: $progname font vardir DIR
@@ -1049,7 +1023,8 @@ For more information about these \`features', consult the teTeX manual
         texlinks --multiplatform || rc=1
       fi
       ;;
-    help)
+
+    help|--help|-h)
       echo "$help"
       ;;
 
@@ -1142,11 +1117,19 @@ $formatsForHyphenFmt"
       ;;
 
     init)
+      if test -n "$texconfig_sys"; then  # set by texconfig-sys
+        fmtutil=fmtutil-sys
+        updmap=updmap-sys
+      else
+        fmtutil=fmtutil
+        updmap=updmap
+      fi
+      
       case $2 in
         "")
-          if fmtutil --all \
+          if $fmtutil --all \
              && texlinks --multiplatform \
-             && updmap; then
+             && $updmap; then
             :
           else
             rc=1
@@ -1155,7 +1138,7 @@ $formatsForHyphenFmt"
         *)
           shift 1
           for i in "$@"; do
-            fmtutil --byfmt "$i" || rc=1
+            $fmtutil --byfmt "$i" || rc=1
           done
           ;;
       esac
@@ -1209,13 +1192,10 @@ Valid PAPER settings:
 
       p=$2; pXdvi=$2; pDvips=$2
       case $2 in
-        a4)
-          pDvips=A4size
-          ;;
         letter)
-          pDvips=letterSize
-          pXdvi=us
-          ;;
+          pXdvi=us;;
+        a4)
+          pXdvi=a4;;
         "") echo "$help" >&2; rc=1; return;;
         *)
           echo "$progname: unknown PAPER \`$2' given as argument for \`$progname paper'" >&2
@@ -1311,6 +1291,14 @@ Valid PAPER settings:
     rehash)
       mktexlsr
       ;;
+    
+    # 
+    version|--version)
+      echo "$progname version $version"
+      setupTexmfmain
+      setupTexmfdist
+      showDistVersionInfo
+      (exit 0); exit 0;;
 
     # handle "xdvi paper PAPER"
     xdvi)
diff --git a/Master/bin/alpha-linux/texconfig-dialog b/Master/bin/alpha-linux/texconfig-dialog
index 76e1f51eea6..8ccda930dd7 100755
--- a/Master/bin/alpha-linux/texconfig-dialog
+++ b/Master/bin/alpha-linux/texconfig-dialog
@@ -21,7 +21,7 @@ export PATH
 test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 # the version string
-version=1112981053 # seconds since `00:00:00 1970-01-01 UTC'
+version=1184605103 # seconds since `00:00:00 1970-01-01 UTC'
                    # date '+%s' (with GNU date)
 
 : ${PAGER=more}
@@ -103,14 +103,14 @@ runDialog()
 ###############################################################################
 findDialog()
 {
-  { u=`uname -s`; } 2>/dev/null
-  case "$u" in
-    FreeBSD|Linux|cygwin*|CYGWIN*)
-      test -f /usr/bin/whiptail && DIALOG_PROG=/usr/bin/whiptail
-      test -f /usr/bin/dialog && DIALOG_PROG=/usr/bin/dialog
-      test -f /bin/dialog && DIALOG_PROG=/bin/dialog
-      ;;
-  esac
+  for bin in whiptail dialog
+  do
+    binLoc=`texconfig findprog $bin`
+    case $binLoc in
+      "") DIALOG_PROG="";;
+      *)  DIALOG_PROG=$binLoc; break;;
+    esac
+  done
   case $DIALOG_PROG in
     "") 
       : ${DIALOG_TERMINFO=$TEXMFMAIN/texconfig}
diff --git a/Master/bin/alpha-linux/texconfig-sys b/Master/bin/alpha-linux/texconfig-sys
index 9d193722416..8a88750098c 100755
--- a/Master/bin/alpha-linux/texconfig-sys
+++ b/Master/bin/alpha-linux/texconfig-sys
@@ -1,4 +1,5 @@
 #!/bin/sh
+# $Id: texconfig-sys 5067 2007-09-30 18:06:26Z karl $
 
 # texconfig-sys: Thomas Esser, public domain.
 
@@ -25,6 +26,7 @@ c=`kpsewhich -var-value TEXMFSYSCONFIG`
 
 TEXMFVAR="$v"
 TEXMFCONFIG="$c"
+texconfig_sys=1
 export TEXMFVAR TEXMFCONFIG
 
 exec texconfig ${1+"$@"}
diff --git a/Master/bin/alpha-linux/texcount b/Master/bin/alpha-linux/texcount
new file mode 120000
index 00000000000..dedfa7d2c3e
--- /dev/null
+++ b/Master/bin/alpha-linux/texcount
@@ -0,0 +1 @@
+../../texmf-dist/scripts/texcount/TeXcount.pl
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/texdoc b/Master/bin/alpha-linux/texdoc
index f66b3c855de..821fdbaa30e 100755..120000
--- a/Master/bin/alpha-linux/texdoc
+++ b/Master/bin/alpha-linux/texdoc
@@ -1,206 +1 @@
-#!/bin/sh
-#
-# Thomas Esser, David Aspinall, Simon Wilkinson.
-# Public domain.
-#
-# Simple script to attempt to find documentation for tex files.
-# Uses kpsewhich to find a .dvi, .pdf or .ps file along the
-# 'TeX system documentation' ($TEXDOCS, default: $TEXMF/doc) search path.
-#
-# Original version by David Aspinall <da@dcs.ed.ac.uk>
-#
-# This version rewritten for use with bash 2 and teTeX under Linux by
-# Simon Wilkinson <sxw@dcs.ed.ac.uk>
-#
-# Changes for web2c-7.2 resp. teTeX-0.9 and portability fixes by
-# Thomas Esser <te@dbs.uni-hannover.de>, Jun 14 1998
-#
-# Support for compressed documentation implemented by adopting changes
-# made by debian. Thomas Esser, Dec. 2004.
-
-test -f /bin/sh5 && test -z "$RUNNING_SH5" \
-  && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
-  && { RUNNING_SH5=true; export RUNNING_SH5; exec /bin/sh5 $0 ${1+"$@"}; }
-unset RUNNING_SH5
-
-test -f /bin/bsh && test -z "$RUNNING_BSH" \
-  && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \
-  && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; }
-unset RUNNING_BSH
-
-export PATH
-
-needsCleanup=false
-progname=texdoc
-tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$
-
-###############################################################################
-# setupTmpDir()
-#   set up a temp directory and a trap to remove it
-###############################################################################
-setupTmpDir()
-{
-  $needsCleanup && return
-
-  trap 'cleanup --force' 1 2 3 7 13 15
-  needsCleanup=true
-  mkdir "$tmpdir" || abort "could not create directory \`$tmpdir'"
-}
-
-###############################################################################
-# abort(errmsg) 
-#   print `errmsg' to stderr and exit with error code 1
-###############################################################################
-abort()
-{   
-  warn "$progname: $1."
-  cleanup
-  (exit 1)
-  exit 1
-}                              
-
-###############################################################################
-# cleanup()
-#   clean up the temp area
-###############################################################################
-cleanup()
-{
-  case $1 in
-    --force)
-        $needsCleanup && test -n "$tmpdir" && test -d "$tmpdir" \
-          && { rm -f "$tmpdir"/*; cd /; rmdir "$tmpdir"; }
-        ;;
-    *)  # directory might not be empty if some other viewer is still
-        # running, so be quiet about it
-        rmdir $tmpdir >/dev/null 2>&1;;
-  esac
-}
-
-
-# Viewing programs, according to filename extension.  (You can
-# override or add to them by setting environment variables).
-# MacOS X: does not have X11 by default, so give dvi a low priority
-case `(uname -s) 2>/dev/null` in
-  Darwin)
-	: ${TEXDOCVIEW_dvi='(open %s >/dev/console 2>&1 || xdvi %s &) || echo "Method for opening %s did not work"'}
-	: ${TEXDOCVIEW_ps='open %s'}
-	: ${TEXDOCVIEW_pdf='open %s'}
-	: ${TEXDOCVIEW_html='open %s'}
-	: ${TEXDOCVIEW_txt="open -a TextEdit.app %s"}
-	: ${TEXDOCVIEW_="open -a TextEdit.app %s"} # no extension, default to pager
-        extlist='.pdf .ps .txt .dvi .html'
-	;;
-  *)
-	: ${TEXDOCVIEW_dvi='(xdvi %s) &'}
-	: ${TEXDOCVIEW_pdf='(acroread %s) &'}
-	: ${TEXDOCVIEW_ps='(gv %s) &'}
-	: ${TEXDOCVIEW_html='mozilla -remote openURL'"'(%s)'"' 2>/dev/null || mozilla %s &'}
-	: ${TEXDOCVIEW_txt="${PAGER-more} %s"}
-	: ${TEXDOCVIEW_="${PAGER-more} %s"} # no extension, default to pager
-        extlist='.dvi .dvi.gz .dvi.bz2 .pdf .pdf.gz .pdf.bz2 .ps .ps.gz .ps.bz2 .txt .txt.gz .txt.bz2 .html'
-
-        # Commands run to uncompress files, according to filename extension.
-        : ${TEXDOCUNZIP_gz='gzip -d -c'}
-        : ${TEXDOCUNZIP_bz2='bzip2 -d -c'}
-	;;
-esac
-
-mode=viewer
-help='Usage: texdoc [OPTION]... [NAME]...
-  Search for NAME in the TeX documentation and start a viewer.
-
-  --help        show this help
-  -v		verbose mode: show viewer command
-  -l            just list all matching files. Do not start a viewer.
-  -s            search the disk. remaining arguments will be passed
-                as egrep patterns to filter the find output.'
-
-verbosemode=false
-while 
-  case $1 in
-     -s)     mode=search; shift; break;;
-     -l)     mode=list;;
-     -v)     verbosemode=true;;
-     *-help)
-             echo "$help" >&2
-             exit 1;;
-     -*)     echo "texdoc: option $1 not recognized" 1>&2;;
-      *)     break;;
-  esac
-do shift; done
-
-case $# in
-  0)
-    echo "$help" >&2
-    exit 1
-    ;;
-esac
-
-for name
-do
-  case $mode in
-    search)
-      find `kpsewhich --expand-path='$TEXMF/doc' | tr : ' '` -type f -print |
-        egrep $name
-      continue
-      ;;
-  esac
-
-  case $name in
-    texdoc)
-      man texdoc; continue;;
-  esac
-
-  found=false
-  for ext in "" $extlist; do
-
-    filename=`kpsewhich -format='TeX system documentation' $name$ext 2>/dev/null`
-    test -z "$filename" && continue
-    found=true
-
-    if test $mode = list; then
-      echo $filename
-    else
-      dir=`echo $filename | sed 's%/[^/]*$%%'`
-      ext=`echo $filename | sed -n 's%.*\.\([^/]*\)$%\1%p'`
-
-      eval uncompress="\$TEXDOCUNZIP_$ext"
-      if test -n "$uncompress"
-      then
-        ext=`echo $filename | sed -e "s|\\.$ext\$||" | sed 's%.*\.%%'`
-      fi
-      viewer=\$"TEXDOCVIEW_$ext"
-      if test -n "$uncompress"; then
-        src=`echo "$filename" | sed -e 's%.*/%%' -e 's%\.[^.]*$%%'`
-
-        # only one viewer per file, if the same file is given more
-        # than once
-        test -f "$tmpdir/$src" && break
-
-        setupTmpDir
-        eval "$uncompress $filename > $tmpdir/$src"
-        filename=$tmpdir/$src
-        viewer=`eval echo $viewer | sed -e "s|%s|$filename; rm -f $filename; cleanup|"`
-      else
-        viewer=`eval echo $viewer | sed -e "s|%s|$filename|g"`
-      fi
-
-      if test -z "$viewer"
-      then 
-        echo "Don't know how to view file type $ext" 1>&2
-        echo "(matching file was $filename)" 1>&2
-      else 
-        $verbosemode && echo $viewer
-        test -n "$dir" && test -d "$dir" && cd "$dir"
-        eval $viewer
-        break     # just stop after the first usable extension
-      fi
-    fi
-
-  done
-  $found || echo "Can't find documentation for \`$name'" 1>&2
-done
-
-cleanup
-(exit 0)
-exit 0
+../../texmf/scripts/texlive/texdoc.tlu
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/texdoctk b/Master/bin/alpha-linux/texdoctk
index c8f60e28bf6..56729104154 100755..120000
--- a/Master/bin/alpha-linux/texdoctk
+++ b/Master/bin/alpha-linux/texdoctk
@@ -1,1794 +1 @@
-#!/usr/bin/env perl
-# We started with a hack provided by Thomas Esser. This expression replaces
-# the unix specific line \type {#!/usr/local/bin/perl -w}.
-###############################################################################
-# texdoctk v.0.6.0 (Nov 5, 2004) - GUI for TeX documentation access
-# Copyright (C) 2000-2004  Thomas Ruedas
-# This program is provided under the GNU Public License; see the file
-# README.texdoctk for details about requirements, installation, configuration,
-# and the full disclaimer.
-###############################################################################
-use strict;
-use Tk;
-use Getopt::Long;
-Getopt::Long::config('bundling');
-use File::Basename;
-
-my $IsWin32 = ($^O =~ /MSWin32/i);
-
-#if ($IsWin32) {
-#  use Win32::Registry;
-#  use Win32::API;
-#}
-
-# initialization of some internal variables
-$|=1;
-my $quiet=1;
-my $autoview;
-my $xfmt_viewer=1,
-my @tdcolors;
-my %butcol;
-my $srchentry;
-my $srchflag=0;
-my $tmpfno;
-# system variables
-my ($texmfmain,$texmfdist,$texmfdoc,$texmflocal,$texmfhome,
-    $texdocpath,$distdocpath,$docdocpath,$localdocpath,$homedocpath,
-    $datadir,
-    $dvi_viewer,$dvips_conv,$ps_viewer,$pdf_viewer,
-    $pdfps_conv,$html_viewer,$htmlps_conv,$htmlps_redir,
-    $txt_viewer,$txtps_conv,$txtps_redir,$print_cmd);
-
-# defaults: unix values
-my $qq="'";
-my $HomeEnv=$ENV{HOME};
-my $TeXDocRcDefaults="texdocrc.defaults";
-my $TempDir; $TempDir=$ENV{TMPDIR} or $TempDir="/tmp";
-my $CmdConsole="xterm -e ";
-
-if ($IsWin32) {
-  $qq = "\"";
-  $HomeEnv = &GetHomeDir;
-  chomp $HomeEnv;
-  $TeXDocRcDefaults = "texdocrc-win32.defaults";
-  $TempDir = &GetTempPath;
-  $CmdConsole = "command /c ";
-}
-
-my $myrc="${HomeEnv}/.texdocrc"; # optional personal settings file
-
-my ($line,@dummy);
-my @tmpfiles;
-# read system-wide defaults from texdocrc.defaults
-my $sysrc=`kpsewhich --progname=texdoctk --format=${qq}other text files${qq} ${TeXDocRcDefaults}`;
-my $database=`kpsewhich --progname=texdoctk --format=${qq}other text files${qq} texdoctk.dat`;
-my $locdatabase=`kpsewhich --progname=texdoctk --format=${qq}other text files${qq} texdoctk-local.dat`;
-my $homedatabase=`kpsewhich --progname=texdoctk --format=${qq}other text files${qq} texdoctk-pers.dat`;
-chomp $locdatabase;
-chomp $homedatabase;
-chomp $sysrc;
-&readrc($sysrc,1);
-@dummy=split("/",$sysrc);
-pop @dummy;
-$datadir=join('/',@dummy);
-# possibly use personal settings instead of defaults
-if (-e $myrc) { &readrc($myrc,2); }
-# command line options
-GetOptions('v'=>\$quiet,'a'=>\$autoview);
-my $special=0;
-my @button;
-$button[17]="Miscellaneous";
-my (@packname,@topic,@doc,@keywords,@maxind,%stydoc);
-# read database file
-my $i=-1;
-my $j;
-open(DATABASE,"$database") || &fatalmsg("Couldn't open database $database.\n");
-while ($line = <DATABASE>) {
-  LINETYPE: {
-      ($line =~ /^\@/) && do { # category
-	  ++$i;
-	  if ($i == $#button) {
-	      pop @button;
-	      push @button,(substr($line,1,-1));
-	      $special=1;
-	  } else {
-	      $button[$i]=substr($line,1,-1);
-	  }
-	  $j=0;
-	  last LINETYPE;
-      };
-      ($line =~ /^(#|$)/) && do { # comment or empty line
-	  last LINETYPE;
-      };
-#     list item
-       @dummy=split(";",$line);
-       $packname[$i][$j]=$dummy[0];
-       $topic[$i][$j]=$dummy[1];
-       $doc[$i][$j]=$dummy[2];
-       $keywords[$i][$j]=$dummy[3];
-       if ($doc[$i][$j] =~ /sty$/ && $keywords[$i][$j]) {
-	   $stydoc{"$doc[$i][$j]"}=substr($keywords[$i][$j],1,1);
-	   unless ($stydoc{"$doc[$i][$j]"} =~ /^\d$/) {
-	       $stydoc{"$doc[$i][$j]"}=0;
-	   }
-       }
-       $maxind[$i]=$j;
-       ++$j;
-  };
-}
-close(DATABASE);
-# Read site-local and user's database(s) if it/they exist(s)
-foreach my $dbfile ($locdatabase,$homedatabase) {
-  if (-e "$dbfile") {
-    open(DATABASE,"$dbfile") ||
-      print "Couldn't open additional database $dbfile.\n";
-    $i=17; # local/user: if no category is specified in database, add to "Misc"
-    while ($line = <DATABASE>) {
-    LINETYPE: {
-	($line =~ /^\@/) && do { # category
-	  $i=&arrindex(@button,substr($line,1,-1));
-	  if ($i >= $#button) {
-	    $i=$#button;
-	    pop @button;
-	    push @button,(substr($line,1,-1));
-	    $special=1;
-	  }
-	  last LINETYPE;
-	};
-	($line =~ /^(#|$)/) && do { # comment or empty line
-	  last LINETYPE;
-	};
-#       list item
-	@dummy=split(";",$line);
-	$j=&arrindex(@{$packname[$i]},$dummy[0]);
-	if ($j > $#{$packname[$i]}) {
-	  $packname[$i][$j]=$dummy[0];
-	  $topic[$i][$j]=$dummy[1];
-	  $doc[$i][$j]=$dummy[2];
-	  $keywords[$i][$j]=$dummy[3];
-	  if ($doc[$i][$j] =~ /sty$/ && $keywords[$i][$j]) {
-	    $stydoc{"$doc[$i][$j]"}=substr($keywords[$i][$j],1,1);
-	    unless ($stydoc{"$doc[$i][$j]"} =~ /^\d$/) {
-	      $stydoc{"$doc[$i][$j]"}=0;
-	    }
-	  }
-	  $maxind[$i]=$j;
-	  ++$j;
-	}
-      };
-    }
-    close(DATABASE);
-    $special=1 if ($i == 17 && $j > 0);
-  }
-}
-
-# Tk
-# hash table for toplevel windows; used to avoid multiple calls of same window
-my %tlwins;
-my %buttonlist;
-# create frames for main window: commands on top, frame for buttons below
-my $main=new MainWindow;
-$tlwins{'mainwindow'}{'addr'}=$main;
-$main->resizable(0,0);
-$main->title("TeX Documentation Browser");
-$main->bind('all','<Control-q>'=>\&clean_exit);
-$main->bind('all','<Control-m>'=>sub { $main->raise(); });
-$main->bind('all','<Control-h>'=>\&helptext);
-$main->bind('all','<Control-s>'=>sub { $main->raise(); &mksrch; });
-$main->bind('all','<Control-t>'=>\&settings);
-my $cmdframe=$main->Frame(-background=>"#ffcc99");
-my $buttonframe=$main->Frame;
-$cmdframe->pack(-side=>'top',-fill=>'x');
-$buttonframe->pack(-side=>'bottom');
-# normal cursor
-my $defcursor=$main->cget(-cursor);
-# make buttons for command frame
-my $Qbut=$cmdframe->Button(-text=>'Quit',%butcol,
-			   -command=>\&clean_exit)->pack(-side=>'left');
-$tlwins{'mainwindow'}{'buttons'}[0]=$Qbut;
-# define common default font for labels and text explicitly
-my $deffont=$Qbut->cget(-font);
-# ensure readability on high-res screens (suggested by R.Kotucha)
-$deffont='Helvetica -16 bold' if &x_resolution > 1200;
-$Qbut->configure(-font=>$deffont);
-$tlwins{'mainwindow'}{'buttons'}[1]=$cmdframe->Button(-text=>'Search',
-						      -font=>$deffont,%butcol,
-						      -command=>\&mksrch
-						      )->pack(-side=>'left');
-$tlwins{'mainwindow'}{'buttons'}[2]=$cmdframe->Button(-text=>'Help/About',
-						      -font=>$deffont,%butcol,
-						      -command=>\&helptext
-						      )->pack(-side=>'right');
-$tlwins{'mainwindow'}{'buttons'}[3]=$cmdframe->Button(-text=>'Settings',
-						      -font=>$deffont,%butcol,
-						      -command=>\&settings
-						      )->pack(-side=>'right');
-# make buttons for category button frame
-my $lbut=0;
-my $l;
-foreach (@button) { $l=length $_; $lbut=$l if ( $l > $lbut) }
-my @catg;
-my ($i2,$i3);
-my $nbutt=scalar @button;
-my $ncols=$nbutt/3-1;
-foreach (0..$ncols) {
-    $i=$_;
-    $i2=$i+$nbutt/3;
-    $i3=$i+2*$nbutt/3;
-    $catg[$i]=$buttonframe->Button(-text=>$button[$i],
-				   -font=>$deffont,%butcol,
-				   -width=>$lbut,
-				   -command=>[\&tpslct,$i,\@dummy])->grid
-	($catg[$i2]=$buttonframe->Button(-text=>$button[$i2],
-					 -font=>$deffont,%butcol,
-					 -width=>$lbut,
-					 -command=>[\&tpslct,$i2,\@dummy]),
-	 $catg[$i3]=$buttonframe->Button(-text=>$button[$i3],
-					 -font=>$deffont,%butcol,
-					 -width=>$lbut,
-					 -command=>[\&tpslct,$i3,\@dummy]));
-}
-# disable last button (lower right) if no local specials are found in list
-my $ncat;
-if ($special == 0) {
-    $catg[$#button]->configure(-state=>'disabled');
-    $ncat=$nbutt-1;
-} else {
-    $ncat=$nbutt;
-}
-for ($i=0,$j=4; $i<@catg; ++$i,++$j) {
-    $tlwins{'mainwindow'}{'buttons'}[$j]=$catg[$i];
-}
-MainLoop;
-
-########## SUBROUTINES ########################################################
-# toplevel for selecting a topic of a category for viewing or printing
-sub tpslct {
-    my($opt,@srchitems)=@_;
-    my (@lbitems,@lbdocs,$dspselect,$docselect,$wtitle);
-    if ($opt >= 0) {
-#       main window buttons
-#       see if toplevel window is already there
-	if (Exists($tlwins{$opt}{'addr'})) {
-	    $tlwins{$opt}{'addr'}->deiconify();
-	    $tlwins{$opt}{'addr'}->raise();
-	    return;
-	}
-	for ($j=0; $j <= $maxind[$opt]; ++$j) {
-	    push @lbitems,$topic[$opt][$j];
-	    push @lbdocs,$doc[$opt][$j];
-	}
-	$wtitle=$button[$opt];
-    } else {
-#       search results
-        my $spec_wtitle=shift @srchitems;
-	for ($j=0; $j < $#srchitems; $j+=2) {
-	    my $k=$j+1;
-	    push @lbitems,$topic[$srchitems[$j]][$srchitems[$k]];
-	    push @lbdocs,$doc[$srchitems[$j]][$srchitems[$k]];
-	}
-	$wtitle="Search results for $spec_wtitle";
-    }
-# toplevel window of category $opt with two frames
-    my $tpwin=$main->Toplevel(-title=>$wtitle);
-    $tlwins{$opt}{'addr'}=$tpwin;
-    my $tpdsp=$tpwin->Frame(-relief=>'groove')->pack(-side=>'top');
-    my $tpslc=$tpwin->Frame()->pack(-side=>'top');
-# selection frame with listbox and buttons
-#   label for listbox
-    my $tplabel=$tpslc->Label(-text=>'Topics',
-			      -font=>$deffont)->pack(-anchor=>'w',
-						     -side=>'top');
-#   listbox with optional scrollbar
-    my $tplist=$tpslc->Scrolled("Listbox",
-				-font=>$deffont,
-				-scrollbars=>'osoe',
-#				-height=>0,
-				-width=>0,
-				-selectmode=>'single',
-				-exportselection=>0,
-				-cursor=>'hand2')->pack(-side=>'left',
-							-fill=>'y',
-							-expand=>1);
-    $tplist->insert('end',@lbitems); # fill topics into listbox
-#   buttons frame
-    my $tpbframe=$tpslc->Frame(-borderwidth=>8);
-    $tpbframe->pack(-side=>'right');
-#   make buttons for command frame
-    my $n_buttons = 0;
-    $tlwins{$opt}{'buttons'}[$n_buttons++]=
-	$tpbframe->Button(-text=>'View',
-			  -font=>$deffont,%butcol,
-			  -command=>sub{ &viewslc($docselect,$tpbframe);},
-			  -width=>6)->pack(-side=>'top');
-    if (! $IsWin32) {
-      $tlwins{$opt}{'buttons'}[$n_buttons++]=
-	$tpbframe->Button(-text=>'Print',
-			  -font=>$deffont,%butcol,
-			  -command=>sub{ &prtslc($docselect,$tpbframe);},
-			  -width=>6)->pack(-side=>'top');
-    }
-    $tlwins{$opt}{'buttons'}[$n_buttons++]=
-	$tpbframe->Button(-text=>'Cancel',
-			  -font=>$deffont,%butcol,
-			  -command=>sub{ destroy $tpwin; undef $tlwins{$opt};},
-			  -width=>6)->pack(-side=>'bottom');
-#   if only 1 item is in the list (most likely in search results), select it
-    if (scalar @lbitems == 1) {
-        $tplist->selectionSet(0);
-        $dspselect=$lbitems[0];
-        $docselect=$lbdocs[0];
-	&viewslc($docselect,$tpbframe)
-	  if ($autoview && $wtitle =~ /^Search results/);
-    }
-# display frame
-    my $dsplabel=$tpdsp->Label(-text=>'Selection:',
-			       -font=>$deffont)->pack(-anchor=>'w',,
-							 -fill=>'x',
-							 -side=>'left');
-    my $dspslc=$tpdsp->Label(-textvariable=>\$dspselect,
-			     -font=>$deffont,
-			     -borderwidth=>2)->pack(-anchor=>'w',
-						    -fill=>'x',
-						    -side=>'right');
-# handle selection; only one selection possible
-    $tplist->bind('<Button-1>'=>sub{my ($slctind)=$tplist->curselection();
-				    $dspselect=$lbitems[$slctind];
-				    $docselect=$lbdocs[$slctind];});
-#   key bindings
-    $tplist->bind('<Double-Button-1>'=>sub{
-	&viewslc($docselect,$tpbframe);});
-    $tpwin->bind('<Control-v>'=>sub{
-	&viewslc($docselect,$tpbframe);});
-    $tpwin->bind('<Control-p>'=>sub{
-	&prtslc($docselect,$tpbframe);});
-    $tpwin->bind('<Control-c>'=>sub{destroy $tpwin; undef $tlwins{$opt};});
-    $tplist->bind('<Button-3>'=>sub{
-	if ($docselect) {
-	    &showpath($docselect,$tpbframe);
-	} else {
-	    &popmsg(2,"No selection;\nuse left mouse button.",$tpbframe);
-	}});
-}
-
-# view document selected in listbox
-sub viewslc {
-    my($slc,$parframe)=@_;
-    my $viewer;
-    my $itype=-1;
-    my $browser=0;
-    my $styflag=0;
-    unless (defined $slc) {
-	&popmsg(2,"No selection was made.",$parframe);
-	return;
-    }
-    $parframe->configure(-cursor=>'watch');
-    chomp $slc;
-    my @dummy=split('\.',$slc);
-  DOC_FORMAT: { # determine document type
-      ($dummy[-1] =~ /dvi/) && do { $viewer=$dvi_viewer; last DOC_FORMAT; };
-      ($dummy[-1] =~ /ps/) && do { $viewer=$ps_viewer; last DOC_FORMAT; };
-      ($dummy[-1] =~ /pdf/) && do { $viewer=$pdf_viewer; last DOC_FORMAT; };
-      ($dummy[-1] =~ /txt/ || $dummy[-1] =~ /faq$/) && do {
-	  $viewer=($txt_viewer eq "TDK_OWN" || 
-		   $txt_viewer =~ /xterm/) ?
-		       $txt_viewer : "${CmdConsole} $txt_viewer";
-	  last DOC_FORMAT;
-      };
-      ($dummy[-1] =~ /README/i || $dummy[-2] =~ /\/README$/i) && do {
-	  $viewer=($txt_viewer eq "TDK_OWN" || 
-		   $txt_viewer =~ /xterm/) ?
-		       $txt_viewer : "${CmdConsole} $txt_viewer";
-	  last DOC_FORMAT;
-      };
-      ($dummy[-1] =~ /htm/) && do {
-	  $viewer=$html_viewer;
-	  if ($html_viewer =~ /netscape/i) { # check if Netscape is open
-	      my $lockfile="${HomeEnv}/.netscape/lock";
-	      $browser=1 if (-e $lockfile || -l $lockfile);
-	  } elsif ($html_viewer =~ /mozilla/i) { # check if Mozilla is open
-	      my $mozcheck=
-		`mozilla -remote 'openFile($texmfmain/doc/index.html)'`;
-	      $browser=1 unless ($?);
-	  }
-	  last DOC_FORMAT;
-      };
-#     some packages have no normal documentation but useful info in the .sty
-      ($dummy[-1] =~ /sty$/) && do {
-	  $viewer=($txt_viewer eq "TDK_OWN" || 
-		   $txt_viewer =~ /xterm/) ?
-		       $txt_viewer : "${CmdConsole} $txt_viewer";
-	  $slc="../tex/$slc"; # .sty files are in ${tex,local}docpath/../tex/
-	  $styflag=1;
-	  last DOC_FORMAT;
-      };
-      $parframe->configure(-cursor=>$defcursor);
-      if ($xfmt_viewer != 1) {
-	&popmsg(2,"$dummy[-1]: not a known document format",$parframe);
-	return;
-      }
-  };
-    if ($viewer eq "") {
-      if ($xfmt_viewer == 1) {
-	    &popmsg(-1,'Unknown format; assuming plain text.',$parframe);
-	    $viewer=($txt_viewer eq "TDK_OWN" || 
-		     $txt_viewer =~ /xterm/) ?
-		       $txt_viewer : "${CmdConsole} $txt_viewer";
-      } else {
-	&popmsg(2,"$dummy[-1]: no viewer available/specified for this format",
-		$parframe);
-	$parframe->configure(-cursor=>$defcursor);
-	return;
-      }
-    }
-# build complete path and start viewer if file exists
-    my $slcdoc;
-    $slcdoc=&finddoc($slcdoc,$slc,$parframe);
-    if ($slcdoc ne "") {
-#       change to doc directory in case there are pictures
-	my $docpath=substr($slcdoc,0,(rindex($slcdoc,'/',(length $slcdoc))));
-	chomp $slcdoc;
-	chdir ($docpath);
-#       try to get doc out of .sty file
-	if ($styflag) {
-	    &popmsg(-1,'Trying to extract documentation out of .sty file;
-might be cluttered with program comments.',
-		    $parframe);
-	    $slcdoc=&stripsty($slcdoc,substr($slc,7));
-	}
-#       for text files use built-in text viewer if set
-	if ($IsWin32) {
-	  if ($viewer eq "TDK_OWN") {
- 	    &ShellExecute('open', $slcdoc);
- 	    $parframe->configure(-cursor=>$defcursor);
- 	    return;
-	  }
-	  else {
-	    system("$viewer $slcdoc");
-	  }
-	}
-	else {
-	  if ($viewer eq "TDK_OWN") {
- 	    &textview($slcdoc);
- 	    $parframe->configure(-cursor=>$defcursor);
- 	    return;
-	  }
-	  if ($quiet == 0) { # show messages
- 	    if ($browser == 0) { # normal viewers or new Netscape/Mozilla
-	      system("$viewer $slcdoc &");
- 	    } else { # open doc in existing Netscape/Mozilla window
-	      system("$viewer -remote 'openFile($slcdoc)' &");
-	      &popmsg(-1,"Opening document in existing $viewer window.",
-		      $parframe);
-	    }
-	  } else { # viewer messages written to /dev/null instead of terminal
- 	    if ($browser == 0) { # normal viewers or new Netscape/Mozilla
-	      system("perl -we 'use strict; \
-my \$dump=\"\"; \
-open(NULL,\">/dev/null\"); \
-open (VIEWQ,\"$viewer $slcdoc |\"); \
-while (\$dump=<VIEWQ>) { print NULL \$dump; } \
-close(VIEWQ); \
-close(NULL);' &");
-	    } else { # open doc in existing window (Netscape or Mozilla)
-	      # not quiet; I didn't get an inline perl call like in
-	      # the other branch working
-	      system("$viewer -remote 'openFile($slcdoc)' &");
-	      &popmsg(-1,"Opening document in existing $viewer window.",
-		      $parframe);
-	    }
-	  }
-	}
-      }
-    $parframe->configure(-cursor=>$defcursor);
-}
-
-# Tk widget for text document
-sub textview {
-    my($txtfile)=@_;
-#   see if toplevel window with this file is already there
-    if (Exists($tlwins{$txtfile}{'addr'})) {
-	$tlwins{$txtfile}{'addr'}->deiconify();
-	$tlwins{$txtfile}{'addr'}->raise();
-	return;
-    }
-    my $tfv_tk=$main->Toplevel(-title=>"Text file viewer");
-    $tfv_tk->resizable(0,1);
-    $tlwins{$txtfile}{'addr'}=$tfv_tk;
-    $tfv_tk->Label(-text=>"File: $txtfile",
-		   -font=>$deffont,
-		   -relief=>'ridge',
-		   -borderwidth=>3)->pack(-side=>'top',
-					  -fill=>'x',
-					  -ipady=>10,
-					  -anchor=>'s');
-    my $txtbody=$tfv_tk->Scrolled("Text",
-				  -relief=>'flat',
-				  -font=>$deffont,
-				  -height=>20,
-				  -width=>80,
-				  -scrollbars=>"e")->pack(-side=>'top',
-							  -fill=>'y',
-							  -expand=>1);
-    open(TXTFILE,"$txtfile");
-    while (<TXTFILE>) {	$txtbody->insert('end',$_); }
-    close(TXTFILE);
-    $txtbody->configure(-state=>'disabled');
-    $tlwins{$txtfile}{'buttons'}[0]=
-	$tfv_tk->Button(-text=>'Close',
-			-font=>$deffont,%butcol,
-			-command=>sub{ destroy $tfv_tk;
-				       undef $tlwins{$txtfile};
-				   })->pack(-side=>'bottom',
-					    -fill=>'x');
-    $tfv_tk->bind('<Control-c>'=>sub{destroy $tfv_tk;
-				     undef $tlwins{$txtfile};
-				 });
-}
-
-# print document selected in listbox
-sub prtslc {
-    my($slc,$parframe)=@_;
-    $tmpfno=&randname;
-    my $pstmpfile="${TempDir}/texdoc_$tmpfno.ps";
-    push @tmpfiles,$pstmpfile;
-    my $status;
-    chomp $slc;
-    unless (defined $slc) {
-	&popmsg(2,"No selection was made.",$parframe);
-	return;
-    }
-    if ($print_cmd eq "") {
-	&popmsg(2,"No printer specified.",$parframe);
-	return;
-    }
-# build complete path and check existence of file
-    my @dummy=split('\.',$slc);
-    if ($dummy[-1] =~ /sty$/) {
-	$slc="../tex/$slc"; # .sty files are in ${tex,local,home}docpath/../tex
-    }
-    my $slcdoc;
-    $slcdoc=&finddoc($slcdoc,$slc,$parframe);
-    return if ($slcdoc eq "");
-#   change to doc directory in case there are pictures
-    my $docpath=substr($slcdoc,0,(rindex($slcdoc,'/',(length $slcdoc))));
-    chdir ($docpath);
-  DOC_FORMAT: { # determine document type
-#     convert dvi files to ps before printing
-      ($dummy[-1] =~ /dvi/) && do {
-	  if ($dvips_conv eq "") {
-	      &popmsg(2,"No converter available for dvi->ps conversion.",
-		      $parframe);
-	      return;
-	  }
-	  &popmsg(-1,"Converting dvi to ps for printing and sending file to print...",$parframe);
-	  $status=system("$dvips_conv $slcdoc -o $pstmpfile");
-	  if ($status != 0) {
-	      &popmsg(2,"Error: Conversion dvi->ps failed!",$parframe);
-	  }
-	  last DOC_FORMAT;
-      };
-#     PostScript is printed directly
-      ($dummy[-1] =~ /ps/) && do {
-	  &popmsg(-1,"Sending file to $print_cmd...",$parframe);
-	  $pstmpfile=$slcdoc;
-	  last DOC_FORMAT;
-      };
-#     convert pdf files to ps before printing
-      ($dummy[-1] =~ /pdf/) && do {
-	  if ($pdfps_conv eq "") {
-	      &popmsg(2,"No converter available for pdf->ps conversion.",
-		      $parframe);
-	      return;
-	  }
-	  &popmsg(-1,"Converting pdf to ps for printing and sending file to print...",$parframe);
-	  system("$pdfps_conv $slcdoc $pstmpfile");
-	  last DOC_FORMAT;
-      };
-#     convert html files to ps before printing
-      ($dummy[-1] =~ /htm/) && do {
-	  if ($htmlps_conv eq "") {
-	      &popmsg(2,"No converter available for html->ps conversion.",
-		      $parframe);
-	      return;
-	  }
-	  &popmsg(-1,"Converting html to ps for printing and sending file to print...",$parframe);
-	  my $htmlps_redir_sign=($htmlps_redir == 1) ? ">" :"";
-	  system("$htmlps_conv $slcdoc $htmlps_redir_sign $pstmpfile");
-	  last DOC_FORMAT;
-      };
-#     convert txt files to ps before printing
-      ($dummy[-1] =~ /txt/ || $dummy[-1] =~ /faq$/
-       || $dummy[-1] =~ /README/i) && do {
-	  if ($txtps_conv eq "") {
-	      &popmsg(2,"No converter available for txt->ps conversion.",
-		      $parframe);
-	      return;
-	  }
-	  &popmsg(-1,"Converting txt to ps for printing and sending file to print...",$parframe);
-	  my $txtps_redir_sign=($txtps_redir == 1) ? ">" :"";
-	  system("$txtps_conv $slcdoc $txtps_redir_sign $pstmpfile");
-	  last DOC_FORMAT;
-      };
-#     convert extracted comments from sty files to ps before printing
-      ($dummy[-1] =~ /sty$/) && do {
-	  if ($txtps_conv eq "") {
-	      &popmsg(2,"No converter available for sty(txt)->ps conversion.",
-		      $parframe);
-	      return;
-	  }
-	  &popmsg(-1,"Converting sty(txt) to ps for printing and sending file to print...",$parframe);
-#         try to get doc out of .sty file
-	  &popmsg(-1,'Trying to extract documentation out of .sty file;
-might be cluttered with program comments.',
-		    $parframe);
-	  $slcdoc=&stripsty($slcdoc,substr($slc,7));
-	  my $txtps_redir_sign=($txtps_redir == 1) ? ">" :"";
-	  system("$txtps_conv $slcdoc $txtps_redir_sign $pstmpfile");
-	  last DOC_FORMAT;
-      };
-      &popmsg(2,"$dummy[-1]: cannot print document format",$parframe);
-      return;
-  };
-    system("$print_cmd $pstmpfile");
-}
-
-# test existence and search a documentation which is not in specified place
-sub finddoc {
-    my($slcdoc,$slc,$parframe)=@_;
-    my ($dummy,$status);
-  SLCDOCFIND: foreach ($texdocpath,$distdocpath,$docdocpath) {
-      $slcdoc="$_/$slc";
-      if (-e $slcdoc) {
-#       found where it should be
-	return $slcdoc;
-      } else {
-#       see if the documentation file is in the local doc tree...
-	my @srchslcdoc=($slcdoc);
-	if ($localdocpath) {
-	    push @srchslcdoc,"$localdocpath/$slc";
-	    return $srchslcdoc[-1] if (-e $srchslcdoc[-1]);
-	}
-#       ... or the user's doc tree...
-	if ($homedocpath) {
-	    push @srchslcdoc,"$homedocpath/$slc";
-	    return $srchslcdoc[-1] if (-e $srchslcdoc[-1]);
-	}
-#       ... otherwise proceed with searching
-	$status=-1;
-#       see if the documentation file is compressed
-      CMPREND: foreach my $cmprtype ("gz","bz2","zip") {
-	    foreach (@srchslcdoc) {
-		$dummy="$_.$cmprtype";
-		if (-e $dummy) { # yes, it is compressed
-        	    $tmpfno=&randname;
-		    my $rawname=basename($slc,"");
-		    $slcdoc="${TempDir}/texdoc_$tmpfno$rawname";
-		    push @tmpfiles,$slcdoc;
-		    my ($dcmp,$dcmp_opt);
-		  COMPRESS: { # determine compression type
-		      ($cmprtype eq "gz") && do {
-			  $dcmp="gzip";
-			  $dcmp_opt="-cd";
-			  last COMPRESS;
-		      };
-		      ($cmprtype eq "bz2") && do {
-			  $dcmp="bzip2";
-			  $dcmp_opt="-cd";
-			  last COMPRESS;
-		      };
-		      ($cmprtype eq "zip") && do {
-			  $dcmp="zip";
-			  $dcmp_opt="-p";
-			  last COMPRESS;
-		      };
-		  };
-#                   try to decompress
-		    $status=system("$dcmp $dcmp_opt $dummy > $slcdoc");
-		    if ($status != 0) { # failure
-			&popmsg(2,
-				"$dcmp: Couldn't decompress file, cancelling.",
-				$parframe);
-			$slcdoc="";
-			return $slcdoc;
-		    }
-#		    last CMPREND; does not work, what we need is:
-                    return $slcdoc;
-		}
-	    }
-	}
-      }
-    }
-    if ($status != 0) {
-      $parframe->configure(-cursor=>'watch');
-#     try to find it elsewhere with kpsewhich
-      my $rawname=basename($slc,"");
-      $slcdoc=($slcdoc =~ /\.sty$/) ?
-	`kpsewhich $rawname` :
-	  `kpsewhich --format=${qq}TeX system documentation${qq} $rawname`;
-      if ($slcdoc eq "") { # nothing found; cancel
-	&popmsg(2,"$rawname not found, cancelling.",$parframe);
-	$slcdoc="";
-      }
-      $parframe->configure(-cursor=>$defcursor);
-    }
-    return $slcdoc;
-}
-
-# determine existence and show paths of files (Button-3)
-sub showpath {
-    my ($docselect,$tpbframe)=@_;
-    my $found=0;
-    if ($docselect =~ /\.sty$/) {
-    STYPATH: foreach my $fullpath ("$texmfmain/tex/$docselect",
-				   "$texmfdist/tex/$docselect",
-				   "$texmflocal/tex/$docselect",
-				   "$texmfhome/tex/$docselect") {
-	if (-e $fullpath) {
-	  &popmsg(0,"Selected file:\n$fullpath",$tpbframe);
-	  $found=1;
-	  last STYPATH;
-	}
-      }
-      if (!$found) {
-	&popmsg(2,"Selected file:\n$docselect\ndoes not exist.",$tpbframe) }
-    } else {
-    DOCPATH: foreach my $fullpath ("$texdocpath/$docselect",
-				   "$distdocpath/$docselect",
-				   "$docdocpath/$docselect",
-				   "$localdocpath/$docselect",
-				   "$homedocpath/$docselect") {
-	foreach ('','.gz','.bz2','.zip') {
-	  my $fullpathext="$fullpath$_";
-	  if (-e $fullpathext) {
-	    &popmsg(0,"Selected file:\n$fullpathext",$tpbframe);
-	    $found=1;
-	    last DOCPATH;
-	  }
-	}
-      }
-      if (!$found) {
-	&popmsg(2,"Selected file:\n$docselect\ndoes not exist (neither in normal form nor compressed).",$tpbframe) }
-    }
-}
-
-# make or destroy search entry widget
-sub mksrch {
-    if ($srchflag == 1) {
-	destroy $srchentry;
-	$srchflag=0;
-    } else {
-#       get the search string
-	$srchentry=$cmdframe->Entry(-cursor=>'xterm',
-				    -font=>$deffont,
-				    -width=>20,
-				    -takefocus=>1)->pack(-side=>'left');
-	$srchentry->focus();
-	$srchentry->bind('<Return>'=>[\&srchstr, $srchentry]);
-	$srchflag=1;
-#       key binding
-	$srchentry->bind('<Control-c>'=>sub{destroy $srchentry; $srchflag=0;});
-    }
-}
-
-# search a string in @packname, @topic and @keywords
-sub srchstr {
-    my ($i,$j,$string);
-    my (@results,@reslist);
-    $main->configure(-cursor=>'watch');
-    $string=$srchentry->get();
-# search
-    if ($string) {
-	for ($i=0; $i<$ncat; ++$i) {
-	    for ($j=0; $j<$maxind[$i]+1; ++$j) {
-	      SRCH: {
-		  ($topic[$i][$j] =~ /$string/i) && do {
-		      push @results,($i,$j);
-		      last SRCH;
-		  };
-		  (defined $keywords[$i][$j]) && do {
-		      if ($keywords[$i][$j] =~ /$string/i) {
-			  push @results,($i,$j);
-			  last SRCH;
-		      }
-		  };
-		  ($packname[$i][$j] =~ /$string/i) && do {
-		      push @results,($i,$j);
-		      last SRCH;
-		  };
-	      };
-	    }
-	}
-    } else { # return full database
-	$string='all database entries';
-	for ($i=0; $i<$ncat; ++$i) {
-	    for ($j=0; $j<$maxind[$i]+1; ++$j) { push @results,($i,$j); }
-	}
-    }
-# destroy entry widget and show results
-    destroy $srchentry;
-    $srchflag=0;
-    if (scalar @results == 0) {
-	&popmsg(0,"Search for $string: no matches found.",$cmdframe);
-    } else {
-#       cancel multiple entries
-	my ($omit,$pack1,$pack2);
-	@reslist=($results[0],$results[1]);
-	for ($i=0; $i<$#results; $i+=2) {
-	    $omit=0;
-	    $pack1=$packname[$results[$i]][$results[$i+1]];
-	    for ($j=0; $j<$#reslist; $j+=2) {
-		$pack2=$packname[$reslist[$j]][$reslist[$j+1]];
-		if ($pack1 eq $pack2) { $omit=1; last; }
-	    }
-	    if ($omit == 0) { push @reslist,($results[$i],$results[$i+1]); }
-	}
-	unshift @reslist,$string;
-	&tpslct(-1,@reslist);
-    }
-    $main->configure(-cursor=>$defcursor);
-}
-
-# extract documentation of .sty files; a flag in the @keywords array shows
-# where the doc is located:
-# -0-: no specific place; -1-: at end, behind \endinput; -2-: at beginning,
-# terminated by %%%%%%; -3-: at beginning, terminated with blank line
-sub stripsty {
-    my ($slcdoc,$slc)=@_;
-    my @stydoc;
-    $tmpfno=&randname;
-    my $tmpslcdoc="${TempDir}/texdoc_$tmpfno.txt";
-    push @tmpfiles,$tmpslcdoc;
-    open (STY,"$slcdoc");
-  LOC: {
-      ($stydoc{$slc} == 0) && do { # no specific place, suck in everything :-(
-	  while ($line = <STY>) { push @stydoc,$line if ($line =~ /^%/); }
-	  last LOC;
-      };
-      ($stydoc{$slc} == 1) && do { # at end, behind \endinput
-	  while ($line = <STY>) {
-	      last if ($line =~ /^\s*\\endinput/ && !($line =~ /^%/));
-	  }
-	  while ($line = <STY>) { push @stydoc,$line; }
-	  last LOC;
-      };
-      ($stydoc{$slc} == 2) && do { # up to a certain %%%%%%%, hopefully the 1st
-	  for (my $i=0; $i<9; ++$i) { $stydoc[$i]=<STY>; } # after the 8th line
-	  while ($line = <STY>) {
-	      last if ($line =~ /^%{4,}/);
-	      push @stydoc,$line;
-	  }
-	  last LOC;
-      };
-      ($stydoc{$slc} == 3) && do { # up to 1st blank/apparently empty line
-	  while ($line = <STY>) {
-	      last if ($line =~ /^\s*$/);
-	      push @stydoc,$line;
-	  }
-	  last LOC;
-      };
-  };
-    close(STY);
-    open(TMPSTY,">$tmpslcdoc");
-    foreach (@stydoc) { print TMPSTY $_; }
-    close(TMPSTY);
-    return $tmpslcdoc;
-}
-
-# pop up a note or an error or warning message toplevel window
-sub popmsg {
-    my($level,$msg,$parframe)=@_;
-    my $degree;
-  LEVEL: {
-      ($level == -1) && do { $degree="Info"; last LEVEL; };
-      ($level == 0) && do { $degree="Note"; last LEVEL; };
-      ($level == 1) && do {
-	return if ($quiet == 1);
-	$degree="Warning";
-	last LEVEL
-      };
-      ($level == 2) && do { $degree="Error"; last LEVEL; };
-  };
-    my $msgwin=$parframe->Toplevel(-title=>$degree);
-    my $lbl=$msgwin->Label(-text=>uc($degree),
-			   -font=>$deffont)->pack(-side=>'top', -fill=>'x');
-#   get size of message text
-    my @dummy=split("\n",$msg);
-    my $nline=scalar @dummy;
-    my $msgwidth=0;
-    my $lline;
-    foreach (@dummy) {
-	$lline=length $_;
-	if ($lline > $msgwidth) { $msgwidth=$lline; }
-    }
-    my $message=$msgwin->Text(-relief=>'flat',
-			      -font=>$deffont,
-			      -height=>$nline,
-			      -width=>$msgwidth)->pack(-side=>'top');
-    $message->insert('end',$msg);
-    $message->configure(-state=>'disabled');
-    if ($level < 0) { # transient message window
-	$msgwin->after(3000,sub{destroy $msgwin});
-    } else { # persistent message window
-	$msgwin->Button(-text=>'Close',
-			-font=>$deffont,%butcol,
-			-command=>sub{destroy $msgwin})->pack(-side=>'bottom',
-							      -fill=>'x');
-	$msgwin->bind('<Control-c>'=>sub{destroy $msgwin});
-    }
-}
-
-# show/change settings (don't show this to an expert :-/ )
-sub settings {
-    my ($homedocpath_tmp,$quiet_tmp,$autoview_tmp,$xfmt_viewer_tmp,
-	$dvi_viewer_tmp,$dvips_conv_tmp,
-	$ps_viewer_tmp,$pdf_viewer_tmp,$pdfps_conv_tmp,
-	$html_viewer_tmp,$htmlps_conv_tmp,$htmlps_redir_tmp,
-	$txt_viewer_tmp,$txtps_conv_tmp,$txtps_redir_tmp,$print_cmd_tmp)=
-	    ($homedocpath,$quiet,$autoview,$xfmt_viewer,
-	     $dvi_viewer,$dvips_conv,$ps_viewer,
-	     $pdf_viewer,$pdfps_conv,$html_viewer,
-	     $htmlps_conv,$htmlps_redir,$txt_viewer,
-	     $txtps_conv,$txtps_redir,$print_cmd);
-    my @tdcolors_tmp=@tdcolors;
-#   see if toplevel window is already there
-    if (Exists($tlwins{"setmenu"}{'addr'})) {
-	$tlwins{"setmenu"}{'addr'}->deiconify();
-	$tlwins{"setmenu"}{'addr'}->raise();
-	return;
-    }
-    my $setmenu=$main->Toplevel(-title=>'Settings');
-    $setmenu->resizable(0,0);
-    $tlwins{"setmenu"}{'addr'}=$setmenu;
-# documentation path
-    my $datlabel;
-    $datlabel="Database file(s) used: teTeX";
-    $datlabel.=", local database" if (-e $locdatabase);
-    $datlabel.=", user database" if (-e $homedatabase);
-    my $docframe=$setmenu->Frame(-relief=>'groove',
-				 -borderwidth=>2)->pack(-side=>'top',
-							-fill=>'x',
-							-expand=>1);
-    my $docframestring="\nDistribution documentation root path(s):\n$texdocpath";
-    $docframestring.=", $distdocpath" if (-e $distdocpath);
-    $docframestring.=", $docdocpath" if (length $docdocpath);
-    if ($localdocpath && $localdocpath ne $texdocpath) {
-	$docframestring.="\nLocal documentation root path: $localdocpath\n";
-    }
-    $docframe->Label(-text=>"$docframestring",
-		     -font=>$deffont)->pack(-side=>'top',
-					    -anchor=>'w',
-					    -fill=>'x',
-					    -expand=>1);
-    if (defined $texmfhome && -d $texmfhome) {
-      $homedocpath_tmp=basename($homedocpath_tmp,"");
-      my $usrdocframe=$docframe->Frame(-relief=>'flat')->pack(-side=>'top',
-							      -fill=>'x');
-      my $usrdoclabel=$usrdocframe->Label(-text=>"User's documentation root path: $texmfhome/",
-					  -font=>$deffont)->pack(-side=>'left');
-      my $usrdocentry=$usrdocframe->Entry(-textvariable=>\$homedocpath_tmp,
-					  -font=>$deffont)->pack(-side=>'left');
-    }
-    $docframe->Label(-text=>"$datlabel.",
-		     -font=>$deffont)->pack(-side=>'top',
-					    -anchor=>'w',
-					    -ipady=>2,
-					    -fill=>'x',
-					    -expand=>1);
-# General viewer behaviour
-    my $genvframe=$setmenu->Frame(-label=>'General viewer behaviour',
-				  -relief=>'groove',
-				  -borderwidth=>2)->pack(-side=>'top',
-							 -fill=>'x',
-							 -ipady=>6,
-							 -expand=>1);
-    my $genvframe1=$genvframe->Frame()->pack(-side=>'left');
-    my $genvsub1=$genvframe1->Frame()->pack(-side=>'top',
-					    -anchor=>'w',
-					    -ipady=>3);
-    my $genvecbut=$genvsub1->
-	Checkbutton(-variable=>\$quiet_tmp)->pack(-side=>'left',
-						  -anchor=>'sw');
-    my $genvelabel=$genvsub1->Label(-text=>'Suppress error messages',
-				    -font=>$deffont)->pack(-side=>'left',
-							   -anchor=>'sw');
-    my $genvsub2=$genvframe1->Frame()->pack(-side=>'top',
-					    -anchor=>'w');
-    my $genvscbut=$genvsub2->
-	Checkbutton(-variable=>\$autoview_tmp)->pack(-side=>'left',
-						     -anchor=>'sw');
-    my $genvslabel=$genvsub2->Label(-text=>'Autostart viewer for one-item listboxes',
-				    -font=>$deffont)->pack(-side=>'left',
-							   -anchor=>'sw');
-    my $genvsub3=$genvframe1->Frame()->pack(-side=>'top',
-					    -anchor=>'w');
-    my $genvxcbut=$genvsub3->
-	Checkbutton(-variable=>\$xfmt_viewer_tmp)->pack(-side=>'left',
-							-anchor=>'sw');
-    my $genvxlabel=$genvsub3->Label(-text=>'Use text viewer for unknown file format',
-				    -font=>$deffont)->pack(-side=>'left',
-							   -anchor=>'sw');
-#   colours of GUI
-    my @tdcolors_d=@tdcolors_tmp;
-    $tlwins{'setmenu'}{'buttons'}[0]=
-	$genvframe->Button(-text=>'Change viewer colours',
-			   -command=>sub {
-			       @tdcolors_tmp=&popcolor($setmenu,@tdcolors_tmp);
-			       @tdcolors_d=@tdcolors_tmp;
-			   },
-			   -font=>$deffont,%butcol)->pack(-side=>'right');
-# DVI
-    my $dviframe=$setmenu->Frame(-label=>'DVI',
-				 -relief=>'groove',
-				 -borderwidth=>2)->pack(-side=>'top',
-							-fill=>'x',
-							-ipady=>6,
-							-expand=>1);
-    my $dvisub1=$dviframe->Frame()->pack(-side=>'top',
-					 -anchor=>'w');
-    my $dvisub2=$dviframe->Frame()->pack(-side=>'top',
-					 -anchor=>'w',
-					 -ipady=>6);
-    my $dvivlabel=$dvisub1->Label(-text=>'Viewer command',
-				  -anchor=>'w',
-				  -font=>$deffont)->pack(-side=>'left');
-    my $dviventry=$dvisub1->Entry(-textvariable=>\$dvi_viewer_tmp,
-				  -font=>$deffont)->pack(-side=>'left');
-    my $dviclabel=$dvisub2->Label(-text=>'DVI->PS converter command',
-				  -anchor=>'w',
-				  -font=>$deffont)->pack(-side=>'left',
-							 -anchor=>'sw');
-    my $dvilbwidth=length 'DVI->PS converter command';
-    $dvivlabel->configure(-width=>1.1*$dvilbwidth);
-    $dviclabel->configure(-width=>1.1*$dvilbwidth);
-    my $dvicentry=$dvisub2->Entry(-textvariable=>\$dvips_conv_tmp,
-				  -font=>$deffont)->pack(-side=>'left',
-							 -anchor=>'sw');
-# PostScript
-    my $psframe=$setmenu->Frame(-label=>'PostScript',
-				-relief=>'groove',
-				-borderwidth=>2)->pack(-side=>'top',
-						       -fill=>'x',
-						       -ipady=>10,
-						       -expand=>1);
-    my $psvlabel=$psframe->Label(-text=>'Viewer command',
-				 -font=>$deffont)->pack(-side=>'left',
-							-anchor=>'w');
-    my $psventry=$psframe->Entry(-textvariable=>\$ps_viewer_tmp,
-				 -font=>$deffont)->pack(-side=>'left');
-# PDF
-    my $pdfframe=$setmenu->Frame(-label=>'PDF',
-				 -relief=>'groove',
-				 -borderwidth=>2)->pack(-side=>'top',
-							-fill=>'x',
-							-ipady=>6,
-							-expand=>1);
-    my $pdfsub1=$pdfframe->Frame()->pack(-side=>'top',
-					 -anchor=>'w');
-    my $pdfsub2=$pdfframe->Frame()->pack(-side=>'top',
-					 -anchor=>'w',
-					 -ipady=>6);
-    my $pdfvlabel=$pdfsub1->Label(-text=>'Viewer command',
-				  -font=>$deffont)->pack(-side=>'left',
-							 -anchor=>'w');
-    my $pdfventry=$pdfsub1->Entry(-textvariable=>\$pdf_viewer_tmp,
-				  -font=>$deffont)->pack(-side=>'left');
-    my $pdfclabel=$pdfsub2->Label(-text=>'PDF->PS converter command',
-				  -font=>$deffont)->pack(-side=>'left',
-							 -anchor=>'sw');
-    my $pdfcentry=$pdfsub2->Entry(-textvariable=>\$pdfps_conv_tmp,
-				  -font=>$deffont)->pack(-side=>'left',
-							 -anchor=>'sw');
-# HTML
-    my $htmlframe=$setmenu->Frame(-label=>'HTML',
-				  -relief=>'groove',
-				  -borderwidth=>2)->pack(-side=>'top',
-							 -fill=>'x',
-							 -ipady=>6,
-							 -expand=>1);
-    my $htmlsub1=$htmlframe->Frame()->pack(-side=>'top',
-					   -anchor=>'w');
-    my $htmlsub2=$htmlframe->Frame()->pack(-side=>'top',
-					   -anchor=>'w',
-					   -ipady=>6);
-    my $htmlvlabel=$htmlsub1->Label(-text=>'Viewer command',
-				    -font=>$deffont)->pack(-side=>'left',
-							   -anchor=>'w');
-    my $htmlventry=$htmlsub1->Entry(-textvariable=>\$html_viewer_tmp,
-				    -font=>$deffont)->pack(-side=>'left');
-    my $htmlclabel=$htmlsub2->Label(-text=>'HTML->PS converter command',
-				    -font=>$deffont)->pack(-side=>'left',
-							   -anchor=>'sw');
-    my $htmlcentry=$htmlsub2->Entry(-textvariable=>\$htmlps_conv_tmp,
-				    -font=>$deffont)->pack(-side=>'left',
-							   -anchor=>'sw');
-    my $htmlrlabel=$htmlsub2->Label(-text=>'Output redirect needed',
-				    -font=>$deffont)->pack(-side=>'left',
-							   -anchor=>'sw');
-    my $htmlrcbut=$htmlsub2->
-	Checkbutton(-variable=>\$htmlps_redir_tmp)->pack(-side=>'left',
-							 -anchor=>'sw');
-# plain text
-    my $txtframe=$setmenu->Frame(-label=>'Plain text',
-				 -relief=>'groove',
-				 -borderwidth=>2)->pack(-side=>'top',
-							-fill=>'x',
-							-ipady=>6,
-							-expand=>1);
-    my $txtsub1=$txtframe->Frame()->pack(-side=>'top',
-					 -anchor=>'w');
-    my $txtsub2=$txtframe->Frame()->pack(-side=>'top',
-					 -anchor=>'w',
-					 -ipady=>6);
-    my $txtvlabel=$txtsub1->Label(-text=>'Viewer command',
-				  -font=>$deffont)->pack(-side=>'left',
-							 -anchor=>'w');
-    my $txtventry=$txtsub1->Entry(-textvariable=>\$txt_viewer_tmp,
-				  -font=>$deffont)->pack(-side=>'left');
-    my $txt_view_flag;
-    if ($txt_viewer_tmp eq "TDK_OWN") {
-	$txt_view_flag=1;
-	$txtventry->configure(-state=>'disabled');
-    } else {
-	$txt_view_flag=0;
-	$txtventry->configure(-state=>'normal');
-    }
-    my $txtvilabel=$txtsub1->Label(-text=>"\tUse texdoctk\'s own viewer",
-				   -font=>$deffont)->pack(-side=>'left',
-							  -anchor=>'sw');
-    my $txtvcbut=$txtsub1->
-	Checkbutton(-variable=>\$txt_view_flag,
-		    -command=>sub {
-			if ($txt_view_flag == 1) {
-			    $txt_viewer_tmp="TDK_OWN";
-			    $txtventry->configure(-state=>'disabled');
-			} else {
-			    $txt_viewer_tmp=$txt_viewer;
-			    $txtventry->configure(-state=>'normal');
-			    $txtventry->focus();
-			}
-		    })->pack(-side=>'left',
-			     -anchor=>'sw');
-    my $txtclabel=$txtsub2->Label(-text=>'Text->PS converter command',
-				  -font=>$deffont)->pack(-side=>'left',
-							 -anchor=>'sw');
-    my $txtcentry=$txtsub2->Entry(-textvariable=>\$txtps_conv_tmp,
-				  -font=>$deffont)->pack(-side=>'left',
-							 -anchor=>'sw');
-    my $txtrlabel=$txtsub2->Label(-text=>'Output redirect needed',
-				  -font=>$deffont)->pack(-side=>'left',
-							 -anchor=>'sw');
-    my $txtrcbut=$txtsub2->
-	Checkbutton(-variable=>\$txtps_redir_tmp)->pack(-side=>'left',
-							-anchor=>'sw');
-# printer
-    my $prtframe=$setmenu->Frame(-label=>'Printer',
-				 -relief=>'groove',
-				 -borderwidth=>2)->pack(-side=>'top',
-							-fill=>'x',
-							-ipady=>10,
-							-expand=>1);
-    my $prtclabel=$prtframe->Label(-text=>'Command',
-				   -font=>$deffont)->pack(-side=>'left',
-							  -anchor=>'w');
-    my $prtcentry=$prtframe->Entry(-textvariable=>\$print_cmd_tmp,
-				   -font=>$deffont)->pack(-side=>'left');
-# buttons and key bindings
-    my $setbfr=$setmenu->Frame()->pack(-side=>'bottom');
-    $tlwins{'setmenu'}{'buttons'}[1]=
-	$setbfr->Button(-text=>'OK',
-			-font=>$deffont,%butcol,
-			-command=>sub{
-			    $homedocpath="$texmfhome/$homedocpath_tmp";
-			    ($quiet,$autoview,$xfmt_viewer,
-			     $dvi_viewer,$dvips_conv,
-			     $ps_viewer,$pdf_viewer,
-			     $pdfps_conv,$html_viewer,
-			     $htmlps_conv,$htmlps_redir,
-			     $txt_viewer,$txtps_conv,$txtps_redir,$print_cmd)=
-				 ($quiet_tmp,$autoview_tmp,$xfmt_viewer_tmp,
-				  $dvi_viewer_tmp,$dvips_conv_tmp,
-				  $ps_viewer_tmp,
-				  $pdf_viewer_tmp,$pdfps_conv_tmp,
-				  $html_viewer_tmp,
-				  $htmlps_conv_tmp,$htmlps_redir_tmp,
-				  $txt_viewer_tmp,$txtps_conv_tmp,
-				  $txtps_redir_tmp,$print_cmd_tmp);
-			    @tdcolors=@tdcolors_tmp;
-			    %butcol=('-background'=>$tdcolors[0],
-				     '-foreground'=>$tdcolors[1],
-				     '-activebackground'=>$tdcolors[2],
-				     '-activeforeground'=>$tdcolors[3]);
-			    foreach my $tlkey (keys %tlwins) {
-				foreach (@{$tlwins{$tlkey}{'buttons'}}) {
-				    $_->configure(%butcol);
-				}
-			    }
-			    if ($txt_viewer eq "" && 
-				defined $ENV{PAGER}) {
-				$txt_viewer=$ENV{PAGER};
-			    }
-			    destroy $setmenu},
-			-width=>6)->pack(-side=>'left',
-					 -padx=>10,
-					 -pady=>10);
-    $tlwins{'setmenu'}{'buttons'}[2]=
-	$setbfr->Button(-text=>'Save',
-			-font=>$deffont,%butcol,
-			-command=>sub{
-			    $setmenu->configure(-cursor=>'watch');
-			    &popmsg(-1,"Writing settings to $myrc",$setmenu);
-			    my $tdcolors_tmp=join(' ',@tdcolors_tmp);
-			    &writerc($homedocpath_tmp,
-				     $quiet_tmp,$autoview_tmp,$xfmt_viewer_tmp,
-				     $tdcolors_tmp,
-				     $dvi_viewer_tmp,$dvips_conv_tmp,
-				     $ps_viewer_tmp,
-				     $pdf_viewer_tmp,$pdfps_conv_tmp,
-				     $html_viewer_tmp,
-				     $htmlps_conv_tmp,$htmlps_redir_tmp,
-				     $txt_viewer_tmp,$txtps_conv_tmp,
-				     $txtps_redir_tmp,$print_cmd_tmp,$setmenu);
-			    $setmenu->configure(-cursor=>$defcursor);
-			})->pack(-side=>'left',
-				 -padx=>10);
-    $tlwins{'setmenu'}{'buttons'}[3]=
-	$setbfr->Button(-text=>'Cancel',
-			-font=>$deffont,%butcol,
-			-command=>sub{destroy $setmenu;
-				      undef $tlwins{"setmenu"};
-				  })->pack(-side=>'left',
-					   -padx=>10);
-    $setmenu->bind('<Control-c>'=>sub{destroy $setmenu;
-				      undef $tlwins{"setmenu"};});
-}
-
-# dialog toplevel for color settings
-sub popcolor {
-    my ($parframe,@entryvar)=@_;
-#   see if toplevel window is already there
-    if (Exists($tlwins{'chngcol'}{'addr'})) {
-	$tlwins{'chngcol'}{'addr'}->deiconify();
-	$tlwins{'chngcol'}{'addr'}->raise();
-	return;
-    }
-    my $dlgwin=$parframe->Toplevel(-title=>'Change colours');
-    $dlgwin->resizable(0,0);
-    $tlwins{'chngcol'}{'addr'}=$dlgwin;
-#   entry widgets for default/active back/foreground
-    $dlgwin->Label(-text=>'Enter colours as names or RGB #xxxxxx values',
-		   -font=>$deffont)->pack(-side=>'top');
-    my $dlgdef=$dlgwin->Frame()->pack(-side=>'top');
-    my $dlgact=$dlgwin->Frame()->pack(-side=>'top');
-    my $dlgdef1=$dlgdef->Frame()->pack(-side=>'left');
-    my $dlgtfr0=$dlgdef1->Frame()->pack(-side=>'top');
-    my $dlgtfr1=$dlgdef1->Frame()->pack(-side=>'top');
-    my $dlgact1=$dlgact->Frame()->pack(-side=>'left');
-    my $dlgtfr2=$dlgact1->Frame()->pack(-side=>'top');
-    my $dlgtfr3=$dlgact1->Frame()->pack(-side=>'top');
-    $dlgtfr0->Label(-text=>"Default background",
-		    -anchor=>'w',
-		    -width=>18,
-		    -font=>$deffont)->pack(-side=>'left');
-    $dlgtfr0->Entry(-textvariable=>\$entryvar[0],
-		    -font=>$deffont)->pack(-side=>'left');
-    $dlgtfr1->Label(-text=>"Default foreground",
-		    -anchor=>'w',
-		    -width=>18,
-		    -font=>$deffont)->pack(-side=>'left');
-    $dlgtfr1->Entry(-textvariable=>\$entryvar[1],
-		    -font=>$deffont)->pack(-side=>'left');
-    my $deflabel=$dlgdef->Label(-text=>'Default',
-				-relief=>'ridge',
-				-width=>10,
-				-height=>2)->pack(-side=>'right',
-						  -padx=>7);
-    $dlgtfr2->Label(-text=>"Active background",
-		    -anchor=>'w',
-		    -width=>18,
-		    -font=>$deffont)->pack(-side=>'left');
-    $dlgtfr2->Entry(-textvariable=>\$entryvar[2],
-		    -font=>$deffont)->pack(-side=>'left');
-    $dlgtfr3->Label(-text=>"Active foreground",
-		    -anchor=>'w',
-		    -width=>18,
-		    -font=>$deffont)->pack(-side=>'left');
-    $dlgtfr3->Entry(-textvariable=>\$entryvar[3],
-		    -font=>$deffont)->pack(-side=>'left');
-    my $actlabel=$dlgact->Label(-text=>'Active',
-				-background=>$entryvar[2],
-				-foreground=>$entryvar[3],
-				-relief=>'ridge',
-				-width=>10,
-				-height=>2)->pack(-side=>'right',
-						  -padx=>7);
-#   buttons
-    my $setbfr=$dlgwin->Frame()->pack(-side=>'bottom');
-    my $chngflag=0;
-    $tlwins{'chngcol'}{'buttons'}[0]=
-	$setbfr->Button(-text=>'OK',
-			-font=>$deffont,%butcol,
-			-command=>sub {
-			    foreach (@entryvar) { # RGB form with leading #
-				$_="#$_" if (/^[A-Fa-f0-9]{6}$/);
-			    }
-			    $chngflag=1 if (&colcheck($dlgwin,@entryvar));
-			},
-			-width=>6)->pack(-side=>'left',
-					 -padx=>5,
-					 -pady=>10);
-    $tlwins{'chngcol'}{'buttons'}[1]=
-	$setbfr->Button(-text=>'Preview',
-			-font=>$deffont,%butcol,
-			-command=>sub {
-			    foreach (@entryvar) { # RGB form with leading #
-				$_="#$_" if (/^[A-Fa-f0-9]{6}$/);
-			    }
-			    if (&colcheck($dlgwin,@entryvar)) {
-				$deflabel->
-				    configure(-background=>$entryvar[0],
-					      -foreground=>$entryvar[1]);
-				$actlabel->
-				    configure(-background=>$entryvar[2],
-					      -foreground=>$entryvar[3]);
-			    }
-			},
-			-width=>6)->pack(-side=>'left',
-					 -padx=>5,
-					 -pady=>10);
-    $tlwins{'chngcol'}{'buttons'}[2]=
-	$setbfr->Button(-text=>'Cancel',
-			-font=>$deffont,%butcol,
-			-command=>sub{destroy $dlgwin;
-				      undef $tlwins{'chngcol'};
-				  })->pack(-side=>'right',
-					   -padx=>5,
-					   -pady=>10);
-    $dlgwin->bind('<Control-c>'=>sub{destroy $dlgwin;
-				     undef $tlwins{'chngcol'}; });
-    $dlgwin->waitVariable(\$chngflag);
-    destroy $dlgwin;
-    undef $tlwins{'chngcol'};
-    return @entryvar;
-}
-
-# check colours set in popcolor; relies on the existence of X11's showrgb
-sub colcheck {
-    my ($dlgwin,@entryvar)=@_;
-    my $ecnt=0;
-    foreach (@entryvar) { # all colours defined?
-	last unless ($_);
-	++$ecnt;
-    }
-    &popmsg(2,'Some colours undefined.',$dlgwin) if ($ecnt != 4);
-    my $defcol=0;
-    if (`which showrgb`) { # test for proper name
-	my @rgb=`showrgb`;
-	my @norgb;
-	foreach my $colour (@entryvar) {
-	    if ($colour =~ /^#[A-Fa-f0-9]{6}$/ || grep /\b$colour\b/i,@rgb) {
-		++$defcol;
-	    } else {
-		push @norgb,$colour;
-	    }
-	}
-	if ($defcol != 4) {
-	    my $norgb=join("\n",@norgb);
-	    &popmsg(2,"Some colours invalid:\n$norgb",$dlgwin);
-	}
-    } else { $defcol=4; }
-    return ($ecnt == 4 && $defcol == 4) ? 1 : 0;
-}
-
-# write user's ~/.texdocrc
-sub writerc {
-    use File::Copy qw/cp mv/;
-    my ($homedocpath_tmp,$quiet_tmp,$autoview_tmp,$xfmt_viewer_tmp,
-	$tdcolors_tmp,
-	$dvi_viewer_tmp,$dvips_conv_tmp,
-	$ps_viewer_tmp,
-	$pdf_viewer_tmp,$pdfps_conv_tmp,
-	$html_viewer_tmp,
-	$htmlps_conv_tmp,$htmlps_redir_tmp,
-	$txt_viewer_tmp,$txtps_conv_tmp,
-	$txtps_redir_tmp,$print_cmd_tmp,$parframe)=@_;
-    my $err=0;
-    mv $myrc,"$myrc.save" if (-e $myrc);
-    open(MYRC,">$myrc");
-    print MYRC "# user's .texdocrc, generated by program\n
-# root of user's doc directory (from \$HOMETEXMF)
-# can be left empty if \$TEXMFHOME is undefined
-HOMEDOCPATH=$homedocpath_tmp
-# general viewer behaviour (y or yes to make active)
-QUIET=$quiet_tmp
-AUTOVIEW=$autoview_tmp
-XFMT_VIEWER=$xfmt_viewer_tmp
-# button colours: default and active back-/foreground
-# names and RGB values are both allowed; use the form #xxxxxx for RGB
-TDCOLORS=$tdcolors_tmp
-# the following variables contain whole commands, i.e. options can be given
-# DVI settings
-DVI_VIEWER=$dvi_viewer_tmp
-DVIPS_CONV=$dvips_conv_tmp
-# PostScript handling
-PS_VIEWER=$ps_viewer_tmp
-# PDF handling
-PDF_VIEWER=$pdf_viewer_tmp
-PDFPS_CONV=$pdfps_conv_tmp
-# HTML handling
-HTML_VIEWER=$html_viewer_tmp
-HTMLPS_CONV=$htmlps_conv_tmp
-# HTMLPS_REDIR must be on, if the html->ps converter normally writes its output
-# to stdout instead of a file (e.g. as html2ps) (y or yes to make active)
-HTMLPS_REDIR=$htmlps_redir_tmp
-# Plain text handling
-# TDK_OWN is texdoctk's own text file viewer
-TXT_VIEWER=$txt_viewer_tmp
-TXTPS_CONV=$txtps_conv_tmp
-# TXTPS_REDIR must be on, if the txt->ps converter normally writes its output
-# to stdout instead of a file (e.g. as a2ps) (y or yes to make active)
-TXTPS_REDIR=$txtps_redir_tmp
-# printer
-PRINT_CMD=$print_cmd_tmp
-\n# end of config\n";
-    close(MYRC);
-}
-
-# help window (toplevel)
-sub helptext {
-#   see if toplevel window is already there
-    if (Exists($tlwins{"helptext"}{'addr'})) {
-	$tlwins{"helptext"}{'addr'}->deiconify();
-	$tlwins{"helptext"}{'addr'}->raise();
-	return;
-    }
-    my $help=$main->Toplevel(-title=>'Help/About');
-    $help->resizable(0,1);
-    $tlwins{'helptext'}{'addr'}=$help;
-    $help->Label(-text=>"texdoctk
-TeX documentation browser
- v.0.6.0a (Nov 5, 2004)",
-		 -font=>$deffont)->pack(-side=>'top',
-					-ipady=>10,
-					-anchor=>'s');
-    my $helpbody=$help->Scrolled("Text",
-				 -relief=>'flat',
-				 -font=>$deffont,
-				 -height=>20,
-				 -width=>60,
-				 -scrollbars=>"e")->pack(-side=>'top',
-							 -fill=>'y',
-							 -expand=>1);
-    my $pos=tell DATA;
-    while (<DATA>) {
-	$_ =~ s/\$sysrc/$sysrc/;
-	last if (/^#/);
-	$helpbody->insert('end',$_);
-    }
-    seek(DATA,$pos,0);
-    $helpbody->configure(-state=>'disabled');
-    $tlwins{'helptext'}{'buttons'}[0]=
-	$help->Button(-text=>'Close',
-		      -font=>$deffont,%butcol,
-		      -command=>sub{destroy $help;
-				    undef $tlwins{"helptext"};
-				})->pack(-side=>'bottom',
-					 -fill=>'x');
-    $help->bind('<Control-c>'=>sub{destroy $help; undef $tlwins{"helptext"};});
-}
-
-# read config file; personal settings override the default settings
-sub readrc {
-    my($rcfile,$icall)=@_;
-    my ($var,$val);
-    my $pathflag=0;
-    my $pathflagl=0;
-    my $pathflagh=0;
-    my $tdcolors='';
-#   for backward compatibility of converter/printer options
-    my ($dvips_opts,$pdfps_opts,$print_opts);
-#   read defaults resp. local/personal settings
-  CALL: {
-      ($icall == 1) && do {
-	open (RC,"$rcfile") ||
-	  &fatalmsg("Couldn't open system-wide default config file ${TeXDocRcDefaults}.\n");
-	last CALL;
-      };
-      ($icall == 2) && do {
-	open (RC,"$rcfile") ||
-	  &fatalmsg("Couldn't open personal config file ~/.texdocrc.\n");
-	last CALL;
-      };
-    };
-    while ($line = <RC>) {
-	next if ($line =~ /^($|#)/);
-	chomp $line;
-	($var,$val)=split("=",$line,2);
-      RCVARS: {
-	  ($var =~ /texdocpath/i) && do { # TEXDOCPATH
-	    if (length $val > 0) {
-	      $pathflag=1;
-	      eval(join("",("\$",lc($var),"=\$val")));
-	    }
-	    last RCVARS;
-	  };
-	  ($var =~ /localdocpath/i) && do { # LOCALDOCPATH
-	    if (length $val > 0) {
-	      $pathflagl=1;
-	      eval(join("",("\$",lc($var),"=\$val")));
-	    }
-	    last RCVARS;
-	  };
-	  ($var =~ /homedocpath/i) && do { # HOMEDOCPATH
-	    if ($icall == 2 && length $val > 0) { # set only in ~/.texdocrc
-	      $pathflagh=1;
-	      eval(join("",("\$",lc($var),"=\$val")));
-	    }
-	    last RCVARS;
-	  };
-	  # other variables
-	  eval(join("",("\$",lc($var),"=\$val")));
-	};
-    }
-    close(RC);
-#   find texmf/doc, and possibly other distribution texmf trees
-    if ($rcfile eq $sysrc || $pathflag == 1) {
-	$texmfmain=`kpsewhich --expand-path=${qq}\$TEXMFMAIN${qq}`;
-	chomp $texmfmain;
-	$texdocpath="$texmfmain/$texdocpath";
-	$texmfdist=`kpsewhich --expand-path=${qq}\$TEXMFDIST${qq}`;
-	chomp $texmfdist;
-	$distdocpath=join('/',"$texmfdist",basename($texdocpath,""))
-			  if (length $texmfdist);
-	# TeXLive has this texmf-doc
-	$texmfdoc=join('/',"$texmfmain-doc",basename($texdocpath,""));
-	if (-e $texmfdoc) {
-	  chomp $texmfdoc;
-	  $docdocpath="$texmfdoc/$docdocpath";
-	}
-    }
-#   find texmf-local/doc, if there is one
-    if ($rcfile eq $sysrc || $pathflagl == 1) {
-	$texmflocal=`kpsewhich --expand-path=${qq}\$TEXMFLOCAL${qq}`;
-	chomp $texmflocal;
-	if (length $texmflocal) {
-	  # if LOCALDOCPATH is not explicitly defined, it equals TEXDOCPATH
-	  unless (defined $localdocpath) {
-	    $localdocpath=basename($texdocpath,"");
-	  }
-	  $localdocpath="$texmflocal/$localdocpath";
-	}
-    }
-#   find user's $HOMETEXMF/doc, if there is one
-    if ($icall == 2 || $pathflagh == 1) {
-        $texmfhome=`kpsewhich --expand-path=${qq}\$HOMETEXMF${qq}`;
-	chomp $texmfhome;
-	if (length $texmfhome) {
-	  # if HOMEDOCPATH is not explicitly defined, it equals TEXDOCPATH
-	  unless (defined $homedocpath) {
-	    $homedocpath=basename($texdocpath,"");
-	  }
-	  $homedocpath="$texmfhome/$homedocpath";
-	}
-    }
-#   colours: create array
-    @tdcolors=split(' ',$tdcolors);
-    if (scalar @tdcolors != 4) { # if old texdocrc file is used
-	if (!(-e $myrc) || (-e $myrc && $icall == 2)) {
-	    print "NOTE: Button colours not set in $rcfile; using defaults.\n";
-	    @tdcolors=('#d9d9d9','Black','#ececec','red');
-	}
-    }
-    %butcol=('-background'=>$tdcolors[0],
-	     '-foreground'=>$tdcolors[1],
-	     '-activebackground'=>$tdcolors[2],
-	     '-activeforeground'=>$tdcolors[3]);
-#   viewer: suppress viewer warnings/use $PAGER if no $txt_viewer is defined
-    $quiet=($quiet =~ /y/i || $quiet eq "1") ? 1 : 0;
-    if (!(defined $txt_viewer) && defined $ENV{PAGER}) {
-	$txt_viewer=$ENV{PAGER};
-    }
-#   viewer: autostart viewer if listbox of search results contains only 1 item
-    $autoview=($autoview =~ /y/i || $autoview eq "1") ? 1 : 0;
-#   viewer: use text viewer to open files with unrecognized format
-    $xfmt_viewer=($xfmt_viewer =~ /y/i || $xfmt_viewer eq "1") ? 1 : 0;
-#   converter: output redirection flags for HTML/Text->PS converters
-    $htmlps_redir=($htmlps_redir =~ /(y|1)/i) ? 1 : 0;
-    $txtps_redir=($txtps_redir =~ /(y|1)/i) ? 1 : 0;
-#   for backward compatibility of converter/printer options
-    $dvips_conv.=" $dvips_opts" if ($dvips_opts);
-    $pdfps_conv.=" $pdfps_opts" if ($pdfps_opts);
-    $print_cmd.=" $print_opts" if ($print_opts);
-}
-
-# determine resolution if xwininfo is available
-# slightly modified from a patch contributed by Reinhard Kotucha
-sub x_resolution {
-    my $x_res;
-    if ($IsWin32) {
-      $x_res = &GetScreenWidth;
-    }
-    else {
-      open(XINF,"xwininfo -root|") or return 1200;
-      while (<XINF>) {
-        chop;
-        if (/Width:/) { ($x_res=$_)=/Width:\s+(\d+)/; last; }
-      }
-      close(XINF);
-    }
-    return $x_res;
-}
-
-# generate a random name for temporary files
-sub randname {
-    my $namestr;
-    my @chars=("A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z");
-    my $time=time;
-    my $maxcnt=3+substr($time,-1);
-    for (my $i=0; $i<=$maxcnt; $i++) { $namestr.=$chars[rand(51)] }
-    my @tmp=split(/./,$time/$$);
-    $namestr.=$tmp[1];
-    until (length($namestr) > 16) { $namestr.=int(rand(1000000)) }
-    return $namestr;
-}
-
-# find index of an array entry
-sub arrindex {
-  my @array=@_;
-  my $item=pop @array;
-  my $i=0;
-  foreach (@array) {
-    last if ($_ eq $item);
-    ++$i;
-  }
-  return $i;
-}
-
-# clean up and exit
-sub clean_exit {
-    foreach (@tmpfiles) { if (-e $_) { unlink $_; } }
-    exit;
-}
-
-# alternative main window, launched for fatal error messages on startup
-sub fatalmsg {
-    my($msg)=@_;
-    print STDERR $msg; # also print to stderr
-# create frame for main window
-    my $main=new MainWindow;
-    $main->resizable(0,0);
-    $main->title("TeX Documentation Browser");
-    $main->bind('<Control-q>'=>sub { exit });
-    $main->bind('<Control-k>'=>sub { exit });
-    my $msgframe=$main->Frame(-background=>"#ffcc99");
-    my $cmdframe=$main->Frame;
-    $msgframe->pack(-side=>'top');
-    $cmdframe->pack(-side=>'bottom',-fill=>'x');
-# make buttons for command frame
-    my $Qbut=$cmdframe->Button(-text=>'Kill',%butcol,
-			       -command=>sub { exit })->pack(-fill=>'x');
-# define common default font for labels and text explicitly
-    my @deffont=$Qbut->configure(-font);
-# ensure readability on high-res screens (suggested by R.Kotucha)
-    $deffont='Helvetica -16 bold' if &x_resolution > 1200;
-    $Qbut->configure(-font=>$deffont);
-    $msgframe->Label(-text=>'FATAL ERROR',
-		     -font=>$deffont)->pack(-side=>'top', -fill=>'x');
-#   get size of message text
-    my @dummy=split("\n",$msg);
-    my $nline=scalar @dummy;
-    my $msgwidth=0;
-    my $lline;
-    foreach (@dummy) {
-	$lline=length $_;
-	if ($lline > $msgwidth) { $msgwidth=$lline; }
-    }
-    my $message=$msgframe->Text(-relief=>'flat',
-				-font=>$deffont,
-				-height=>$nline,
-				-width=>$msgwidth)->pack(-side=>'top');
-    $message->insert('end',$msg);
-    $message->configure(-state=>'disabled');
-    MainLoop;
-}
-
-if ($IsWin32) {
-  sub GetScreenWidth {
-    my $GetDeviceCaps = new Win32::API('gdi32', 'GetDeviceCaps', 'NN', 'N');
-    my $HORZRES = 8; # from WinGDI.h
-    if(not defined $GetDeviceCaps) {
-      die "Can't import API GetDeviceCaps: $!\n";
-    }
-    return $GetDeviceCaps->Call(0, $HORZRES);
-  }
-
-  sub GetTempPath {
-    my $GetTempPath = new Win32::API('kernel32', 'GetTempPath', 'NP', 'N');
-    if(not defined $GetTempPath) {
-      die "Can't import API GetTempPath: $!\n";
-    }
-    my $lpBuffer = " " x 260;
-
-    $GetTempPath->Call(80, $lpBuffer);
-  }
-
-  sub ShellExecute {
-    my ($command, $file) = @_;
-    my $ShellExecute = new Win32::API('shell32', 'ShellExecute', 'NPPPPN', 'N');
-    if(not defined $ShellExecute) {
-      die "Can't import API ShellExecute: $!\n";
-    }
-    $ShellExecute->Call(0, $command, $file, '', '', 0);
-  }
-
-  sub GetHomeDir {
-    my $home = $ENV{'HOME'};
-    # Should check for CSIDL_...
-    return $home;
-  }
-}
-__END__
-Many TeX programmers provide more or less detailed manuals for
-their programs or packages. They are usually available as .dvi,
-.ps, .pdf, .html or plain text files (sometimes included in the
-.sty files instead of a separate documentation file) and can be
-accessed with this browser, which is simply an interface to find a
-documentation more easily. It starts the respective viewer for
-reading the selected documentation making use of a database file
-which contains the path entries according to the current teTeX
-texmf/doc structure; additional usage of a system-wide local and
-of individual user texmf trees with corresponding databases is also
-possible.
-The documentations are grouped in several categories shown in the
-main window; pressing one of its buttons lists all documentations
-belonging to this topic.
-The topic window lets you select one documentation file, view or
-send it to the default printer. By right-clicking on the selected
-item you get the complete path of the file.
-The search button of the main window allows you to search the
-database for a string; it does not search file names. Enter the
-string and hit <Return> to start the search or <Control-c> to
-cancel. Just hitting <Return> without typing something in will
-show the full list of files in the database.
-Defaults for the documentation root directory, the viewers, the
-converters, certain options and the printer are set in the global
-configuration file $sysrc.
-However, each user can put a copy of it as .texdocrc into his home
-directory to modify them according to his needs; modification or
-generation of ~/.texdocrc can also be done with the Settings menu.
-Additionally, the settings can be changed temporarily with this
-menu.
-
-The following key shortcuts are defined for use with the browser:
-  <Ctrl-q>	Quit browser
-  <Ctrl-m>	Raise the Main window to the foreground
-  <Ctrl-s>	Search a keyword in database (case insensitive)
-  <Ctrl-c>	Cancel/close subwindow or search entry widget
-  <Ctrl-v>	View selected document (topic windows)
-  <Ctrl-p>	Print selected document (topic windows)
-  <Ctrl-t>	Open settings menu
-  <Ctrl-k>	Kill fatal error message window (same as
-		<Ctrl-q>)
-  <Ctrl-h>	Open this help
-  <Return>	Equivalent to button press;
-		OK in selection menu and search
-  <Tab>		Next/previous widget
-
-There are the following command line options:
-  -a		autostart viewer if a listbox of search results
-		contains only one item; can also be set in a
-		configuration file
-  -v		disable suppression of viewer messages sent to
-		stderr and of certain permanent message popup
-		windows, in case this was not set in a
-		configuration file; default: off
-
-Some more information is available in the manpage of texdoctk.
-
-Comments and suggestions to:
-Thomas Ruedas
-tr@geol.ku.dk
-# Local Variables:
-# mode: perl
-# auto-fill-hook: do-auto-fill
-# End:
+../../texmf/scripts/tetex/texdoctk.pl
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/texi2dvi b/Master/bin/alpha-linux/texi2dvi
index 18f6f59322b..4607be1949e 100755
--- a/Master/bin/alpha-linux/texi2dvi
+++ b/Master/bin/alpha-linux/texi2dvi
@@ -1,14 +1,14 @@
 #! /bin/sh
-# texi2dvi --- produce DVI (or PDF) files from Texinfo (or LaTeX) sources.
-# $Id: texi2dvi,v 1.42 2005/02/11 13:35:14 karl Exp $
+# texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
+# $Id: texi2dvi,v 1.122 2008/04/17 18:45:49 karl Exp $
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
-# 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# the Free Software Foundation; either version 3 of the License,
+# or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, you can either send email to this
-# program's maintainer or write to: The Free Software Foundation,
-# Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Original author: Noah Friedman.
 #
@@ -31,48 +29,106 @@ test -f /bin/ksh && test -z "$RUNNING_KSH" \
   && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; }
 unset RUNNING_KSH
 
+# No failure shall remain unpunished.
+set -e
+
 # This string is expanded by rcs automatically when this file is checked out.
-rcs_revision='$Revision: 1.42 $'
+rcs_revision='$Revision: 1.122 $'
 rcs_version=`set - $rcs_revision; echo $2`
 program=`echo $0 | sed -e 's!.*/!!'`
-version="texi2dvi (GNU Texinfo 4.8) $rcs_version
+version="texi2dvi (GNU Texinfo 4.12) $rcs_version
+
+Copyright (C) 2008 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+"
 
-Copyright (C) 2005 Free Software Foundation, Inc.
-There is NO warranty.  You may redistribute this software
-under the terms of the GNU General Public License.
-For more information about these matters, see the files named COPYING."
+build_mode=${TEXI2DVI_BUILD_MODE:-local}
+build_dir=${TEXI2DVI_BUILD_DIRECTORY:-.}
 
 usage="Usage: $program [OPTION]... FILE...
 
-Run each Texinfo or LaTeX FILE through TeX in turn until all
+Run each Texinfo or (La)TeX FILE through TeX in turn until all
 cross-references are resolved, building all indices.  The directory
 containing each FILE is searched for included files.  The suffix of FILE
-is used to determine its language (LaTeX or Texinfo).
+is used to determine its language ((La)TeX or Texinfo).  To process
+(e)plain TeX files, set the environment variable LATEX=tex.
+
+In order to make texi2dvi a drop-in replacement of TeX/LaTeX in AUC-TeX,
+the FILE may also be composed of the following simple TeX commands.
+  \`\\input{FILE}'     the actual file to compile
+  \`\\nonstopmode'     same as --batch
 
 Makeinfo is used to perform Texinfo macro expansion before running TeX
 when needed.
 
-Operation modes:
+General options:
   -b, --batch         no interaction
-  -c, --clean         remove all auxiliary files
   -D, --debug         turn on shell debugging (set -x)
   -h, --help          display this help and exit successfully
   -o, --output=OFILE  leave output in OFILE (implies --clean);
-                      Only one input FILE may be specified in this case
+			only one input FILE may be specified in this case
   -q, --quiet         no output unless errors (implies --batch)
   -s, --silent        same as --quiet
   -v, --version       display version information and exit successfully
   -V, --verbose       report on what is done
 
 TeX tuning:
-  -@                   use @input instead of \input; for preloaded Texinfo
-  -e, -E, --expand     force macro expansion using makeinfo
-  -I DIR               search DIR for Texinfo files
-  -l, --language=LANG  specify the LANG of FILE (LaTeX or Texinfo)
-  -p, --pdf            use pdftex or pdflatex for processing
-  -r, --recode         call recode before TeX to translate input characters
-  -t, --command=CMD    insert CMD in copy of input file
-   or --texinfo=CMD    multiple values accumulate
+  -@                         use @input instead of \input for preloaded Texinfo
+      --dvi                  output a DVI file [default]
+  -e, -E, --expand           force macro expansion using makeinfo
+  -I DIR                     search DIR for Texinfo files
+  -l, --language=LANG        specify the LANG of FILE (LaTeX or Texinfo)
+      --no-line-error        do not pass --file-line-error to TeX
+  -p, --pdf                  use pdftex or pdflatex for processing
+  -r, --recode               call recode before TeX to translate input
+      --recode-from=ENC      recode from ENC to the @documentencoding
+      --src-specials         pass --src-specials to TeX
+  -t, --command=CMD          insert CMD in copy of input file
+   or --texinfo=CMD          multiple values accumulate
+      --translate-file=FILE  use given charset translation file for TeX
+
+Build modes:
+  --build=MODE         specify the treatment of auxiliary files [$build_mode]
+      --tidy           same as --build=tidy
+  -c, --clean          same as --build=clean
+      --build-dir=DIR  specify where the tidy compilation is performed;
+			 implies --tidy;
+			 defaults to TEXI2DVI_BUILD_DIRECTORY [$build_dir]
+  --mostly-clean       remove the auxiliary files and directories
+			 but not the output
+
+The MODE specifies where the TeX compilation takes place, and, as a
+consequence, how auxiliary files are treated.  The build mode
+can also be set using the environment variable TEXI2DVI_BUILD_MODE.
+
+Valid MODEs are:
+  \`local'      compile in the current directory, leaving all the auxiliary
+	       files around.  This is the traditional TeX use.
+  \`tidy'       compile in a local *.t2d directory, where the auxiliary files
+	       are left.  Output files are copied back to the original file.
+  \`clean'      same as \`tidy', but remove the auxiliary directory afterwards.
+	       Every compilation therefore requires the full cycle.
+
+Using the \`tidy' mode brings several advantages:
+  -   the current directory is not cluttered with plethora of temporary files.
+  -   clutter can be even reduced using --build-dir=dir: all the *.t2d
+      directories are stored there.
+  -   clutter can be reduced to zero using, e.g., --build-dir=/tmp/\$USER.t2d
+      or --build-dir=\$HOME/.t2d.
+  -   the output file is updated after every succesful TeX run, for
+      sake of concurrent visualization of the output.  In a \`local' build
+      the viewer stops during the whole TeX run.
+  -   if the compilation fails, the previous state of the output file
+      is preserved.
+  -   PDF and DVI compilation are kept in separate subdirectories
+      preventing any possibility of auxiliary file incompatibility.
+
+On the other hand, because \`tidy' compilation takes place in another
+directory, occasionally TeX won't be able to find some files (e.g., when
+using \\graphicspath): in that case use -I to specify the additional
+directories to consider.
 
 The values of the BIBTEX, LATEX (or PDFLATEX), MAKEINDEX, MAKEINFO,
 TEX (or PDFTEX), TEXINDEX, and THUMBPDF environment variables are used
@@ -86,30 +142,48 @@ Texinfo home page: http://www.gnu.org/software/texinfo/"
 # Initialize variables for option overriding and otherwise.
 # Don't use `unset' since old bourne shells don't have this command.
 # Instead, assign them an empty value.
-batch=false     # eval for batch mode
-clean=
-debug=
-escape='\'
+action=compile
+batch=false     # true for batch mode
+debug=false
+escape="\\"
 expand=         # t for expansion via makeinfo
-miincludes=     # makeinfo include path
-oformat=dvi
+includes=
+line_error=true # Pass --file-line-error to TeX.
+no_line_error=false  # absolutely do not pass --file-line-error to TeX
 oname=          # --output
-quiet=          # by default let the tools' message be displayed
+out_lang=dvi
+quiet=false     # by default let the tools' message be displayed
 recode=false
 set_language=
+src_specials=
 textra=         # Extra TeX commands to insert in the input file.
-textra_cmd=     # sed command to insert TEXTRA where appropriate
-tmpdir=${TMPDIR:-/tmp}/t2d$$  # avoid collisions on 8.3 filesystems.
-txincludes=     # TEXINPUTS extensions, with trailing colon
 txiprereq=19990129 # minimum texinfo.tex version with macro expansion
-verb=false      # echo for verbose mode
+verb=false      # true for verbose mode
+translate_file= # name of charset translation file
+recode_from=    # if not empty, recode from this encoding to @documentencoding
 
 orig_pwd=`pwd`
 
+# We have to initialize IFS to space tab newline since we save and
+# restore IFS and apparently POSIX allows stupid/broken behavior with
+# empty-but-set IFS.
+# http://lists.gnu.org/archive/html/automake-patches/2006-05/msg00008.html
+# We need space, tab and new line, in precisely that order.  And don't leave
+# trailing blanks.
+space=' '
+tab='	'
+newline='
+'
+IFS="$space$tab$newline"
+
+# In case someone pedantic insists on using grep -E.
+: ${EGREP=egrep}
+
 # Systems which define $COMSPEC or $ComSpec use semicolons to separate
-# directories in TEXINPUTS -- except for Cygwin, where COMSPEC might be
-# inherited, but : is used.
-if test -n "$COMSPEC$ComSpec" && uname | grep -iv cygwin >/dev/null; then
+# directories in TEXINPUTS -- except for Cygwin et al., where COMSPEC
+# might be inherited, but : is used.
+if test -n "$COMSPEC$ComSpec" \
+   && uname | $EGREP -iv 'cygwin|mingw|djgpp' >/dev/null; then
   path_sep=";"
 else
   path_sep=":"
@@ -118,37 +192,129 @@ fi
 # Pacify verbose cds.
 CDPATH=${ZSH_VERSION+.}$path_sep
 
-# In case someone crazy insists on using grep -E.
-: ${EGREP=egrep}
+# If $TEX is set to a directory, don't use it.
+test -n "$TEX" && test -d "$TEX" && unset TEX
 
-# return true if program $1 is somewhere in PATH, else false.
+# 
+## --------------------- ##
+## Auxiliary functions.  ##
+## --------------------- ##
+
+# In case `local' is not supported by the shell, provide a function
+# that simulates it by simply performing the assignments.  This means
+# that we must not expect `local' to work, i.e., we must not (i) rely
+# on it during recursion, and (ii) have two local declarations of the
+# same variable.  (ii) is easy to check statically, and our test suite
+# does make sure there is never twice a static local declaration of a
+# variable.  (i) cannot be checked easily, so just be careful.
 #
-findprog ()
+# Note that since we might use a function simulating `local', we can
+# no longer rely on the fact that no IFS-splitting is performed.  So,
+# while
+#
+# foo=$bar
+#
+# is fine (no IFS-splitting), never write
+#
+# local foo=$bar
+#
+# but rather
+#
+# local foo="$bar"
+(
+  foo=bar
+  test_local () {
+    local foo=foo
+  }
+  test_local
+  test $foo = bar
+) || local () {
+  case $1 in
+    *=*) eval "$1";;
+  esac
+}
+
+
+# cd_orig
+# -------
+# Return to the original directory.
+cd_orig ()
 {
-  foundprog=false
+  # In case $orig_pwd is on a different drive (for DOS).
+  cd /
 
-  saveIFS=$IFS
+  # Return to the original directory so that
+  # - the next file is processed in correct conditions
+  # - the temporary file can be removed
+  cd "$orig_pwd" || exit 1
+}
+
+# func_dirname FILE
+# -----------------
+# Return the directory part of FILE.
+func_dirname ()
+{
+  dirname "$1" 2>/dev/null \
+  || { echo "$1" | sed 's!/[^/]*$!!;s!^$!.!'; }
+}
+
+
+# absolute NAME -> ABS-NAME
+# -------------------------
+# Return an absolute path to NAME.
+absolute ()
+{
+  case $1 in
+   [\\/]* | ?:[\\/]*)
+      # Absolute paths don't need to be expanded.
+      echo "$1"
+      ;;
+   *) local slashes
+      slashes=`echo "$1" | sed -n 's,.*[^/]\(/*\)$,\1,p'`
+      local rel
+      rel=$orig_pwd/`func_dirname "$1"`
+      if test -d "$rel"; then
+	(cd "$rel" 2>/dev/null &&
+	 local n
+	 n=`pwd`/`basename "$1"`"$slashes"
+	 echo "$n")
+      else
+	error 1 "not a directory: $rel"
+      fi
+      ;;
+  esac
+}
+
+
+# findprog PROG
+# -------------
+# Return true if PROG is somewhere in PATH, else false.
+findprog ()
+{
+  local saveIFS="$IFS"
   IFS=$path_sep  # break path components at the path separator
   for dir in $PATH; do
-    # use test -x rather than test -f for DJGPP, where test -x checks
-    # for .exe.  But test -x will also return true for directories, so
-    # explicitly ignore those.
-    if test -x "$dir/$1" && test ! -d "$dir/$1"; then
-      foundprog=true
-      break
-
-    # But on cygwin, test -x foo will not find foo.exe.  So also check
-    # for that.
-    elif test -x "$dir/$1.exe"; then
-      foundprog=true
-      break      
+    IFS=$saveIFS
+    # The basic test for an executable is `test -f $f && test -x $f'.
+    # (`test -x' is not enough, because it can also be true for directories.)
+    # We have to try this both for $1 and $1.exe.
+    #
+    # Note: On Cygwin and DJGPP, `test -x' also looks for .exe.  On Cygwin,
+    # also `test -f' has this enhancement, bot not on DJGPP.  (Both are
+    # design decisions, so there is little chance to make them consistent.)
+    # Thusly, it seems to be difficult to make use of these enhancements.
+    #
+    if  { test -f "$dir/$1"	&& test -x "$dir/$1"; } ||
+	{ test -f "$dir/$1.exe"	&& test -x "$dir/$1.exe"; }; then
+      return 0
     fi
   done
-  IFS=$saveIFS
-  $foundprog
+  return 1
 }
 
-# Report some information.
+# report LINE1 LINE2...
+# ---------------------
+# Report some information on stderr.
 report ()
 {
   for i in "$@"
@@ -157,30 +323,1083 @@ report ()
   done
 }
 
+# verbose WORD1 WORD2
+# -------------------
 # Report some verbose information.
 verbose ()
 {
-  $verb >&2 "$0: $@"
+  if $verb; then
+    echo >&2 "$0: $@"
+  fi
 }
 
-# Report an error and exit with failure.
-fatal ()
+# run COMMAND-LINE
+# ----------------
+# Run the COMMAND-LINE verbosely, and catching errors as failures.
+run ()
 {
-  s=$1
+  verbose "Running $@"
+  "$@" 2>&5 1>&2 ||
+     error 1 "$1 failed"
+}
+
+
+# error EXIT_STATUS LINE1 LINE2...
+# --------------------------------
+# Report an error and exit with failure if EXIT_STATUS is non null.
+error ()
+{
+  local s="$1"
   shift
   report "$@"
-  exit $s
+  if test "$s" != 0; then
+    exit $s
+  fi
+}
+
+# ensure_dir DIR1 DIR2...
+# -----------------------
+# Make sure the directories exist.
+ensure_dir ()
+{
+  for dir
+  do
+    test -d "$dir" \
+      || mkdir "$dir" \
+      || error 1 "cannot create directory: $dir"
+  done
+}
+
+
+## ---------------- ##
+## Handling lists.  ##
+## ---------------- ##
+
+
+# list_append LIST-NAME ELEM
+# --------------------------
+# Set LIST-NAME to its former contents, with ELEM appended.
+list_append ()
+{
+  local la_l="$1"
+  shift
+  eval set X \$$la_l "$@"
+  shift
+  eval $la_l=\""$@"\"
+}
+
+# list_prefix LIST-NAME SEP -> STRING
+# -----------------------------------
+# Return a string that is composed of the LIST-NAME with each item
+# preceded by SEP.
+list_prefix ()
+{
+  local lp_p="$2"
+  eval set X \$$1
+  shift
+  local lp_res
+  for i
+  do
+    lp_res="$lp_res \"$lp_p\" \"$i\""
+  done
+  echo "$lp_res"
 }
 
+# list_infix LIST-NAME SEP -> STRING
+# ----------------------------------
+# Same as list_prefix, but a separator.
+list_infix ()
+{
+  eval set X \$$1
+  shift
+  local la_IFS="$IFS"
+  IFS=$path_sep
+  echo "$*"
+  IFS=$la_IFS
+}
+
+# list_dir_to_abs LIST-NAME
+# -------------------------
+# Convert the list to using only absolute dir names.
+# Currently unused, but should replace absolute_filenames some day.
+list_dir_to_abs ()
+{
+  local ld_l="$1"
+  eval set X \$$ld_l
+  shift
+  local ld_res
+  for dir
+  do
+    dir=`absolute "$dir"`
+    test -d "$dir" || continue
+    ld_res="$ld_res \"$dir\""
+  done
+  set X $ld_res; shift
+  eval $ld_l=\"$@\"
+}
+
+
+## ------------------------------ ##
+## Language auxiliary functions.  ##
+## ------------------------------ ##
+
+# out_lang_tex
+# ------------
+# Return the tex output language (DVI or PDF) for $OUT_LANG.
+out_lang_tex ()
+{
+  case $out_lang in
+    dvi | ps | dvipdf ) echo dvi;;
+    pdf ) echo $out_lang;;
+    html | info | text ) echo $out_lang;;
+    *)    error 1 "$0: invalid out_lang: $1";;
+  esac
+}
+
+
+# out_lang_ext
+# ------------
+# Return the extension for $OUT_LANG.
+out_lang_ext ()
+{
+  case $out_lang in
+    dvipdf ) echo pdf;;
+    dvi | html | info | pdf | ps | text ) echo $out_lang;;
+    *)    error 1 "$0: invalid out_lang: $1";;
+  esac
+}
+
+
+## ------------------------- ##
+## TeX auxiliary functions.  ##
+## ------------------------- ##
+
 # Save TEXINPUTS so we can construct a new TEXINPUTS path for each file.
 # Likewise for bibtex and makeindex.
-tex_envvars="BIBINPUTS BSTINPUTS INDEXSTYLE TEXINPUTS"
+tex_envvars="BIBINPUTS BSTINPUTS DVIPSHEADERS INDEXSTYLE MFINPUTS MPINPUTS \
+TEXINPUTS TFMFONTS"
 for var in $tex_envvars; do
   eval ${var}_orig=\$$var
   export $var
 done
 
 
+# absolute_filenames TEX-PATH -> TEX-PATH
+# ---------------------------------------
+# Convert relative paths to absolute paths, so we can run in another
+# directory (e.g., in tidy build mode, or during the macro-support
+# detection).
+#
+# Empty path components are meaningful to tex.  We rewrite them
+# as `EMPTY' so they don't get lost when we split on $path_sep.
+# Hopefully no one will have an actual directory named EMPTY.
+absolute_filenames ()
+{
+  local replace_empty="-e 's/^$path_sep/EMPTY$path_sep/g' \
+		       -e 's/$path_sep\$/${path_sep}EMPTY/g' \
+		       -e 's/$path_sep$path_sep/${path_sep}EMPTY:/g'"
+  local res
+  res=`echo "$1" | eval sed $replace_empty`
+  save_IFS=$IFS
+  IFS=$path_sep
+  set x $res; shift
+  res=.
+  for dir
+  do
+    case $dir in
+      EMPTY)
+	res=$res$path_sep
+	;;
+      *)
+	if test -d $dir; then
+	  res=$res$path_sep`absolute "$dir"`
+	fi
+	;;
+    esac
+  done
+  echo "$res"
+}
+
+
+# output_base_name FILE
+# ---------------------
+# The name of FILE, possibly renamed to satisfy --output.
+output_base_name ()
+{
+  case $oname in
+    '') echo "$1";;
+     *) local out_noext
+	out_noext=`echo "$oname" | sed 's/\.[^.]*$//'`
+	local file_ext
+	file_ext=`echo "$1" | sed 's/^.*\.//'`
+	echo "$out_noext.$file_ext"
+      ;;
+  esac
+}
+
+
+# move_to_dest FILE...
+# --------------------
+# Move FILE to the place where the user expects it.  Truly move it, that
+# is, it must not remain in its build location unless that is also the
+# output location.  (Otherwise it might appear as an extra file in make
+# distcheck.)
+#
+# FILE can be the principal output (in which case -o directly applies), or
+# an auxiliary file with the same base name.
+move_to_dest ()
+{
+  local dest
+  local destfile
+  local destdir
+  local destbase
+  local sourcedir
+  local sourcebase
+
+  for file
+  do
+    case $tidy:$oname in
+      true:)  dest=$orig_pwd;;
+      false:) dest=;;
+      *:*)    dest=`output_base_name "$file"`;;
+    esac
+    if test ! -f "$file"; then
+      error 1 "no such file or directory: $file"
+    fi
+    if test -n "$dest"; then
+      # We need to know whether $dest is a directory.
+      if test -d "$dest"; then
+        destdir=$dest
+        destfile=$dest/$file
+      else
+        destdir="`dirname $dest`"
+        destfile=$dest
+      fi
+      # We want to compare the source location and the output location,
+      # and if they are different, do the move.  But if they are the
+      # same, we must preserve the source.  Since we can't assume
+      # stat(1) or test -ef is available, resort to comparing the
+      # directory names, canonicalized with pwd.  We can't use cmp -s
+      # since the output file might not actually change from run to run;
+      # e.g., TeX DVI output is timestamped to only the nearest minute.
+      destdir=`cd $destdir && pwd`
+      destbase=`basename $destfile`
+      #
+      sourcedir=`dirname $file`
+      sourcedir=`cd $sourcedir && pwd`
+      sourcebase=`basename $file`
+      #
+      if test "$sourcedir/$sourcebase" != "$destdir/$destbase"; then
+        verbose "Moving $file to $destfile"
+        rm -f "$destfile"
+        mv "$file" "$destfile"
+      fi
+    fi
+  done
+}
+
+
+## --------------------- ##
+## Managing xref files.  ##
+## --------------------- ##
+
+# aux_file_p FILE
+# ---------------
+# Return with success with FILE is an aux file.
+aux_file_p ()
+{
+  test -f "$1" || return 1
+  case $1 in
+    *.aux) return 0;;
+    *)     return 1;;
+  esac
+}
+
+# bibaux_file_p FILE
+# ------------------
+# Return with success with FILE is an aux file containing citation
+# requests.
+bibaux_file_p ()
+{
+  test -s "$1" || return 1
+  if (grep '^\\bibstyle[{]' "$1"   \
+      && grep '^\\bibdata[{]' "$1" \
+      ## The following line is suspicious: fails when there
+      ## are citations in sub aux files.  We need to be
+      ## smarter in this case.
+      ## && grep '^\\citation[{]' "$f"
+      ) >&6 2>&1;
+  then
+    return 0
+  fi
+  return 1
+}
+
+# index_file_p FILE
+# -----------------
+# Return with success with FILE is an index file.
+# When index.sty is used, there is a space before the brace.
+index_file_p ()
+{
+  test -f "$1" || return 1
+  case `sed '1q' "$1"` in
+    "\\entry{"*|"\\indexentry{"*|"\\indexentry {"*) return 0;;
+    *) return 1;;
+  esac
+}
+
+# xref_file_p FILE
+# ----------------
+# Return with success if FILE is an xref file (indexes, tables and lists).
+xref_file_p ()
+{
+  test -f "$1" || return 1
+  # If the file is not suitable to be an index or xref file, don't
+  # process it.  It's suitable if the first character is a
+  # backslash or right quote or at, as long as the first line isn't
+  # \input texinfo.
+  case `sed '1q' "$1"` in
+    "\\input texinfo"*) return 1;;
+    [\\''@]*)           return 0;;
+	   *)           return 1;;
+  esac
+}
+
+
+# generated_files_get FILENAME-NOEXT [PREDICATE-FILTER]
+# -----------------------------------------------------
+# Return the list of files generated by the TeX compilation of FILENAME-NOEXT.
+generated_files_get ()
+{
+  local filter=true
+  if test -n "$2"; then
+    filter=$2
+  fi
+
+  # Gather the files created by TeX.
+  (
+    if test -f "$1.log"; then
+      sed -n -e "s,^\\\\openout.* = \`\\(.*\\)'\\.,\\1,p" "$1.log"
+    fi
+    echo "$1.log"
+  ) |
+  # Depending on these files, infer outputs from other tools.
+  while read file; do
+    echo $file
+    case $in_lang in
+      texinfo)
+	# texindex: texinfo.cp -> texinfo.cps
+       if index_file_p $file; then
+	 echo ${file}s
+       fi
+       ;;
+      latex)
+       # bibtex: *.aux -> *.bbl and *.blg.
+	if aux_file_p $file; then
+	  echo $file | sed 's/^\(.*\)\.aux$/\1.bbl/'
+	 echo $file | sed 's/^\(.*\)\.aux$/\1.blg/'
+       fi
+       ;;
+    esac
+  done |
+  # Filter existing files matching the criterion.
+  # 
+  # With an input file name containing a space, this produces a
+  # "command not found" message (and filtering is ineffective).
+  # The situation with a newline is presumably even worse.
+  while read file; do
+    if $filter "$file"; then
+      echo $file
+    fi
+  done |
+  sort |
+  # Some files are opened several times, e.g., listings.sty's *.vrb.
+  uniq
+}
+
+
+# xref_files_save
+# ---------------
+# Save the xref files.
+xref_files_save ()
+{
+  # Save copies of auxiliary files for later comparison.
+  xref_files_orig=`generated_files_get "$in_noext" xref_file_p`
+  if test -n "$xref_files_orig"; then
+    verbose "Backing up xref files: $xref_files_orig"
+    # The following line improves `cp $xref_files_orig "$work_bak"'
+    # by preserving the directory parts.  Think of
+    # cp chap1/main.aux chap2/main.aux $work_bak.
+    tar cf - $xref_files_orig | (cd "$work_bak" && tar xf -)
+  fi
+}
+
+
+# xref_files_changed
+# ------------------
+# Whether the xref files were changed since the previous run.
+xref_files_changed ()
+{
+  # LaTeX (and the package changebar) report in the LOG file if it
+  # should be rerun.  This is needed for files included from
+  # subdirs, since texi2dvi does not try to compare xref files in
+  # subdirs.  Performing xref files test is still good since LaTeX
+  # does not report changes in xref files.
+  if grep "Rerun to get" "$in_noext.log" >&6 2>&1; then
+    return 0
+  fi
+
+  # If old and new lists don't at least have the same file list,
+  # then one file or another has definitely changed.
+  xref_files_new=`generated_files_get "$in_noext" xref_file_p`
+  verbose "Original xref files = $xref_files_orig"
+  verbose "New xref files      = $xref_files_new"
+  if test "x$xref_files_orig" != "x$xref_files_new"; then
+    return 0
+  fi
+
+  # Compare each file until we find a difference.
+  for this_file in $xref_files_new; do
+    verbose "Comparing xref file `echo $this_file | sed 's|\./||g'` ..."
+    # cmp -s returns nonzero exit status if files differ.
+    if cmp -s "$this_file" "$work_bak/$this_file"; then :; else
+      verbose "xref file `echo $this_file | sed 's|\./||g'` differed ..."
+      if $debug; then
+	diff -u "$work_bak/$this_file" "$this_file"
+      fi
+      return 0
+    fi
+  done
+
+  # No change.
+  return 1
+}
+
+
+
+## ----------------------- ##
+## Running the TeX suite.  ##
+## ----------------------- ##
+
+
+
+# run_tex ()
+# ----------
+# Run TeX as "$tex $in_input", taking care of errors and logs.
+run_tex ()
+{
+  case $in_lang:`out_lang_tex` in
+    latex:dvi)   tex=${LATEX:-latex};;
+    latex:pdf)   tex=${PDFLATEX:-pdflatex};;
+    texinfo:dvi)
+	# MetaPost also uses the TEX environment variable.  If the user
+	# has set TEX=latex for that reason, don't bomb out.
+	case $TEX in
+	  *latex) tex=tex;; # don't bother trying to find etex
+	       *) tex=$TEX
+	esac;;
+    texinfo:pdf) tex=$PDFTEX;;
+
+    *) error 1 "$0: $out_lang not supported for $in_lang";;
+  esac
+
+  # Beware of aux files in subdirectories that require the
+  # subdirectory to exist.
+  case $in_lang:$tidy in
+    latex:true)
+       sed -n 's|^[ ]*\\include{\(.*\)/.*}.*|\1|p' "$in_input" |
+       sort -u |
+       while read d
+       do
+	 ensure_dir "$work_build/$d"
+       done
+       ;;
+  esac
+
+  # Note that this will be used via an eval: quote properly.
+  local cmd="$tex"
+
+  # If possible, make TeX report error locations in GNU format.
+  if test "${tex_help:+set}" != set; then
+    # Go to a temporary directory to try --help, since old versions that
+    # don't accept --help will generate a texput.log.
+    tex_help_dir=$t2ddir/tex_help
+    ensure_dir "$tex_help_dir"
+    tex_help=`cd "$tex_help_dir" >&6 && $tex --help </dev/null 2>&1`
+  fi
+  if $no_line_error; then :; else
+    # The mk program and perhaps others want to parse TeX's
+    # original error messages.
+    case $line_error:$tex_help in
+      true:*file-line-error*) cmd="$cmd --file-line-error";;
+    esac
+  fi
+
+  # Tell TeX about TCX file, if specified.
+  test -n "$translate_file" && cmd="$cmd --translate-file=$translate_file"
+
+  # Tell TeX to make source specials (for backtracking from output to
+  # source, given a sufficiently smart editor), if specifed.
+  test -n "$src_specials" && cmd="$cmd $src_specials"
+
+  # Tell TeX to be batch if requested.
+  if $batch; then
+    # \batchmode does not show terminal output at all, so we don't
+    # want that.  And even in batch mode, TeX insists on having input
+    # from the user.  Close its stdin to make it impossible.
+    cmd="$cmd </dev/null '${escape}nonstopmode' '${escape}input'"
+  fi
+
+  # we'd like to handle arbitrary input file names, such as a~b.tex.
+  # This isn't a general way to do it :), though it does work, kind of.
+  # cmd="$cmd '${escape}catcode126=12 \input '"
+  
+  # TeX's \input does not (easily or reliably) support whitespace
+  # characters or other special characters in file names.  Our intensive
+  # use of absolute file names makes this worse: the enclosing directory
+  # names may include white spaces.  Improve the situation using a
+  # symbolic link to the filename in the current directory, in tidy mode
+  # only.  Do not alter in_input.
+  # 
+  # The filename is almost always tokenized using plain TeX conventions
+  # (the exception would be if the user made a texinfo.fmt file).  Not
+  # all the plain TeX special characters cause trouble, but there's no
+  # harm in making the link.
+  # 
+  case $tidy:`func_dirname "$in_input"` in
+    true:*["$space$tab$newline\"#\$%\\^_{}"]*)
+      _run_tex_file_name=`basename "$in_input"`
+      if test ! -f "$_run_tex_file_name"; then
+	verbose ln -s "$in_input"
+	rm -f "$_run_tex_file_name"
+	ln -s "$_run_tex_file_name"
+      fi
+      cmd="$cmd '$_run_tex_file_name'"
+      ;;
+
+    *)
+      cmd="$cmd '$in_input'"
+      ;;
+  esac
+
+  verbose "$0: Running $cmd ..."
+  if eval "$cmd" >&5; then
+    case $out_lang in
+      dvi | pdf ) move_to_dest "$in_noext.$out_lang";;
+    esac
+  else
+    error 1 "$tex exited with bad status, quitting."
+  fi
+}
+
+# run_bibtex ()
+# -------------
+# Run bibtex on current file.
+# - If its input (AUX) exists.
+# - If some citations are missing (LOG contains `Citation').
+#   or the LOG complains of a missing .bbl
+#
+# Don't try to be too smart:
+#
+# 1. Running bibtex only if the bbl file exists and is older than
+# the LaTeX file is wrong, since the document might include files
+# that have changed.
+#
+# 3. Because there can be several AUX (if there are \include's),
+# but a single LOG, looking for missing citations in LOG is
+# easier, though we take the risk to match false messages.
+run_bibtex ()
+{
+  case $in_lang in
+    latex)   bibtex=${BIBTEX:-bibtex};;
+    texinfo) return;;
+  esac
+
+  # "Citation undefined" is for LaTeX, "Undefined citation" for btxmac.tex.
+  # The no .aux && \bibdata test is also for btxmac, in case it was the
+  # first run of a bibtex-using document.  Otherwise, it's possible that
+  # bibtex would never be run.
+  if test -r "$in_noext.aux" \
+     && test -r "$in_noext.log" \
+     && (grep 'Warning:.*Citation.*undefined' "$in_noext.log" \
+	  || grep '.*Undefined citation' "$in_noext.log" \
+	  || grep 'No file .*\.bbl\.' "$in_noext.log") \
+	  || (grep 'No \.aux file' "$in_noext.log" \
+	      && grep '^\\bibdata' "$in_noext.aux") \
+	>&6 2>&1; \
+  then
+    for f in `generated_files_get "$in_noext" bibaux_file_p`
+    do
+      run $bibtex "$f"
+    done
+  fi
+}
+
+# run_index ()
+# ------------
+# Run texindex (or makeindex) on current index files.  If they already
+# exist, and after running TeX a first time the index files don't
+# change, then there's no reason to run TeX again.  But we won't know
+# that if the index files are out of date or nonexistent.
+run_index ()
+{
+  case $in_lang in
+    latex)   texindex=${MAKEINDEX:-makeindex};;
+    texinfo) texindex=${TEXINDEX:-texindex};;
+  esac
+  index_files=`generated_files_get $in_noext index_file_p`
+  if test -n "$texindex" && test -n "$index_files"; then
+    run $texindex $index_files
+  fi
+}
+
+
+# run_thumbpdf ()
+# ---------------
+run_thumbpdf ()
+{
+  if test `out_lang_tex` = pdf \
+     && test -r "$in_noext.log" \
+     && grep 'thumbpdf\.sty'  "$in_noext.log" >&6 2>&1; \
+  then
+    thumbpdf=${THUMBPDF:-thumbpdf}
+    verbose "Running $thumbpdf $in_noext ..."
+    if $thumbpdf "$in_noext" >&5; then
+      run_tex
+    else
+      report "$thumbpdf exited with bad status." \
+	     "Ignoring its output."
+    fi
+  fi
+}
+
+
+# run_dvipdf FILE.dvi
+# -------------------
+# Convert FILE.dvi to FILE.pdf.
+run_dvipdf ()
+{
+  # Find which dvi->pdf program is available.
+  if test -z "$dvipdf"; then
+    for i in "$DVIPDF" dvipdfmx dvipdfm dvipdf dvi2pdf dvitopdf;
+    do
+      if findprog $i; then
+	dvipdf=$i
+      fi
+    done
+  fi
+  # These tools have varying interfaces, some 'input output', others
+  # 'input -o output'.  They all seem to accept 'input' only,
+  # outputting using the expected file name.
+  run $dvipdf "$1"
+  if test ! -f `echo "$1" | sed -e 's/\.dvi$/.pdf/'`; then
+    error 1 "$0: cannot find output file"
+  fi
+}
+
+# run_tex_suite ()
+# ----------------
+# Run the TeX tools until a fix point is reached.
+run_tex_suite ()
+{
+  # Move to the working directory.
+  if $tidy; then
+    verbose "cd $work_build"
+    cd "$work_build" || exit 1
+  fi
+
+  # Count the number of cycles.
+  local cycle=0
+
+  while :; do
+    cycle=`expr $cycle + 1`
+    verbose "Cycle $cycle for $command_line_filename"
+
+    xref_files_save
+
+    # We run bibtex first, because I can see reasons for the indexes
+    # to change after bibtex is run, but I see no reason for the
+    # converse.
+    run_bibtex
+    run_index
+    run_core_conversion
+
+    xref_files_changed || break
+  done
+
+  # If we were using thumbpdf and producing PDF, then run thumbpdf
+  # and TeX one last time.
+  run_thumbpdf
+
+  # Install the result if we didn't already (i.e., if the output is
+  # dvipdf or ps).
+  case $out_lang in
+    dvipdf)
+      run_dvipdf "$in_noext.`out_lang_tex`"
+      move_to_dest "$in_noext.`out_lang_ext`"
+      ;;
+    ps)
+      dvips -o "$in_noext.`out_lang_ext`" "$in_noext.`out_lang_tex`"
+      move_to_dest "$in_noext.`out_lang_ext`"
+      ;;
+  esac
+
+  cd_orig
+}
+
+## -------------------------------- ##
+## TeX processing auxiliary tools.  ##
+## -------------------------------- ##
+
+
+# A sed script that preprocesses Texinfo sources in order to keep the
+# iftex sections only.  We want to remove non TeX sections, and comment
+# (with `@c texi2dvi') TeX sections so that makeinfo does not try to
+# parse them.  Nevertheless, while commenting TeX sections, don't
+# comment @macro/@end macro so that makeinfo does propagate them.
+# Unfortunately makeinfo --iftex --no-ifinfo doesn't work well enough
+# (yet), makeinfo can't parse the TeX commands, so work around with sed.
+#
+comment_iftex=\
+'/^@tex/,/^@end tex/{
+  s/^/@c texi2dvi/
+}
+/^@iftex/,/^@end iftex/{
+  s/^/@c texi2dvi/
+  /^@c texi2dvi@macro/,/^@c texi2dvi@end macro/{
+    s/^@c texi2dvi//
+  }
+}
+/^@ifnottex/,/^@end ifnottex/{
+  s/^/@c (texi2dvi)/
+}
+/^@ifinfo/,/^@end ifinfo/{
+  /^@node/p
+  /^@menu/,/^@end menu/p
+  t
+  s/^/@c (texi2dvi)/
+}
+s/^@ifnotinfo/@c texi2dvi@ifnotinfo/
+s/^@end ifnotinfo/@c texi2dvi@end ifnotinfo/'
+
+# Uncommenting is simple: Remove any leading `@c texi2dvi'.
+uncomment_iftex='s/^@c texi2dvi//'
+
+
+# run_makeinfo ()
+# ---------------
+# Expand macro commands in the original source file using Makeinfo.
+# Always use `end' footnote style, since the `separate' style
+# generates different output (arguably this is a bug in -E).  Discard
+# main info output, the user asked to run TeX, not makeinfo.
+run_makeinfo ()
+{
+  test $in_lang == texinfo ||
+    return 0
+
+  # Unless required by the user, makeinfo expansion is wanted only
+  # if texinfo.tex is too old.
+  if test "$expand" = t; then
+    makeinfo=${MAKEINFO:-makeinfo}
+  else
+    # Check if texinfo.tex performs macro expansion by looking for
+    # its version.  The version is a date of the form YEAR-MO-DA.
+    # We don't need to use [0-9] to match the digits since anyway
+    # the comparison with $txiprereq, a number, will fail with non
+    # digits.
+    # Run in a temporary directory to avoid leaving files.
+    version_test_dir=$t2ddir/version_test
+    ensure_dir "$version_test_dir"
+    (
+       cd "$version_test_dir"
+       echo '\input texinfo.tex @bye' >txiversion.tex
+       # Be sure that if tex wants to fail, it is not interactive:
+       # close stdin.
+       $TEX txiversion.tex </dev/null >txiversion.out 2>txiversion.err
+    )
+    if test $? != 0; then
+      cat "$version_test_dir/txiversion.out"
+      cat "$version_test_dir/txiversion.err" >&2
+      error 1 "texinfo.tex appears to be broken, quitting."
+    fi
+    eval `sed -n 's/^.*\[\(.*\)version \(....\)-\(..\)-\(..\).*$/txiformat=\1 txiversion="\2\3\4"/p' "$version_test_dir/txiversion.out"`
+    verbose "texinfo.tex preloaded as \`$txiformat', version is \`$txiversion' ..."
+    if test "$txiprereq" -le "$txiversion" >&6 2>&1; then
+      makeinfo=
+    else
+      makeinfo=${MAKEINFO:-makeinfo}
+    fi
+    # As long as we had to run TeX, offer the user this convenience:
+    if test "$txiformat" = Texinfo; then
+	escape=@
+    fi
+  fi
+
+  if test -n "$makeinfo"; then
+    # in_src: the file with macros expanded.
+    # Use the same basename to generate the same aux file names.
+    work_src=$workdir/src
+    ensure_dir "$work_src"
+    in_src=$work_src/$in_base
+    local miincludes
+    miincludes=`list_prefix includes -I`
+    verbose "Macro-expanding $command_line_filename to $in_src ..."
+    # eval $makeinfo because it might be defined as something complex
+    # (running missing) and then we end up with things like '"-I"',
+    # and "-I" (including the quotes) is not an option name.  This
+    # happens with gettext 0.14.5, at least.
+    sed "$comment_iftex" "$command_line_filename" \
+      | eval $makeinfo --footnote-style=end -I "$in_dir" $miincludes \
+	-o /dev/null --macro-expand=- \
+      | sed "$uncomment_iftex" >"$in_src"
+    # Continue only if everything succeeded.
+    if test $? -ne 0 \
+       || test ! -r "$in_src"; then
+      verbose "Expansion failed, ignored...";
+    else
+      in_input=$in_src
+    fi
+  fi
+}
+
+# insert_commands ()
+# ------------------
+# Used most commonly for @finalout, @smallbook, etc.
+insert_commands ()
+{
+  local textra_cmd
+  case $in_lang in
+    latex)   textra_cmd=1i;;
+    texinfo) textra_cmd='/^@setfilename/a';;
+    *)       error 1 "internal error, unknown language: $in_lang";;
+  esac
+
+  if test -n "$textra"; then
+    # _xtr.  The file with the user's extra commands.
+    work_xtr=$workdir/xtr
+    in_xtr=$work_xtr/$in_base
+    ensure_dir "$work_xtr"
+    verbose "Inserting extra commands: $textra"
+    sed "$textra_cmd\\
+$textra" "$in_input" >"$in_xtr"
+    in_input=$in_xtr
+  fi
+}
+
+# run_recode ()
+# -------------
+# If this is a Texinfo file with a specified input encoding, and
+# recode is available, then recode to plain 7 bit Texinfo.
+run_recode ()
+{
+  local from
+  local to
+
+  if test $in_lang = texinfo; then
+    pgm='s/^ *@documentencoding  *\([^ ][^ ]*\) *$/\1/
+	t found
+	d
+	:found
+	q'
+    encoding=`sed -e "$pgm" "$in_input"`
+    if $recode && test -n "$encoding" && findprog recode; then
+      if test -n "$recode_from"; then
+	from=$recode_from
+	to=$encoding
+      else
+	from=$encoding
+	to=$texinfo
+      fi
+      verbose "Recoding from $from to $to."
+      # _rcd.  The Texinfo file recoded in 7bit.
+      work_rcd=$workdir/recode
+      in_rcd=$work_rcd/$in_base
+      ensure_dir "$work_rcd"
+      if recode "$encoding..$to" <"$in_input" >"$in_rcd" \
+	 && test -s "$in_rcd"; then
+	in_input=$in_rcd
+      else
+	verbose "Recoding failed, using original input."
+      fi
+    fi
+  fi
+}
+
+# compute_language FILENAME
+# -------------------------
+# Return the short string describing the language in which FILENAME
+# is written: `texinfo' or `latex'.
+compute_language ()
+{
+  # If the user explicitly specified the language, use that.
+  # Otherwise, if the first line is \input texinfo, assume it's texinfo.
+  # Otherwise, guess from the file extension.
+  if test -n "$set_language"; then
+    echo $set_language
+  elif sed 1q "$1" | grep 'input texinfo' >&6; then
+    echo texinfo
+  else
+    # Get the type of the file (latex or texinfo) from the given language
+    # we just guessed, or from the file extension if not set yet.
+    case $1 in
+      *.ltx | *.tex | *.drv | *.dtx) echo latex;;
+      *)                             echo texinfo;;
+    esac
+  fi
+}
+
+
+# run_hevea (MODE)
+# ----------------
+# Convert to HTML/INFO/TEXT.
+#
+# Don't pass `-noiso' to hevea: it's useless in HTML since anyway the
+# charset is set to latin1, and troublesome in other modes since
+# accented characters loose their accents.
+#
+# Don't pass `-o DEST' to hevea because in that case it leaves all its
+# auxiliary files there too...  Too bad, because it means we will need
+# to handle images some day.
+run_hevea ()
+{
+  local hevea="${HEVEA:-hevea}"
+  local run_hevea="$hevea"
+
+  case $1 in
+    html) ;;
+    text|info) run_hevea="$run_hevea -$1";;
+    *) error 1 "run_hevea: invalid argument: $1";;
+  esac
+
+  # Compiling to the tmp directory enables to preserve a previous
+  # successful compilation.
+  run_hevea="$run_hevea -fix -O -o '$out_base'"
+  run_hevea="$run_hevea `list_prefix includes -I` -I '$orig_pwd' "
+  run_hevea="$run_hevea '$in_input'"
+
+  if $debug; then
+    run_hevea="$run_hevea -v -v"
+  fi
+
+  verbose "running $run_hevea"
+  if eval "$run_hevea" >&5; then
+    # hevea leaves trailing white spaces, this is annoying.
+    case $1 in text|info)
+      perl -pi -e 's/[ \t]+$//g' "$out_base"*;;
+    esac
+    case $1 in
+    html|text) move_to_dest "$out_base";;
+    info) # There can be foo.info-1, foo.info-2 etc.
+	       move_to_dest "$out_base"*;;
+    esac
+  else
+    error 1 "$hevea exited with bad status, quitting."
+  fi
+}
+
+
+# run_core_conversion ()
+# ----------------------
+# Run the TeX (or HeVeA).
+run_core_conversion ()
+{
+  case $in_lang:`out_lang_tex` in
+    *:dvi|*:pdf)
+	run_tex;;
+    latex:html|latex:text|latex:info)
+	run_hevea $out_lang;;
+    *)
+	error 1 "invalid input/output combination: $in_lang/$out_lang";;
+  esac
+}
+
+
+# compile ()
+# ----------
+# Run the full compilation chain, from pre-processing to installation
+# of the output at its expected location.
+compile ()
+{
+  # Source file might include additional sources.
+  # We want `.:$orig_pwd' before anything else.  (We'll add `.:' later
+  # after all other directories have been turned into absolute paths.)
+  # `.' goes first to ensure that any old .aux, .cps,
+  # etc. files in ${directory} don't get used in preference to fresher
+  # files in `.'.  Include orig_pwd in case we are in clean build mode, where
+  # we've cd'd to a temp directory.
+  txincludes=`list_infix includes $path_sep`
+  common="$orig_pwd$path_sep$in_dir$path_sep$txincludes$path_sep"
+  for var in $tex_envvars; do
+    eval val="\$common\$${var}_orig"
+    # Convert relative paths to absolute paths, so we can run in another
+    # directory (e.g., in clean build mode, or during the macro-support
+    # detection).
+    val=`absolute_filenames "$val"`
+    eval $var="\"$val\""
+    export $var
+    eval verbose \"$var=\'\$${var}\'\"
+  done
+
+  # --expand
+  run_makeinfo
+
+  # --command, --texinfo
+  insert_commands
+
+  # --recode
+  run_recode
+
+  # Run until a fix point is reached.
+  run_tex_suite
+}
+
+
+# remove FILES
+# ------------
+remove ()
+{
+  verbose "Removing" "$@"
+  rm -rf "$@"
+}
+
+
+# mostly_clean
+# ------------
+# Remove auxiliary files and directories.  Changes the current directory.
+mostly_clean ()
+{
+  cd_orig
+  set X "$t2ddir"
+  shift
+  $tidy || {
+    local log="$work_build/$in_noext.log"
+    set X ${1+"$@"} "$log" `generated_files_get "$work_build/$in_noext"`
+    shift
+  }
+  remove ${1+"$@"}
+}
+
+
+# cleanup ()
+# ----------
+# Remove what should be removed according to options.
+# Called at the end of each compilation cycle, and at the end of
+# the script.  Changes the current directory.
+cleanup ()
+{
+  case $build_mode in
+    local) cd_orig; remove "$t2ddir";;
+    clean) mostly_clean;;
+    tidy)  ;;
+  esac
+}
+
+
+
+## ---------------------- ##
+## Command line parsing.  ##
+## ---------------------- ##
+
 # Push a token among the arguments that will be used to notice when we
 # ended options/arguments parsing.
 # Use "set dummy ...; shift" rather than 'set - ..." because on
@@ -209,41 +1428,53 @@ while test x"$1" != x"$arg_sep"; do
   case "$1" in
     -@ ) escape=@;;
     # Silently and without documentation accept -b and --b[atch] as synonyms.
-    -b | --b*) batch=true;;
-    -c | --c*) clean=t;;
-    -D | --d*) debug=t;;
-    -e | -E | --e*) expand=t;;
-    -h | --h*) echo "$usage"; exit 0;;
+    -b | --batch) batch=true;;
+	 --build)      shift; build_mode=$1;;
+	 --build-dir)  shift; build_dir=$1; build_mode=tidy;;
+    -c | --clean) build_mode=clean;;
+    -D | --debug) debug=true;;
+	 --dvi)   out_lang=dvi;;
+	 --dvipdf)   out_lang=dvipdf;;
+    -e | -E | --expand) expand=t;;
+    -h | --help) echo "$usage"; exit 0;;
+	 --html) out_lang=html;;
     -I | --I*)
       shift
-      miincludes="$miincludes -I $1"
-      txincludes="$txincludes$1$path_sep"
+      # Use absolute dir names in the includes.
+      val=`absolute "$1"`
+      list_append includes "$val"
       ;;
-    -l | --l*) shift; set_language=$1;;
-    -o | --o*)
+    --info) out_lang=info;;
+    -l | --lang | --language) shift; set_language=$1;;
+    --mostly-clean) action=mostly-clean;;
+    --no-line-error) no_line_error=true;;
+    -o | --out  | --output)
       shift
-      clean=t
-      case "$1" in
-        /* | ?:/*) oname=$1;;
-                *) oname="$orig_pwd/$1";;
-      esac;;
-    -p | --p*) oformat=pdf;;
-    -q | -s | --q* | --s*) quiet=t; batch=true;;
-    -r | --r*) recode=true;;
-    -t | --tex* | --com* ) shift; textra="$textra\\
+      # Make it absolute, just in case we also have --clean, or whatever.
+      oname=`absolute "$1"`;;
+    -p | --pdf) out_lang=pdf;;
+	 --ps)  out_lang=ps;;
+    -q | -s | --quiet | --silent) quiet=true; batch=true;;
+    -r | --recode) recode=true;;
+    --recode-from) shift; recode=true; recode_from="$1";;
+    --src-specials) src_specials=--src-specials;;
+    -t | --texinfo | --command ) shift; textra="$textra\\
 "`echo "$1" | sed 's/\\\\/\\\\\\\\/g'`;;
+    --text) out_lang=text;;
+    --translate-file ) shift; translate_file="$1";;
+    --tidy) build_mode=tidy;;
     -v | --vers*) echo "$version"; exit 0;;
-    -V | --verb*) verb=echo;;
+    -V | --verb*) verb=true;;
     --) # What remains are not options.
       shift
       while test x"$1" != x"$arg_sep"; do
-        set dummy ${1+"$@"} "$1"; shift
-        shift
+	set dummy ${1+"$@"} "$1"; shift
+	shift
       done
       break;;
     -*)
-      fatal 1 "Unknown or ambiguous option \`$1'." \
-              "Try \`--help' for more information."
+      error 1 "Unknown or ambiguous option \`$1'." \
+	      "Try \`--help' for more information."
       ;;
     *) set dummy ${1+"$@"} "$1"; shift;;
    esac
@@ -252,15 +1483,24 @@ done
 # Pop the token
 shift
 
+# $tidy:  compile in a t2d directory.
+# $clean: remove all the aux files.
+case $build_mode in
+  local) clean=false; tidy=false;;
+  tidy)  clean=false; tidy=true;;
+  clean) clean=true;  tidy=true;;
+      *) error 1 "invalid build mode: $build_mode";;
+esac
+
 # Interpret remaining command line args as filenames.
 case $# in
  0)
-  fatal 2 "Missing file arguments." "Try \`--help' for more information."
+  error 2 "Missing file arguments." "Try \`--help' for more information."
   ;;
  1) ;;
  *)
   if test -n "$oname"; then
-    fatal 2 "Can't use option \`--output' with more than one argument."
+    error 2 "Can't use option \`--output' with more than one argument."
   fi
   ;;
 esac
@@ -298,151 +1538,6 @@ if test -z "$PDFTEX"; then
 fi
 
 
-# Prepare the temporary directory.  Remove it at exit, unless debugging.
-if test -z "$debug"; then
-  trap "cd / && rm -rf $tmpdir" 0 1 2 15
-fi
-
-# Create the temporary directory with strict rights
-(umask 077 && mkdir $tmpdir) || exit 1
-
-# Prepare the tools we might need.  This may be extra work in some
-# cases, but improves the readability of the script.
-utildir=$tmpdir/utils
-mkdir $utildir || exit 1
-
-# A sed script that preprocesses Texinfo sources in order to keep the
-# iftex sections only.  We want to remove non TeX sections, and comment
-# (with `@c texi2dvi') TeX sections so that makeinfo does not try to
-# parse them.  Nevertheless, while commenting TeX sections, don't
-# comment @macro/@end macro so that makeinfo does propagate them.
-# Unfortunately makeinfo --iftex --no-ifinfo doesn't work well enough
-# (yet), makeinfo can't parse the TeX commands, so work around with sed.
-#
-comment_iftex_sed=$utildir/comment.sed
-cat <<EOF >$comment_iftex_sed
-/^@tex/,/^@end tex/{
-  s/^/@c texi2dvi/
-}
-/^@iftex/,/^@end iftex/{
-  s/^/@c texi2dvi/
-  /^@c texi2dvi@macro/,/^@c texi2dvi@end macro/{
-    s/^@c texi2dvi//
-  }
-}
-/^@ifnottex/,/^@end ifnottex/{
-  s/^/@c (texi2dvi)/
-}
-/^@ifinfo/,/^@end ifinfo/{
-  /^@node/p
-  /^@menu/,/^@end menu/p
-  t
-  s/^/@c (texi2dvi)/
-}
-s/^@ifnotinfo/@c texi2dvi@ifnotinfo/
-s/^@end ifnotinfo/@c texi2dvi@end ifnotinfo/
-EOF
-# Uncommenting is simple: Remove any leading `@c texi2dvi'.
-uncomment_iftex_sed=$utildir/uncomment.sed
-cat <<EOF >$uncomment_iftex_sed
-s/^@c texi2dvi//
-EOF
-
-# Compute the list of xref files.
-# Takes the filename (without extension) of which we look for xref
-# files as argument.  The index files must be reported last.
-get_xref_files ()
-{
-  # Get list of xref files (indexes, tables and lists).
-  # Find all files having root filename with a two-letter extension,
-  # saves the ones that are really Texinfo-related files.  .?o? catches
-  # many files: .toc, .log, LaTeX tables and lists, FiXme's .lox, maybe more.
-  for this_file in "$1".?o? "$1".aux "$1".?? "$1".idx; do
-    # If file is empty, skip it.
-    test -s "$this_file" || continue
-    # If the file is not suitable to be an index or xref file, don't
-    # process it.  It's suitable if the first character is a
-    # backslash or right quote or at, as long as the first line isn't
-    # \input texinfo.
-    first_character=`sed -n '1s/^\(.\).*$/\1/p;q' $this_file`
-    if (test "x$first_character" = "x\\" \
-        && sed 1q $this_file | grep -v '^\\input *texinfo' >/dev/null) \
-       || test "x$first_character" = "x'" \
-       || test "x$first_character" = "x@"; then
-      xref_files="$xref_files ./$this_file"
-    fi
-  done
-  echo "$xref_files"
-}
-
-# Convert relative paths to absolute paths, so we can run in another
-# directory (e.g., in --clean mode, or during the macro-support detection.)
-#
-# Empty path components are meaningful to tex.  We rewrite them
-# as `EMPTY' so they don't get lost when we split on $path_sep.
-# Hopefully no one will have an actual directory named EMPTY.
-absolute_filenames ()
-{
-  replace_empty="-e 's/^$path_sep/EMPTY$path_sep/g' \
-                 -e 's/$path_sep\$/${path_sep}EMPTY/g' \
-                 -e 's/$path_sep$path_sep/${path_sep}EMPTY:/g'"
-  _res=`echo "$1" | eval sed $replace_empty`
-  save_IFS=$IFS
-  IFS=$path_sep
-  set x $_res; shift
-  _res=.
-  for dir
-  do
-    case $dir in
-      EMPTY)
-        _res=$_res$path_sep
-        ;;
-      [\\/]* | ?:[\\/]*)        # Absolute paths don't need to be expanded.
-        _res=$_res$path_sep$dir
-        ;;
-      *)
-        abs=`cd "$dir" && pwd` && _res=$_res$path_sep$abs
-        ;;
-    esac
-  done
-  echo "$_res"
-}
-
-
-# run_tex ()
-# ----------
-# Run TeX as "$tex $tex_args $filename_input", taking care of errors
-# and logs.
-run_tex ()
-{
-  # Note that this will be used via an eval: quote properly.
-  cmd=$tex
-
-  # If possible, make TeX report error locations in GNU format.
-  tex_args=
-  case $tex_help in
-    *file-line-error*) cmd="$cmd --file-line-error";;
-  esac
-
-  # Tell TeX to be batch if requested.
-  if $batch; then
-    # \batchmode does not show terminal output at all, so we don't
-    # want that.  And even in batch mode, TeX insists on having input
-    # from the user.  Close its stdin to make it impossible.
-    cmd="$cmd </dev/null '${escape}nonstopmode' '${escape}input'"
-  fi
-
-  cmd="$cmd '$filename_input'"
-
-  verbose "Running $cmd ..."
-  if eval "$cmd" >&5; then :; else
-    test "$clean" = t \
-        && cp "$filename_noext.log" "$orig_pwd"
-    fatal 1 "$tex exited with bad status, quitting." \
-            "see $filename_noext.log for errors."
-  fi
-}
-
 # File descriptor usage:
 # 0 standard input
 # 1 standard output (--verbose messages)
@@ -452,15 +1547,24 @@ run_tex ()
 # 5 tools output (turned off by --quiet)
 # 6 tracing/debugging (set -x output, etc.)
 
-# Tools' output.  If quiet, discard, else redirect to the message flow.
-if test "$quiet" = t; then
+
+# Main tools' output (TeX, etc.) that TeX users are used to seeing.
+#
+# If quiet, discard, else redirect to the message flow.
+if $quiet; then
   exec 5>/dev/null
 else
   exec 5>&1
 fi
 
-# Enable tracing
-if test "$debug" = t; then
+
+# Enable tracing, and auxiliary tools output.
+#
+# Should be used where you'd typically use /dev/null to throw output
+# away.  But sometimes it is convenient to see that output (e.g., from
+# a grep) to aid debugging.  Especially debugging at distance, via the
+# user.
+if $debug; then
   exec 6>&1
   set -x
 else
@@ -468,10 +1572,38 @@ else
 fi
 
 # 
-# TeXify files.
 
-for command_line_filename in ${1+"$@"}; do
-  verbose "Processing $command_line_filename ..."
+# input_file_name_decode
+# ----------------------
+# Decode COMMAND_LINE_FILENAME, and compute:
+# - COMMAND_LINE_FILENAME clean of TeX commands
+# - IN_DIR
+#   The directory to the input file, possibly absolute if needed.
+# - IN_DIR_ABS
+#   The absolute directory of the input file.
+# - IN_BASE
+#   The input file base name (no directory part).
+# - IN_NOEXT
+#   The input file name without extensions (nor directory part).
+# - IN_INPUT
+#   Defaults to COMMAND_LINE_FILENAME, but might change if the
+#   input is preprocessed (recode etc.).  With directory, possibly absolute.
+input_file_name_decode ()
+{
+  # See if we are run from within AUC-Tex, in which case we are
+  # passed `\input{FOO.tex}' or even `\nonstopmode\input{FOO.tex}'.
+  case $command_line_filename in
+    *\\nonstopmode*)
+      batch=true;;
+  esac
+  case $command_line_filename in
+    *\\input{*}*)
+      # Let AUC-TeX error parser deal with line numbers.
+      line_error=false
+      command_line_filename=`\
+	expr X"$command_line_filename" : X'.*input{\([^}]*\)}'`
+      ;;
+  esac
 
   # If the COMMAND_LINE_FILENAME is not absolute (e.g., --debug.tex),
   # prepend `./' in order to avoid that the tools take it as an option.
@@ -482,354 +1614,102 @@ for command_line_filename in ${1+"$@"}; do
   # though the user may be able to reenter a valid filename at the tex
   # prompt (assuming they're attending the terminal), this script won't
   # be able to find the right xref files and so forth.
-  if test ! -r "$command_line_filename"; then
-    report "Could not read $command_line_filename, skipping."
-    continue
+  test -r "$command_line_filename" ||
+    error 1 "cannot read $command_line_filename, skipping."
+
+  # Get the name of the current directory.
+  in_dir=`func_dirname "$command_line_filename"`
+  in_dir_abs=`absolute "$in_dir"`
+  # In a clean build, we `cd', so get an absolute file name.
+  if $tidy; then
+    in_dir=$in_dir_abs
   fi
 
-  # Get the name of the current directory.  We want the full path
-  # because in clean mode we are in tmp, in which case a relative
-  # path has no meaning.
-  filename_dir=`echo $command_line_filename | sed 's!/[^/]*$!!;s!^$!.!'`
-  filename_dir=`cd "$filename_dir" >/dev/null && pwd`
-
   # Strip directory part but leave extension.
-  filename_ext=`basename "$command_line_filename"`
+  in_base=`basename "$command_line_filename"`
   # Strip extension.
-  filename_noext=`echo "$filename_ext" | sed 's/\.[^.]*$//'`
-  ext=`echo "$filename_ext" | sed 's/^.*\.//'`
-
-  # _src.  Use same basename since we want to generate aux files with
-  # the same basename as the manual.  If --expand, then output the
-  # macro-expanded file to here, else copy the original file.
-  tmpdir_src=$tmpdir/src
-  filename_src=$tmpdir_src/$filename_noext.$ext
-
-  # _xtr.  The file with the user's extra commands.
-  tmpdir_xtr=$tmpdir/xtr
-  filename_xtr=$tmpdir_xtr/$filename_noext.$ext
-
-  # _rcd.  The Texinfo file recoded in 7bit.
-  tmpdir_rcd=$tmpdir/rcd
-  filename_rcd=$tmpdir_rcd/$filename_noext.$ext
-
-  # _bak.  Copies of the previous xref files (another round is run if
-  # they differ from the new one).
-  tmpdir_bak=$tmpdir/bak
-
-  # Make all those directories and give up if we can't succeed.
-  mkdir $tmpdir_src $tmpdir_xtr $tmpdir_rcd $tmpdir_bak || exit 1
+  in_noext=`echo "$in_base" | sed 's/\.[^.]*$//'`
 
-  # Source file might include additional sources.
-  # We want `.:$orig_pwd' before anything else.  (We'll add `.:' later
-  # after all other directories have been turned into absolute paths.)
-  # `.' goes first to ensure that any old .aux, .cps,
-  # etc. files in ${directory} don't get used in preference to fresher
-  # files in `.'.  Include orig_pwd in case we are in clean mode, where
-  # we've cd'd to a temp directory.
-  common="$orig_pwd$path_sep$filename_dir$path_sep$txincludes"
-  for var in $tex_envvars; do
-    eval ${var}="\$common\$${var}_orig"
-    export $var
-  done
+  # The normalized file name to compile.  Must always point to the
+  # file to actually compile (in case of recoding, macro-expansion etc.).
+  in_input=$in_dir/$in_base
 
-  # Convert relative paths to absolute paths, so we can run in another
-  # directory (e.g., in --clean mode, or during the macro-support detection.)
-  TEXINPUTS=`absolute_filenames "$TEXINPUTS"`
-  verbose "TEXINPUTS: $TEXINPUTS"
-  BIBINPUTS=`absolute_filenames "$BIBINPUTS"`
-  verbose "BIBINPUTS: $BIBINPUTS"
-  BSTINPUTS=`absolute_filenames "$BSTINPUTS"`
-  verbose "BSTINPUTS: $BSTINPUTS"
-  INDEXSTYLE=`absolute_filenames "$INDEXSTYLE"`
-  verbose "INDEXSTYLE: $INDEXSTYLE"
 
-  # If the user explicitly specified the language, use that.
-  # Otherwise, if the first line is \input texinfo, assume it's texinfo.
-  # Otherwise, guess from the file extension.
-  if test -n "$set_language"; then
-    language=$set_language
-  elif sed 1q "$command_line_filename" | grep 'input texinfo' >&6; then
-    language=texinfo
+  # Compute the output file name.
+  if test x"$oname" != x; then
+    out_name=$oname
   else
-    language=
-  fi
-
-  # Get the type of the file (latex or texinfo) from the given language
-  # we just guessed, or from the file extension if not set yet.
-  case ${language:-$filename_ext} in
-    [lL]a[tT]e[xX] | *.ltx | *.tex)
-      # Assume a LaTeX file.  LaTeX needs bibtex and uses latex for
-      # compilation.  No makeinfo.
-      language=latex
-      bibtex=${BIBTEX:-bibtex}
-      makeinfo= # no point in running makeinfo on latex source.
-      texindex=${MAKEINDEX:-makeindex}
-      textra_cmd=1i
-      if test $oformat = dvi; then
-        tex=${LATEX:-latex}
-      else
-        tex=${PDFLATEX:-pdflatex}
-      fi
-      thumbpdf=${THUMBPDF:-thumbpdf}
-      ;;
-
-    *)
-      # Assume a Texinfo file.  Texinfo files need makeinfo, texindex and tex.
-      language=texinfo
-      bibtex=
-      texindex=${TEXINDEX:-texindex}
-      textra_cmd='/^@setfilename/a'
-      if test $oformat = dvi; then
-        # MetaPost also uses the TEX environment variable.  If the user
-        # has set TEX=latex for that reason, don't bomb out.
-        if echo $TEX | grep 'latex$' >/dev/null; then
-          tex=tex  # don't bother trying to find etex
-        else
-          tex=$TEX
-        fi
-      else
-        tex=$PDFTEX
-      fi
-      # Unless required by the user, makeinfo expansion is wanted only
-      # if texinfo.tex is too old.
-      if test "$expand" = t; then
-        makeinfo=${MAKEINFO:-makeinfo}
-      else
-        # Check if texinfo.tex performs macro expansion by looking for
-        # its version.  The version is a date of the form YEAR-MO-DA.
-        # We don't need to use [0-9] to match the digits since anyway
-        # the comparison with $txiprereq, a number, will fail with non
-        # digits.
-        # Run in the tmpdir to avoid leaving files.
-	(
-           cd $tmpdir
-	   echo '\input texinfo.tex @bye' >txiversion.tex
-	   # Be sure that if tex wants to fail, it is not interactive:
-	   # close stdin.
-           $tex txiversion.tex </dev/null
-	) >$tmpdir/txiversion.out 2>$tmpdir/txiversion.err
-	if test $? != 0; then
-	  cat $tmpdir/txiversion.out
-	  cat $tmpdir/txiversion.err >&2
-	  fatal 1 "texinfo.tex appears to be broken, quitting."
-        fi
-	eval `sed -n 's/^.*\[\(.*\)version \(....\)-\(..\)-\(..\).*$/txiformat=\1 txiversion="\2\3\4"/p' $tmpdir/txiversion.out`
-        verbose "texinfo.tex preloaded as \`$txiformat', version is \`$txiversion' ..."
-        if test "$txiprereq" -le "$txiversion" >/dev/null 2>&1; then
-          makeinfo=
-        else
-          makeinfo=${MAKEINFO:-makeinfo}
-        fi
-        # As long as we had to run TeX, offer the user this convenience:
-        test "$txiformat" = Texinfo && escape=@
-      fi
-      thumbpdf=${THUMBPDF:-thumbpdf}
-      ;;
-  esac
-
-  # Go to $tmpdir to try --help, since old versions that don't accept
-  # --help will generate a texput.log.
-  tex_help=`cd $tmpdir >/dev/null && $tex --help </dev/null 2>&1`
-
-  # Expand macro commands in the original source file using Makeinfo.
-  # Always use `end' footnote style, since the `separate' style
-  #   generates different output (arguably this is a bug in -E).
-  # Discard main info output, the user asked to run TeX, not makeinfo.
-  if test -n "$makeinfo"; then
-    verbose "Macro-expanding $command_line_filename to $filename_src ..."
-    sed -f $comment_iftex_sed "$command_line_filename" \
-      | $makeinfo --footnote-style=end -I "$filename_dir" $miincludes \
-        -o /dev/null --macro-expand=- \
-      | sed -f $uncomment_iftex_sed >"$filename_src"
-    filename_input=$filename_src
+    out_name=$in_noext.`out_lang_ext`
   fi
+  out_dir=`func_dirname "$out_name"`
+  out_dir_abs=`absolute "$out_dir"`
+  out_base=`basename "$out_name"`
+  out_noext=`echo "$out_base" | sed 's/\.[^.]*$//'`
+}
 
-  # If makeinfo failed (or was not even run), use the original file as input.
-  if test $? -ne 0 \
-     || test ! -r "$filename_src"; then
-    verbose "Reverting to $command_line_filename ..."
-    filename_input=$filename_dir/$filename_ext
-  fi
 
-  # Used most commonly for @finalout, @smallbook, etc.
-  if test -n "$textra"; then
-    verbose "Inserting extra commands: $textra"
-    sed "$textra_cmd\\
-$textra" "$filename_input" >"$filename_xtr"
-    filename_input=$filename_xtr
-  fi
+## -------------- ##
+## TeXify files.  ##
+## -------------- ##
 
-  # If this is a Texinfo file with a specified input encoding, and
-  # recode is available, then recode to plain 7 bit Texinfo.
-  if test $language = texinfo; then
-    pgm='s/^ *@documentencoding  *\([^ ][^ ]*\) *$/\1/
-	t found
-	d
-	:found
-	q'
-    encoding=`sed -e "$pgm" "$filename_input"`
-    if $recode && test -n "$encoding" && findprog recode; then
-      verbose "Recoding from $encoding to Texinfo."
-      if recode "$encoding"..texinfo <"$filename_input" >"$filename_rcd" \
-         && test -s "$filename_rcd"; then
-        filename_input=$filename_rcd
-      else
-        verbose "Recoding failed, using original input."
-      fi
-    fi
-  fi
+for command_line_filename
+do
+  verbose "Processing $command_line_filename ..."
 
-  # If clean mode was specified, then move to the temporary directory.
-  if test "$clean" = t; then
-    verbose "cd $tmpdir_src"
-    cd "$tmpdir_src" || exit 1
+  input_file_name_decode
+
+  # `texinfo' or `latex'?
+  in_lang=`compute_language "$command_line_filename"`
+
+  # An auxiliary directory used for all the auxiliary tasks involved
+  # in compiling this document.
+  case $build_dir in
+      '' | . ) t2ddir=$out_noext.t2d ;;
+      *) # Avoid collisions between multiple occurrences of the same
+	 # file.  The sed expression is fragile if the cwd has
+	 # active characters.
+	 t2ddir=$build_dir/`echo "$out_dir_abs/$out_noext.t2d" |
+	     sed "s,^$orig_pwd/,," |
+	     sed 's,/,!,g'`
+  esac
+  # Remove it at exit if clean mode.
+  trap "cleanup" 0 1 2 15
+
+  ensure_dir "$build_dir" "$t2ddir"
+
+  # We will change directory, better work with an absolute path...
+  t2ddir=`absolute "$t2ddir"`
+  # Sometimes there are incompatibilities between auxiliary files for
+  # DVI and PDF.  The contents can also change whether we work on PDF
+  # and/or DVI.  So keep separate spaces for each.
+  workdir=$t2ddir/`out_lang_tex`
+  ensure_dir "$workdir"
+
+  # _build.  In a tidy build, where the auxiliary files are output.
+  if $tidy; then
+    work_build=$workdir/build
+  else
+    work_build=.
   fi
 
-  while :; do # will break out of loop below
-    orig_xref_files=`get_xref_files "$filename_noext"`
-
-    # Save copies of originals for later comparison.
-    if test -n "$orig_xref_files"; then
-      verbose "Backing up xref files: `echo $orig_xref_files | sed 's|\./||g'`"
-      cp $orig_xref_files $tmpdir_bak
-    fi
-
-    # Run bibtex on current file.
-    # - If its input (AUX) exists.
-    # - If AUX contains both `\bibdata' and `\bibstyle'.
-    # - If some citations are missing (LOG contains `Citation').
-    #   or the LOG complains of a missing .bbl
-    #
-    # We run bibtex first, because I can see reasons for the indexes
-    # to change after bibtex is run, but I see no reason for the
-    # converse.
-    #
-    # Don't try to be too smart.  Running bibtex only if the bbl file
-    # exists and is older than the LaTeX file is wrong, since the
-    # document might include files that have changed.  Because there
-    # can be several AUX (if there are \include's), but a single LOG,
-    # looking for missing citations in LOG is easier, though we take
-    # the risk to match false messages.
-    if test -n "$bibtex" \
-       && test -r "$filename_noext.aux" \
-       && test -r "$filename_noext.log" \
-       && (grep '^\\bibdata[{]'  "$filename_noext.aux" \
-           && grep '^\\bibstyle[{]' "$filename_noext.aux" \
-           && (grep 'Warning:.*Citation.*undefined' "$filename_noext.log" \
-               || grep 'No file .*\.bbl\.' "$filename_noext.log")) \
-          >&6 2>&1; \
-    then
-      verbose "Running $bibtex $filename_noext ..."
-      $bibtex "$filename_noext" >&5 ||
-        fatal 1 "$bibtex exited with bad status, quitting."
-    fi
-
-    # What we'll run texindex on -- exclude non-index files.
-    # Since we know index files are last, it is correct to remove everything
-    # before .aux and .?o?.  But don't really do <anything>o<anything>
-    # -- don't match whitespace as <anything>.
-    # Otherwise, if orig_xref_files contains something like
-    #   foo.xo foo.whatever
-    # the space after the o will get matched.
-    index_files=`echo "$orig_xref_files" \
-                 | sed "s!.*\.aux!!g;
-                        s!./$filename_noext\.[^ ]o[^ ]!!g;
-                        s/^[ ]*//;s/[ ]*$//"`
-    # Run texindex (or makeindex) on current index files.  If they
-    # already exist, and after running TeX a first time the index
-    # files don't change, then there's no reason to run TeX again.
-    # But we won't know that if the index files are out of date or
-    # nonexistent.
-    if test -n "$texindex" && test -n "$index_files"; then
-      verbose "Running $texindex $index_files ..."
-      $texindex $index_files 2>&5 1>&2 ||
-         fatal 1 "$texindex exited with bad status, quitting."
-    fi
-
-    # Finally, run TeX.
-    run_tex
-
-    # Decide if looping again is needed.
-    finished=t
-
-    # LaTeX (and the package changebar) report in the LOG file if it
-    # should be rerun.  This is needed for files included from
-    # subdirs, since texi2dvi does not try to compare xref files in
-    # subdirs.  Performing xref files test is still good since LaTeX
-    # does not report changes in xref files.
-    if grep "Rerun to get" "$filename_noext.log" >&6 2>&1; then
-      finished=
-    fi
-
-    # Check if xref files changed.
-    new_xref_files=`get_xref_files "$filename_noext"`
-    verbose "Original xref files = `echo $orig_xref_files | sed 's|\./||g'`"
-    verbose "New xref files      = `echo $new_xref_files | sed 's|\./||g'`"
-
-    # If old and new lists don't at least have the same file list,
-    # then one file or another has definitely changed.
-    test "x$orig_xref_files" != "x$new_xref_files" && finished=
-
-    # File list is the same.  We must compare each file until we find
-    # a difference.
-    if test -n "$finished"; then
-      for this_file in $new_xref_files; do
-        verbose "Comparing xref file `echo $this_file | sed 's|\./||g'` ..."
-        # cmp -s returns nonzero exit status if files differ.
-        if cmp -s "$this_file" "$tmpdir_bak/$this_file"; then :; else
-          # We only need to keep comparing until we find one that
-          # differs, because we'll have to run texindex & tex again no
-          # matter how many more there might be.
-          finished=
-          verbose "xref file `echo $this_file | sed 's|\./||g'` differed ..."
-          test "$debug" = t && diff -c "$tmpdir_bak/$this_file" "$this_file"
-          break
-        fi
-      done
-    fi
-
-    # If finished, exit the loop, else rerun the loop.
-    test -n "$finished" && break
-  done # while :;
-
-  # If we were using thumbpdf and producing PDF, then run thumbpdf
-  # and TeX one last time.
-  if test $oformat = pdf \
-     && test -r "$filename_noext.log" \
-     && grep 'thumbpdf\.sty'  "$filename_noext.log" >&6 2>&1; \
-  then
-    verbose "Running $thumbpdf $filename_noext ..."
-    $thumbpdf "$filename_noext" >&5 ||
-      fatal 1 "$thumbpdf exited with bad status, quitting."
-    run_tex
-  fi
+  # _bak.  Copies of the previous auxiliary files (another round is
+  # run if they differ from the new ones).
+  work_bak=$workdir/bak
 
+  # Make those directories.
+  ensure_dir "$work_build" "$work_bak"
 
-  # If we were in clean mode, compilation was in a tmp directory.
-  # Copy the DVI (or PDF) file into the directory where the compilation
-  # has been done.  (The temp dir is about to get removed anyway.)
-  # We also return to the original directory so that
-  # - the next file is processed in correct conditions
-  # - the temporary file can be removed
-  if test -n "$clean"; then
-    if test -n "$oname"; then
-       dest=$oname
-    else
-       dest=$orig_pwd
-    fi
-    verbose "Copying $oformat file from `pwd` to $dest"
-    cp -p "./$filename_noext.$oformat" "$dest"
-    cd / # in case $orig_pwd is on a different drive (for DOS)
-    cd $orig_pwd || exit 1
-  fi
+  case $action in
+    compile)
+      # Compile the document.
+      compile
+      cleanup
+      ;;
 
-  # Remove temporary files.
-  if test "x$debug" = "x"; then
-    verbose "Removing $tmpdir_src $tmpdir_xtr $tmpdir_bak ..."
-    cd /
-    rm -rf $tmpdir_src $tmpdir_xtr $tmpdir_bak
-  fi
+    mostly-clean)
+      mostly_clean
+      ;;
+  esac
 done
 
 verbose "done."
diff --git a/Master/bin/alpha-linux/texi2html b/Master/bin/alpha-linux/texi2html
deleted file mode 100755
index f73a674725b..00000000000
--- a/Master/bin/alpha-linux/texi2html
+++ /dev/null
@@ -1,17535 +0,0 @@
-#! /usr/bin/env perl
-'di ';
-'ig 00 ';
-#+##############################################################################
-#
-# texi2html: Program to transform Texinfo documents to HTML
-#
-#    Copyright (C) 1999, 2000  Free Software Foundation, Inc.
-#
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-#-##############################################################################
-
-# This requires perl version 5 or higher
-#require 5.0;
-
-# for POSIX::setlocale and File::Spec
-require 5.00405;
-# Perl pragma to restrict unsafe constructs
-use strict;
-# used in case of tests, to revert to "C" locale.
-use POSIX qw(setlocale LC_ALL LC_CTYPE);
-# used to find a relative path back to the current working directory
-use File::Spec;
-#
-# According to
-# larry.jones@sdrc.com (Larry Jones)
-# this pragma is not present in perl5.004_02:
-#
-# Perl pragma to control optional warnings
-# use warnings;
-
-# Declarations. Empty lines separate the different classes of variables:
-
-
-#++##############################################################################
-#
-# NOTE FOR DEBUGGING THIS SCRIPT:
-# You can run 'perl texi2html.pl' directly, provided you have
-# the environment variable T2H_HOME set to the directory containing
-# the texi2html.init file
-#
-#--##############################################################################
-
-# CVS version:
-# $Id: texi2html.pl,v 1.126 2005/02/04 00:14:39 pertusus Exp $
-
-# Homepage:
-my $T2H_HOMEPAGE = "http://texi2html.cvshome.org/";
-
-# Authors (appears in comments):
-my $T2H_AUTHORS = <<EOT;
-Written by: Lionel Cons <Lionel.Cons\@cern.ch> (original author)
-            Karl Berry  <karl\@freefriends.org>
-            Olaf Bachmann <obachman\@mathematik.uni-kl.de>
-            and many others.
-Maintained by: Many creative people <dev\@texi2html.cvshome.org>
-Send bugs and suggestions to <users\@texi2html.cvshome.org>
-EOT
-
-# Version: set in configure.in
-my $THISVERSION = '1.76';
-my $THISPROG = "texi2html $THISVERSION"; # program name and version
-
-# set by configure, prefix for the sysconfdir and so on
-my $prefix = '/TeX/texlive-svn/Build/source/inst';
-my $sysconfdir;
-my $pkgdatadir;
-my $datadir;
-
-# We need to eval as $prefix has to be expanded. However when we haven't
-# run configure @sysconfdir will be expanded as an array, thus we verify
-# whether configure was run or not
-if ('${prefix}/etc' ne '@' . 'sysconfdir@')
-{
-    $sysconfdir = eval '"${prefix}/etc"';
-}
-else
-{
-    $sysconfdir = "/usr/local/etc";
-}
-
-if ('/TeX/texlive-svn/Build/source/inst' ne '@' . 'datadir@')
-{
-    $pkgdatadir = eval '"/TeX/texlive-svn/Build/source/inst/texi2html"';
-    $datadir = eval '"/TeX/texlive-svn/Build/source/inst"';
-}
-else
-{
-    $pkgdatadir = "/usr/local/share/texi2html";
-    $datadir = "/usr/local/share";
-}
-# The man page for this program is included at the end of this file and can be
-# viewed using the command 'nroff -man texi2html'.
-
-#+++############################################################################
-#                                                                              #
-# Constants                                                                    #
-#                                                                              #
-#---############################################################################
-
-my $DEBUG_MENU   =  1;
-my $DEBUG_INDEX =  2;
-my $DEBUG_TEXI  =  4;
-my $DEBUG_MACROS =  8;
-my $DEBUG_FORMATS   = 16;
-my $DEBUG_ELEMENTS  = 32;
-my $DEBUG_USER  = 64;
-my $DEBUG_L2H   = 128;
-
-my $ERROR = "***";                 # prefix for errors
-my $WARN  = "**";                  # prefix for warnings
-
-my $VARRE = '[\w\-]+';          # RE for a variable name
-my $NODERE = '[^:]+';             # RE for node names
-
-my $MAX_LEVEL = 4;
-my $MIN_LEVEL = 1;
-
-my $i18n_dir = 'i18n'; # name of the directory containing the per language files
-my $conf_file_name = 'Config' ;
-my $texinfo_htmlxref = 'htmlxref.cnf';
-
-# directories for texi2html init files
-my @texi2html_config_dirs = ('./');
-push @texi2html_config_dirs, "$ENV{'HOME'}/.texi2html/" if (defined($ENV{'HOME'}));
-push @texi2html_config_dirs, "$sysconfdir/texi2html/" if (defined($sysconfdir));
-push @texi2html_config_dirs, "$pkgdatadir" if (defined($pkgdatadir));
-
-# directories for texinfo configuration files
-my @texinfo_config_dirs = ('./.texinfo/');
-push @texinfo_config_dirs, "$ENV{'HOME'}/.texinfo/" if (defined($ENV{'HOME'}));
-push @texinfo_config_dirs, "$sysconfdir/texinfo/" if (defined($sysconfdir));
-push @texinfo_config_dirs, "$datadir/texinfo/" if (defined($datadir));
-
-#+++############################################################################
-#                                                                              #
-# Initialization                                                               #
-# Pasted content of File $(srcdir)/texi2html.init: Default initializations     #
-#                                                                              #
-#---############################################################################
-
-# leave this within comments, and keep the require statement
-# This way, you can directly run texi2html.pl, if $ENV{T2H_HOME}/texi2html.init
-# exists.
-
-{
-package Texi2HTML::Config;
-
-
-sub load($) 
-{
-    my $file = shift;
-    eval { require($file) ;};
-    if ($@ ne '')
-    {
-        print STDERR "error loading $file: $@\n";
-        return 0;
-    }
-    return 1;
-}
-
-# customization options variables
-
-use vars qw(
-$DEBUG
-$PREFIX
-$VERBOSE
-$SUBDIR
-$IDX_SUMMARY
-$SPLIT
-$SHORT_REF
-@EXPAND
-$EXPAND
-$TOP
-$DOCTYPE 
-$FRAMESET_DOCTYPE 
-$CHECK 
-$TEST 
-$DUMP_TEXI
-$MACRO_EXPAND
-$USE_GLOSSARY 
-$INVISIBLE_MARK 
-$USE_ISO 
-$TOP_FILE 
-$TOC_FILE
-$FRAMES
-$SHOW_MENU
-$NUMBER_SECTIONS
-$USE_NODES
-$USE_UNICODE
-$NODE_FILES
-$NODE_NAME_IN_MENU
-$AVOID_MENU_REDUNDANCY
-$SECTION_NAVIGATION
-$SHORTEXTN 
-$EXTENSION
-$OUT 
-$NOVALIDATE
-$DEF_TABLE 
-$LANG 
-$DO_CONTENTS
-$DO_SCONTENTS
-$SEPARATED_FOOTNOTES
-$TOC_LINKS
-$L2H 
-$L2H_L2H 
-$L2H_SKIP 
-$L2H_TMP 
-$L2H_CLEAN 
-$L2H_FILE
-$L2H_HTML_VERSION
-$EXTERNAL_DIR
-@INCLUDE_DIRS 
-@PREPEND_DIRS 
-$IGNORE_PREAMBLE_TEXT
-@CSS_FILES
-);
-
-# customization variables
-use vars qw(
-$ENCODING
-$DOCUMENT_ENCODING
-$MENU_PRE_STYLE
-$CENTER_IMAGE
-$EXAMPLE_INDENT_CELL
-$SMALL_EXAMPLE_INDENT_CELL
-$SMALL_FONT_SIZE
-$SMALL_RULE
-$DEFAULT_RULE
-$MIDDLE_RULE
-$BIG_RULE
-$TOP_HEADING
-$INDEX_CHAPTER
-$SPLIT_INDEX
-$HREF_DIR_INSTEAD_FILE
-$AFTER_BODY_OPEN
-$PRE_BODY_CLOSE
-$EXTRA_HEAD
-$VERTICAL_HEAD_NAVIGATION
-$WORDS_IN_PAGE
-$ICONS
-$UNNUMBERED_SYMBOL_IN_MENU
-$MENU_SYMBOL
-$OPEN_QUOTE_SYMBOL
-$CLOSE_QUOTE_SYMBOL
-$TOC_LIST_STYLE
-$TOC_LIST_ATTRIBUTE
-$TOP_NODE_FILE
-$NODE_FILE_EXTENSION
-$BEFORE_OVERVIEW
-$AFTER_OVERVIEW
-$BEFORE_TOC_LINES
-$AFTER_TOC_LINES
-$NEW_CROSSREF_STYLE
-%ACTIVE_ICONS
-%NAVIGATION_TEXT
-%PASSIVE_ICONS
-%BUTTONS_GOTO
-%BUTTONS_EXAMPLE
-@CHAPTER_BUTTONS
-@MISC_BUTTONS
-@SECTION_BUTTONS
-@SECTION_FOOTER_BUTTONS
-@NODE_FOOTER_BUTTONS
-);
-
-# customization variables which may be guessed in the script
-#our $ADDRESS;
-use vars qw(
-$BODYTEXT
-$CSS_LINES
-$DOCUMENT_DESCRIPTION
-$EXTERNAL_CROSSREF_SPLIT
-);
-
-# I18n
-use vars qw(
-$I
-$LANGUAGES
-);
-
-# customizable subroutines references
-use vars qw(
-$print_section
-$one_section
-$end_section
-$print_Top_header
-$print_Top_footer
-$print_Top
-$print_Toc
-$print_Overview
-$print_Footnotes
-$print_About
-$print_misc_header
-$print_misc_footer
-$print_misc
-$print_section_header
-$print_section_footer
-$print_chapter_header
-$print_chapter_footer
-$print_page_head
-$print_page_foot
-$print_head_navigation
-$print_foot_navigation
-$button_icon_img
-$print_navigation
-$about_body
-$print_frame
-$print_toc_frame
-$toc_body
-$titlepage
-$css_lines
-$print_redirection_page
-$init_out
-$finish_out
-$node_file_name
-$element_file_name
-
-$protect_text
-$anchor
-$def_item
-$def
-$menu
-$menu_link
-$menu_description
-$menu_comment
-$simple_menu_link
-$ref_beginning
-$info_ref
-$book_ref
-$external_href
-$external_ref
-$internal_ref
-$table_item
-$table_line
-$row
-$cell
-$list_item
-$comment
-$def_line
-$def_line_no_texi
-$raw
-$heading
-$paragraph
-$preformatted
-$foot_line_and_ref
-$foot_section
-$address
-$image
-$index_entry_label
-$index_entry
-$index_letter
-$print_index
-$index_summary
-$summary_letter
-$complex_format
-$cartouche
-$sp
-$definition_category
-$table_list
-$copying_comment
-$index_summary_file_entry
-$index_summary_file_end
-$index_summary_file_begin
-$style
-$format
-$normal_text
-$empty_line
-$unknown
-$unknown_style
-$float
-$caption_shortcaption
-$listoffloats
-$listoffloats_entry
-$listoffloats_caption
-$listoffloats_float_style
-$listoffloats_style
-$acronym_like
-$quotation
-$quotation_prepend_text
-$paragraph_style_command
-
-$PRE_ABOUT
-$AFTER_ABOUT
-);
-
-# hash which entries might be redefined by the user
-use vars qw(
-$complex_format_map
-%accent_map
-%def_map
-%format_map
-%simple_map
-%simple_map_pre
-%simple_map_texi
-%style_map
-%style_map_pre
-%style_map_texi
-%unformatted_text_simple_map_texi
-%unformatted_text_style_map_texi
-%unformatted_text_texi_map
-%paragraph_style
-%things_map
-%pre_map
-%texi_map
-%unicode_map
-%unicode_diacritical
-%ascii_character_map
-%ascii_simple_map
-%ascii_things_map
-%perl_charset_to_html
-%iso_symbols
-%misc_command
-%css_map
-%format_in_paragraph
-%special_list_commands
-%accent_letters
-%unicode_accents
-%special_accents
-);
-
-$I = \&Texi2HTML::I18n::get_string;
-
-$toc_body                 = \&T2H_GPL_toc_body;
-$style                    = \&T2H_GPL_style;
-$format                   = \&T2H_GPL_format;
-$normal_text              = \&t2h_gpl_normal_text;
-
-sub T2H_GPL_toc_body($)
-{
-    my $elements_list = shift;
-#    my $do_contents = shift;
-#    my $do_scontents = shift;
-    #return unless ($do_contents or $do_scontents or $FRAMES);
-    return unless ($DO_CONTENTS or $DO_SCONTENTS or $FRAMES);
-    my $current_level = 0;
-    my $ul_style = $NUMBER_SECTIONS ? $TOC_LIST_ATTRIBUTE : ''; 
-    foreach my $element (@$elements_list)
-    {
-        next if ($element->{'top'} or $element->{'index_page'});
-        my $ind = '  ' x $current_level;
-        my $level = $element->{'toc_level'};
-        print STDERR "Bug no toc_level for ($element) $element->{'texi'}\n" if (!defined ($level));
-        if ($level > $current_level)
-        {
-            while ($level > $current_level)
-            {
-                $current_level++;
-                my $ln = "\n$ind<ul${ul_style}>\n";
-                $ind = '  ' x $current_level;
-                push(@{$Texi2HTML::TOC_LINES}, $ln);
-            }
-        }
-        elsif ($level < $current_level)
-        {
-            while ($level < $current_level)
-            {
-                $current_level--;
-                $ind = '  ' x $current_level;
-                my $line = "</li>\n$ind</ul>";
-                $line .=  "</li>" if ($level == $current_level);
-                push(@{$Texi2HTML::TOC_LINES}, "$line\n");
-                
-            }
-        }
-        else
-        {
-            push(@{$Texi2HTML::TOC_LINES}, "</li>\n");
-        }
-        my $file = '';
-        $file = $element->{'file'} if ($SPLIT);
-        my $text = $element->{'text'};
-        $text = $element->{'name'} unless ($NUMBER_SECTIONS);
-        my $entry = "<li>" . &$anchor ($element->{'tocid'}, "$file#$element->{'id'}",$text);
-        push (@{$Texi2HTML::TOC_LINES}, $ind . $entry);
-        push(@{$Texi2HTML::OVERVIEW}, $entry. "</li>\n") if ($level == 1);
-    }
-    while (0 < $current_level)
-    {
-        $current_level--;
-        my $ind = '  ' x $current_level;
-        push(@{$Texi2HTML::TOC_LINES}, "</li>\n$ind</ul>\n");
-    }
-    #@{$Texi2HTML::TOC_LINES} = () unless ($do_contents);
-    @{$Texi2HTML::TOC_LINES} = () unless ($DO_CONTENTS);
-    if (@{$Texi2HTML::TOC_LINES})
-    {
-        unshift @{$Texi2HTML::TOC_LINES}, $BEFORE_TOC_LINES;
-        push @{$Texi2HTML::TOC_LINES}, $AFTER_TOC_LINES;
-    }
-    #@{$Texi2HTML::OVERVIEW} = () unless ($do_scontents or $FRAMES);
-    @{$Texi2HTML::OVERVIEW} = () unless ($DO_SCONTENTS or $FRAMES);
-    if (@{$Texi2HTML::OVERVIEW})
-    {
-        unshift @{$Texi2HTML::OVERVIEW}, "<ul${ul_style}>\n";
-        push @{$Texi2HTML::OVERVIEW}, "</ul>\n";
-        unshift @{$Texi2HTML::OVERVIEW}, $BEFORE_OVERVIEW;
-        push @{$Texi2HTML::OVERVIEW}, $AFTER_OVERVIEW;
-    }
-}
-
-sub T2H_GPL_style($$$$$$$$$)
-{                           # known style
-    my $style = shift;
-    my $command = shift;
-    my $text = shift;
-    my $args = shift;
-    my $no_close = shift;
-    my $no_open = shift;
-    my $line_nr = shift;
-    my $state = shift;
-    my $style_stack = shift;
-
-    my $do_quotes = 0;
-    my $use_attribute = 0;
-    my $use_begin_end = 0;
-    if (ref($style) eq 'HASH')
-    {
-        #print STDERR "GPL_STYLE $command\n";
-        #print STDERR " @$args\n";
-        $do_quotes = $style->{'quote'};
-        if ((@{$style->{'args'}} == 1) and defined($style->{'attribute'}))
-        {
-            $style = $style->{'attribute'};
-            $use_attribute = 1;
-            $text = $args->[0];
-        }
-        elsif (defined($style->{'function'}))
-        {
-            $text = &{$style->{'function'}}($command, $args, $style_stack, $state, $line_nr);
-        }
-    }
-    else
-    {
-        if ($style =~ s/^\"//)
-        {                       # add quotes
-            $do_quotes = 1;
-        }
-        if ($style =~ s/^\&//)
-        {                       # custom
-            $style = 'Texi2HTML::Config::' . $style;
-            eval "\$text = &$style(\$text, \$command, \$style_stack)";
-        }
-        elsif ($style ne '')
-        {
-            $use_attribute = 1;
-        }
-        else
-        {                       # no style
-        }
-    }
-    if ($use_attribute)
-    {                       # good style
-        my $attribute_text = '';
-        if ($style =~ /^(\w+)(\s+.*)/)
-        {
-            $style = $1;
-            $attribute_text = $2;
-        }
-        if ($do_quotes)
-        {
-             $text = $OPEN_QUOTE_SYMBOL . "$text" if (!$no_open);
-             $text .= $CLOSE_QUOTE_SYMBOL if (!$no_close);
-        }
-        $text = "<${style}$attribute_text>$text</$style>" ;
-    }
-    if (ref($style) eq 'HASH')
-    {
-        if (defined($style->{'begin'}) and !$no_open)
-        {
-             $text = $style->{'begin'} . $text;
-        }
-        if (defined($style->{'end'}) and !$no_close)
-        {
-            $text = $text . $style->{'end'};
-        }
-    }
-    if ($do_quotes and !$use_attribute)
-    {
-        $text = $OPEN_QUOTE_SYMBOL . "$text" if (!$no_open);
-        $text .= $CLOSE_QUOTE_SYMBOL if (!$no_close);
-    }
-    return $text;
-}
-
-sub T2H_GPL_format($$$)
-{
-    my $tag = shift;
-    my $element = shift;
-    my $text = shift;
-    return '' if (!defined($element) or ($text !~ /\S/));
-    return $text if ($element eq '');
-    my $attribute_text = '';
-    if ($element =~ /^(\w+)(\s+.*)/)
-    {
-        $element = $1;
-        $attribute_text = $2;
-    }
-    return "<${element}$attribute_text>\n" . $text. "</$element>\n";
-}
-
-sub t2h_gpl_normal_text($)
-{
-    my $text = shift;
-    $text =~ s/``/"/go;
-    $text =~ s/''/"/go;
-    $text =~ s/-(--?)/$1/go;
-    return $text;
-}
-# 
-# -*-perl-*-
-######################################################################
-# File: texi2html.init
-#
-# Default values for command-line arguments and for various customizable
-# procedures are set in this file.
-#
-# A copy of this file is pasted into the beginning of texi2html by
-# running './configure'.
-#
-# Copy this file, rename it and make changes to it, if you like.
-# Afterwards, load the file with command-line 
-# option -init-file <your_init_file>
-#
-# $Id: texi2html.init,v 1.81 2005/02/01 21:20:28 pertusus Exp $
-
-######################################################################
-# The following variables can also be set by command-line options
-#
-#
-# The default values are set in this file, texi2html.init and the content
-# of this file is included at the beginning of the texi2html script file. 
-# Those values may be overrided by values set in $sysconfdir/texi2htmlrc 
-# and then by values set in $HOME/texi2htmlrc.
-#
-# command line switches may override these values, and values set in files
-# specified by -init-file are also taken into account.
-# values set in these files overwrite values set by the command-line
-# options appearing before -init-file and might still be overwritten by
-# command-line arguments following the -init-file option.
-
-# -debug
-# The integer value specifies what kind of debugging output is generated.
-$DEBUG = 0;
-
-# -doctype
-# The value is the 'SystemLiteral' which identifies the canonical DTD 
-# for the document.
-# Definition: The SystemLiteral is called the entity's system
-# identifier. It is a URI, which may be used to retrieve the entity.
-# See http://www.xml.com/axml/target.html#NT-ExternalID
-$DOCTYPE = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html401/loose.dtd">';
-
-# -frameset-doctype
-# When frames are used, this SystemLiteral identifies the DTD used for
-# the file containing the frame description.
-$FRAMESET_DOCTYPE = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html401/frameset.dtd">';
-
-# -test
-# If this value is true, some variables which should be dynamically generated 
-# (the date, the user running texi2html, the version of texi2html) are set to 
-# fix and given values. This is usefull in case the resulting manual is 
-# compared with a reference. For example this is used in the tests of test.sh.
-$TEST = 0;
-
-# -dump-texi
-# This value is usefull for debugging purposes. The result of the first pass is
-# put in <document name>.passtexi, the result of the second pass is put in 
-# <document name>.passfirst.
-$DUMP_TEXI = 0;
-
-# -expand
-# the @EXPAND array contains the expanded section names.
-@EXPAND = ('html');
-
-# -invisible
-# This seems obsolete and is not used anywhere.
-# This was a workaround for a known bug of many WWW browsers, including 
-# netscape. This was used to create invisible destination in anchors.
-$INVISIBLE_MARK = '';
-# $INVISIBLE_MARK = '&#160;';
-
-# -iso
-# if this value is true, ISO8859 characters are used for special symbols 
-# (like copyright, etc).
-$USE_ISO = 1;
-
-# -I
-# add a directory to the list of directories where @include files are
-# searched for (besides the directory of the file). additional '-I' 
-# args are appended to this list.
-# (APA: Don't implicitely search ., to conform with the docs!)
-# my @INCLUDE_DIRS = (".");
-@INCLUDE_DIRS = ();
-
-# -P
-# prepend a directory to the list of directories where @include files are
-# searched for before the directory of the file. additional '-P' 
-# args are prepended to this list.
-@PREPEND_DIRS = ();
-
-# -top-file
-# This file name is used for the top-level file.
-# The extension is set appropriately, if necessary.
-# If empty, <basename of document>.html is used.
-# Typically, you would set this to "index.html".
-$TOP_FILE = '';
-
-# -toc-file
-# This file name is used for the table of contents.  The
-# extension is set appropriately, if necessary.
-# If empty, <basename of document>_toc.html is used.
-$TOC_FILE = '';
-
-# -frames
-# if the value is true, HTML 4.0 "frames" are used. 
-# A file describing the frame layout is generated, together with a file 
-# with the short table of contents.
-$FRAMES = 0;
-
-# -menu | -nomenu
-# if the value is true the Texinfo menus are shown.
-$SHOW_MENU = 1;
-
-# -number | -nonumber
-# if this is set the sections are numbered, and section names and numbers 
-# are used in references and menus (instead of node names).
-$NUMBER_SECTIONS = 1;
-
-# -use-nodes
-# if this is set the nodes are used as sectionning elements. 
-# Otherwise the nodes are incorporated in sections.
-$USE_NODES = 0;
-
-# -node-files
-# if this is set one file per node is generated, which can be a target for 
-# cross manual references.
-$NODE_FILES = 0;
-
-# -split section|chapter|node|none
-# if $SPLIT is set to 'section' (resp. 'chapter') one html file per section 
-# (resp. chapter) is generated. If $SPLIT is set to 'node' one html file per 
-# node or sectionning element is generated. In all these cases separate pages 
-# for Top, Table of content (Toc), Overview and About are generated.
-# Otherwise a monolithic html file that contains the whole document is 
-# created.
-#$SPLIT = 'section';
-$SPLIT = '';
-
-# -sec-nav|-nosec-nav
-# if this is set then navigation panels are printed at the beginning of each 
-# section.
-# If the document is split at nodes then navigation panels are 
-# printed at the end if there were more than $WORDS_IN_PAGE words on page.
-#
-# If the document is split at sections this is ignored.
-#
-# This is most useful if you do not want to have section navigation
-# with -split chapter. There will be chapter navigation panel at the 
-# beginning and at the end of chapters anyway.
-$SECTION_NAVIGATION = 1;
-
-# -separated-footnotes
-# if this is set footnotes are on a separated page. Otherwise they are at
-# the end of each file (if the document is split).
-$SEPARATED_FOOTNOTES = 1;
-
-# -toc-links
-# if this is set, links from headings to toc entries are created.
-$TOC_LINKS = 0;
-
-# -subdir
-# If this is set, then put result files into the specified directory.
-# If not set, then result files are put into the current directory.
-#$SUBDIR = 'html';
-$SUBDIR = '';
-
-# -short-extn
-# If this is set, then all HTML files will have extension ".htm" instead of
-# ".html". This is helpful when shipping the document to DOS-based systems.
-$SHORTEXTN = 0;
-
-# -prefix
-# This set the output file prefix, prepended to all .html, .gif and .pl files.
-# By default, this is the basename of the document.
-$PREFIX = '';
-
-# -o filename
-# If this is set a monolithic document is outputted into $filename.
-$OUT = '';
-
-# -no-validate
-# suppress node cross-reference validation
-$NOVALIDATE = 0;
-
-# -short-ref
-# if this is set cross-references are given without section numbers.
-$SHORT_REF = '';
-
-# -idx-sum
-# if value is set, then for each @printindex <index name>
-# <document name>_<index name>.idx is created which contains lines of the form
-# key ref sorted alphabetically (case matters).
-$IDX_SUMMARY = 0;
-
-# -def-table
-# If this is set a table construction for @def.... instead of definition 
-# lists.
-# (New Option: 27.07.2000 Karl Heinz Marbaise)
-$DEF_TABLE = 0;
-
-# -verbose
-# if this is set chatter about what we are doing.
-$VERBOSE = '';
-
-# -lang
-# FIXME this has changed
-# For page titles use $Texi2HTML::I18n::WORDS->{$T2H_LANG}->{...} as title.
-# To add a new language, supply list of titles (see $Texi2HTML::I18n::WORDS).
-# and use ISO 639 language codes (see e.g. perl module Locale-Codes-1.02
-# for  definitions).
-# Default's to 'en' if not set or no @documentlanguage is specified.
-$LANG = 'en';
-
-# -ignore-preamble-text
-# If this is set the text before @node and sectionning commands is ignored.
-$IGNORE_PREAMBLE_TEXT = 0;
-
-# -html-xref-prefix
-# base directory for external manuals.
-#$EXTERNAL_DIR = '../';
-$EXTERNAL_DIR = undef;
-
-# -l2h
-# if this is set, latex2html is used for generation of math content.
-$L2H = '';
-
-# -css-include
-# All the specified css files are used. More precisely the @import sections
-# are added to the beginning of the CSS_LINES the remaining is added at
-# the end of the CSS_LINES (after the css rules generated by texi2html).
-# cf texinfo manual for more info.
-# - means STDIN
-@CSS_FILES = ();
-
-######################
-# The following options are only relevant if $L2H is set
-#
-# -l2h-l2h
-# name/location of latex2html program
-$L2H_L2H = "latex2html";
-
-# -l2h-skip
-# If this is set the actual call to latex2html is skipped. The previously
-# generated content is reused, instead.
-$L2H_SKIP = '';
-
-# -l2h-tmp
-# If this is set l2h uses the specified directory for temporary files. The path
-# leading to this directory may not contain a dot (i.e., a ".");
-# otherwise, l2h will fail.
-$L2H_TMP = '';
- 
-# -l2h-file
-# If set, l2h uses the file as latex2html init file
-$L2H_FILE = 'l2h.init';
-
-# -l2h-clean
-# if this is set the intermediate files generated by texi2html in relation with
-# latex2html are cleaned (they all have the prefix <document name>_l2h_).
-$L2H_CLEAN = 1;
-
-##############################################################################
-#
-# The following can only be set in the init file
-#
-##############################################################################
-
-# If true do table of contents even if there is no @content
-$DO_CONTENTS = 0;
-# If true do short table of contents even if there is no @shortcontent
-$DO_SCONTENTS = 0;
-
-# if set, then use node names in menu entries, instead of section names
-$NODE_NAME_IN_MENU = 0;
-
-# new style for crossrefs
-$NEW_CROSSREF_STYLE = 1;
-
-# if set and menu entry equals menu description, then do not print 
-# menu description.
-# Likewise, if node name equals entry name, do not print entry name.
-$AVOID_MENU_REDUNDANCY = 1;
-
-# if set, center @image by default
-# otherwise, do not center by default
-$CENTER_IMAGE = 1;
-
-# used as identation for block enclosing command @example, etc
-# If not empty, must be enclosed in <td></td>
-$EXAMPLE_INDENT_CELL = '<td>&nbsp;</td>';
-
-# same as above, only for @small
-$SMALL_EXAMPLE_INDENT_CELL = '<td>&nbsp;</td>';
-
-# font size for @small
-$SMALL_FONT_SIZE = '-1';
-
-# horizontal rules
-$SMALL_RULE = '<hr size="1">';
-$DEFAULT_RULE = '<hr>';
-$MIDDLE_RULE = '<hr size="2">';
-$BIG_RULE = '<hr size="6">';
-
-# if non-empty, and no @..heading appeared in Top node, then
-# use this as header for top node/section, otherwise use value of
-# @settitle or @shorttitle (in that order)
-$TOP_HEADING = '';
-
-# if set, use this chapter for 'Index' button, else
-# use first chapter with @printindex
-$INDEX_CHAPTER = '';
-
-# if set and $SPLIT is set, then split index pages at the next letter
-# after they have more than that many entries
-$SPLIT_INDEX = 100;
-
-# symbol put at the beginning of nodes entry in menu (and optionnaly of 
-# unnumbered in menus, see next variable)
-$MENU_SYMBOL = '&bull;';
-#$MENU_SYMBOL = '*';
-
-$OPEN_QUOTE_SYMBOL = "\`";
-$CLOSE_QUOTE_SYMBOL = "'";
-
-# if true put a $MENU_SYMBOL before unnumbered in menus
-$UNNUMBERED_SYMBOL_IN_MENU = 0;
-
-# extension for nodes files when NODE_FILES is true
-$NODE_FILE_EXTENSION = "html";	    
-
-# extension
-$EXTENSION = "html";
-
-# file name used for Top node when NODE_FILES is true
-$TOP_NODE_FILE = "index";
-
-# this controls the pre style for menus
-$MENU_PRE_STYLE = 'font-family: serif';
-
-# This controls the ul style for toc
-$TOC_LIST_STYLE = 'list-style: none';
-$TOC_LIST_ATTRIBUTE = ' class="toc"';
-
-# These lines are inserted before and after the shortcontents 
-$BEFORE_OVERVIEW = "<div class=\"shortcontents\">\n";
-$AFTER_OVERVIEW = "</div>\n";
-
-# These lines are inserted before and after the contents 
-$BEFORE_TOC_LINES = "<div class=\"contents\">\n";
-$AFTER_TOC_LINES = "</div>\n";
-
-# if set (e.g., to index.html) replace hrefs to this file
-# (i.e., to index.html) by ./
-$HREF_DIR_INSTEAD_FILE = '';
-
-# text inserted after <body ...>
-$AFTER_BODY_OPEN = '';
-
-# text inserted before </body>, this will be automatically inside <p></p>
-$PRE_BODY_CLOSE = '';
-
-# this is added inside <head></head> after <title> and some <meta name>
-# stuff, it can be used for eg. <style>, <script>, <meta> etc. tags.
-$EXTRA_HEAD = '';
-
-# Specifies the minimum page length required before a navigation panel
-# is placed at the bottom of a page 
-# FIXME this is not true:
-# THIS_WORDS_IN_PAGE holds number of words of current page
-$WORDS_IN_PAGE = 300;
-
-# if this is set a vertical navigation panel is used.
-$VERTICAL_HEAD_NAVIGATION = 0;
-
-# html version for latex2html
-$L2H_HTML_VERSION = "4.0";
-
-# specify in this array which "buttons" should appear in which order
-# in the navigation panel for sections; use ' ' for empty buttons (space)
-@SECTION_BUTTONS =
-    (
-     'Back', 'Forward', ' ', 'FastBack', 'Up', 'FastForward',
-     ' ', ' ', ' ', ' ',
-     'Top', 'Contents', 'Index', 'About',
-    );
-
-# buttons for misc stuff
-@MISC_BUTTONS = ('Top', 'Contents', 'Index', 'About');
-
-# buttons for chapter file footers
-# (and headers but only if SECTION_NAVIGATION is false)
-@CHAPTER_BUTTONS =
-    (
-     'FastBack', 'FastForward', ' ',
-     ' ', ' ', ' ', ' ',
-     'Top', 'Contents', 'Index', 'About',
-    );
-
-# buttons for section file footers
-@SECTION_FOOTER_BUTTONS =
-    (
-     'Back', 'Forward', ' ', 'FastBack', 'Up', 'FastForward'
-    );
-
-@NODE_FOOTER_BUTTONS =
-    (
-     'Back', 'Forward', ' ', 'FastBack', 'Up', 'FastForward',
-     ' ', ' ', ' ', ' ',
-     'Top', 'Contents', 'Index', 'About',
-#     'Back', 'Forward', ' ', 'FastBack', 'Up', 'FastForward'
-    );
-
-$ICONS = 0;
-
-# insert here name of icon images for buttons
-# Icons are used, if $ICONS and resp. value are set
-%ACTIVE_ICONS =
-    (
-     'Top',         '',
-     'Contents',    '',
-     'Overview',    '',
-     'Index',       '',
-     'This',        '',
-     'Back',        '',
-     'FastBack',    '',
-     'Prev',        '',
-     'Up',          '',
-     'Next',        '',
-     'NodeUp',      '',
-     'NodeNext',    '',
-     'NodePrev',    '',
-     'Following',   '',
-     'Forward',     '',
-     'FastForward', '',
-     'About' ,      '',
-     'First',       '',
-     'Last',        '',
-     ' ',           ''
-    );
-
-# insert here name of icon images for these, if button is inactive
-%PASSIVE_ICONS =
-    (
-     'Top',         '',
-     'Contents',    '',
-     'Overview',    '',
-     'Index',       '',
-     'This',        '',
-     'Back',        '',
-     'FastBack',    '',
-     'Prev',        '',
-     'Up',          '',
-     'Next',        '',
-     'NodeUp',      '',
-     'NodeNext',    '',
-     'NodePrev',    '',
-     'Following',   '',
-     'Forward',     '',
-     'FastForward', '',
-     'About',       '',
-     'First',       '',
-     'Last',        '',
-    );
-
-
-$init_out    = \&t2h_default_init_out;
-$finish_out    = \&t2h_default_finish_out;
-
-# We have to do this dynamically because of internationalization and because
-# in body $LANG could be used.
-sub t2h_default_init_out()
-{
-# Names of text as alternative for icons
-    %NAVIGATION_TEXT =
-    (
-     'Top',         &$I('Top'),
-     'Contents',    &$I('Contents'),
-     'Overview',    &$I('Overview'),
-     'Index',       &$I('Index'),
-     ' ',           ' &nbsp; ',
-     'This',        &$I('current'),
-     'Back',        ' &lt; ',
-     'FastBack',    ' &lt;&lt; ',
-     'Prev',        &$I('Prev'),
-     'Up',          &$I(' Up '),
-     'Next',        &$I('Next'),
-     'NodeUp',      &$I('node up'),
-     'NodeNext',    &$I('next node'),
-     'NodePrev',    &$I('previous node'),
-     'Following',   &$I('following node'),
-     'Forward',     ' &gt; ',
-     'FastForward', ' &gt;&gt; ',
-     'About',       ' ? ',
-     'First',       ' |&lt; ',
-     'Last',        ' &gt;| '
-    );
-
-    %BUTTONS_GOTO =
-    (
-     'Top',         &$I('cover (top) of document'),
-     'Contents',    &$I('table of contents'),
-     'Overview',    &$I('short table of contents'),
-     'Index',       &$I('index'),
-     'This',        &$I('current section'),
-     'Back',        &$I('previous section in reading order'),
-     'FastBack',    &$I('beginning of this chapter or previous chapter'),
-     'Prev',        &$I('previous section on same level'),
-     'Up',          &$I('up section'),
-     'Next',        &$I('next section on same level'),
-     'NodeUp',      &$I('up node'),
-     'NodeNext',    &$I('next node'),
-     'NodePrev',    &$I('previous node'),
-     'Following',   &$I('node following in node reading order'),
-     'Forward',     &$I('next section in reading order'),
-     'FastForward', &$I('next chapter'),
-     'About' ,      &$I('about (help)'),
-     'First',       &$I('first section in reading order'),
-     'Last',        &$I('last section in reading order'),
-    );
-    # Set the default body text, inserted between <body ... >
-    $BODYTEXT = 'lang="' . $LANG . '" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080" alink="#FF0000"' unless (defined($BODYTEXT));
-    if (!defined($EXTERNAL_CROSSREF_SPLIT))
-    {
-        if ($SPLIT) 
-        {
-            $EXTERNAL_CROSSREF_SPLIT = 1;
-        }
-        else
-        {
-            $EXTERNAL_CROSSREF_SPLIT = 0;
-        }
-    }
-    $ENCODING = $DOCUMENT_ENCODING if (!defined($ENCODING));
-    my $to_encoding;
-    if (defined($ENCODING))
-    {
-        $to_encoding = main::set_encoding ($ENCODING);
-        
-        if (defined($to_encoding) and defined($perl_charset_to_html{$to_encoding}))
-        {# FIXME is this really right ?
-             $ENCODING = $perl_charset_to_html{$to_encoding};
-        }
-        elsif (defined($to_encoding))
-        {# FIXME is this really right ?
-             $ENCODING = $to_encoding;
-        }
-    }
-    else
-    {
-        #$ENCODING = 'iso-8859-1';
-        $ENCODING = 'us-ascii';
-    }
-    # FIXME default might be utf8 ?
-    $DOCUMENT_ENCODING = 'us-ascii' if (!defined($DOCUMENT_ENCODING));
-    
-    return $to_encoding;
-};
-
-sub t2h_default_finish_out()
-{
-}
-
-#######################################################################
-#
-# Values guessed if not set here, set in init_out
-#
-#######################################################################
-
-$BODYTEXT = undef;
-
-# Formatted document encoding. If undef set to @documentencoding. If undef and
-# there is no @documentencoding, set in init_out 
-$ENCODING = undef;
-
-# if undef set to @documentdescription. If there is no @documentdescription,
-# set in page_head
-$DOCUMENT_DESCRIPTION = undef;
-
-# if undef set 1 if SPLIT, to 0 otherwise
-$EXTERNAL_CROSSREF_SPLIT = undef;
-
-########################################################################
-# Control of Page layout:
-# You can make changes of the Page layout at two levels:
-# 1.) For small changes, it is often enough to change the value of
-#     some global string/hash/array variables
-# 2.) For larger changes, reimplement one of the T2H_DEFAULT_<fnc>* routines,
-#     give them another name, and assign them to the respective
-#     $<fnc> variable.
-
-# As a general interface, the hashes Texi2HTML::HREF, Texi2HTML::NAME, Texi2HTML::NODE, Texi2HTML::NO_TEXI, hold
-# href, html-name, node-name, name after removal of texi commands of
-# This     -- current section (resp. html page)
-# Top      -- top page FIXME: ($T2H_TOP_FILE)
-# Contents -- Table of contents
-# Overview -- Short table of contents
-# Index    -- Index page
-# About    -- page which explain "navigation buttons"
-# First    -- first node
-# Last     -- last node
-#
-# Whether or not the following hash values are set, depends on the context
-# (all values are w.r.t. 'This' section)
-# Next        -- next node of texinfo
-# Prev        -- previous node of texinfo
-# NodeUp      -- up node of texinfo
-# Following   -- following node in node reading order, taking menu into account
-# Forward     -- next node in reading order
-# Back        -- previous node in reading order
-# Up          -- parent given by sectionning commands
-# FastForward -- if leave node, up and next, else next node
-# FastBackward-- if leave node, up and prev, else prev node
-#
-# Furthermore, the following global variabels are set:
-# $Texi2HTML::THISDOC{title}          -- title as set by @setttile
-# $Texi2HTML::THISDOC{title_no_texi}  -- title without texi (without html elements)
-# $Texi2HTML::THISDOC{title_texi}     -- title with texinfo @-commands
-# $Texi2HTML::THISDOC{fulltitle}      -- full title as set by @title...
-# $Texi2HTML::THISDOC{subtitle}       -- subtitle as set by @subtitle
-# $Texi2HTML::THISDOC{author}         -- author as set by @author
-# $Texi2HTML::THISDOC{copying}        -- text of @copying and @end copying in comment
-#
-# $Texi2HTML::THISDOC{program}          -- name and version of texi2html
-# $Texi2HTML::THISDOC{program_homepage} -- homepage for texi2html
-# $Texi2HTML::THISDOC{program_authors}  -- authors of texi2html
-# $Texi2HTML::THISDOC{today}            -- date formatted with pretty_date
-# $Texi2HTML::THISDOC{toc_file}         -- table of contents file
-# $Texi2HTML::THISDOC{file_base_name}   -- base name of the texinfo manual file
-# $Texi2HTML::THISDOC{destination_directory}
-                                 #      -- directory for the resulting files
-# $Texi2HTML::THISDOC{user}             -- user running the script
-# other $Texi2HTML::THISDOC keys corresponds with texinfo commands, the value
-# being the command arg, for the following commands:
-# kbdinputstyle, paragraphindent, setchapternewpage, headings, footnotestyle,
-# exampleindent, firstparagraphindent, everyheading, everyfooting,
-# evenheading, evenfooting, oddheading, oddfooting
-#
-# and pointer to arrays of lines which need to be printed by main::print_lines
-# $Texi2HTML::THIS_SECTION  -- lines of 'This' section
-# $Texi2HTML::THIS_HEADER   -- lines preceding navigation panel of 'This' section
-# $Texi2HTML::OVERVIEW      -- lines of short table of contents
-# $Texi2HTML::TOC_LINES     -- lines of table of contents
-# $Texi2HTML::TITLEPAGE     -- lines of title page
-#
-# $Texi2HTML::THIS_ELEMENT  holds the element reference.  
-## FIXME: $T2H_TOP           -- lines of Top texinfo node
-
-#
-# There are the following subs which control the layout:
-#
-$print_section            = \&T2H_DEFAULT_print_section;
-$end_section              = \&T2H_DEFAULT_end_section;
-$one_section              = \&T2H_DEFAULT_one_section;
-$print_Top_header         = \&T2H_DEFAULT_print_Top_header;
-$print_Top_footer	      = \&T2H_DEFAULT_print_Top_footer;
-$print_Top		      = \&T2H_DEFAULT_print_Top;
-$print_Toc		      = \&T2H_DEFAULT_print_Toc;
-$print_Overview	      = \&T2H_DEFAULT_print_Overview;
-$print_Footnotes	      = \&T2H_DEFAULT_print_Footnotes;
-$print_About	      = \&T2H_DEFAULT_print_About;
-$print_misc_header	      = \&T2H_DEFAULT_print_misc_header;
-$print_misc_footer	      = \&T2H_DEFAULT_print_misc_footer;
-$print_misc		      = \&T2H_DEFAULT_print_misc;
-$print_section_footer     = \&T2H_DEFAULT_print_section_footer;
-$print_chapter_header     = \&T2H_DEFAULT_print_chapter_header;
-$print_section_header     = \&T2H_DEFAULT_print_section_header;
-$print_chapter_footer     = \&T2H_DEFAULT_print_chapter_footer;
-$print_page_head	      = \&T2H_DEFAULT_print_page_head;
-$print_page_foot	      = \&T2H_DEFAULT_print_page_foot;
-$print_head_navigation    = \&T2H_DEFAULT_print_head_navigation;
-$print_foot_navigation    = \&T2H_DEFAULT_print_foot_navigation;
-$button_icon_img	      = \&T2H_DEFAULT_button_icon_img;
-$print_navigation	      = \&T2H_DEFAULT_print_navigation;
-$about_body		      = \&T2H_DEFAULT_about_body;
-$print_frame              = \&T2H_DEFAULT_print_frame;
-$print_toc_frame          = \&T2H_DEFAULT_print_toc_frame;
-#$toc_body                 = \&T2H_DEFAULT_toc_body;
-$titlepage                 = \&T2H_DEFAULT_titlepage;
-$css_lines                 = \&T2H_DEFAULT_css_lines;
-$print_redirection_page    = \&T2H_DEFAULT_print_redirection_page;
-$node_file_name            = \&T2H_DEFAULT_node_file_name;
-
-########################################################################
-# Layout for html for every sections
-#
-sub T2H_DEFAULT_print_section
-{
-    my $fh = shift;
-    my $first_in_page = shift;
-    my $previous_is_top = shift;
-    my $buttons = \@SECTION_BUTTONS;
-
-    if ($first_in_page and $SECTION_NAVIGATION)
-    {
-        &$print_head_navigation($fh, $buttons);
-    }
-    else
-    { # got to do this here, as it isn't done in print_head_navigation
-        main::print_lines($fh, $Texi2HTML::THIS_HEADER);
-        &$print_navigation($fh, $buttons) if ($SECTION_NAVIGATION);
-    }
-    my $nw = main::print_lines($fh);
-    if (defined $SPLIT
-        and (($SPLIT eq 'node') && $SECTION_NAVIGATION))
-    {
-        &$print_foot_navigation($fh);
-        print $fh "$SMALL_RULE\n";
-        &$print_navigation($fh, \@NODE_FOOTER_BUTTONS) if (!defined($WORDS_IN_PAGE) or (defined ($nw)
-                                    and $nw >= $WORDS_IN_PAGE));
-    }
-}
-
-sub T2H_DEFAULT_one_section($)
-{
-    my $fh = shift;
-    main::print_lines($fh, $Texi2HTML::THIS_HEADER);
-    main::print_lines($fh);
-    print $fh "$SMALL_RULE\n";
-    &$print_foot_navigation($fh);
-    &$print_page_foot($fh);
-}
-
-###################################################################
-# Layout of top-page I recommend that you use @ifnothtml, @ifhtml,
-# @html within the Top texinfo node to specify content of top-level
-# page.
-#
-# If you enclose everything in @ifnothtml, then title, subtitle,
-# author and overview is printed
-# Texi2HTML::HREF of Next, Prev, Up, Forward, Back are not defined
-# if $T2H_SPLIT then Top page is in its own html file
-sub T2H_DEFAULT_print_Top_header($$)
-{
-    my $fh = shift;
-    my $do_page_head = shift;
-    &$print_page_head($fh) if ($do_page_head);
-}
-sub T2H_DEFAULT_print_Top_footer($$)
-{
-    my $fh = shift;
-    my $end_page = shift;
-    my $buttons = \@MISC_BUTTONS;
-    &$print_foot_navigation($fh);
-    print $fh "$SMALL_RULE\n";
-    if ($end_page)
-    {
-        &$print_navigation($fh, $buttons);
-        &$print_page_foot($fh);
-    }
-}
-sub T2H_DEFAULT_print_Top
-{
-    my $fh = shift;
-    my $has_top_heading = shift;
-
-    # for redefining navigation buttons use:
-    # my $buttons = [...];
-    # as it is, 'Top', 'Contents', 'Index', 'About' are printed
-    my $buttons = \@MISC_BUTTONS;
-    &$print_head_navigation($fh, $buttons);
-    my $nw;
-    if ($Texi2HTML::THIS_SECTION)
-    {
-        # if top-level node has content, then print it with extra header
-        #print $fh "<h1>$Texi2HTML::NAME{Top}</h1>\n"
-        print $fh "<h1 class=\"settitle\">$Texi2HTML::NAME{Top}</h1>\n"
-            unless ($has_top_heading);
-        $nw = main::print_lines($fh, $Texi2HTML::THIS_SECTION);
-    }
-    else
-    {
-        # top-level node is fully enclosed in @ifnothtml
-        # print fulltitle, subtitle, author, Overview
-        print $fh $Texi2HTML::TITLEPAGE;
-        if (@{$Texi2HTML::OVERVIEW})
-        {
-             print $fh '<h2> ' . &$I('Overview:') . "</h2>\n" . "<blockquote>\n";
-             my $nw = main::print_lines($fh, $Texi2HTML::OVERVIEW);
-             print $fh "</blockquote>\n";
-        }
-    }
-}
-
-###################################################################
-# Layout of Toc, Overview, and Footnotes pages
-# By default, we use "normal" layout
-# Texi2HTML::HREF of Next, Prev, Up, Forward, Back, etc are not defined
-# use: my $buttons = [...] to redefine navigation buttons
-sub T2H_DEFAULT_print_Toc
-{
-    return &$print_misc(@_);
-}
-sub T2H_DEFAULT_print_Overview
-{
-    return &$print_misc(@_);
-}
-sub T2H_DEFAULT_print_Footnotes
-{
-    return &$print_misc(@_);
-}
-sub T2H_DEFAULT_print_About
-{
-    return &$print_misc(@_);
-}
-
-sub T2H_DEFAULT_print_misc_header
-{
-    my $fh = shift;
-    my $buttons = shift;
-    &$print_page_head($fh) if $SPLIT;
-    &$print_head_navigation($fh, $buttons);
-}
-
-sub T2H_DEFAULT_print_misc_footer
-{
-    my $fh = shift;
-    my $buttons = shift;
-    my $nwords = shift;
-    &$print_foot_navigation($fh, $buttons);
-    print $fh "$SMALL_RULE\n";
-    if ($SPLIT)
-    {
-        &$print_navigation($fh, $buttons);# if ($SPLIT ne 'node');
-        &$print_page_foot($fh);
-    }
-}
-
-sub T2H_DEFAULT_print_misc
-{
-    my $fh = shift;
-    my $buttons = \@MISC_BUTTONS;
-    &$print_misc_header($fh, $buttons);
-    print $fh "<h1>$Texi2HTML::NAME{This}</h1>\n";
-    main::print_lines($fh);
-    &$print_misc_footer($fh, $buttons);
-}
-##################################################################
-# section_footer is only called if SPLIT eq 'section'
-# section_footer: after print_section of last section, before print_page_foot
-#
-
-sub T2H_DEFAULT_print_section_footer
-{
-    my $fh = shift;
-    my $buttons = \@SECTION_FOOTER_BUTTONS;
-    &$end_section ($fh, 1);
-    &$print_navigation($fh, $buttons);
-}
-
-###################################################################
-# chapter_header and chapter_footer are only called if
-# SPLIT eq 'chapter'
-# chapter_header: after print_page_head, before print_section
-# chapter_footer: after print_section of last section, before print_page_foot
-#
-# If you want to get rid of navigation stuff after each section,
-# redefine print_section such that it does not call print_navigation,
-# and put print_navigation into print_chapter_header
-sub T2H_DEFAULT_print_chapter_header
-{
-    # nothing to do there, by default, the navigation panel 
-    # is the section navigation panel
-    if (! $SECTION_NAVIGATION)
-    { # in this case print_navigation is called here. 
-        my $fh = shift;
-        my $buttons = \@CHAPTER_BUTTONS;
-        &$print_head_navigation($fh, $buttons); #do that instead ?
-        #&$print_head_navigation($fh, $buttons); # FIXME VERTICAL_HEAD_NAVIGATION ?
-        print $fh "\n$MIDDLE_RULE\n";
-    }
-}
-
-sub T2H_DEFAULT_print_chapter_footer
-{
-    my $fh = shift;
-    my $buttons = \@CHAPTER_BUTTONS;
-    &$print_foot_navigation($fh);
-    print $fh "$BIG_RULE\n";
-    &$print_navigation($fh, $buttons);
-}
-
-sub T2H_DEFAULT_print_section_header
-{
-    # nothing to do there, by default
-    if (! $SECTION_NAVIGATION)
-    { # in this case print_navigation is called here. 
-        my $fh = shift;
-        my $buttons = \@SECTION_BUTTONS;
-        &$print_head_navigation($fh, $buttons); 
-    }
-}
-
-###################################################################
-# Layout of standard header and footer
-#
-
-sub T2H_DEFAULT_print_page_head($)
-{
-    my $fh = shift;
-    my $longtitle = "$Texi2HTML::THISDOC{'title_unformatted'}";
-    $longtitle .= ": $Texi2HTML::UNFORMATTED{'This'}" if exists $Texi2HTML::UNFORMATTED{'This'};
-    #my $longtitle = "$Texi2HTML::THISDOC{'title_no_texi'}";
-    #$longtitle .= ": $Texi2HTML::NO_TEXI{'This'}" if exists $Texi2HTML::NO_TEXI{'This'};
-    my $description = $DOCUMENT_DESCRIPTION;
-    $description = $longtitle if (!defined($description));
-    $description = "<meta name=\"description\" content=\"$description\">" if
-         ($description ne '');
-    $description = $Texi2HTML::THISDOC{'documentdescription'} if (defined($Texi2HTML::THISDOC{'documentdescription'}));
-    my $encoding = '';
-    $encoding = "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=$ENCODING\">" if (defined($ENCODING) and ($ENCODING ne ''));
-    print $fh <<EOT;
-$DOCTYPE
-<html>
-$Texi2HTML::THISDOC{'copying'}<!-- Created on $Texi2HTML::THISDOC{today} by $Texi2HTML::THISDOC{program} -->
-<!--
-$Texi2HTML::THISDOC{program_authors}
--->
-<head>
-<title>$longtitle</title>
-
-$description
-<meta name="keywords" content="$longtitle">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="Generator" content="$Texi2HTML::THISDOC{program}">
-$encoding
-$CSS_LINES
-$EXTRA_HEAD
-</head>
-
-<body $BODYTEXT>
-$AFTER_BODY_OPEN
-EOT
-}
-
-sub program_string()
-{
-    my $user = $Texi2HTML::THISDOC{'user'};
-    my $date = $Texi2HTML::THISDOC{'today'};
-    $user = '' if (!defined($user));
-    $date = '' if (!defined($date));
-    if (($user ne '') and ($date ne ''))
-    {
-        return  &$I('This document was generated by @emph{%{user}} on @emph{%{date}} using @uref{%{program_homepage}, @emph{%{program}}}.', {
-           'user' => $user, 'date' => $date, 'program_homepage' => $Texi2HTML::THISDOC{'program_homepage'}, 'program' => $Texi2HTML::THISDOC{'program'} });
-    }
-    elsif ($user ne '')
-    {
-        return  &$I('This document was generated by @emph{%{user}} using @uref{%{program_homepage}, @emph{%{program}}}.', {
-           'user' => $user, 'program_homepage' => $Texi2HTML::THISDOC{'program_homepage'}, 'program' => $Texi2HTML::THISDOC{'program'} });
-    }
-    elsif ($date ne '')
-    {
-        return  &$I('This document was generated on @i{%{date}} using @uref{%{program_homepage}, @i{%{program}}}.', {
-           'date' => $date, 'program_homepage' => $Texi2HTML::THISDOC{'program_homepage'}, 'program' => $Texi2HTML::THISDOC{'program'} });
-    }
-    return &$I('This document was generated using @uref{%{program_homepage}, @emph{%{program}}}.', {
-       'program_homepage' => $Texi2HTML::THISDOC{'program_homepage'}, 'program'
-=> $Texi2HTML::THISDOC{'program'} });
-}
-
-sub T2H_DEFAULT_end_section($$)
-{
-    my $fh = shift;
-    my $end_foot_navigation = shift;
-    &$print_foot_navigation($fh) if ($end_foot_navigation);
-    print $fh "$BIG_RULE\n";
-}
-
-sub T2H_DEFAULT_print_page_foot($)
-{
-    my $fh = shift;
-    my $program_string = program_string();
-    print $fh <<EOT;
-<p>
- <font size="-1">
-  $program_string
- </font>
- <br>
-$PRE_BODY_CLOSE
-</p>
-</body>
-</html>
-EOT
-}
-
-###################################################################
-# Layout of navigation panel
-
-sub T2H_DEFAULT_print_head_navigation($$)
-{
-    my $fh = shift;
-    my $buttons = shift;
-    if ($VERTICAL_HEAD_NAVIGATION)
-    {
-        print $fh <<EOT;
-<table border="0" cellpadding="0" cellspacing="0">
-<tr valign="top">
-<td align="left">
-EOT
-    }
-    main::print_lines($fh, $Texi2HTML::THIS_HEADER);
-    &$print_navigation($fh, $buttons, $VERTICAL_HEAD_NAVIGATION);
-    if ($VERTICAL_HEAD_NAVIGATION)
-    {
-        print $fh <<EOT;
-</td>
-<td align="left">
-EOT
-    }
-    elsif (defined $SPLIT
-           and ($SPLIT eq 'node'))
-    {
-        print $fh "$SMALL_RULE\n";
-    }
-}
-
-sub T2H_DEFAULT_print_foot_navigation
-{
-    my $fh = shift;
-    if ($VERTICAL_HEAD_NAVIGATION)
-    {
-        print $fh <<EOT;
-</td>
-</tr>
-</table>
-EOT
-    }
-}
-
-######################################################################
-# navigation panel
-#
-# how to create IMG tag
-sub T2H_DEFAULT_button_icon_img
-{
-    my $button = shift;
-    my $icon = shift;
-    my $name = shift;
-    return '' if (!defined($icon));
-    if (defined($name) && $name)
-    {
-        $name = ": $name";
-    }
-    else
-    {
-        $name = '';
-    }
-    $button = "" if (!defined ($button));
-    return qq{<img src="$icon" border="0" alt="$button$name" align="middle">};
-}
-
-sub T2H_DEFAULT_print_navigation
-{
-    my $fh = shift;
-    my $buttons = shift;
-    my $vertical = shift;
-    my $spacing = 1;
-    print $fh '<table cellpadding="', $spacing, '" cellspacing="', $spacing,
-      "\" border=\"0\">\n";
-
-    print $fh "<tr>" unless $vertical;
-    for my $button (@$buttons)
-    {
-        print $fh qq{<tr valign="top" align="left">\n} if $vertical;
-        print $fh qq{<td valign="middle" align="left">};
-
-        if (ref($button) eq 'CODE')
-        {
-            &$button($fh, $vertical);
-        }
-        elsif (ref($button) eq 'SCALAR')
-        {
-            print $fh "$$button" if defined($$button);
-        }
-        elsif (ref($button) eq 'ARRAY')
-        {
-            my $text = $button->[1];
-            my $button_href = $button->[0];
-            if (defined($button_href) and !ref($button_href) 
-               and defined($text) and (ref($text) eq 'SCALAR') and defined($$text))
-            {             # use given text
-                if ($Texi2HTML::HREF{$button_href})
-                {
-                  print $fh "" .
-                        &$anchor('',
-                                    $Texi2HTML::HREF{$button_href},
-                                    $$text
-                                   ) 
-                                    ;
-                }
-                else
-                {
-                  print $fh $$text;
-                }
-            }
-        }
-        elsif ($button eq ' ')
-        {                       # handle space button
-            print $fh
-                $ICONS && $ACTIVE_ICONS{' '} ?
-                    &$button_icon_img($button, $ACTIVE_ICONS{' '}) :
-                        $NAVIGATION_TEXT{' '};
-            #next;
-        }
-        elsif ($Texi2HTML::HREF{$button})
-        {                       # button is active
-            my $btitle = $BUTTONS_GOTO{$button} ?
-                'title="' . ucfirst($BUTTONS_GOTO{$button}) . '"' : '';
-            if ($ICONS && $ACTIVE_ICONS{$button})
-            {                   # use icon
-                print $fh '' .
-                    &$anchor('',
-                        $Texi2HTML::HREF{$button},
-                        &$button_icon_img($button,
-                                   $ACTIVE_ICONS{$button},
-                                   #$Texi2HTML::NAME{$button}),
-                                   $Texi2HTML::NO_TEXI{$button}),
-                        $btitle
-                      );
-            }
-            else
-            {                   # use text
-                print $fh
-                    '[' .
-                        &$anchor('',
-                                    $Texi2HTML::HREF{$button},
-                                    $NAVIGATION_TEXT{$button},
-                                    $btitle
-                                   ) .
-                                       ']';
-            }
-        }
-        else
-        {                       # button is passive
-            print $fh
-                $ICONS && $PASSIVE_ICONS{$button} ?
-                    &$button_icon_img($button,
-                                          $PASSIVE_ICONS{$button},
-                                          #$Texi2HTML::NAME{$button}) :
-                                          $Texi2HTML::NO_TEXI{$button}) :
-
-                                              "[" . $NAVIGATION_TEXT{$button} . "]";
-        }
-        print $fh "</td>\n";
-        print $fh "</tr>\n" if $vertical;
-    }
-    print $fh "</tr>" unless $vertical;
-    print $fh "</table>\n";
-}
-
-######################################################################
-# Frames: this is from "Richard Y. Kim" <ryk@coho.net>
-# Should be improved to be more conforming to other _print* functions
-# FIXME pass toc_file and main_file as args or in $Texi2HTML::THISDOC ?
-
-sub T2H_DEFAULT_print_frame
-{
-    my $fh = shift;
-    my $toc_file = shift;
-    my $main_file = shift;
-    print $fh <<EOT;
-$FRAMESET_DOCTYPE
-<html>
-<head><title>$Texi2HTML::THISDOC{title}</title></head>
-<frameset cols="140,*">
-  <frame name="toc" src="$toc_file">
-  <frame name="main" src="$main_file">
-</frameset>
-</html>
-EOT
-}
-
-sub T2H_DEFAULT_print_toc_frame
-{
-    my $fh = shift;
-    my $stoc_lines = shift;
-    &$print_page_head($fh);
-    print $fh <<EOT;
-<h2>Content</h2>
-EOT
-    print $fh map {s/\bhref=/target="main" href=/; $_;} @$stoc_lines;
-    print $fh "</body></html>\n";
-}
-
-# This subroutine is intended to fill @Texi2HTML::TOC_LINES and 
-# @Texi2HTML::OVERVIEW with the table of contents and short table of
-# contents.
-#
-# arguments:
-# ref on an array containing all the elements
-
-# each element is a reference on a hash. The following keys might be of
-# use:
-# 'top': true if this is the top element
-# 'index_page': true if the element is an index page added because of index 
-#               splitting
-# 'toc_level': level of the element in the table of content. Highest level
-#              is 1 for the @top element and for chapters, appendix and so on,
-#              2 for section, unnumberedsec and so on... 
-# 'tocid': label used for reference linking to the element in table of
-#          contents
-# 'file': the file containing the element, usefull to do href to that file
-#         in case the document is split.
-# 'text': text of the element, with section number
-# 'name': text of the element, without section number
-
-# Relevant configuration variables are:
-# $NUMBER_SECTIONS
-# $TOC_LIST_ATTRIBUTE: usefull in case a list is used
-# $FRAMES: @Texi2HTML::OVERVIEW is used in one of the frames. 
-# $BEFORE_OVERVIEW
-# $AFTER_OVERVIEW
-# $BEFORE_TOC_LINES
-# $AFTER_TOC_LINES
-# $DO_CONTENTS
-# $DO_SCONTENTS
-
-sub T2H_DEFAULT_toc_body($)
-{
-}
-
-sub T2H_DEFAULT_css_lines ($$)
-{
-    my $import_lines = shift;
-    my $rule_lines = shift;
-    return if (defined($CSS_LINES) or (!@$rule_lines and !@$import_lines and (! keys(%css_map))));
-    $CSS_LINES = "<style type=\"text/css\">\n<!--\n";
-    $CSS_LINES .= join('',@$import_lines) . "\n" if (@$import_lines);
-    foreach my $css_rule (sort(keys(%css_map)))
-    {
-        next unless ($css_map{$css_rule});
-        $CSS_LINES .= "$css_rule {$css_map{$css_rule}}\n";
-    }
-    $CSS_LINES .= join('',@$rule_lines) . "\n" if (@$rule_lines);
-    $CSS_LINES .= "-->\n</style>\n";
-}
-
-######################################################################
-# About page
-#
-
-# PRE_ABOUT can be a function reference or a scalar.
-# Note that if it is a scalar, T2H_InitGlobals has not been called,
-# and all global variables like $ADDRESS are not available.
-$PRE_ABOUT = sub
-{
-    return '  ' . program_string() .  "\n";
-};
-
-# If customizing $AFTER_ABOUT, be sure to put the content inside <p></p>.
-$AFTER_ABOUT = '';
-
-%BUTTONS_EXAMPLE =
-    (
-     'Top',         ' &nbsp; ',
-     'Contents',    ' &nbsp; ',
-     'Overview',    ' &nbsp; ',
-     'Index',       ' &nbsp; ',
-     'This',        '1.2.3',
-     'Back',        '1.2.2',
-     'FastBack',    '1',
-     'Prev',        '1.2.2',
-     'Up',          '1.2',
-     'Next',        '1.2.4',
-     'NodeUp',      '1.2',
-     'NodeNext',    '1.2.4',
-     'NodePrev',    '1.2.2',
-     'Following',   '1.2.4',
-     'Forward',     '1.2.4',
-     'FastForward', '2',
-     'About',       ' &nbsp; ',
-     'First',       '1.',
-     'Last',        '1.2.4',
-    );
-
-sub T2H_DEFAULT_about_body
-{
-    my $about = "<p>\n";
-    if (ref($PRE_ABOUT) eq 'CODE')
-    {
-        $about .= &$PRE_ABOUT();
-    }
-    else
-    {
-        $about .= $PRE_ABOUT;
-    }
-    $about .= <<EOT;
-</p>
-<p>
-EOT
-    $about .= &$I('  The buttons in the navigation panels have the following meaning:') . "\n";
-    $about .= <<EOT;
-</p>
-<table border="1">
-  <tr>
-EOT
-    $about .= '    <th> ' . &$I('Button') . " </th>\n" .
-'    <th> ' . &$I('Name') . " </th>\n" .
-'    <th> ' . &$I('Go to') . " </th>\n" .
-'    <th> ' . &$I('From 1.2.3 go to') . "</th>\n" . "  </tr>\n";
-
-    for my $button (@SECTION_BUTTONS)
-    {
-        next if $button eq ' ' || ref($button) eq 'CODE' || ref($button) eq 'SCALAR' || ref($button) eq 'ARRAY';
-        $about .= "  <tr>\n    <td align=\"center\">";
-        $about .=
-            ($ICONS && $ACTIVE_ICONS{$button} ?
-             &$button_icon_img($button, $ACTIVE_ICONS{$button}) :
-             ' [' . $NAVIGATION_TEXT{$button} . '] ');
-        $about .= "</td>\n";
-        $about .= <<EOT;
-    <td align="center">$button</td>
-    <td>$BUTTONS_GOTO{$button}</td>
-    <td>$BUTTONS_EXAMPLE{$button}</td>
-  </tr>
-EOT
-    }
-
-    $about .= <<EOT;
-</table>
-
-<p>
-EOT
-    $about .= &$I('  where the @strong{ Example } assumes that the current position is at @strong{ Subsubsection One-Two-Three } of a document of the following structure:') . "\n";
-
-#  where the <strong> Example </strong> assumes that the current position
-#  is at <strong> Subsubsection One-Two-Three </strong> of a document of
-#  the following structure:
-    $about .= <<EOT;
-</p>
-
-<ul>
-EOT
-    $about .= '  <li> 1. ' . &$I('Section One') . "\n" .
-"    <ul>\n" .
-'      <li>1.1 ' . &$I('Subsection One-One') . "\n";
-    $about .= <<EOT;
-        <ul>
-          <li>...</li>
-        </ul>
-      </li>
-EOT
-    $about .= '      <li>1.2 ' . &$I('Subsection One-Two') . "\n" .
-"        <ul>\n" .
-'          <li>1.2.1 ' . &$I('Subsubsection One-Two-One') . "</li>\n" .
-'          <li>1.2.2 ' . &$I('Subsubsection One-Two-Two') . "</li>\n" .
-'          <li>1.2.3 ' . &$I('Subsubsection One-Two-Three') . " &nbsp; &nbsp;\n"
-.
-'            <strong>&lt;== ' . &$I('Current Position') . " </strong></li>\n" .
-'          <li>1.2.4 ' . &$I('Subsubsection One-Two-Four') . "</li>\n" .
-"        </ul>\n" .
-"      </li>\n" .
-'      <li>1.3 ' . &$I('Subsection One-Three') . "\n";
-    $about .= <<EOT;
-        <ul>
-          <li>...</li>
-        </ul>
-      </li>
-EOT
-    $about .= '      <li>1.4 ' . &$I('Subsection One-Four') . "</li>\n";
-    $about .= <<EOT;
-    </ul>
-  </li>
-</ul>
-$AFTER_ABOUT
-EOT
-    return $about;
-}
-
-sub T2H_DEFAULT_titlepage()
-{
-    my $result = '';
-    if (@{$Texi2HTML::THISDOC{'titles'}} 
-        or @{$Texi2HTML::THISDOC{'subtitles'}} 
-        or @{$Texi2HTML::THISDOC{'authors'}})
-    {     
-        $result = "<div align=\"center\">\n";
-        foreach my $title (@{$Texi2HTML::THISDOC{'titles'}})
-        {
-            $result .= '<h1>' . $title . "</h1>\n";
-        }    
-        foreach my $subtitle (@{$Texi2HTML::THISDOC{'subtitles'}})
-        {
-            $result .= '<h2>' . $subtitle . "</h2>\n";
-        }
-        foreach my $author (@{$Texi2HTML::THISDOC{'authors'}})
-        {
-            $result .= '<strong> ' . $author . " </strong><br>\n";
-        }
-        $result .= "</div>\n$DEFAULT_RULE\n";
-    }
-
-    $Texi2HTML::TITLEPAGE = $result . $Texi2HTML::TITLEPAGE;
-}
-
-# i18n
-sub T2H_DEFAULT_print_redirection_page($)
-{
-    my $fh = shift;
-    my $longtitle = "$Texi2HTML::THISDOC{'title_no_texi'}";
-    $longtitle .= ": $Texi2HTML::NO_TEXI{'This'}" if exists $Texi2HTML::NO_TEXI{'This'};
-    my $description = $longtitle;
-    $description = $Texi2HTML::THISDOC{'documentdescription'} if (defined($Texi2HTML::THISDOC{'documentdescription'}));
-    my $href = &$anchor('', $Texi2HTML::HREF{'This'}, $Texi2HTML::NAME{'This'}); 
-    print $fh <<EOT;
-$DOCTYPE
-<html>
-<!-- Created on $Texi2HTML::THISDOC{'today'} by $Texi2HTML::THISDOC{'program'} -->
-<!--
-$Texi2HTML::THISDOC{'program_authors'}
--->
-<head>
-<title>$longtitle</title>
-
-<meta name="description" content="$description">
-<meta name="keywords" content="$longtitle">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="Generator" content="$Texi2HTML::THISDOC{program}">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Refresh" content="0; url=$Texi2HTML::HREF{'This'}">
-$EXTRA_HEAD
-</head>
-
-<body $BODYTEXT>
-$AFTER_BODY_OPEN
-<p>The node you are looking for is at $href.</p>
-</body>
-EOT
-}
-
-sub T2H_DEFAULT_node_file_name($)
-{
-    my $node = shift;
-    return (undef, undef) if ($node->{'external_node'} or $node->{'index_page'});
-    my $file;
-    my $node_file;
-    
-    if ($NEW_CROSSREF_STYLE)
-    {
-         if (defined($node->{'file'}))
-         {
-              $file = $node->{'file'};
-              $node_file = $node->{'node_file'};
-         }
-         else
-         {
-              $node_file = $node->{'cross_manual_target'} . ".$NODE_FILE_EXTENSION";
-              $file =  $node_file if (($SPLIT eq 'node') and ($USE_NODES or $node->{'with_section'}));
-         }
-    }
-    else
-    {
-         return (undef, undef) if (defined($node->{'file'}));
-         my $name = main::remove_texi($node->{'texi'});
-         $name =~ s/[^\w\.\-]/-/g;
-         $name = "${name}.$NODE_FILE_EXTENSION";
-         $file = $name if (($SPLIT eq 'node') and ($USE_NODES or $node->{'with_section'}));
-         $node_file = $name;
-    }
-    return ($file, $node_file);
-}
-
-########################################################################
-# Control of formatting:
-# 1.) For some changes, it is often enough to change the value of
-#     some global map. It might necessitate building a little
-#     function along with the change in hash, if the change is the use
-#     of another function (in style_map).
-# 2.) For other changes, reimplement one of the t2h_default_<fnc>* routines,
-#     give them another name, and assign them to the respective
-#     $<fnc> variable (below).
-
-
-#
-# This hash should have keys corresponding with the nonletter command accent
-# whose following character is considered to be the argument
-# This hash associates an accent macro to the ISO name for the accent if any.
-# The customary use of this map is to find the ISO name appearing in html
-# entity (like &eacute;) associated with a texinfo accent macro.
-#
-# The keys of the hash are
-# ": umlaut
-# ~: tilda accent
-# ^: circumflex accent
-# `: grave accent
-# ': acute accent
-# =: macron accent
-%accent_map = (
-          '"',  'uml',
-          '~',  'tilde',
-          '^',  'circ',
-          '`',  'grave',
-          "'", 'acute',
-          '=', '',
-         );
-
-#
-# texinfo "simple things" (@foo) to HTML ones
-#
-%simple_map = (
-           "*", "<br>",     # HTML+
-           ' ', '&nbsp;',
-           "\t", '&nbsp;',
-           "\n", '&nbsp;',
-     # "&#173;" or "&shy;" could also be possible for @-, but it seems
-     # that some browser will consider this as an always visible hyphen mark
-     # which is not what we want (see http://www.cs.tut.fi/~jkorpela/shy.html)
-           '-', '',  # hyphenation hint
-           '|', '',  # used in formatting commands @evenfooting and friends
-           '/', '',
-       # spacing commands
-           ':', '',
-           '!', '!',
-           '?', '?',
-           '.', '.',
-           '@', '@',
-           '}', '}',
-           '{', '{',
-          );
-
-# this map is used in preformatted text
-%simple_map_pre = %simple_map;
-$simple_map_pre{'*'} = "\n";
-
-#
-# texinfo "things" (@foo{}) to HTML ones
-#
-%things_map = (
-               'TeX'          => 'TeX',
-               'LaTeX'          => 'LaTeX',
-# pertusus: unknown by makeinfo, not in texinfo manual (@* is the right thing)
-#               'br', '<br>',     # paragraph break
-               'bullet'       => '*',
-#               #'copyright' => '(C)',
-               'copyright'    => '&copy;',
-               'registeredsymbol'   => '&reg;',
-               'dots'         => '<small class="dots">...</small>',
-               'enddots'      => '<small class="enddots">....</small>',
-               'equiv'        => '==',
-# i18n
-               'error'        => 'error--&gt;',
-               'expansion'    => '==&gt;',
-               'minus'        => '-',
-               'point'        => '-!-',
-               'print'        => '-|',
-               'result'       => '=&gt;',
-               # set in code using the language
-               # 'today', &pretty_date,
-               'today'        => '',
-               'aa'           => '&aring;',
-               'AA'           => '&Aring;',
-               'ae'           => '&aelig;',
-               'oe'           => '&oelig;', #pertusus: also &#156;. &oelig; not in html 3.2
-               'AE'           => '&AElig;',
-               'OE'           => '&OElig;', #pertusus: also &#140;. &OElig; not in html 3.2
-               'o'            =>  '&oslash;',
-               'O'            =>  '&Oslash;',
-               'ss'           => '&szlig;',
-               'l'            => '/l',
-               'L'            => '/L',
-               'exclamdown'   => '&iexcl;',
-               'questiondown' => '&iquest;',
-               'pounds'       => '&pound;',
-               'ordf'         => '&ordf;',
-               'ordm'         => '&ordm;',
-               'comma'        => ',',
-               'euro'         => '&euro;',
-             );
-
-# This map is used in preformatted environments
-%pre_map = %things_map;
-$pre_map{'dots'} = '...';
-$pre_map{'enddots'} = '....';
-#$pre_map{'br'} = "\n";
-
-# ascii representation of @-commands
-%ascii_simple_map = (
-           "*", "\n",     # HTML+
-           ' ', ' ',
-           "\t", "\t",
-           "\n", "\n",
-           '-', '',  # hyphenation hint
-           '|', '',  # used in formatting commands @evenfooting and friends
-           '/', '',
-           ':', '',
-           '!', '!',
-           '?', '?',
-           '.', '.',
-           '@', '@',
-           '}', '}',
-           '{', '{',
-);
-
-%ascii_things_map = (
-               'TeX'          => 'TeX',
-               'LaTeX'          => 'LaTeX',
-               'bullet'       => '*',
-               'copyright' => '(C)',
-               'registeredsymbol'   => '(R)',
-               'dots'         => '...',
-               'enddots'      => '....',
-               'equiv'        => '==',
-# i18n
-               'error'        => 'error-->',
-               'expansion'    => '==>',
-               'minus'        => '-',
-               'point'        => '-!-',
-               'print'        => '-|',
-               'result'       => '=>',
-               'today'        => '',
-               'aa'           => 'aa',
-               'AA'           => 'AA',
-               'ae'           => 'ae',
-               'oe'           => 'oe', 
-               'AE'           => 'AE',
-               'OE'           => 'OE',
-               'o'            =>  '/o',
-               'O'            =>  '/O',
-               'ss'           => 'ss',
-               'l'            => '/l',
-               'L'            => '/L',
-               'exclamdown'   => '?',
-               'questiondown' => '!',
-               'pounds'       => '#',
-               'ordf'         => 'a',
-               'ordm'         => 'o',
-               'comma'        => ',',
-               'euro'         => 'Euro',
-);
-
-#
-# This map is used when texi elements are removed and replaced 
-# by simple text
-#
-%simple_map_texi = (
-           "*", "",  
-           " ", " ",
-           "\t", " ",
-           "-", "-",  # soft hyphen
-           "\n", "\n",
-           "|", "",
-        # spacing commands
-           ":", "",
-           "!", "!",
-           "?", "?",
-           ".", ".",
-           "-", "",
-           '@', '@',
-           '}', '}',
-           '{', '{',
-          );
-
-# text replacing macros when texi commands are removed and plain text is 
-# produced 
-%texi_map = (
-               'TeX', 'TeX',
-               'LaTeX', 'LaTeX',
-               'bullet', '*',
-               'copyright', 'C',
-               'registeredsymbol', 'R',
-               'dots', '...',
-               'enddots', '....',
-               'equiv', '==',
-               'error', 'error-->',
-               'expansion', '==>',
-               'minus', '-',
-               'point', '-!-',
-               'print', '-|',
-               'result', '=>',
-               'today'        => '',
-               'aa', 'aa',
-               'AA', 'AA',
-               'ae', 'ae',
-               'oe', 'oe',
-               'AE', 'AE',
-               'OE', 'OE',
-               'o',  'o',
-               'O',  'O',
-               'ss', 'ss',
-               'l', 'l',
-               'L', 'L',
-               'exclamdown', '! upside-down',
-               #'exclamdown', '&iexcl;',
-               'questiondown', '? upside-down',
-               #'questiondown', '&iquest;',
-               'pounds', 'pound sterling',
-               #'pounds', '&pound;'
-               'ordf'         => 'a',
-               'ordm'         => 'o',
-               'comma'        => ',',
-               'euro'         => 'Euro',
-            );
-
-# taken from
-#Latin extended additionnal
-#http://www.alanwood.net/unicode/latin_extended_additional.html
-#C1 Controls and Latin-1 Supplement
-#http://www.alanwood.net/unicode/latin_1_supplement.html
-#Latin Extended-A
-#http://www.alanwood.net/unicode/latin_extended_a.html
-#Latin Extended-B
-#http://www.alanwood.net/unicode/latin_extended_b.html
-#dotless i: 0131
-%unicode_map = (
-               'bullet'       => '2022',
-               'copyright'    => '00A9',
-               'registeredsymbol'   => '00AE',
-               'dots'         => '2026',
-               'enddots'      => '',
-               'equiv'        => '2261',
-               'error'        => '',
-               'expansion'    => '2192',
-               'minus'        => '2212', # in mathematical operators
-#               'minus'        => '002D', # in latin1
-               'point'        => '2217',
-               'print'        => '',
-               'result'       => '21D2',
-               'today'        => '',
-               'aa'           => '00E5',
-               'AA'           => '00C5',
-               'ae'           => '00E6',
-               'oe'           => '0153',
-               'AE'           => '00C6',
-               'OE'           => '0152',
-               'o'            => '00F8',
-               'O'            => '00D8',
-               'ss'           => '00DF',
-               'l'            => '0142',
-               'L'            => '0141',
-               'exclamdown'   => '00A1',
-               'questiondown' => '00BF',
-               'pounds'       => '00A3',
-               'ordf'         => '00AA',
-               'ordm'         => '00BA',
-               'comma'        => '002C',
-               'euro'         => '20AC',
-             );
-
-%ascii_character_map = (
-            ' ' => '0020',
-            '!' => '0021',
-            '"' => '0022',
-            '#' => '0023',
-            '$' => '0024',
-            '%' => '0025',
-            '&' => '0026',
-            "'" => '0027',
-            '(' => '0028',
-            ')' => '0029',
-            '*' => '002A',
-            '+' => '002B',
-            ',' => '002C',
-            '-' => '002D',
-            '.' => '002E',
-            '/' => '002F',
-            ':' => '003A',
-            ';' => '003B',
-            '<' => '003C',
-            '=' => '003D',
-            '>' => '003E',
-            '?' => '003F',
-            '@' => '0040',
-            '[' => '005B',
-            '\\' => '005C',
-            ']' => '005D',
-            '^' => '005E',
-            '_' => '005F',
-            '`' => '0060',
-            '{' => '007B',
-            '|' => '007C',
-            '}' => '007D',
-            '~' => '007E',
-);
-
-%perl_charset_to_html = (
-              'utf8'       => 'utf-8',
-              'ascii'      => 'us-ascii',
-);
-
-# symbols used for the commands if $USE-ISO is true.
-%iso_symbols = (
-         'equiv'     => '&equiv;',
-         'dots'      => '&hellip;',
-         'bullet'    => '&bull;',
-         'result'    => '&rArr;',
-         'expansion' => '&rarr;',
-         'point'     => '&lowast;',
-        );
-
-# When the value begins with & the function with that name is used to do the
-# html. The first argument is the text enclosed within {}, the second is the
-# style name (which is also the key of the hash)
-#
-# Otherwithe the value is the html element used to enclose the text, and if
-# there is a " the resulting text is also enclosed within `'
-my %old_style_map = (
-      'acronym',    '',
-      'asis',       '',
-      'b',          'b',
-      'cite',       'cite',
-      'code',       'code',
-      'command',    'code',
-      'ctrl',       '&default_ctrl', 
-      'dfn',        'em', 
-      'dmn',        '',   
-      'email',      '&default_email', 
-      'emph',       'em',
-      'env',        'code',
-      'file',       '"tt', 
-      'i',          'i',
-      'kbd',        'kbd',
-      'key',        'kbd',
-      'math',       'em',
-      'option',     '"samp', 
-      'r',          '',
-      'samp',       '"samp', 
-      'sc',         '&default_sc',
-      'strong',     'strong',
-      't',          'tt',
-      'uref',       '&default_uref',
-      'url',        '&default_url',
-      'var',        'var',
-      'verb',       'tt',
-      'titlefont',  '&default_titlefont',
-      'w',          '',
-     );
-
-# default is {'args' => ['normal'], 'attribute' => ''},   
-%style_map = (
-      'asis',       {},
-      'b',          {'attribute' => 'b'},
-      'cite',       {'attribute' => 'cite'},
-      'code',       {'args' => ['code'], 'attribute' => 'code'},
-      'command',    {'args' => ['code'], 'attribute' => 'code'},
-      'ctrl',       {'function' => \&t2h_default_ctrl}, 
-      'dfn',        {'attribute' => 'em'}, 
-      'dmn',        {},   
-      'email',      {'args' => ['code', 'normal'], 
-                       'function' => \&t2h_default_email}, 
-      #'email',      {'args' => ['normal', 'normal'], 
-      #                 'function' => \&t2h_default_email}, 
-      'emph',       {'attribute' => 'em'}, 
-      'env',        {'args' => ['code'], 'attribute' => 'code'},
-      'file',       {'args' => ['code'], 'attribute' => 'tt', 'quote' => '"'},
-      'i',          {'attribute' => 'i'},
-      'slanted',    {'attribute' => 'i'},
-      'sansserif',  {'attribute' => 'span class="sansserif"'},
-      'kbd',        {'args' => ['code'], 'attribute' => 'kbd'},
-      'key',        {'attribute' => 'kbd'},
-      'math',       {'attribute' => 'em'},
-      'option',     {'args' => ['code'], 'attribute' => 'samp', 'quote' => '"'},
-      'r',          {},
-      'samp',       {'args' => ['code'], 'attribute' => 'samp', 'quote' => '"'},
-      'sc',         {'function' => \&t2h_default_sc},
-      'strong',     {'attribute' => 'strong'},
-      't',          {'attribute' => 'tt'},
-      'uref',       {'function' => \&t2h_default_uref, 
-                      'args' => ['code', 'normal', 'normal']},
-      #'uref',       {'function' => \&t2h_default_uref, 
-      #                'args' => ['normal', 'normal', 'normal']},
-      'url',        {'function' => \&t2h_default_uref, 
-                      'args' => ['code', 'normal', 'normal']},
-      'indicateurl', {'args' => ['code'], 'begin' => '&lt;<code>', 'end' => '</code>&gt;'},
-      'var',        {'attribute' => 'var'},
-      'verb',       {'args' => ['code'], 'attribute' => 'tt'},
-      'titlefont',  {'function' => \&t2h_default_titlefont},
-      'w',          {},
-     );
-
-%unicode_diacritical = (
-       'H'          => '030B', 
-       'ringaccent' => '030A', 
-       "'"          => '0301',
-       'v'          => '030C', 
-       ','          => '0327', 
-       '^'          => '0302', 
-       'dotaccent'  => '0307',
-       '`'          => '0300',
-       '='          => '0304', 
-       '~'          => '0303',
-       '"'          => '0308', 
-       'udotaccent' => '0323', 
-       'ubaraccent' => '0332', 
-       'u'          => '0306'
-);
-
-%unicode_accents = (
-    'dotaccent' => { # dot above
-        'A' => '0226', #C moz-1.2 
-        'a' => '0227', #c moz-1.2
-        'B' => '1E02',
-        'b' => '1E03',
-        'C' => '010A',
-        'c' => '010B',
-        'D' => '1E0A',
-        'd' => '1E0B',
-        'E' => '0116',
-        'e' => '0117',
-        'F' => '1E1E',
-        'f' => '1E1F',
-        'G' => '0120',
-        'g' => '0121',
-        'H' => '1E22',
-        'h' => '1E23',
-        'i' => '0069',
-        'I' => '0130',
-        'N' => '1E44',
-        'n' => '1E45',
-        'O' => '022E', #Y moz-1.2
-        'o' => '022F', #v moz-1.2
-        'P' => '1E56',
-        'p' => '1E57',
-        'R' => '1E58',
-        'r' => '1E59',
-        'S' => '1E60',
-        's' => '1E61',
-        'T' => '1E6A',
-        't' => '1E6B',
-        'W' => '1E86',
-        'w' => '1E87',
-        'X' => '1E8A',
-        'x' => '1E8B',
-        'Y' => '1E8E',
-        'y' => '1E8F',
-        'Z' => '017B',
-        'z' => '017C',
-    },
-    'udotaccent' => { # dot below
-        'B' => '1E04',
-        'b' => '1E05',
-        'D' => '1E0C',
-        'd' => '1E0D',
-        'E' => '1EB8',
-        'e' => '1EB9',
-        'H' => '1E24',
-        'h' => '1E25',
-        'I' => '1ECA',
-        'i' => '1ECB',
-        'K' => '1E32',
-        'k' => '1E33',
-        'L' => '1E36',
-        'l' => '1E37',
-        'M' => '1E42',
-        'm' => '1E43',
-        'N' => '1E46',
-        'n' => '1E47',
-        'O' => '1ECC',
-        'o' => '1ECD',
-        'R' => '1E5A',
-        'r' => '1E5B',
-        'S' => '1E62',
-        's' => '1E63',
-        'T' => '1E6C',
-        't' => '1E6D',
-        'U' => '1EE4',
-        'u' => '1EE5',
-        'V' => '1E7E',
-        'v' => '1E7F',
-        'W' => '1E88',
-        'w' => '1E89',
-        'Y' => '1EF4',
-        'y' => '1EF5',
-        'Z' => '1E92',
-        'z' => '1E93',
-    },
-    'ubaraccent' => { # line below
-        'B' => '1E06',
-        'b' => '1E07',
-        'D' => '1E0E',
-        'd' => '1E0F',
-        'h' => '1E96',
-        'K' => '1E34',
-        'k' => '1E35',
-        'L' => '1E3A',
-        'l' => '1E3B',
-        'N' => '1E48',
-        'n' => '1E49',
-        'R' => '1E5E',
-        'r' => '1E5F',
-        'T' => '1E6E',
-        't' => '1E6F',
-        'Z' => '1E94',
-        'z' => '1E95',
-    },
-    ',' => { # cedilla
-        'C' => '00C7',
-        'c' => '00E7',
-        'D' => '1E10',
-        'd' => '1E11',
-        'E' => '0228', #C moz-1.2
-        'e' => '0229', #c moz-1.2
-        'G' => '0122',
-        'g' => '0123',
-        'H' => '1E28',
-        'h' => '1E29',
-        'K' => '0136',
-        'k' => '0137',
-        'L' => '013B',
-        'l' => '013C',
-        'N' => '0145',
-        'n' => '0146',
-        'R' => '0156',
-        'r' => '0157',
-        'S' => '015E',
-        's' => '015F',
-        'T' => '0162',
-        't' => '0163',
-    },
-    '=' => { # macron
-        'A' => '0100',
-        'a' => '0101',
-        'E' => '0112',
-        'e' => '0113',
-        'I' => '012A',
-        'i' => '012B',
-        'G' => '1E20',
-        'g' => '1E21',
-        'O' => '014C',
-        'o' => '014D',
-        'U' => '016A',
-        'u' => '016B',
-        'Y' => '0232', #? moz-1.2
-        'y' => '0233', #? moz-1.2
-    },
-    '"' => { # diaeresis
-        'A' => '00C4',
-        'a' => '00E4',
-        'E' => '00CB',
-        'e' => '00EB',
-        'H' => '1E26',
-        'h' => '1E27',
-        'I' => '00CF',
-        'i' => '00EF',
-        'O' => '00D6',
-        'o' => '00F6',
-        't' => '1E97',
-        'U' => '00DC',
-        'u' => '00FC',
-        'W' => '1E84',
-        'w' => '1E85',
-        'X' => '1E8C',
-        'x' => '1E8D',
-        'y' => '00FF',
-        'Y' => '0178',
-    },
-    'u' => { # breve
-        'A' => '0101',
-        'a' => '0102',
-        'E' => '0114',
-        'e' => '0115',
-        'G' => '011E',
-        'g' => '011F',
-        'I' => '012C',
-        'i' => '012D',
-        'O' => '014E',
-        'o' => '014F',
-        'U' => '016C',
-        'u' => '016D',
-    },
-    "'" => { # acute
-        'A' => '00C1',
-        'a' => '00E1',
-        'C' => '0106',
-        'c' => '0107',
-        'E' => '00C9',
-        'e' => '00E9',
-        'G' => '01F4',
-        'g' => '01F5',
-        'I' => '00CD',
-        'i' => '00ED',
-        'K' => '1E30',
-        'k' => '1E31',
-        'L' => '0139',
-        'l' => '013A',
-        'M' => '1E3E',
-        'm' => '1E3F',
-        'N' => '0143',
-        'n' => '0144',
-        'O' => '00D3',
-        'o' => '00F3',
-        'P' => '1E54',
-        'p' => '1E55',
-        'R' => '0154',
-        'r' => '0155',
-        'S' => '015A',
-        's' => '015B',
-        'U' => '00DA',
-        'u' => '00FA',
-        'W' => '1E82',
-        'w' => '1E83',
-        'Y' => '00DD',
-        'y' => '00FD',
-        'Z' => '0179',
-        'z' => '018A',
-    },
-    '~' => { # tilde
-        'A' => '00C3',
-        'a' => '00E3',
-        'E' => '1EBC',
-        'e' => '1EBD',
-        'I' => '0128',
-        'i' => '0129',
-        'N' => '00D1',
-        'n' => '00F1',
-        'O' => '00D5',
-        'o' => '00F5',
-        'U' => '0168',
-        'u' => '0169',
-        'V' => '1E7C',
-        'v' => '1E7D',
-        'Y' => '1EF8',
-        'y' => '1EF9',
-    },
-    '`' => { # grave
-        'A' => '00C0',
-        'a' => '00E0',
-        'E' => '00C8',
-        'e' => '00E8',
-        'I' => '00CC',
-        'i' => '00EC',
-        'N' => '01F8',
-        'n' => '01F9',
-        'O' => '00D2',
-        'o' => '00F2',
-        'U' => '00D9',
-        'u' => '00F9',
-        'W' => '1E80',
-        'w' => '1E81',
-        'Y' => '1EF2',
-        'y' => '1EF3',
-    },
-    '^' => { # circumflex
-        'A' => '00C2',
-        'a' => '00E2',
-        'C' => '0108',
-        'c' => '0109',
-        'E' => '00CA',
-        'e' => '00EA',
-        'G' => '011C',
-        'g' => '011D',
-        'H' => '0124',
-        'h' => '0125',
-        'I' => '00CE',
-        'i' => '00EE',
-        'J' => '0134',
-        'j' => '0135',
-        'O' => '00D4',
-        'o' => '00F4',
-        'S' => '015C',
-        's' => '015D',
-        'U' => '00DB',
-        'u' => '00FB',
-        'W' => '0174',
-        'w' => '0175',
-        'Y' => '0176',
-        'y' => '0177',
-        'Z' => '1E90',
-        'z' => '1E91',
-    },
-    'ringaccent' => { # ring
-        'A' => '00C5',
-        'a' => '00E5',
-        'U' => '016E',
-        'u' => '016F',
-        'w' => '1E98',
-        'y' => '1E99',
-    },
-    'v' => { # caron
-        'A' => '01CD',
-        'a' => '01CE',
-        'C' => '010C',
-        'c' => '010D',
-        'D' => '010E',
-        'd' => '010F',
-        'E' => '011A',
-        'e' => '011B',
-        'G' => '01E6',
-        'g' => '01E7',
-        'H' => '021E', #K with moz-1.2
-        'h' => '021F', #k with moz-1.2
-        'I' => '01CF',
-        'i' => '01D0',
-        'K' => '01E8',
-        'k' => '01E9',
-        'L' => '013D', #L' with moz-1.2
-        'l' => '013E', #l' with moz-1.2
-        'N' => '0147',
-        'n' => '0148',
-        'O' => '01D1',
-        'o' => '01D2',
-        'R' => '0158',
-        'r' => '0159',
-        'S' => '0160',
-        's' => '0161',
-        'T' => '0164',
-        't' => '0165',
-        'U' => '01D3',
-        'u' => '01D4',
-        'Z' => '017D',
-        'z' => '017E',
-    },
-    'H' => { # double acute
-        'O' => '0150',
-        'o' => '0151',
-        'U' => '0170',
-        'u' => '0171',
-    },
-);
-
-%special_accents = (
-      'ringaccent' => 'aA',
-      "'"          => 'aeiouyAEIOUY',
-      ','          => 'cC',
-      '^'          => 'aeiouAEIOU',
-      '`'          => 'aeiouAEIOU',
-      '~'          => 'nNaoAO',
-      '"'          => 'aeiouyAEIOU',
-);
-
-#foreach my $accent_command ('tieaccent', 'dotless', keys(%unicode_accents), keys(%accent_map))
-foreach my $accent_command ('tieaccent', 'dotless', keys(%unicode_accents))
-{
-     $style_map{$accent_command} = { 'function' => \&t2h_default_accent };
-     $old_style_map{$accent_command} = '&default_accent';
-     $style_map_texi{$accent_command} = { 'function' => \&t2h_default_ascii_accent };
-}
-
-sub default_accent($$)
-{
-    my $text = shift;
-    my $accent = shift;
-    return "&${text}$accent_map{$accent};" if (defined($accent_map{$accent}) and defined($special_accents{$accent}) and ($text =~ /^[$special_accents{$accent}]$/));
-    return '&' . $text . 'ring;' if (($accent eq 'ringaccent') and (defined($special_accents{$accent})) and ($text =~ /^[$special_accents{$accent}]$/));
-    return $text . '&lt;' if ($accent eq 'v');
-    return "&${text}cedil;" if (($accent eq ',') and (defined($special_accents{$accent})) and ($text =~ /^[$special_accents{$accent}]$/));
-    return ascii_accents($text, $accent);
-}
-
-sub t2h_default_accent($$)
-{
-    my $accent = shift;
-    my $args = shift;
-
-    my $text = $args->[0];
-
-    return "&${text}$accent_map{$accent};" if (defined($accent_map{$accent}) and defined($special_accents{$accent}) and ($text =~ /^[$special_accents{$accent}]$/));
-    return '&' . $text . 'ring;' if (($accent eq 'ringaccent') and (defined($special_accents{$accent})) and ($text =~ /^[$special_accents{$accent}]$/));
-    return $text . '&lt;' if ($accent eq 'v');
-    return "&${text}cedil;" if (($accent eq ',') and (defined($special_accents{$accent})) and ($text =~ /^[$special_accents{$accent}]$/));
-    return ascii_accents($text, $accent);
-}
-
-sub ascii_accents($$)
-{
-    my $text = shift;
-    my $accent = shift;
-    return $text if ($accent eq 'dotless');
-    return $text . $accent if (defined($accent_map{$accent}));
-    return $text . "''" if ($accent eq 'H');
-    return $text . '.' if ($accent eq 'dotaccent');
-    return $text . '*' if ($accent eq 'ringaccent');
-    return $text . '[' if ($accent eq 'tieaccent');
-    return $text . '(' if ($accent eq 'u');
-    return $text . '_' if ($accent eq 'ubaraccent');
-    return '.' . $text  if ($accent eq 'udotaccent');
-    return $text . '<' if ($accent eq 'v');
-    return $text . ',' if ($accent eq ','); 
-}
-
-sub default_sc($$)
-{
-    return '<small>' . uc($_[0]) . '</small>';
-}
-
-sub t2h_default_sc($$$)
-{
-    shift;
-    my $args = shift;
-    return '<small>' . uc($args->[0]) . '</small>';
-}
-
-sub default_ctrl($$)
-{
-   return "^$_[0]";
-}
-
-sub t2h_default_ctrl($$$)
-{
-    shift;
-    my $args = shift;
-   return "^$args->[0]";
-}
-
-sub default_sc_pre($$)
-{
-    return uc($_[0]);
-}
-
-sub t2h_default_sc_pre($$$)
-{
-    shift;
-    my $args = shift;
-    return uc($args->[0]);
-}
-
-sub default_titlefont($$)
-{
-    return "<h1 class=\"titlefont\">$_[0]</h1>" if ($_[0] =~ /\S/);
-    return '';
-}
-
-sub t2h_default_titlefont($$$)
-{
-    shift;
-    my $args = shift;
-    return "<h1 class=\"titlefont\">$args->[0]</h1>" if ($args->[0] =~ /\S/);
-    return '';
-}
-
-# According to the texinfo manual this shouldn't lead to a link
-# but rather be formatted like text. If we did like makeinfo do
-# it would be
-#sub url($$)
-#{
-#    return '&lt;<code>' . $_[0] . '</code>&gt;';
-#}
-sub t2h_default_url ($$)
-{
-    shift;
-    my $args = shift;
-    my $url = shift @$args;
-    #$url =~ s/\s*$//;
-    #$url =~ s/^\s*//;
-    $url = main::normalise_space($url);
-    return '' unless ($url =~ /\S/);
-    return &$anchor('', $url, $url);
-}
-
-sub default_url ($$)
-{
-    my $url = shift;
-    my $command = shift;
-    $url =~ s/\s*$//;
-    $url =~ s/^\s*//;
-    return '' unless ($url =~ /\S/);
-    return &$anchor('', $url, $url);
-}
-
-sub default_uref($$)
-{
-    my $arg = shift;
-    my $command = shift;
-    my ($url, $text, $replacement);
-    ($url, $text, $replacement) = split /,\s*/, $arg;
-    $url =~ s/\s*$//;
-    $url =~ s/^\s*//;
-    $text = $replacement if (defined($replacement));
-    $text = $url unless ($text);
-    return $text if ($url eq '');
-    return &$anchor('', $url, $text);
-}
-
-sub t2h_default_uref($$)
-{
-    shift;
-    my $args = shift;
-    my $url = shift @$args;
-    my $text = shift @$args;
-    my $replacement = shift @$args;
-    #$url =~ s/\s*$//;
-    #$url =~ s/^\s*//;
-    $url = main::normalise_space($url);
-    $replacement = '' if (!defined($replacement));
-    $replacement = main::normalise_space($replacement);
-    $text = '' if (!defined($text));
-    $text = main::normalise_space($text);
-    $text = $replacement if ($replacement ne '');
-    $text = $url unless ($text ne '');
-    return $text if ($url eq '');
-    return &$anchor('', $url, $text);
-}
-
-sub default_email($$)
-{
-    my $arg = shift;
-    my $command = shift;
-    my ($mail, $text);
-    ($mail, $text) = split /,\s*/, $arg;
-    $mail =~ s/\s*$//;
-    $mail =~ s/^\s*//;
-    $text = $mail unless ($text);
-    return $text if ($mail eq '');
-    return &$anchor('', "mailto:$mail", $text);
-}
-
-sub t2h_default_email($$)
-{
-    my $command = shift;
-    my $args = shift;
-    my $mail = shift @$args;
-    my $text = shift @$args;
-    $mail = main::normalise_space($mail);
-    #$mail =~ s/\s*$//;
-    #$mail =~ s/^\s*//;
-    $text = $mail unless (defined($text) and ($text ne ''));
-    $text = main::normalise_space($text);
-    return $text if ($mail eq '');
-    return &$anchor('', "mailto:$mail", $text);
-}
-
-sub t2h_default_ascii_accent($$$$)
-{
-    my $accent = shift;
-    my $args = shift;
-
-    my $text = $args->[0];
-    return ascii_accents($text, $accent);
-}
-
-sub t2h_default_no_texi_email
-{
-    my $command = shift;
-    my $args = shift;
-    my $mail = shift @$args;
-    my $text = shift @$args;
-    $mail = main::normalise_space($mail);
-    #$mail =~ s/\s*$//;
-    #$mail =~ s/^\s*//;
-    return $text if (defined($text) and ($text ne ''));
-    return $mail;
-}
-
-sub t2h_default_no_texi_image($$$$)
-{
-    my $command = shift;
-    my $args = shift;
-    my $text = $args->[0];
-    $text = main::normalise_space($text); 
-    my @args = split (/\s*,\s*/, $text);
-    return $args[0];
-}
-
-sub t2h_default_no_texi_acronym_like($$)
-{
-    my $command = shift;
-    my $args = shift;
-    my $acronym_texi = $args->[0];
-    return (main::remove_texi($acronym_texi)); 
-}
-
-sub t2h_remove_command($$$$)
-{
-    return '';
-}
-
-# This is used for style in preformatted sections
-my %old_style_map_pre = %old_style_map;
-$old_style_map_pre{'sc'} = '&default_sc_pre';
-$old_style_map_pre{'titlefont'} = '';
-
-foreach my $command (keys(%style_map))
-{
-    $style_map_pre{$command} = {};
-    $style_map_texi{$command} = {} if (!exists($style_map_texi{$command}));
-    $style_map_texi{$command}->{'args'} = $style_map{$command}->{'args'}
-        if (exists($style_map{$command}->{'args'}));
- #print STDERR "COMMAND $command";
-    
-    foreach my $key (keys(%{$style_map{$command}}))
-    {
-        $style_map_pre{$command}->{$key} = $style_map{$command}->{$key};
-    }
-}
-
-$style_map_pre{'sc'}->{'function'} = \&t2h_default_sc_pre;
-$style_map_pre{'titlefont'} = {};
-
-$style_map_texi{'sc'}->{'function'} = \&t2h_default_sc_pre;
-$style_map_texi{'email'}->{'function'} = \&t2h_default_no_texi_email;
-
-####### special styles. You shouldn't need to change them
-my %special_style = (
-           #'xref'      => ['keep','normal','normal','keep','normal'],
-           'xref'         => { 'args' => ['keep','keep','keep','keep','keep'],
-               'function' => \&main::do_xref },
-           'ref'         => { 'args' => ['keep','keep','keep','keep','keep'],
-               'function' => \&main::do_xref },
-           'pxref'         => { 'args' => ['keep','keep','keep','keep','keep'],
-               'function' => \&main::do_xref },
-           'inforef'      => { 'args' => ['keep','keep','keep'], 
-               'function' => \&main::do_xref },
-           'image'        => { 'args' => ['keep'], 'function' => \&main::do_image },
-           'anchor'       => { 'args' => ['keep'], 'function' => \&main::do_anchor_label },
-           'footnote'     => { 'args' => ['keep'], 'function' => \&main::do_footnote },
-           'shortcaption' => { 'args' => ['keep'], 'function' => \&main::do_caption_shortcaption },
-           'caption' => { 'args' => ['keep'], 'function' => \&main::do_caption_shortcaption },
-           'acronym',    {'args' => ['keep','keep'], 'function' => \&main::do_acronym_like},
-           'abbr',    {'args' => ['keep','keep'], 'function' => \&main::do_acronym_like},
-);
-
-# FIXME the unless defined(.... are now unusefull because the user can
-# overwrite.
-
-# @image is replaced by the first arg in strings
-$style_map_texi{'image'} = { 'args' => ['keep'],
-       'function' => \&t2h_default_no_texi_image }
-    unless (defined($style_map_texi{'image'}));
-
-$style_map_texi{'acronym'} = { 'args' => ['keep','keep'],
-       'function' => \&t2h_default_no_texi_acronym_like };
-$style_map_texi{'abbr'} = { 'args' => ['keep','keep'],
-       'function' => \&t2h_default_no_texi_acronym_like };
-
-foreach my $special (keys(%special_style))
-{
-    $style_map{$special} = $special_style{$special}
-          unless (defined($style_map{$special}));
-    $style_map_pre{$special} = $special_style{$special}
-          unless (defined($style_map_pre{$special}));
-    $style_map_texi{$special} = { 'args' => ['keep'],
-        'function' => \&t2h_remove_command }
-          unless (defined($style_map_texi{$special}));
-}
-####### end special styles.
-
-
-#foreach my $command (keys(%style_map))
-#{
-#    print STDERR "STYLE_MAP_TEXI $command($style_map_texi{$command}) ";
-#    print STDERR "ARGS $style_map_texi{$command}->{'args'} " if (defined($style_map_texi{$command}->{'args'}));
-#    print STDERR "FUN $style_map_texi{$command}->{'function'} " if (defined($style_map_texi{$command}->{'function'}));
-#    print STDERR "\n";
-#}
-
-# uncomment to use the old interface
-#%style_map = %old_style_map;
-#%style_map_pre = %old_style_map_pre;
-
-#FIXME USE_ISO ?
-%unformatted_text_simple_map_texi = %simple_map_pre;
-%unformatted_text_texi_map = %pre_map;
-%unformatted_text_style_map_texi = ();
-
-foreach my $command (keys(%style_map_texi))
-{
-    #$unformatted_text_style_map_texi{$command} = {};
-    foreach my $key (keys (%{$style_map_texi{$command}}))
-    {
-    #print STDERR "$command, $key, $style_map_texi{$command}->{$key}\n";
-        $unformatted_text_style_map_texi{$command}->{$key} = 
-             $style_map_texi{$command}->{$key};
-    }
-    $unformatted_text_style_map_texi{$command} = {} if (!defined($unformatted_text_style_map_texi{$command}));
-}
-
-foreach my $accent_command ('tieaccent', 'dotless', keys(%unicode_accents))
-{
-#    $unformatted_text_style_map_texi{$accent_command}->{'args'} = ['normal'];
-    $unformatted_text_style_map_texi{$accent_command}->{'function'} = \&t2h_default_accent;
-}
-
-%format_map = (
-#       'quotation'   =>  'blockquote',
-       # lists
-#       'itemize'     =>  'ul',
-       'enumerate'   =>  'ol',
-       'multitable'  =>  'table',
-       'table'       =>  'dl compact="compact"',
-       'vtable'      =>  'dl compact="compact"',
-       'ftable'      =>  'dl compact="compact"',
-       'group'       =>  '',
-       );
-
-%special_list_commands = (
-       'table'        =>  {},
-       'vtable'       =>  {},
-       'ftable'       =>  {},
-       'itemize'      =>  { 'bullet'  => '' }
-       );
-#
-# texinfo format to align attribute of paragraphs
-#
-
-%paragraph_style = (
-      'center'     => 'center',
-      'flushleft'  => 'left',
-      'flushright' => 'right',
-      );
-      
-# an eval of these $complex_format_map->{what}->{'begin'} yields beginning
-# an eval of these $complex_format_map->{what}->{'end'} yields end
-# $EXAMPLE_INDENT_CELL and SMALL_EXAMPLE_INDENT_CELL can be usefull here
-# FIXME add \n at the end ?
-$complex_format_map =
-{
- 'example' =>
- {
-  'begin' => q{"<table><tr>$EXAMPLE_INDENT_CELL<td>"},
-  'end' => q{'</td></tr></table>'},
- },
- 'smallexample' =>
- {
-  'begin' => q{"<table><tr>$SMALL_EXAMPLE_INDENT_CELL<td>"},
-  'end' => q{'</td></tr></table>'},
- },
- 'display' =>
- {
-  'begin' => q{"<table><tr>$EXAMPLE_INDENT_CELL<td>"},
-  'end' => q{'</td></tr></table>'},
- },
- 'smalldisplay' =>
- {
-  'begin' => q{"<table><tr>$SMALL_EXAMPLE_INDENT_CELL<td>"},
-  'end' => q{'</td></tr></table>'},
- }
-};
-
-# format shouldn't narrow the margins
-
-$complex_format_map->{'lisp'} =  $complex_format_map->{'example'};
-$complex_format_map->{'smalllisp'} = $complex_format_map->{'smallexample'};
-$complex_format_map->{'format'} = $complex_format_map->{'display'};
-$complex_format_map->{'smallformat'} = $complex_format_map->{'smalldisplay'};
-
-%def_map = (
-    # basic commands
-    'deffn', [ 'f', 'category', 'name', 'arg' ],
-    'defvr', [ 'v', 'category', 'name' ],
-    'deftypefn', [ 'f', 'category', 'type', 'name', 'arg' ],
-    'deftypeop', [ 'f', 'category', 'class' , 'type', 'name', 'arg' ],
-    'deftypevr', [ 'v', 'category', 'type', 'name' ],
-    'defcv', [ 'v', 'category', 'class' , 'name' ],
-    'deftypecv', [ 'v', 'category', 'class' , 'type', 'name' ],
-    'defop', [ 'f', 'category', 'class' , 'name', 'arg' ],
-    'deftp', [ 't', 'category', 'name', 'arg' ],
-    # basic x commands
-    # shortcuts
-    # i18n
-    'defun', 'deffn Function',
-    'defmac', 'deffn Macro',
-    'defspec', 'deffn {Special Form}',
-    'defvar', 'defvr Variable',
-    'defopt', 'defvr {User Option}',
-    'deftypefun', 'deftypefn {Function}',
-    'deftypevar', 'deftypevr Variable',
-    'defivar', 'defcv {Instance Variable}',
-    'deftypeivar', 'deftypecv {Instance Variable}',
-    'defmethod', 'defop Method',
-    'deftypemethod', 'deftypeop Method',
-         );
-
-foreach my $key (keys(%def_map))
-{
-    $def_map{$key . 'x'} = $def_map{$key};
-}
-
-#
-# miscalleneous commands
-#
-# Depending on the value, the command arg or spaces following the command
-#     are handled differently:
-# 
-# the value is a reference on a hash.
-# the hash keys are
-#    'arg'  if the value is 'line' then the remaining of the line is the arg
-#           if it is a number it is the number of args (separated by spaces)
-#    'skip' if the value is 'line' then the remaining of the line is skipped
-#           if the value is 'space' space but no newline is skipped
-#           if the value is 'whitespace' space is skipped
-#           if the value is 'linewhitespace' space is skipped if there are 
-#                 only spaces remaining on the line
-#           if the value is 'linespace' space but no newline is skipped if 
-#                 there are only spaces remaining on the line
-#    'texi' if true it is some texinfo code and @value and @macros are expanded
-#    'keep' if true the args and the macro are kept, otherwise the macro 
-#          args and skipped stuffs are removed
-%misc_command = (
-        # not needed for formatting
-        'raisesections' => {'skip' => 'line'},  # no arg
-        'lowersections' => {'skip' => 'line'}, # no arg
-        'contents' => {}, # no arg
-        'shortcontents' => {}, # no arg
-        'summarycontents'=> {}, # no arg
-        'detailmenu' => {'skip' => 'whitespace'}, # no arg
-        'end detailmenu' => {'skip' => 'space'}, # no arg
-        #'end detailmenu', 1, # no arg
-        'bye' => {'skip' => 'line'}, # no arg
-        # comments
-        'comment' => {'arg' => 'line'},
-        'c' => {'arg' => 'line'},
-        #'c'=> {'arg' => 'line', 'keep' => 1},
-        # in preamble
-        'novalidate' => {}, # no arg
-        'dircategory'=> {'skip' => 'line'}, # line. Position with regard 
-                         # with direntry is significant
-        'pagesizes' => {'skip' => 'line', 'arg' => 2}, # can have 2 args 
-        'finalout' => {}, # no arg
-        'paragraphindent' => {'skip' => 'line', 'arg' => 1}, # arg none asis 
-                             # or a number and forbids anything else on the line
-        'firstparagraphindent' => {'skip' => 'line', 'arg' => 1}, # none insert
-        'exampleindent' => {'skip' => 'line', 'arg' => 1}, # asis or a number
-        'footnotestyle'=> {'skip' => 'line', 'arg' => 1}, # end and separate
-                                 # and nothing else on the line
-        'afourpaper' => {'skip' => 'line'}, # no arg
-        'afourlatex' => {'skip' => 'line'}, # no arg
-        'afourwide' => {'skip' => 'line'}, # no arg
-        'headings'=> {'skip' => 'line', 'arg' => 1}, 
-                    #off on single double singleafter doubleafter
-                    # interacts with setchapternewpage
-        'setchapternewpage' => {'skip' => 'line', 'arg' => 1}, # off on odd
-        'everyheading' => {'arg' => 'line'},
-        'everyfooting' => {'arg' => 'line'},
-        'evenheading' => {'arg' => 'line'},
-        'evenfooting' => {'arg' => 'line'},
-        'oddheading' => {'arg' => 'line'},
-        'oddfooting' => {'arg' => 'line'},
-        'smallbook' => {'skip' => 'line'}, # no arg
-        'setfilename' => {'arg' => 'line'},
-        'shorttitle' => {'arg' => 'line', 'texi' => 1},
-        'shorttitlepage' => {'arg' => 'line', 'texi' => 1},
-        'settitle' => {'arg' => 'line', 'texi' => 1},
-        'author' => {'arg' => 'line', 'texi' => 1},
-        'subtitle' => {'arg' => 'line', 'texi' => 1},
-        'title' => {'arg' => 'line', 'texi' => 1},
-        'syncodeindex' => {'skip' => 'linespace', 'arg' => 2}, 
-                          # args are index identifiers
-        'synindex' => {'skip' => 'linespace', 'arg' => 2},
-        'defindex' => {'skip' => 'line', 'arg' => 1}, # one identifier arg
-        'defcodeindex' => {'skip' => 'line', 'arg' => 1}, # one identifier arg
-        'documentlanguage' => {'skip' => 'whitespace', 'arg' => 1}, 
-                                                       # language code arg
-        'kbdinputstyle' => {'skip' => 'whitespace', 'arg' => 1}, # code 
-                                                        #example distinct
-        'sp' => {'skip' => 'whitespace', 'arg' => 1}, # no arg 
-                                    # at the end of line or a numerical arg
-        # formatting
-        'page' => {}, # no arg (pagebreak)
-        'refill' => {}, # no arg (obsolete, to be ignored)
-        'noindent' => {'skip' => 'space'}, # no arg
-        'need' => {'skip' => 'line', 'arg' => 1}, # one numerical/real arg
-        'exdent' => {'skip' => 'space'},  
-        # not valid for info (should be in @iftex)
-        'vskip' => {'arg' => 'line'}, # arg line in TeX
-        'cropmarks' => {}, # no arg
-        # miscalleneous
-        'verbatiminclude'=> {'skip' => 'line'},
-        'noindent' => {'skip' => 'space'},
-        'documentencoding' => {'arg' => 1},
-        # ???
-        'filbreak' => {},
-     );
-my %misc_command_old = (
-        # not needed for formatting
-        'raisesections', 'line',  # no arg
-        'lowersections', 'line', # no arg
-        'contents', 1, # no arg
-        'shortcontents', 1, # no arg
-        'summarycontents', 1, # no arg
-        'detailmenu', 'whitespace', # no arg
-        'end detailmenu', 'space', # no arg
-        #'end detailmenu', 1, # no arg
-        'novalidate', 1, # no arg
-        'bye', 'line', # no arg
-        # comments
-        'comment', 'line',
-        'c', 'line',
-        # in preamble
-        'dircategory', 'line', # line. Position with regard with direntry is 
-                               # significant
-        'pagesizes', 'line arg2', # can have 2 args 
-        'finalout', 1, # no arg
-        'paragraphindent', 'line arg1', # in fact accepts only none asis 
-                             # or a number and forbids anything else on the line
-        'firstparagraphindent', 'line arg1', # in fact accepts only none insert
-        'exampleindent', 'line arg1', # in fact accepts only asis or a number
-        'footnotestyle', 'line arg1', # in fact accepts only end and separate
-                                 # and nothing else on the line
-        'afourpaper', 'line', # no arg
-        'afourlatex', 'line', # no arg
-        'afourwide', 'line',  # no arg
-        'headings', 'line', # one arg, possibilities are 
-                    #off on single double singleafter doubleafter
-                    # interacts with setchapternewpage
-        'setchapternewpage', 'line', # no arg
-        'everyheading', 'line',
-        'everyfooting', 'line',
-        'evenheading', 'line',
-        'evenfooting', 'line',
-        'oddheading', 'line',
-        'oddfooting', 'line',
-        'smallbook', 'line', # no arg
-        'setfilename', 'line',
-        'shorttitle', 'linetexi',
-        'shorttitlepage', 'linetexi',
-        'settitle', 'linetexi',
-        'author', 'linetexi',
-        'subtitle', 'linetexi',
-        'title','linetexi',
-        'syncodeindex','linespace arg2', # args are 
-        'synindex','linespace arg2',
-        'defindex', 'line arg1', # one identifier arg
-        'defcodeindex', 'line arg1', # one identifier arg
-        'documentlanguage', 'whitespace arg1', # one language code arg
-        'kbdinputstyle', 'whitespace arg1', # one arg within 
-                                 #code example distnct
-        'sp', 'whitespace arg1', # no arg at the en of line or a numerical arg
-        # formatting
-        'page', 1, # no arg (pagebreak)
-        'refill', 1, # no arg (obsolete, to be ignored))
-        'noindent', 'space', # no arg
-        'need', 'line arg1', # one numerical/real arg
-        'exdent', 'space',  
-        # not valid for info (should be in @iftex)
-        'vskip', 'line', # arg line in TeX
-        'cropmarks', 1, # no arg
-        # miscalleneous
-        'verbatiminclude', 'line',
-        'documentencoding', 'arg1',
-        # ???
-        'filbreak', 1,
-     );
-
-%format_in_paragraph = (
-        'group' => 1,
-        'html'  => 1,
-);
-# map mapping css specification to style
-
-%css_map = 
-     (
-         'ul.toc'                 => "$TOC_LIST_STYLE",
-         'pre.menu-comment'       => "$MENU_PRE_STYLE",
-         'pre.menu-preformatted'  => "$MENU_PRE_STYLE",
-         'a.summary-letter'       => 'text-decoration: none',
-         'pre.display'            => 'font-family: serif',
-         'pre.smalldisplay'       => 'font-family: serif; font-size: smaller',
-         'pre.smallexample'       => 'font-size: smaller',
-         'span.sansserif'         => 'font-family:sans-serif; font-weight:normal;'
-     );
-
-$css_map{'pre.format'} = $css_map{'pre.display'};
-$css_map{'pre.smallformat'} = $css_map{'pre.smalldisplay'}; 
-$css_map{'pre.smalllisp'} = $css_map{'pre.smallexample'};
-
-# formatting functions
-
-$anchor            = \&t2h_default_anchor;
-$def_item          = \&t2h_default_def_item;
-$def               = \&t2h_default_def;
-$menu              = \&t2h_default_menu;
-$menu_link         = \&t2h_default_menu_link;
-$menu_comment      = \&t2h_default_menu_comment;
-$menu_description  = \&t2h_default_menu_description;
-$simple_menu_link  = \&t2h_default_simple_menu_link;
-$external_ref      = \&t2h_default_external_ref;
-$external_href     = \&t2h_default_external_href;
-$internal_ref      = \&t2h_default_internal_ref;
-$table_item        = \&t2h_default_table_item;
-$table_line        = \&t2h_default_table_line;
-$table_list        = \&t2h_default_table_list;
-$row               = \&t2h_default_row;
-$cell              = \&t2h_default_cell;
-$list_item         = \&t2h_default_list_item;
-$comment           = \&t2h_default_comment;
-$def_line	       = \&t2h_default_def_line;
-$def_line_no_texi  = \&t2h_default_def_line_no_texi;
-$raw               = \&t2h_default_raw;
-$heading           = \&t2h_default_heading;
-$paragraph         = \&t2h_default_paragraph;
-$preformatted      = \&t2h_default_preformatted;
-$foot_line_and_ref = \&t2h_default_foot_line_and_ref;
-$foot_section      = \&t2h_default_foot_section;
-$image             = \&t2h_default_image;
-$address           = \&t2h_default_address;
-$index_entry_label = \&t2h_default_index_entry_label;
-$index_summary     = \&t2h_default_index_summary;
-$summary_letter    = \&t2h_default_summary_letter;
-$index_entry       = \&t2h_default_index_entry;
-$index_letter      = \&t2h_default_index_letter;
-$print_index       = \&t2h_default_print_index;
-$protect_text      = \&t2h_default_protect_text;
-$complex_format    = \&t2h_default_complex_format;
-$cartouche         = \&t2h_default_cartouche;
-$sp                = \&t2h_default_sp;
-$definition_category      = \&t2h_default_definition_category;
-$copying_comment          = \&t2h_default_copying_comment;
-$index_summary_file_entry = \&t2h_default_index_summary_file_entry;
-$index_summary_file_end   = \&t2h_default_index_summary_file_end;
-$index_summary_file_begin = \&t2h_default_index_summary_file_begin;
-$empty_line               = \&t2h_default_empty_line;
-$unknown                  = \&t2h_default_unknown;
-$unknown_style            = \&t2h_default_unknown_style;
-$caption_shortcaption     = \&t2h_caption_shortcaption;
-$float                     = \&t2h_default_float;
-$listoffloats             = \&t2h_default_listoffloats;
-$listoffloats_entry       = \&t2h_default_listoffloats_entry;
-$listoffloats_caption     = \&t2h_default_listoffloats_caption;
-$listoffloats_float_style = \&t2h_default_listoffloats_float_style;
-$listoffloats_style       = \&t2h_default_listoffloats_style;
-$acronym_like             = \&t2h_default_acronym_like;
-$quotation                = \&t2h_default_quotation;
-$quotation_prepend_text   = \&t2h_default_quotation_prepend_text;
-$paragraph_style_command  = \&t2h_default_paragraph_style_command;
-
-# This function is called whenever a complex format is processed
-#
-# arguments:
-# name of the format
-# text appearing inside the format
-#
-# an eval of $complex_format->{format name}->{'begin'} should lead to the
-# beginning of the complex format, an eval of 
-# $complex_format->{format name}->{'end'}  should lead to the end of the 
-# complex format.
-sub t2h_default_complex_format($$)
-{
-    my $name = shift;
-    my $text = shift;
-    return '' if ($text eq '');
-    my $beginning = eval "$complex_format_map->{$name}->{'begin'}";
-    if ($@ ne '')
-    {
-        print STDERR "$ERROR Evaluation of $complex_format_map->{$name}->{'begin'}: $@";
-        $beginning = '';
-
-    }
-    my $end = eval "$complex_format_map->{$name}->{'end'}";
-    if ($@ ne '')
-    {
-        print STDERR "$ERROR Evaluation of $complex_format_map->{$name}->{'end'}: $@";
-        $end = '';
-
-    }
-    return $beginning . $text . $end;	
-}
-
-sub t2h_default_empty_line($)
-{
-    my $text = shift;
-    return $text;
-}
-
-sub t2h_default_unknown($$)
-{
-    my $macro = shift;
-    my $line = shift;
-    
-    my ($result_line, $result, $result_text, $message);
-    return ($line, 0, undef, undef);
-}
-
-sub t2h_default_unknown_style($$)
-{
-    my $command = shift;
-    my $text = shift;
-    
-    my ($result, $result_text, $message);
-    return (0, undef, undef);
-}
-
-sub t2h_caption_shortcaption($)
-{
-    my $float = shift;
-    my $caption_lines;
-    my $shortcaption_lines;
-    my $style = $float->{'style_texi'};
-    if (defined($float->{'nr'}))
-    {
-         my $nr = $float->{'nr'};
-         if ($style ne '')
-         {
-              $style = &$I('%{style} %{number}', { 'style' => $style, 'number' => $nr});
-         }
-         else 
-         {
-              $style = $nr;
-         }
-    }
-    
-    if (defined($float->{'caption_texi'}))
-    {
-         @$caption_lines = @{$float->{'caption_texi'}};
-         if (defined($style))
-         {
-              $caption_lines->[0] = '@strong{' . &$I('%{style}: %{caption_first_line}', { 'style' => $style, 'caption_first_line' => $caption_lines->[0] });
-         }
-         else
-         {
-              $caption_lines->[0] = '@strong{' .  $caption_lines->[0];
-         }
-         push @$caption_lines, "}\n";
-    }
-    elsif (defined($style))
-    {
-         $caption_lines->[0] = '@strong{' . $style . '}' . "\n";
-    }
-    if (defined($float->{'shortcaption_texi'}))
-    {
-         @$shortcaption_lines = @{$float->{'shortcaption_texi'}};
-         if (defined($style))
-         {
-              $shortcaption_lines->[0] = '@strong{' . &$I('%{style}: %{shortcaption_first_line}', { 'style' => $style, 'shortcaption_first_line' => $shortcaption_lines->[0] });
-         }
-         else
-         {
-              $shortcaption_lines->[0] = '@strong{' .  $shortcaption_lines->[0];
-         }
-         push @$shortcaption_lines, "}\n";
-    }
-    elsif (defined($style))
-    {
-         $shortcaption_lines->[0] = '@strong{' . $style . '}' . "\n";
-    }
-    return ($caption_lines, $shortcaption_lines);
-}
-
-sub t2h_default_float($$$$$)
-{
-    my $text = shift;
-    my $float = shift;
-    my $caption = shift;
-    my $shortcaption = shift;
-    
-    my $label = '';
-    if (exists($float->{'id'}))
-    {
-        $label = &$anchor($float->{'id'});
-    }
-    my $caption_text = '';
-    
-    if (defined($float->{'caption_texi'}))
-    {
-         $caption_text = $caption;
-    }
-    elsif (defined($float->{'shortcaption_texi'}))
-    {
-         $caption_text = $shortcaption;
-    }
-    elsif (defined($caption))
-    {
-         $caption_text = $caption;
-    }
-    
-    return '<div class="float">' . "$label\n" . $text . '</div>' . $caption_text;
-}
-
-sub t2h_default_listoffloats_style($)
-{
-    my $style_texi = shift;
-    return ($style_texi);
-}
-
-sub t2h_default_listoffloats_float_style($$)
-{
-    my $style_texi = shift;
-    my $float = shift;
-    
-    my $style = $float->{'style_texi'};
-    if (defined($float->{'nr'}))
-    {
-         my $nr = $float->{'nr'};
-         if ($style ne '')
-         {
-              $style = &$I('%{style} %{number}', { 'style' => $style, 'number' => $nr});
-         }
-         else 
-         {
-              $style = $nr;
-         }
-    }
-    return $style;
-}
-
-sub t2h_default_listoffloats_caption($)
-{
-    my $float = shift;
-    if (defined($float->{'shortcaption_texi'}))
-    {
-         return [ @{$float->{'shortcaption_texi'}} ];
-    }
-    elsif (defined($float->{'caption_texi'}))
-    {
-         return [ @{$float->{'caption_texi'}} ];
-    }
-    return [ ];
-}
-
-sub t2h_default_listoffloats_entry($$$$)
-{
-    my $style_texi = shift;
-    my $float = shift;
-    my $float_style = shift;
-    my $caption = shift;
-    my $href = shift;
-
-    return '<dt>' . &$anchor('', $href, $float_style) . '</dt><dd>' . $caption
-. '</dd>' . "\n";
-}
-
-sub t2h_default_listoffloats($$$)
-{
-    my $style_texi = shift;
-    my $style = shift;
-    my $float_entries = shift;
-
-    my $result = "<dl class=\"listoffloats\">\n" ;
-    foreach my $float_entry (@$float_entries)
-    {
-         $result .= $float_entry;
-    }
-    return $result . "</dl>\n";
-} 
-
-# This function is used to protect characters which are special in html 
-# in inline text:  &, ", <, and >. 
-#
-# argument:
-# text to be protected
-sub t2h_default_protect_text($)
-{
-   my $text = shift;
-   $text =~ s/&/&amp;/g;
-   $text =~ s/</&lt;/g;
-   $text =~ s/>/&gt;/g;
-   $text =~ s/\"/&quot;/g;
-   return $text;
-}
-
-# This function produces an anchor 
-#
-# arguments:
-# $name           :   anchor name
-# $href           :   anchor href
-# text            :   text displayed
-# extra_attribs   :   added to anchor attributes list
-sub t2h_default_anchor($;$$$)
-{
-    my $name = shift;
-    my $href = shift;
-    my $text = shift;
-    my $attributes = shift;
-#print STDERR "!$name!$href!$text!$attributes!\n";
-    if (!defined($attributes) or ($attributes !~ /\S/))
-    {
-        $attributes = '';
-    }
-    else 
-    {
-        $attributes = ' ' . $attributes;
-    }
-    $name = '' if (!defined($name) or ($name !~ /\S/));
-    $href = '' if (!defined($href) or ($href !~ /\S/));
-    $text = '' if (!defined($text));
-    return $text if (($name eq '') and ($href eq ''));
-    $name = "name=\"$name\"" if ($name ne '');
-    $href = "href=\"$href\"" if ($href ne '');
-    $href = ' ' . $href if (($name ne '') and ($href ne ''));
-#print STDERR "!!!$name!$href!$text!$attributes!\n";
-    return "<a ${name}${href}${attributes}>$text</a>";
-}
-
-# This function is used to format the text associated with a @deff/@end deff
-#
-# argument:
-# text
-#
-# $DEF_TABLE should be used to distinguish between @def formatted as table
-# and as definition lists.
-sub t2h_default_def_item($)
-{
-    my $text = shift;
-    if ($text =~ /\S/)
-    {
-        if (! $DEF_TABLE)
-        {
-            return '<dd>' . $text . '</dd>';
-        }
-        else
-        {
-            return '<tr><td colspan="2">' . $text . '</td></tr>';
-        }
-    }
-    return '';
-}
-
-sub t2h_default_definition_category($$$)
-{
-    my $name = shift;
-    my $class = shift;
-    my $style = shift;
-#    print STDERR "definition_category $name, class $class, style $style\n";
-    return undef if (!defined($name) or $name =~ /^\s*$/);
-    return ($name) if (!defined($class) or $class =~ /^\s*$/);
-    if ($style eq 'f')
-    {
-        return &$I('%{name} on %{class}', { 'name' => $name, 'class' => $class });
-    }
-    elsif ($style eq 'v')
-    {
-        return &$I('%{name} of %{class}', { 'name' => $name, 'class' => $class });
-    }
-    else
-    {
-        return $name;
-    }
-}
-
-# format the container for the @deffn line and text
-# 
-# argument
-# text of the whole @def, line and associated text.
-#
-# $DEF_TABLE should be used.
-sub t2h_default_def($)
-{
-    my $text = shift;
-    if ($text =~ /\S/)
-    {
-        if (! $DEF_TABLE)
-        {
-            return "<dl>\n" . $text . "</dl>\n";
-        }
-        else
-        {
-            return "<table width=\"100%\">\n" . $text . "</table>\n";
-        }
-    }
-    return '';
-
-}
-
-# a whole menu
-#
-# argument:
-# the whole menu text (entries and menu comments)
-#
-# argument:
-# whole menu text.
-sub t2h_default_menu($)
-{
-    my $text = shift;
-    if ($text =~ /\S/)
-    {
-        return "<table class=\"menu\" border=\"0\" cellspacing=\"0\">\n" 
-        . $text . "</table>\n";
-    }
-}
-
-# a simple menu entry ref in case we aren't in a standard menu context
-sub t2h_default_simple_menu_link($$$$$$)
-{
-    my $entry = shift;
-    my $preformatted = shift;
-    my $href = shift;
-    my $node = shift;
-    my $name = shift;
-    my $ending = shift;
-    $ending = '' if (!defined($ending));
-    if (($entry eq '') or $NODE_NAME_IN_MENU or $preformatted)
-    {
-        $name .= ':' if ($name ne '');
-        $entry = "$MENU_SYMBOL$name$node";
-    }
-    $entry = &$anchor('', $href, $entry) if ($href);
-    $entry .= $ending if ($preformatted);
-    return $entry . '&nbsp;';
-}
-
-# formats a menu entry link pointing to a node or section 
-#
-# arguments:
-# the entry text
-# the state, a hash reference holding informations about the context, with a 
-#     usefull entry, 'preformatted', true if we are in a preformatted format
-#     (a format keeping space between words). In that case a function
-#     of the main program, main::do_preformatted($text, $state) might 
-#     be used to format the text with the current format style.
-# href is optionnal. It is the reference to the section or the node anchor
-#     which should be used to make the link (typically it is the argument 
-#     of a href= attribute in a <a> element).
-sub t2h_default_menu_link($$$$$$)
-{
-    my $entry = shift;
-    my $state = shift;
-    my $href = shift;
-    my $node = shift;
-    my $name = shift;
-    my $ending = shift;
-    if (($entry eq '') or $NODE_NAME_IN_MENU or $state->{'preformatted'})
-    {
-        $name .= ':' if ($name ne '');
-        $entry = "$MENU_SYMBOL$name$node";
-    }
-    $entry = &$anchor ('', $href, $entry) if (defined($href));
-    if ($state->{'preformatted'})
-    {
-        return '<tr><td>' . main::do_preformatted($entry . $ending, $state);
-    }
-    return "<tr><td align=\"left\" valign=\"top\">$entry</td><td>&nbsp;&nbsp;</td>";
-}
-
-# formats a menu entry description, ie the text appearing after the node
-# specification in a menu entry an spanning until there is another
-# menu entry, an empty line or some text at the very beginning of the line
-# (we consider that text at the beginning of the line begins a menu comment) 
-#
-# arguments:
-# the description text
-# the state. See menu_entry.
-sub t2h_default_menu_description($$)
-{
-    my $text = shift;
-    my $state = shift;
-    if ($state->{'preformatted'})
-    {
-        return main::do_preformatted($text, $state) . '</td></tr>';
-    }
-    return "<td align=\"left\" valign=\"top\">$text</td></tr>\n";
-}
-
-# a menu comment (between menu lines)
-# formats the container of a menu comment. A menu comment is any text 
-# appearing between menu lines, either separated by an empty line from
-# the preceding menu entry, or a text beginning at the first character
-# of the line (text not at the very beginning of the line is considered to
-# be the continuation of a menu entry description text).
-#
-# The text itself is considered to be in a preformatted environment
-# with name 'menu-commment' and with style $MENU_PRE_STYLE.
-#
-# argument
-# text contained in the menu comment.
-sub t2h_default_menu_comment($)
-{
-   my $text = shift;
-   if ($text =~ /\S/)
-   {
-       return "<tr><th colspan=\"3\" align=\"left\" valign=\"top\">$text</th></tr>";
-   }
-   return '';
-}
-
-# Construct a href to an external source of information.
-# node is the node with texinfo @-commands
-# node_id is the node transformed such that it is unique and can be used to 
-#     make an html cross ref as explained in the texinfo manual
-# file is the file in '(file)node'
-sub t2h_default_external_href($$$)
-{
-    my $node = shift;
-    my $node_id = shift;
-    my $node_xhtml_id = shift;
-    my $file = shift;
-    $file = '' if (!defined($file));
-    my $target_split = $EXTERNAL_CROSSREF_SPLIT;
-    if ($file ne '')
-    {
-         if ($NEW_CROSSREF_STYLE)
-         {
-             $file =~ s/\.[^\.]*$//;
-             $file =~ s/^.*\///;
-             my $href;
-             if (exists($Texi2HTML::THISDOC{'htmlxref'}->{$file}))
-             {
-                  $target_split = $Texi2HTML::THISDOC{'htmlxref'}->{$file}->{'split'};
-                  $href = $Texi2HTML::THISDOC{'htmlxref'}->{$file}->{'href'};
-             }
-             if ($target_split)
-             {
-                  if (defined($href))
-                  {
-                       $file = "$href";
-                  }
-                  elsif (defined($EXTERNAL_DIR))
-                  {
-                       $file = "$EXTERNAL_DIR/$file";
-                  }
-                  elsif ($SPLIT)
-                  {
-                       $file = "../$file";
-                  }
-                  $file .= "/";
-             }
-             else
-             {# target not split
-                  if (defined($href))
-                  {
-                       $file = "$href";
-                  }
-                  else
-                  {
-                       if (defined($EXTERNAL_DIR))
-                       {
-                            $file = "$EXTERNAL_DIR/$file";
-                       }
-                       elsif ($SPLIT)
-                       {
-                           $file = "../$file";
-                       }
-                       $file .= "." . $NODE_FILE_EXTENSION;
-                  }
-             }
-         }
-         else
-         {
-             $file .= "/";
-             if (defined($EXTERNAL_DIR))
-             {
-                 $file = $EXTERNAL_DIR . $file;
-             }
-             else
-             {
-                 $file = '../' . $file;
-             } 
-         }
-    }
-    else
-    { # here we necessarily have a ref to a node in the document, but the
-      # node is invalid
-         if ($NEW_CROSSREF_STYLE)
-         {
-              if (!$SPLIT)
-              {
-                   $file = $TOP_FILE;
-              }
-         }
-    }
-    if ($node eq '')
-    {
-         if ($NEW_CROSSREF_STYLE)
-         {
-             if ($SPLIT)
-             {
-                 return $file . $TOP_NODE_FILE . '.' . $NODE_FILE_EXTENSION . '#Top';
-                 # or ?
-                 #return $file . '#Top';
-             }
-             else
-             {
-                  return $file . '#Top';
-             }
-         }
-         else
-         {
-             return $file;
-         }
-    }
-    my $target;
-    if ($NEW_CROSSREF_STYLE)
-    {
-         $node = $node_id;
-         $target = $node_xhtml_id;
-    }
-    else
-    {
-         $node = main::remove_texi($node);
-         $node =~ s/[^\w\.\-]/-/g;
-    }
-    my $file_basename = $node;
-    $file_basename = $TOP_NODE_FILE if ($node =~ /^top$/i);
-    if ($NEW_CROSSREF_STYLE)
-    {
-        if ($SPLIT)
-        {
-            return $file . $file_basename . ".$NODE_FILE_EXTENSION" . '#' . $target;
-        }
-        else
-        {
-            return $file . '#' . $target;
-        }
-    }
-    else
-    {
-        return $file . $file_basename . ".$NODE_FILE_EXTENSION";
-    }
-}
-# format a reference external to the generated manual. This produces a full 
-# reference with introductive words and the reference itself.
-#
-# arguments:
-# type of the reference: xref (reference at the beginning of a sentence),
-#     pxref (reference in a parenthesis),  
-# section in the book. This might be undef.
-# book name.
-# node and file name formatted according to the convention used in info
-#     '(file)node' and no node means the Top node.
-# href linking to the html page containing the referenced node. A typical
-#     use for this href is a href attribute in an <a> element
-# an optionnal cross reference name
-sub t2h_default_external_ref($$$$$$)
-{
-    my $type = shift;
-    my $section = shift;
-    my $book = shift;
-    my $file_node = shift;
-    my $href = shift;
-    my $cross_ref = shift;
-
-    $file_node = "$cross_ref: $file_node" if (($file_node ne '') and ($cross_ref ne ''));
-    $file_node = &$anchor('', $href, $file_node) if ($file_node ne '');
-
-    # Yes, this is ugly, but this helps internationalization
-    if ($type eq 'pxref')
-    {
-         if (($book ne '') and ($file_node ne ''))
-         {
-              return &$I('see %{node_file_href} section `%{section}\' in @cite{%{book}}', { 'node_file_href' => $file_node, 'book' => $book, 'section' => $section }) if ($section ne '');
-              return &$I('see %{node_file_href} @cite{%{book}}', { 'node_file_href' => $file_node, 'book' => $book });
-         }
-         elsif ($book ne '')
-         {
-              return &$I('see section `%{section}\' in @cite{%{book}}', { 'book' => $book, 'section' => $section }) if ($section ne '');
-              return &$I('see @cite{%{book}}', { 'book' => $book });
-         }
-         elsif ($file_node ne '')
-         {
-              return &$I('see %{node_file_href}', { 'node_file_href' => $file_node });
-         }
-    }
-    if ($type eq 'xref')
-    {
-         if (($book ne '') and ($file_node ne ''))
-         {
-              return &$I('See %{node_file_href} section `%{section}\' in @cite{%{book}}', { 'node_file_href' => $file_node, 'book' => $book, 'section' => $section }) if ($section ne '');
-              return &$I('See %{node_file_href} @cite{%{book}}', { 'node_file_href' => $file_node, 'book' => $book });
-         }
-         elsif ($book ne '')
-         {
-              return &$I('See section `%{section}\' in @cite{%{book}}', { 'book' => $book, 'section' => $section }) if ($section ne '');
-              return &$I('See @cite{%{book}}', { 'book' => $book });
-         }
-         elsif ($file_node ne '')
-         {
-              return &$I('See %{node_file_href}', { 'node_file_href' => $file_node });
-         }
-    }
-    if ($type eq 'ref')
-    {
-         if (($book ne '') and ($file_node ne ''))
-         {
-              return &$I('%{node_file_href} section `%{section}\' in @cite{%{book}}', { 'node_file_href' => $file_node, 'book' => $book, 'section' => $section }) if ($section ne '');
-              return &$I('%{node_file_href} @cite{%{book}}', { 'node_file_href' => $file_node, 'book' => $book });
-         }
-         elsif ($book ne '')
-         {
-              return &$I('section `%{section}\' in @cite{%{book}}', { 'book' => $book, 'section' => $section }) if ($section ne '');
-              return &$I('@cite{%{book}}', { 'book' => $book });
-         }
-         elsif ($file_node ne '')
-         {
-              return &$I('%{node_file_href}', { 'node_file_href' => $file_node });
-         }
-    }
-    return '';
-}
-
-# format a reference to a node or a section in the generated manual. This 
-# produces a full reference with introductive words and the reference itself.
-#
-# arguments:
-# type of the reference: xref (reference at the beginning of a sentence),
-#     pxref (reference in a parenthesis),  
-# href linking to the html page containing the node or the section. A typical
-#     use for this href is a href attribute in an <a> element
-# short name for this reference
-# name for this reference
-# boolean true if the reference is a reference to a section
-# 
-# $SHORT_REF should be used.
-sub t2h_default_internal_ref($$$$$)
-{
-    my $type = shift;
-    my $href = shift;
-    my $short_name = shift;
-    my $name = shift;
-    my $is_section = shift;
-
-    if (! $SHORT_REF)
-    {
-        $name = &$anchor('', $href, $name);
-        if ($type eq 'pxref')
-        {
-            return &$I('see section %{reference_name}', { 'reference_name' => $name }) if ($is_section);
-            return &$I('see %{reference_name}', { 'reference_name' => $name });
-        }
-        elsif ($type eq 'xref')
-        {
-            return &$I('See section %{reference_name}', { 'reference_name' => $name }) if ($is_section);
-            return &$I('See %{reference_name}', { 'reference_name' => $name });
-        }
-        elsif ($type eq 'ref')
-        {
-            return &$I('%{reference_name}', { 'reference_name' => $name });
-        }
-    }
-    else
-    {
-        $name = &$anchor('', $href, $short_name);
-        if ($type eq 'pxref')
-        {
-            return &$I('see %{reference_name}', { 'reference_name' => $name });
-        }
-        elsif ($type eq 'xref')
-        {
-            return &$I('See %{reference_name}', { 'reference_name' => $name });
-        }
-        elsif ($type eq 'ref')
-        {
-            return &$I('%{reference_name}', { 'reference_name' => $name });
-        }
-    }
-    return '';
-}
-
-# text after @item in table, vtable and ftable
-sub t2h_default_table_item($$$$$)
-{
-    my $text = shift;
-    my $index_label = shift;
-    my $format = shift;
-    my $command = shift;
-    my $formatted_command = shift;
-    $formatted_command = '' if (!defined($formatted_command) or 
-          exists($special_list_commands{$format}->{$command}));
-    $text .= "\n" . $index_label  if (defined($index_label));
-    return '<dt>' . $formatted_command . $text . '</dt>' . "\n";
-}
-
-# format text on the line following @item (in table, vtable and ftable)
-sub t2h_default_table_line($)
-{
-    my $text = shift;
-
-    if ($text =~ /\S/)
-    {
-         return '<dd>' . $text . '</dd>' . "\n";
-    }
-    return '';
-}
-
-# row in multitable
-sub t2h_default_row($$)
-{
-    my $text = shift;
-    my $macro = shift;
-
-    if ($text =~ /\S/)
-    {
-         if ($macro eq 'headitem')
-         {
-              return '<thead><tr>' . $text . '</tr></thead>' . "\n";
-         }
-         return '<tr>' . $text . '</tr>' . "\n";
-    }
-    return '';
-}
-
-# cell in multitable
-sub t2h_default_cell($$)
-{
-    my $text = shift;
-    my $row_macro = shift;
-
-    if ($row_macro eq 'headitem')
-    {
-        return '<th>' . $text . '</th>';
-    }
-    return '<td>' . $text . '</td>';
-}
-
-# format an item in a list
-#
-# argument:
-# text of the item
-# format of the list (itemize or enumerate)
-# command passed as argument to the format
-# formatted_command leading command formatted, if it is a thing command
-sub t2h_default_list_item($$$$$$$)
-{
-    my $text = shift;
-    my $format = shift;
-    my $command = shift;
-    my $formatted_command = shift;
-    my $item_nr = shift;
-    my $enumerate_style = shift;
-    my $number = shift;
-
-    $formatted_command = '' if (!defined($formatted_command) or 
-          exists($special_list_commands{$format}->{$command}));
-    if ($text =~ /\S/)
-    {
-        return '<li>' . $formatted_command . $text . '</li>';
-    }
-    return '';
-}
-
-sub t2h_default_table_list($$$$$$)
-{
-    my $format = shift;
-    my $text = shift;
-    my $command = shift;
-    my $formatted_command = shift;
-    my $item_nr = shift;
-    my $enumerate_style = shift;
-    my $number = shift;
-    $formatted_command = '' if (!defined($formatted_command) or 
-          exists($special_list_commands{$format}->{$command}));
-    if ($format eq 'itemize')
-    {
-        return "<ul>\n" . $text . "</ul>\n" if ($command eq 'bullet');
-        return "<ul$TOC_LIST_ATTRIBUTE>\n" . $text . "</ul>\n";
-    }
-}
-
-# an html comment
-sub t2h_default_comment($)
-{
-    my $text = shift;
-    while ($text =~ /-->/) # --> ends an html comment !
-    { 
-        $text =~ s/-->/->/go;
-    }
-    return '<!--' . $text . '-->' . "\n";
-}
-
-# a paragraph
-# arguments:
-# $text of the paragraph
-# $align for the alignement
-# The following is usefull if the paragraph is in an itemize.
-# $paragraph_command is the leading formatting command (like @minus)
-# $paragraph_command_formatted is the leading formatting command formatted
-# $paragraph_number is a reference on the number of paragraphs appearing
-#    in the format. The value should be increased if a paragraph is done
-# $format is the format name (@itemize)
-sub t2h_default_paragraph($$$$$$$$$)
-{
-    my $text = shift;
-    my $align = shift;
-    my $paragraph_command = shift;
-    my $paragraph_command_formatted = shift;
-    my $paragraph_number = shift;
-    my $format = shift;
-    my $item_nr = shift;
-    my $enumerate_style = shift;
-    my $number = shift;
-#print STDERR "format: $format\n" if (defined($format));
-    $paragraph_command_formatted = '' if (!defined($paragraph_command_formatted) or 
-          exists($special_list_commands{$format}->{$paragraph_command}));
-    #my $in_term = shift;
-    return '' if ($text =~ /^\s*$/);
-    if (defined($paragraph_number) and defined($$paragraph_number))
-    {
-         $$paragraph_number++;
-         #return $text . "\n" if (($format eq 'itemize' or $format eq 'enumerate') and
-         return $text  if (($format eq 'itemize' or $format eq 'enumerate') and
-            ($$paragraph_number == 1));
-    }
-    my $open = '<p>';
-    if ($align)
-    {
-        $open = "<p align=\"$paragraph_style{$align}\">";
-    }
-    return $open. "$text</p>";
-}
-
-# a preformatted region
-# arguments:
-# $text of the preformatted region
-# $pre_style css style
-# $class identifier for the preformatted region (example, menu-comment)
-# The following is usefull if the preformatted is in an itemize.
-# $leading_command is the leading formatting command (like @minus)
-# $leading_command_formatted is the leading formatting command formatted
-# $preformatted_number is a reference on the number of preformatteds appearing
-#    in the format. The value should be increased if a preformatted is done
-sub t2h_default_preformatted($$$$$$$$$$)
-{
-    my $text = shift;
-    my $pre_style = shift;
-    my $class = shift;
-    my $leading_command = shift;
-    my $leading_command_formatted = shift;
-    my $preformatted_number = shift;
-    my $format = shift;
-    my $item_nr = shift;
-    my $enumerate_style = shift;
-    my $number = shift;
-
-    return '' if ($text eq '');
-    $leading_command_formatted = '' if (!defined($leading_command_formatted) or 
-          exists($special_list_commands{$format}->{$leading_command}));
-    if (defined($preformatted_number) and defined($$preformatted_number))
-    {
-        $$preformatted_number++;
-    }
-    return "<pre class=\"$class\">$text</pre>";
-}
-
-# This function formats a heading for an element
-#
-# argument:
-# an element. It is a hash reference for a node or a sectionning command.
-# The interesting keys are:
-# 'text': the heading text
-# 'name': the heading text without section number
-# 'node': true if it is a node
-# 'level': level of the element. 0 for @top, 1 for chapter, heading, 
-#      appendix..., 2 for section and so on...
-# 'tag_level': the sectionning element name, raisesections and lowersections
-#      taken into account
-#
-# relevant configuration variable:
-# $NUMBER_SECTIONS
-sub t2h_default_heading($)
-{
-    my $element = shift;
-    my $level = 3;
-    if (!$element->{'node'})
-    {
-        $level = $element->{'level'};
-    }
-    $level = 1 if ($level == 0);
-    my $text = $element->{'text'};
-    if (!$element->{'node'} and (!$NUMBER_SECTIONS))
-    {
-        $text = $element->{'name'};
-    }
-    return '' if ($text !~ /\S/);
-    my $class = $element->{'tag_level'};
-    $class = 'unnumbered' if ($class eq 'top');
-    if (defined($element->{'tocid'}) and $TOC_LINKS)
-    {
-         $text = &$anchor ('', "$Texi2HTML::THISDOC{'toc_file'}#$element->{'tocid'}", $text);
-    }
-    return "<h$level class=\"$class\"> $text </h$level>\n";
-}
-
-# formatting of raw regions
-# ih L2H is true another mechanism is used for tex
-sub t2h_default_raw($$)
-{
-    my $style = shift;
-    my $text = shift;
-    if ($style eq 'verbatim' or $style eq 'tex')
-    {
-        return "<pre class=\"$style\">" . &$protect_text($text) . '</pre>';
-    }
-    elsif ($style eq 'html')
-    {
-        return $text;
-    }
-    else
-    {
-        warn "$WARN (bug) unknown style $style\n";
-        return &$protect_text($text);
-    }
-}
-
-# This function formats a footnote reference and the footnote text associated
-# with a given footnote.
-# The footnote reference is the text appearing in the main document pointing
-# to the footnote text.
-#
-# arguments:
-# absolute number of the footnote (in the document)
-# relative number of the footnote (in the page)
-# identifier for the footnote
-# identifier for the footnote reference in the main document
-# main document file
-# footnote text file
-# array with the footnote text lines 
-# the state. See menu entry.
-#
-# returns:
-# reference on an array containing the footnote text lines which should
-#     have been updated
-# the text for the reference pointing on the footnote text
-sub t2h_default_foot_line_and_ref($$$$$$$)
-{
-    my $number_in_doc = shift;
-    my $number_in_page = shift;
-    my $footnote_id = shift;
-    my $place_id = shift;
-    my $document_file = shift;
-    my $footnote_file = shift;
-    my $lines = shift;
-    my $state = shift;
-    
-    unshift (@$lines, '<h3>' . 
-          &$anchor($footnote_id, $document_file . "#$place_id",
-                   "($number_in_doc)")
-          . "</h3>\n");
-    return ($lines, &$anchor($place_id,  $footnote_file . "#$footnote_id", 
-           "($number_in_doc)"));
-}
-
-# formats a group of footnotes.
-#
-# argument:
-# array reference on the footnotes texts lines 
-#
-# returns an array reference on the group of footnotes lines
-sub t2h_default_foot_section($)
-{
-    my $lines = shift;
-    unshift (@$lines, "<div class=\"footnote\">\n" ,"$DEFAULT_RULE\n", "<h3>" . &$I('Footnotes') . "</h3>\n");
-    push (@$lines, "</div>\n"); 
-    return $lines; 
-}
-
-# format an image
-#
-# arguments:
-# image file name with path
-# image basename or alt text
-# a boolean true if we are in a preformatted format
-# image file name without path
-sub t2h_default_image($$$$)
-{
-   my $file = shift;
-   my $base = shift;
-   my $preformatted = shift;
-   my $file_name = shift;
-   return "[ $base ]" if ($preformatted);
-   return "<img src=\"$file\" alt=\"$base\">";
-}
-
-# address put in footer describing when was generated and who did the manual
-sub t2h_default_address($$)
-{
-    my $user = shift;
-    my $date = shift;
-    $user = '' if (!defined($user));
-    $date = '' if (!defined($date));
-    if (($user ne '') and ($date ne ''))
-    {
-        return &$I('by @emph{%{user}} on @emph{%{date}}', { 'user' => $user,
-            'date' => $date });
-    }
-    elsif ($user ne '')
-    {
-        return &$I('by @emph{%{user}}', { 'user' => $user });
-    }
-    elsif ($date ne '')
-    {
-        return &$I('on @emph{%{date}}', { 'date' => $date });
-    }
-    return '';
-}
-
-# format a target in the main document for an index entry.
-#
-# arguments:
-# target identifier
-# boolean true if in preformatted format
-sub t2h_default_index_entry_label($$)
-{
-    my $identifier = shift;
-    my $preformatted = shift;
-    
-    return '' if (!defined($identifier) or ($identifier !~ /\S/));
-    my $label = &$anchor($identifier);
-    return $label . "\n" if (!$preformatted);
-    return $label;
-}
-
-# process definition commands line @deffn for example
-sub t2h_default_def_line($$$$$)
-{
-   my $category = shift;
-   my $name = shift;
-   my $type = shift;
-   my $arguments = shift;
-   my $index_label = shift;
-   $index_label = '' if (!defined($index_label));
-   $name = '' if (!defined($name) or ($name =~ /^\s*$/));
-   $type = '' if (!defined($type) or $type =~ /^\s*$/);
-   if (!defined($arguments) or $arguments =~ /^\s*$/)
-   {
-       $arguments = '';
-   }
-   else
-   {
-       $arguments = '<i>' . $arguments . '</i>';
-   }
-   my $type_name = '';
-   $type_name = " $type" if ($type ne '');
-   $type_name .= ' <b>' . $name . '</b>' if ($name ne '');
-   $type_name .= $arguments . "\n";
-   if (! $DEF_TABLE)
-   {
-       return '<dt>'. '<u>' . $category . ':</u>' . $type_name . $index_label . "</dt>\n";
-   }
-   else
-   {
-       
-       return "<tr>\n<td align=\"left\">" . $type_name . 
-       "</td>\n<td align=\"right\">" . $category . $index_label . "</td>\n" . "</tr>\n";
-   }
-}
-
-# process definition commands line @deffn for example while removing texi
-# commands
-sub t2h_default_def_line_no_texi($$$$$)
-{
-   my $category = shift;
-   my $name = shift;
-   my $type = shift;
-   my $arguments = shift;
-   $name = '' if (!defined($name) or ($name =~ /^\s*$/));
-   $type = '' if (!defined($type) or $type =~ /^\s*$/);
-   if (!defined($arguments) or $arguments =~ /^\s*$/)
-   {
-       $arguments = '';
-   }
-   my $type_name = '';
-   $type_name = " $type" if ($type ne '');
-   $type_name .= ' ' . $name if ($name ne '');
-   $type_name .= $arguments;
-   if (! $DEF_TABLE)
-   {
-       return $category . ':' . $type_name . "\n";
-   }
-   else
-   {
-       
-       return $type_name . "    " . $category . "\n";
-   }
-}
-
-# a cartouche
-sub t2h_default_cartouche($$)
-{
-    my $text = shift;
-
-    if ($text =~ /\S/)
-    {
-        return "<table class=\"cartouche\" border=\"1\"><tr><td>\n" . $text . "</td></tr></table>\n";
-    }
-    return '';
-} 
-
-# key:          
-# origin_href:  
-# entry:        
-# texi entry: 
-# element_href: 
-# element_text: 
-sub t2h_default_index_summary_file_entry ($$$$$$$$)
-{
-    my $index_name = shift;
-    my $key = shift;
-    my $origin_href = shift;
-    my $entry = shift;
-    my $texi_entry = shift;
-    my $element_href = shift;
-    my $element_text = shift;
-    my $is_printed = shift;
-    print IDXFILE "key: $key\n  origin_href: $origin_href\n  entry: $entry\n"
-      . "  texi_entry: $texi_entry\n"
-      . "  element_href: $element_href\n  element_text: $element_text\n";
-}
-
-sub t2h_default_index_summary_file_begin($$)
-{
-    my $name = shift;
-    my $is_printed = shift;
-    open(IDXFILE, ">$Texi2HTML::THISDOC{'destination_directory'}$Texi2HTML::THISDOC{'file_base_name'}" . "_$name.idx")
-       || die "Can't open >$Texi2HTML::THISDOC{'destination_directory'}$Texi2HTML::THISDOC{'file_base_name'}" . "_$name.idx for writing: $!\n";
-}
-
-sub t2h_default_index_summary_file_end($$)
-{
-    my $name = shift;
-    my $is_printed = shift;
-    close (IDXFILE);
-}
-
-sub t2h_default_sp($$)
-{
-   my $number = shift;
-   my $preformatted = shift;
-   return "<br>\n" x $number if (!$preformatted);
-   return "\n" x $number;
-}
-
-sub t2h_default_acronym_like($$$$$$)
-{
-    my $command = shift;
-    my $acronym_texi = shift;
-    my $acronym_text = shift;
-    my $with_explanation = shift;
-    my $explanation_lines = shift;
-    my $explanation_text = shift;
-    my $explanation_unformatted = shift;
-    
-    my $attribute = $command;
-    my $opening = "<$attribute>";
-    if (defined($explanation_unformatted)) 
-    {
-        $opening = "<$attribute title=\"$explanation_unformatted\">";
-    }
-    if ($with_explanation)
-    {
-        return &$I('%{acronym_like} (%{explanation})', {'acronym_like' => $opening . $acronym_text . "</$attribute>", 'explanation' => $explanation_text})
-    }
-    else
-    {
-        return  $opening . $acronym_text . "</$attribute>";
-    }
-}
-
-sub t2h_default_quotation_prepend_text($$)
-{
-    my $style = shift;
-    my $text = shift;
-    return &$I('@b{%{quotation_arg}:} ', {'quotation_arg' => $text}, {'keep_texi' => 1}) if (defined($text));
-    return undef;
-}
-
-sub t2h_default_quotation($$$$)
-{
-    my $text = shift;
-    my $argument_text = shift;
-    my $argument_style_texi = shift;
-    my $argument_style_id = shift;
-#    if (defined($argument_text))
-#    {
-#         return '<blockquote>' . &$I('%{style}:%{quotation}',
-#          {'style' => $argument_text, 'quotation' => $text}) . '</blockquote>' ;
-#    }
-    return '<blockquote>' . $text . "</blockquote>\n";
-}
-
-# format the text within a paragraph style format,
-#
-# argument:
-# format name
-# text within the format
-sub t2h_default_paragraph_style_command($$)
-{
-    my $format = shift;
-    my $text = shift;
-    return $text;
-}
-
-# format a whole index
-#
-# argument:
-# index text
-# index name
-sub t2h_default_print_index($$)
-{
-    my $text = shift;
-    my $name = shift;
-    return "<table border=\"0\" class=\"index-$name\">\n" .
-    "<tr><td></td><th align=\"left\">" . &$I('Index Entry') . "</th><th align=\"left\"> " . &$I('Section') . "</th></tr>\n"
-    . "<tr><td colspan=\"3\"> $DEFAULT_RULE</td></tr>\n" . $text .
-    "</table>\n";
-}
-
-# format a letter entry in an index page. The letter entry contains
-# the index entries for the words beginning with that letter. It is 
-# a target for links pointing from the summary of the index.
-#
-# arguments:
-# the letter
-# identifier for the letter entry. This should be used to make the target
-#     identifier
-# text of the index entries
-sub t2h_default_index_letter($$$)
-{
-     my $letter = shift;
-     my $id = shift;
-     my $text = shift;
-     return '<tr><th>' . &$anchor($id,'',&$protect_text($letter)) . 
-     "</th><td></td><td></td></tr>\n" . $text . 
-     "<tr><td colspan=\"3\"> $DEFAULT_RULE</td></tr>\n";
-}
-
-# format an index entry (in a letter entry).
-#
-# arguments:
-# href to the main text, linking to the place where the index entry appears
-# entry text
-# href to the main text, linking to the section or node where the index 
-#      entry appears
-# section or node heading
-sub t2h_default_index_entry($$$$)
-{
-    my $text_href = shift;
-    my $entry = shift;
-    my $element_href = shift;
-    my $element_text = shift;
-    
-    return '<tr><td></td><td valign="top">' . &$anchor('', $text_href, $entry)
-    . '</td><td valign="top">' .  &$anchor('', $element_href, $element_text)
-    . "</td></tr>\n";
-}
-
-
-sub t2h_default_copying_comment($)
-{
-    my $copying_lines = shift;
-    my $text = &$comment(main::remove_texi(@$copying_lines));
-    return $text;
-}
-# format a letter appearing in a summary for an index. The letter links to
-# the place where the index elements beginning with this letter are (called
-# a letter entry).
-#
-# arguments:
-# letter
-# file where the target letter entry is 
-# identifier for the target letter entry
-sub t2h_default_summary_letter($$$)
-{
-   my $letter = shift;
-   my $file = shift;
-   my $identifier = shift;
-   return &$anchor('', $file . '#' . $identifier, '<b>' . &$protect_text($letter) . '</b>', 'class="summary-letter"');
-}
-
-# format an index summary. This is a list of letters linking to the letter
-# entries.
-#
-# arguments:
-# array reference containing the formatted alphabetical letters
-# array reference containing the formatted non lphabetical letters
-sub t2h_default_index_summary($$)
-{
-    my $alpha = shift;
-    my $nonalpha = shift;
-    my $join = '';
-    my $nonalpha_text = '';
-    my $alpha_text = '';
-    $join = " &nbsp; \n<br>\n" if (@$nonalpha and @$alpha);
-    if (@$nonalpha)
-    {
-       $nonalpha_text = join("\n &nbsp; \n", @$nonalpha) . "\n";
-    }
-    if (@$alpha)
-    {
-       $alpha_text = join("\n &nbsp; \n", @$alpha) . "\n &nbsp; \n";
-    }
-    return "<table><tr><th valign=\"top\">" . &$I('Jump to') .": &nbsp; </th><td>" .
-    $nonalpha_text . $join . $alpha_text . "</td></tr></table>\n";
-}
-
-1;
-
-require "$ENV{T2H_HOME}/texi2html.init" 
-    if ($0 =~ /\.pl$/ &&
-        -e "$ENV{T2H_HOME}/texi2html.init" && -r "$ENV{T2H_HOME}/texi2html.init");
-
-my $translation_file = 'translations.pl'; # file containing all the translations
-my $T2H_OBSOLETE_STRINGS;
-require "$ENV{T2H_HOME}/$translation_file"
-    if ($0 =~ /\.pl$/ &&
-        -e "$ENV{T2H_HOME}/$translation_file" && -r "$ENV{T2H_HOME}/$translation_file");
-
-# 
-$LANGUAGES->{'de'} = {
-                       '  The buttons in the navigation panels have the following meaning:' => '',
-                       '  where the @strong{ Example } assumes that the current position is at @strong{ Subsubsection One-Two-Three } of a document of the following structure:' => '',
-                       ' Up ' => '',
-                       '%{acronym_like} (%{explanation})' => '',
-                       '%{month}, %{day} %{year}' => '',
-                       '%{name} of %{class}' => '',
-                       '%{name} on %{class}' => '',
-                       '%{node_file_href}' => '',
-                       '%{node_file_href} @cite{%{book}}' => '',
-                       '%{node_file_href} section `%{section}\' in @cite{%{book}}' => '',
-                       '%{reference_name}' => '',
-                       '%{style} %{number}' => '',
-                       '%{style}: %{caption_first_line}' => '',
-                       '%{style}: %{shortcaption_first_line}' => '',
-                       '@b{%{quotation_arg}:} ' => '',
-                       '@cite{%{book}}' => '',
-                       'About This Document' => '@"Uber dieses Dokument',
-                       'April' => 'April',
-                       'August' => 'August',
-                       'Button' => '',
-                       'Contents' => '',
-                       'Current Position' => '',
-                       'December' => 'Dezember',
-                       'February' => 'Februar',
-                       'Footnotes' => 'Fu@ss{}noten',
-                       'From 1.2.3 go to' => '',
-                       'Go to' => '',
-                       'Index' => 'Index',
-                       'Index Entry' => '',
-                       'January' => 'Januar',
-                       'July' => 'Juli',
-                       'Jump to' => '',
-                       'June' => 'Juni',
-                       'March' => 'M@"arz',
-                       'May' => 'Mai',
-                       'Menu:' => '',
-                       'Name' => '',
-                       'Next' => '',
-                       'November' => 'November',
-                       'October' => 'Oktober',
-                       'Overview' => '',
-                       'Overview:' => '',
-                       'Prev' => '',
-                       'Section' => '',
-                       'Section One' => '',
-                       'See %{node_file_href}' => '',
-                       'See %{node_file_href} @cite{%{book}}' => '',
-                       'See %{node_file_href} section `%{section}\' in @cite{%{book}}' => '',
-                       'See %{reference_name}' => '',
-                       'See @cite{%{book}}' => '',
-                       'See section %{reference_name}' => '',
-                       'See section `%{section}\' in @cite{%{book}}' => '',
-                       'September' => 'September',
-                       'Short Table of Contents' => 'Kurzes Inhaltsverzeichniss',
-                       'Subsection One-Four' => '',
-                       'Subsection One-One' => '',
-                       'Subsection One-Three' => '',
-                       'Subsection One-Two' => '',
-                       'Subsubsection One-Two-Four' => '',
-                       'Subsubsection One-Two-One' => '',
-                       'Subsubsection One-Two-Three' => '',
-                       'Subsubsection One-Two-Two' => '',
-                       'T2H_today' => '',
-                       'Table of Contents' => 'Inhaltsverzeichniss',
-                       'This document was generated by @emph{%{user}} on @emph{%{date}} using @uref{%{program_homepage}, @emph{%{program}}}.' => '',
-                       'This document was generated by @emph{%{user}} using @uref{%{program_homepage}, @emph{%{program}}}.' => '',
-                       'This document was generated on @i{%{date}} using @uref{%{program_homepage}, @i{%{program}}}.' => '',
-                       'This document was generated using @uref{%{program_homepage}, @emph{%{program}}}.' => '',
-                       'Top' => '',
-                       'Untitled Document' => '',
-                       'about (help)' => '',
-                       'beginning of this chapter or previous chapter' => '',
-                       'by @emph{%{user}}' => '',
-                       'by @emph{%{user}} on @emph{%{date}}' => '',
-                       'cover (top) of document' => '',
-                       'current' => '',
-                       'current section' => '',
-                       'first section in reading order' => '',
-                       'following node' => '',
-                       'index' => '',
-                       'last section in reading order' => '',
-                       'next chapter' => '',
-                       'next node' => '',
-                       'next section in reading order' => '',
-                       'next section on same level' => '',
-                       'node following in node reading order' => '',
-                       'node up' => '',
-                       'on @emph{%{date}}' => '',
-                       'previous node' => '',
-                       'previous section in reading order' => '',
-                       'previous section on same level' => '',
-                       'section `%{section}\' in @cite{%{book}}' => '',
-                       'see %{node_file_href}' => '',
-                       'see %{node_file_href} @cite{%{book}}' => '',
-                       'see %{node_file_href} section `%{section}\' in @cite{%{book}}' => '',
-                       'see %{reference_name}' => '',
-                       'see @cite{%{book}}' => '',
-                       'see section %{reference_name}' => '',
-                       'see section `%{section}\' in @cite{%{book}}' => '',
-                       'short table of contents' => '',
-                       'table of contents' => '',
-                       'unknown' => '',
-                       'up node' => '',
-                       'up section' => ''
-                     };
-
-$T2H_OBSOLETE_STRINGS->{'de'} = {
-                                  'See' => 'Siehe',
-                                  'section' => 'Abschnitt',
-                                  'see' => 'siehe'
-                                };
-
-
-$LANGUAGES->{'es'} = {
-                       '  The buttons in the navigation panels have the following meaning:' => '',
-                       '  where the @strong{ Example } assumes that the current position is at @strong{ Subsubsection One-Two-Three } of a document of the following structure:' => '',
-                       ' Up ' => '',
-                       '%{acronym_like} (%{explanation})' => '',
-                       '%{month}, %{day} %{year}' => '',
-                       '%{name} of %{class}' => '',
-                       '%{name} on %{class}' => '',
-                       '%{node_file_href}' => '',
-                       '%{node_file_href} @cite{%{book}}' => '',
-                       '%{node_file_href} section `%{section}\' in @cite{%{book}}' => '',
-                       '%{reference_name}' => '',
-                       '%{style} %{number}' => '',
-                       '%{style}: %{caption_first_line}' => '',
-                       '%{style}: %{shortcaption_first_line}' => '',
-                       '@b{%{quotation_arg}:} ' => '',
-                       '@cite{%{book}}' => '',
-                       'About This Document' => '',
-                       'April' => 'abril',
-                       'August' => 'agosto',
-                       'Button' => '',
-                       'Contents' => '',
-                       'Current Position' => '',
-                       'December' => 'diciembre',
-                       'February' => 'febrero',
-                       'Footnotes' => '',
-                       'From 1.2.3 go to' => '',
-                       'Go to' => '',
-                       'Index' => 'Index',
-                       'Index Entry' => '',
-                       'January' => 'enero',
-                       'July' => 'julio',
-                       'Jump to' => '',
-                       'June' => 'junio',
-                       'March' => 'marzo',
-                       'May' => 'mayo',
-                       'Menu:' => '',
-                       'Name' => '',
-                       'Next' => '',
-                       'November' => 'noviembre',
-                       'October' => 'octubre',
-                       'Overview' => '',
-                       'Overview:' => '',
-                       'Prev' => '',
-                       'Section' => '',
-                       'Section One' => '',
-                       'See %{node_file_href}' => '',
-                       'See %{node_file_href} @cite{%{book}}' => '',
-                       'See %{node_file_href} section `%{section}\' in @cite{%{book}}' => '',
-                       'See %{reference_name}' => '',
-                       'See @cite{%{book}}' => '',
-                       'See section %{reference_name}' => '',
-                       'See section `%{section}\' in @cite{%{book}}' => '',
-                       'September' => 'septiembre',
-                       'Short Table of Contents' => 'Resumen del Contenido',
-                       'Subsection One-Four' => '',
-                       'Subsection One-One' => '',
-                       'Subsection One-Three' => '',
-                       'Subsection One-Two' => '',
-                       'Subsubsection One-Two-Four' => '',
-                       'Subsubsection One-Two-One' => '',
-                       'Subsubsection One-Two-Three' => '',
-                       'Subsubsection One-Two-Two' => '',
-                       'T2H_today' => '',
-                       'Table of Contents' => '@\'{@dotless{I}}ndice General',
-                       'This document was generated by @emph{%{user}} on @emph{%{date}} using @uref{%{program_homepage}, @emph{%{program}}}.' => '',
-                       'This document was generated by @emph{%{user}} using @uref{%{program_homepage}, @emph{%{program}}}.' => '',
-                       'This document was generated on @i{%{date}} using @uref{%{program_homepage}, @i{%{program}}}.' => '',
-                       'This document was generated using @uref{%{program_homepage}, @emph{%{program}}}.' => '',
-                       'Top' => '',
-                       'Untitled Document' => '',
-                       'about (help)' => '',
-                       'beginning of this chapter or previous chapter' => '',
-                       'by @emph{%{user}}' => '',
-                       'by @emph{%{user}} on @emph{%{date}}' => '',
-                       'cover (top) of document' => '',
-                       'current' => '',
-                       'current section' => '',
-                       'first section in reading order' => '',
-                       'following node' => '',
-                       'index' => '',
-                       'last section in reading order' => '',
-                       'next chapter' => '',
-                       'next node' => '',
-                       'next section in reading order' => '',
-                       'next section on same level' => '',
-                       'node following in node reading order' => '',
-                       'node up' => '',
-                       'on @emph{%{date}}' => '',
-                       'previous node' => '',
-                       'previous section in reading order' => '',
-                       'previous section on same level' => '',
-                       'section `%{section}\' in @cite{%{book}}' => '',
-                       'see %{node_file_href}' => '',
-                       'see %{node_file_href} @cite{%{book}}' => '',
-                       'see %{node_file_href} section `%{section}\' in @cite{%{book}}' => '',
-                       'see %{reference_name}' => '',
-                       'see @cite{%{book}}' => '',
-                       'see section %{reference_name}' => '',
-                       'see section `%{section}\' in @cite{%{book}}' => '',
-                       'short table of contents' => '',
-                       'table of contents' => '',
-                       'unknown' => '',
-                       'up node' => '',
-                       'up section' => ''
-                     };
-
-$T2H_OBSOLETE_STRINGS->{'es'} = {
-                                  'See' => 'V@\'ease',
-                                  'section' => 'secci@\'on',
-                                  'see' => 'v@\'ase'
-                                };
-
-
-$LANGUAGES->{'fr'} = {
-                       '  The buttons in the navigation panels have the following meaning:' => '  Les boutons de navigation ont la signification suivante :',
-                       '  where the @strong{ Example } assumes that the current position is at @strong{ Subsubsection One-Two-Three } of a document of the following structure:' => '  Dans cet exemple on est @`a @strong{ Sous section un-deux-trois } dans un document dont la structure est :',
-                       ' Up ' => 'Plus haut',
-                       '%{acronym_like} (%{explanation})' => '',
-                       '%{month}, %{day} %{year}' => 'le %{day} %{month} %{year}',
-                       '%{name} of %{class}' => '%{name} de %{class}',
-                       '%{name} on %{class}' => '%{name} de %{class}',
-                       '%{node_file_href}' => '',
-                       '%{node_file_href} @cite{%{book}}' => '',
-                       '%{node_file_href} section `%{section}\' in @cite{%{book}}' => '%{node_file_href} section `%{section}\' dans @cite{%{book}}',
-                       '%{reference_name}' => '',
-                       '%{style} %{number}' => '',
-                       '%{style}: %{caption_first_line}' => '',
-                       '%{style}: %{shortcaption_first_line}' => '',
-                       '@b{%{quotation_arg}:} ' => '',
-                       '@cite{%{book}}' => '',
-                       'About This Document' => 'A propos de ce document',
-                       'April' => 'Avril',
-                       'August' => 'Ao@^ut',
-                       'Button' => 'Bouton',
-                       'Contents' => 'Table des mati@`eres',
-                       'Current Position' => 'Position',
-                       'December' => 'D@\'ecembre',
-                       'February' => 'F@\'evrier',
-                       'Footnotes' => 'Notes de bas de page',
-                       'From 1.2.3 go to' => 'Depuis 1.2.3 aller @`a',
-                       'Go to' => 'Aller @`a',
-                       'Index' => 'Index',
-                       'Index Entry' => 'Entr@\'ee d\'index',
-                       'January' => 'Janvier',
-                       'July' => 'Juillet',
-                       'Jump to' => 'Aller @`a',
-                       'June' => 'Juin',
-                       'March' => 'Mars',
-                       'May' => 'Mai',
-                       'Menu:' => 'Menu@ :',
-                       'Name' => 'Nom',
-                       'Next' => 'Suivant',
-                       'November' => 'Novembre',
-                       'October' => 'Octobre',
-                       'Overview' => 'Vue d\'ensemble',
-                       'Overview:' => 'Vue d\'ensemble@ :',
-                       'Prev' => 'Pr@\'ec@\'edent',
-                       'Section' => '',
-                       'Section One' => 'Section un',
-                       'See %{node_file_href}' => 'Voir %{node_file_href}',
-                       'See %{node_file_href} @cite{%{book}}' => 'Voir %{node_file_href} @cite{%{book}}',
-                       'See %{node_file_href} section `%{section}\' in @cite{%{book}}' => 'Voir %{node_file_href} section `%{section}\' dans @cite{%{book}}',
-                       'See %{reference_name}' => 'Voir %{reference_name}',
-                       'See @cite{%{book}}' => 'Voir @cite{%{book}}',
-                       'See section %{reference_name}' => 'Voir la section %{reference_name}',
-                       'See section `%{section}\' in @cite{%{book}}' => 'Voir la section `%{section}\' dans @cite{%{book}}',
-                       'September' => 'Septembre',
-                       'Short Table of Contents' => 'R@\'esum@\'e du contenu',
-                       'Subsection One-Four' => 'Sous section un-quatre',
-                       'Subsection One-One' => 'Sous section un-un',
-                       'Subsection One-Three' => 'Sous section un-trois',
-                       'Subsection One-Two' => 'Sous section un-deux',
-                       'Subsubsection One-Two-Four' => 'Sous sous section un-deux-quatre',
-                       'Subsubsection One-Two-One' => 'Sous sous section un-deux-un',
-                       'Subsubsection One-Two-Three' => 'Sous sous section un-deux-trois',
-                       'Subsubsection One-Two-Two' => 'Sous sous section un-deux-deux',
-                       'T2H_today' => 'le %2$d %1$s %3$d',
-                       'Table of Contents' => 'Table des mati@`eres',
-                       'This document was generated by @emph{%{user}} on @emph{%{date}} using @uref{%{program_homepage}, @emph{%{program}}}.' => 'Ce document a @\'et@\'e g@\'en@\'er@\'e par @emph{%{user}} @emph{%{date}} en utilisant @uref{%{program_homepage}, @emph{%{program}}}.',
-                       'This document was generated by @emph{%{user}} using @uref{%{program_homepage}, @emph{%{program}}}.' => 'Ce document a @\'et@\'e g@\'en@\'er@\'e par @emph{%{user}} en utilisant @uref{%{program_homepage}, @emph{%{program}}}.',
-                       'This document was generated on @i{%{date}} using @uref{%{program_homepage}, @i{%{program}}}.' => '',
-                       'This document was generated using @uref{%{program_homepage}, @emph{%{program}}}.' => 'Ce document a @\'et@\'e g@\'en@\'er@\'e en utilisant @uref{%{program_homepage}, @emph{%{program}}}.',
-                       'Top' => '',
-                       'Untitled Document' => 'Document sans titre',
-                       'about (help)' => '@`a propos (page d\'aide)',
-                       'beginning of this chapter or previous chapter' => 'd@\'ebut de ce chapitre ou chapitre pr@\'ec@\'edent',
-                       'by @emph{%{user}}' => 'par @emph{%{user}}',
-                       'by @emph{%{user}} on @emph{%{date}}' => 'par @emph{%{user}} @emph{%{date}}',
-                       'cover (top) of document' => 'couverture (top) du document',
-                       'current' => 'courante',
-                       'current section' => 'section actuelle',
-                       'first section in reading order' => 'premi@`e section dans l\'ordre de lecture',
-                       'following node' => 'node suivant',
-                       'index' => 'index',
-                       'last section in reading order' => 'derni@`ere section dans l\'ordre de lecture',
-                       'next chapter' => 'chapitre suivant',
-                       'next node' => 'node suivant',
-                       'next section in reading order' => 'section suivante dans l\'ordre de lecture',
-                       'next section on same level' => 'section suivante au m@^eme niveau',
-                       'node following in node reading order' => 'node suivant dans l\'ordre des nodes',
-                       'node up' => 'node au dessus',
-                       'on @emph{%{date}}' => '@emph{%{date}}',
-                       'previous node' => 'node pr@\'ec@\'edent',
-                       'previous section in reading order' => 'section pr@\'ec@\'edente dans l\'ordre de lecture',
-                       'previous section on same level' => 'section pr@\'ec@\'edente au m@^eme niveau',
-                       'section `%{section}\' in @cite{%{book}}' => 'section `%{section}\' dans @cite{%{book}}',
-                       'see %{node_file_href}' => 'voir %{node_file_href}',
-                       'see %{node_file_href} @cite{%{book}}' => 'voir %{node_file_href} @cite{%{book}}',
-                       'see %{node_file_href} section `%{section}\' in @cite{%{book}}' => 'voir %{node_file_href} section `%{section}\' dans @cite{%{book}}',
-                       'see %{reference_name}' => 'voir %{reference_name}',
-                       'see @cite{%{book}}' => 'voir @cite{%{book}}',
-                       'see section %{reference_name}' => 'voir la section %{reference_name}',
-                       'see section `%{section}\' in @cite{%{book}}' => 'voir la section `%{section}\' dans @cite{{book}}',
-                       'short table of contents' => 'table des mati@`eres r@\'esum@\'ee',
-                       'table of contents' => 'table des mati@`eres',
-                       'unknown' => 'inconnu',
-                       'up node' => 'node au dessus',
-                       'up section' => 'section sup@\'erieure'
-                     };
-
-$T2H_OBSOLETE_STRINGS->{'fr'} = {
-                                  '  This document was generated %{who_and_when_generated} using %{program_homepage_href}.' => '  Ce document a &eacute;t&eacute; g&eacute;n&eacute;r&eacute; %{who_and_when_generated} en utilisant %{program_homepage_href}.',
-                                  '  where the <strong> Example </strong> assumes that the current position is at <strong> Subsubsection One-Two-Three </strong> of a document of the following structure:' => '  Dans cet exemple on est &agrave; <strong> Sous section un-deux-trois </strong> dans un document dont la structure est :',
-                                  '%{node_file_href} section `%{section}\' in <cite>%{book}</cite>' => '%{node_file_href} section `%{section}\' dans <cite>%{book}</cite>',
-                                  'See' => 'Voir',
-                                  'See %{node_file_href} <cite>%{book}</cite>' => 'Voir %{node_file_href} <cite>%{book}</cite>',
-                                  'See %{node_file_href} section `%{section}\' in <cite>%{book}</cite>' => 'Voir %{node_file_href} section `%{section}\' dans <cite>%{book}</cite>',
-                                  'See <cite>%{book}</cite>' => 'Voir <cite>%{book}</cite>',
-                                  'See section `%{section}\' in <cite>%{book}</cite>' => 'Voir la section `%{section}\' dans <cite>%{book}</cite>',
-                                  'This document was generated by <i>%{user}</i> on <i>%{date}</i> using %{program_homepage_href}.' => 'Ce document a &eacute;t&eacute; g&eacute;n&eacute;r&eacute; par <i>%{user}</i> <i>%{date}</i> en utilisant %{program_homepage_href}.',
-                                  'This document was generated by <i>%{user}</i> using %{program_homepage_href}.' => 'Ce document a &eacute;t&eacute; g&eacute;n&eacute;r&eacute; par <i>%{user}</i> en utilisant %{program_homepage_href}.',
-                                  'This document was generated by @emph{%{user}} on @emph{%{date}} using %{program_homepage_href}.' => 'Ce document a @\'et@\'e g@\'en@\'er@\'e par @emph{%{user}} @emph{%{date}} en utilisant %{program_homepage_href}.',
-                                  'This document was generated by @emph{%{user}} using %{program_homepage_href}.' => 'Ce document a @\'et@\'e g@\'en@\'er@\'e par @emph{%{user}} en utilisant %{program_homepage_href}.',
-                                  'This document was generated on <i>%{date}</i> using %{program_homepage_href}.' => 'Ce document a &eacute;t&eacute; g&eacute;n&eacute;r&eacute; <i>%{date}</i> en utilisant %{program_homepage_href}.',
-                                  'This document was generated on @emph{%{date}} using %{program_homepage_href}.' => 'Ce document a @\'et@\'e g@\'en@\'er@\'e @emph{%{date}} en utilisant %{program_homepage_href}.',
-                                  'This document was generated on @emph{%{date}} using @uref{%{program_homepage}, @emph{%{program}}}.' => 'Ce document a @\'et@\'e g@\'en@\'er@\'e @emph{%{date}} en utilisant @uref{%{program_homepage}, @emph{%{program}}}.',
-                                  'This document was generated using %{program_homepage_href}.' => 'Ce document a @\'et@\'e g@\'en@\'er@\'e en utilisant %{program_homepage_href}.',
-                                  'about (this page)' => 'a propos (cette page)',
-                                  'by <i>%{user}</i>' => 'par <i>%{user}</i>',
-                                  'by <i>%{user}</i> on <i>%{date}</i>' => 'par <i>%{user}</i> <i>%{date}</i>',
-                                  'concept index' => 'index',
-                                  'on <i>%{date}</i>' => '<i>%{date}</i>',
-                                  'section' => 'section',
-                                  'section `%{section}\' in <cite>%{book}</cite>' => 'section `%{section}\' dans <cite>%{book}</cite>',
-                                  'see' => 'voir',
-                                  'see %{node_file_href} <cite>%{book}</cite>' => 'voir %{node_file_href} <cite>%{book}</cite>',
-                                  'see %{node_file_href} section `%{section}\' in <cite>%{book}</cite>' => 'voir %{node_file_href} section `%{section}\' dans <cite>%{book}</cite>',
-                                  'see <cite>%{book}</cite>' => 'voir <cite>%{book}</cite>',
-                                  'see section `%{section}\' in <cite>%{book}</cite>' => 'voir la section `%{section}\' dans <cite>%{book}</cite>'
-                                };
-
-
-$LANGUAGES->{'nl'} = {
-                       '  The buttons in the navigation panels have the following meaning:' => '',
-                       '  where the @strong{ Example } assumes that the current position is at @strong{ Subsubsection One-Two-Three } of a document of the following structure:' => '',
-                       ' Up ' => '',
-                       '%{acronym_like} (%{explanation})' => '',
-                       '%{month}, %{day} %{year}' => '',
-                       '%{name} of %{class}' => '',
-                       '%{name} on %{class}' => '',
-                       '%{node_file_href}' => '',
-                       '%{node_file_href} @cite{%{book}}' => '',
-                       '%{node_file_href} section `%{section}\' in @cite{%{book}}' => '',
-                       '%{reference_name}' => '',
-                       '%{style} %{number}' => '',
-                       '%{style}: %{caption_first_line}' => '',
-                       '%{style}: %{shortcaption_first_line}' => '',
-                       '@b{%{quotation_arg}:} ' => '',
-                       '@cite{%{book}}' => '',
-                       'About This Document' => 'No translation available!',
-                       'April' => 'April',
-                       'August' => 'Augustus',
-                       'Button' => '',
-                       'Contents' => '',
-                       'Current Position' => '',
-                       'December' => 'December',
-                       'February' => 'Februari',
-                       'Footnotes' => 'No translation available!',
-                       'From 1.2.3 go to' => '',
-                       'Go to' => '',
-                       'Index' => 'Index',
-                       'Index Entry' => '',
-                       'January' => 'Januari',
-                       'July' => 'Juli',
-                       'Jump to' => '',
-                       'June' => 'Juni',
-                       'March' => 'Maart',
-                       'May' => 'Mei',
-                       'Menu:' => '',
-                       'Name' => '',
-                       'Next' => '',
-                       'November' => 'November',
-                       'October' => 'Oktober',
-                       'Overview' => '',
-                       'Overview:' => '',
-                       'Prev' => '',
-                       'Section' => '',
-                       'Section One' => '',
-                       'See %{node_file_href}' => '',
-                       'See %{node_file_href} @cite{%{book}}' => '',
-                       'See %{node_file_href} section `%{section}\' in @cite{%{book}}' => '',
-                       'See %{reference_name}' => '',
-                       'See @cite{%{book}}' => '',
-                       'See section %{reference_name}' => '',
-                       'See section `%{section}\' in @cite{%{book}}' => '',
-                       'September' => 'September',
-                       'Short Table of Contents' => 'Korte inhoudsopgave',
-                       'Subsection One-Four' => '',
-                       'Subsection One-One' => '',
-                       'Subsection One-Three' => '',
-                       'Subsection One-Two' => '',
-                       'Subsubsection One-Two-Four' => '',
-                       'Subsubsection One-Two-One' => '',
-                       'Subsubsection One-Two-Three' => '',
-                       'Subsubsection One-Two-Two' => '',
-                       'T2H_today' => '',
-                       'Table of Contents' => 'Inhoudsopgave',
-                       'This document was generated by @emph{%{user}} on @emph{%{date}} using @uref{%{program_homepage}, @emph{%{program}}}.' => '',
-                       'This document was generated by @emph{%{user}} using @uref{%{program_homepage}, @emph{%{program}}}.' => '',
-                       'This document was generated on @i{%{date}} using @uref{%{program_homepage}, @i{%{program}}}.' => '',
-                       'This document was generated using @uref{%{program_homepage}, @emph{%{program}}}.' => '',
-                       'Top' => '',
-                       'Untitled Document' => '',
-                       'about (help)' => '',
-                       'beginning of this chapter or previous chapter' => '',
-                       'by @emph{%{user}}' => '',
-                       'by @emph{%{user}} on @emph{%{date}}' => '',
-                       'cover (top) of document' => '',
-                       'current' => '',
-                       'current section' => '',
-                       'first section in reading order' => '',
-                       'following node' => '',
-                       'index' => '',
-                       'last section in reading order' => '',
-                       'next chapter' => '',
-                       'next node' => '',
-                       'next section in reading order' => '',
-                       'next section on same level' => '',
-                       'node following in node reading order' => '',
-                       'node up' => '',
-                       'on @emph{%{date}}' => '',
-                       'previous node' => '',
-                       'previous section in reading order' => '',
-                       'previous section on same level' => '',
-                       'section `%{section}\' in @cite{%{book}}' => '',
-                       'see %{node_file_href}' => '',
-                       'see %{node_file_href} @cite{%{book}}' => '',
-                       'see %{node_file_href} section `%{section}\' in @cite{%{book}}' => '',
-                       'see %{reference_name}' => '',
-                       'see @cite{%{book}}' => '',
-                       'see section %{reference_name}' => '',
-                       'see section `%{section}\' in @cite{%{book}}' => '',
-                       'short table of contents' => '',
-                       'table of contents' => '',
-                       'unknown' => '',
-                       'up node' => '',
-                       'up section' => ''
-                     };
-
-$T2H_OBSOLETE_STRINGS->{'nl'} = {
-                                  'See' => 'Zie',
-                                  'section' => 'sectie',
-                                  'see' => 'zie'
-                                };
-
-
-$LANGUAGES->{'no'} = {
-                       '  The buttons in the navigation panels have the following meaning:' => '',
-                       '  where the @strong{ Example } assumes that the current position is at @strong{ Subsubsection One-Two-Three } of a document of the following structure:' => '',
-                       ' Up ' => '',
-                       '%{acronym_like} (%{explanation})' => '',
-                       '%{month}, %{day} %{year}' => '',
-                       '%{name} of %{class}' => '',
-                       '%{name} on %{class}' => '',
-                       '%{node_file_href}' => '',
-                       '%{node_file_href} @cite{%{book}}' => '',
-                       '%{node_file_href} section `%{section}\' in @cite{%{book}}' => '',
-                       '%{reference_name}' => '',
-                       '%{style} %{number}' => '',
-                       '%{style}: %{caption_first_line}' => '',
-                       '%{style}: %{shortcaption_first_line}' => '',
-                       '@b{%{quotation_arg}:} ' => '',
-                       '@cite{%{book}}' => '',
-                       'About This Document' => 'No translation available!',
-                       'April' => 'april',
-                       'August' => 'august',
-                       'Button' => '',
-                       'Contents' => '',
-                       'Current Position' => '',
-                       'December' => 'desember',
-                       'February' => 'februar',
-                       'Footnotes' => 'No translation available!',
-                       'From 1.2.3 go to' => '',
-                       'Go to' => '',
-                       'Index' => 'Indeks',
-                       'Index Entry' => '',
-                       'January' => 'januar',
-                       'July' => 'juli',
-                       'Jump to' => '',
-                       'June' => 'juni',
-                       'March' => 'mars',
-                       'May' => 'mai',
-                       'Menu:' => '',
-                       'Name' => '',
-                       'Next' => '',
-                       'November' => 'november',
-                       'October' => 'oktober',
-                       'Overview' => '',
-                       'Overview:' => '',
-                       'Prev' => '',
-                       'Section' => '',
-                       'Section One' => '',
-                       'See %{node_file_href}' => '',
-                       'See %{node_file_href} @cite{%{book}}' => '',
-                       'See %{node_file_href} section `%{section}\' in @cite{%{book}}' => '',
-                       'See %{reference_name}' => '',
-                       'See @cite{%{book}}' => '',
-                       'See section %{reference_name}' => '',
-                       'See section `%{section}\' in @cite{%{book}}' => '',
-                       'September' => 'september',
-                       'Short Table of Contents' => 'Kort innholdsfortegnelse',
-                       'Subsection One-Four' => '',
-                       'Subsection One-One' => '',
-                       'Subsection One-Three' => '',
-                       'Subsection One-Two' => '',
-                       'Subsubsection One-Two-Four' => '',
-                       'Subsubsection One-Two-One' => '',
-                       'Subsubsection One-Two-Three' => '',
-                       'Subsubsection One-Two-Two' => '',
-                       'T2H_today' => '',
-                       'Table of Contents' => 'Innholdsfortegnelse',
-                       'This document was generated by @emph{%{user}} on @emph{%{date}} using @uref{%{program_homepage}, @emph{%{program}}}.' => '',
-                       'This document was generated by @emph{%{user}} using @uref{%{program_homepage}, @emph{%{program}}}.' => '',
-                       'This document was generated on @i{%{date}} using @uref{%{program_homepage}, @i{%{program}}}.' => '',
-                       'This document was generated using @uref{%{program_homepage}, @emph{%{program}}}.' => '',
-                       'Top' => '',
-                       'Untitled Document' => '',
-                       'about (help)' => '',
-                       'beginning of this chapter or previous chapter' => '',
-                       'by @emph{%{user}}' => '',
-                       'by @emph{%{user}} on @emph{%{date}}' => '',
-                       'cover (top) of document' => '',
-                       'current' => '',
-                       'current section' => '',
-                       'first section in reading order' => '',
-                       'following node' => '',
-                       'index' => '',
-                       'last section in reading order' => '',
-                       'next chapter' => '',
-                       'next node' => '',
-                       'next section in reading order' => '',
-                       'next section on same level' => '',
-                       'node following in node reading order' => '',
-                       'node up' => '',
-                       'on @emph{%{date}}' => '',
-                       'previous node' => '',
-                       'previous section in reading order' => '',
-                       'previous section on same level' => '',
-                       'section `%{section}\' in @cite{%{book}}' => '',
-                       'see %{node_file_href}' => '',
-                       'see %{node_file_href} @cite{%{book}}' => '',
-                       'see %{node_file_href} section `%{section}\' in @cite{%{book}}' => '',
-                       'see %{reference_name}' => '',
-                       'see @cite{%{book}}' => '',
-                       'see section %{reference_name}' => '',
-                       'see section `%{section}\' in @cite{%{book}}' => '',
-                       'short table of contents' => '',
-                       'table of contents' => '',
-                       'unknown' => '',
-                       'up node' => '',
-                       'up section' => ''
-                     };
-
-$T2H_OBSOLETE_STRINGS->{'no'} = {
-                                  'See' => 'Se',
-                                  'section' => 'avsnitt',
-                                  'see' => 'se'
-                                };
-
-
-$LANGUAGES->{'pt'} = {
-                       '  The buttons in the navigation panels have the following meaning:' => '',
-                       '  where the @strong{ Example } assumes that the current position is at @strong{ Subsubsection One-Two-Three } of a document of the following structure:' => '',
-                       ' Up ' => '',
-                       '%{acronym_like} (%{explanation})' => '',
-                       '%{month}, %{day} %{year}' => '',
-                       '%{name} of %{class}' => '',
-                       '%{name} on %{class}' => '',
-                       '%{node_file_href}' => '',
-                       '%{node_file_href} @cite{%{book}}' => '',
-                       '%{node_file_href} section `%{section}\' in @cite{%{book}}' => '',
-                       '%{reference_name}' => '',
-                       '%{style} %{number}' => '',
-                       '%{style}: %{caption_first_line}' => '',
-                       '%{style}: %{shortcaption_first_line}' => '',
-                       '@b{%{quotation_arg}:} ' => '',
-                       '@cite{%{book}}' => '',
-                       'About This Document' => '',
-                       'April' => 'Abril',
-                       'August' => 'Agosto',
-                       'Button' => '',
-                       'Contents' => '',
-                       'Current Position' => '',
-                       'December' => 'Dezembro',
-                       'February' => 'Fevereiro',
-                       'Footnotes' => '',
-                       'From 1.2.3 go to' => '',
-                       'Go to' => '',
-                       'Index' => '@\'Indice',
-                       'Index Entry' => '',
-                       'January' => 'Janeiro',
-                       'July' => 'Julho',
-                       'Jump to' => '',
-                       'June' => 'Junho',
-                       'March' => 'Mar@,{c}o',
-                       'May' => 'Maio',
-                       'Menu:' => '',
-                       'Name' => '',
-                       'Next' => '',
-                       'November' => 'Novembro',
-                       'October' => 'Outubro',
-                       'Overview' => '',
-                       'Overview:' => '',
-                       'Prev' => '',
-                       'Section' => '',
-                       'Section One' => '',
-                       'See %{node_file_href}' => '',
-                       'See %{node_file_href} @cite{%{book}}' => '',
-                       'See %{node_file_href} section `%{section}\' in @cite{%{book}}' => '',
-                       'See %{reference_name}' => '',
-                       'See @cite{%{book}}' => '',
-                       'See section %{reference_name}' => '',
-                       'See section `%{section}\' in @cite{%{book}}' => '',
-                       'September' => 'Setembro',
-                       'Short Table of Contents' => 'Breve Sum@\'ario',
-                       'Subsection One-Four' => '',
-                       'Subsection One-One' => '',
-                       'Subsection One-Three' => '',
-                       'Subsection One-Two' => '',
-                       'Subsubsection One-Two-Four' => '',
-                       'Subsubsection One-Two-One' => '',
-                       'Subsubsection One-Two-Three' => '',
-                       'Subsubsection One-Two-Two' => '',
-                       'T2H_today' => '',
-                       'Table of Contents' => 'Sum@\'ario',
-                       'This document was generated by @emph{%{user}} on @emph{%{date}} using @uref{%{program_homepage}, @emph{%{program}}}.' => '',
-                       'This document was generated by @emph{%{user}} using @uref{%{program_homepage}, @emph{%{program}}}.' => '',
-                       'This document was generated on @i{%{date}} using @uref{%{program_homepage}, @i{%{program}}}.' => '',
-                       'This document was generated using @uref{%{program_homepage}, @emph{%{program}}}.' => '',
-                       'Top' => '',
-                       'Untitled Document' => '',
-                       'about (help)' => '',
-                       'beginning of this chapter or previous chapter' => '',
-                       'by @emph{%{user}}' => '',
-                       'by @emph{%{user}} on @emph{%{date}}' => '',
-                       'cover (top) of document' => '',
-                       'current' => '',
-                       'current section' => '',
-                       'first section in reading order' => '',
-                       'following node' => '',
-                       'index' => '',
-                       'last section in reading order' => '',
-                       'next chapter' => '',
-                       'next node' => '',
-                       'next section in reading order' => '',
-                       'next section on same level' => '',
-                       'node following in node reading order' => '',
-                       'node up' => '',
-                       'on @emph{%{date}}' => '',
-                       'previous node' => '',
-                       'previous section in reading order' => '',
-                       'previous section on same level' => '',
-                       'section `%{section}\' in @cite{%{book}}' => '',
-                       'see %{node_file_href}' => '',
-                       'see %{node_file_href} @cite{%{book}}' => '',
-                       'see %{node_file_href} section `%{section}\' in @cite{%{book}}' => '',
-                       'see %{reference_name}' => '',
-                       'see @cite{%{book}}' => '',
-                       'see section %{reference_name}' => '',
-                       'see section `%{section}\' in @cite{%{book}}' => '',
-                       'short table of contents' => '',
-                       'table of contents' => '',
-                       'unknown' => '',
-                       'up node' => '',
-                       'up section' => ''
-                     };
-
-$T2H_OBSOLETE_STRINGS->{'pt'} = {
-                                  'See' => 'Veja',
-                                  'section' => 'Se@,{c}@~ao',
-                                  'see' => 'veja'
-                                };
-
-
-$LANGUAGES->{'en'} = {
-                       '  The buttons in the navigation panels have the following meaning:' => '',
-                       '  where the @strong{ Example } assumes that the current position is at @strong{ Subsubsection One-Two-Three } of a document of the following structure:' => '',
-                       ' Up ' => '',
-                       '%{acronym_like} (%{explanation})' => '',
-                       '%{month}, %{day} %{year}' => '',
-                       '%{name} of %{class}' => '',
-                       '%{name} on %{class}' => '',
-                       '%{node_file_href}' => '',
-                       '%{node_file_href} @cite{%{book}}' => '',
-                       '%{node_file_href} section `%{section}\' in @cite{%{book}}' => '',
-                       '%{reference_name}' => '',
-                       '%{style} %{number}' => '',
-                       '%{style}: %{caption_first_line}' => '',
-                       '%{style}: %{shortcaption_first_line}' => '',
-                       '@b{%{quotation_arg}:} ' => '',
-                       '@cite{%{book}}' => '',
-                       'About This Document' => '',
-                       'April' => '',
-                       'August' => '',
-                       'Button' => '',
-                       'Contents' => '',
-                       'Current Position' => '',
-                       'December' => '',
-                       'February' => '',
-                       'Footnotes' => '',
-                       'From 1.2.3 go to' => '',
-                       'Go to' => '',
-                       'Index' => '',
-                       'Index Entry' => '',
-                       'January' => '',
-                       'July' => '',
-                       'Jump to' => '',
-                       'June' => '',
-                       'March' => '',
-                       'May' => '',
-                       'Menu:' => '',
-                       'Name' => '',
-                       'Next' => '',
-                       'November' => '',
-                       'October' => '',
-                       'Overview' => '',
-                       'Overview:' => '',
-                       'Prev' => '',
-                       'Section' => '',
-                       'Section One' => '',
-                       'See %{node_file_href}' => '',
-                       'See %{node_file_href} @cite{%{book}}' => '',
-                       'See %{node_file_href} section `%{section}\' in @cite{%{book}}' => '',
-                       'See %{reference_name}' => '',
-                       'See @cite{%{book}}' => '',
-                       'See section %{reference_name}' => '',
-                       'See section `%{section}\' in @cite{%{book}}' => '',
-                       'September' => '',
-                       'Short Table of Contents' => '',
-                       'Subsection One-Four' => '',
-                       'Subsection One-One' => '',
-                       'Subsection One-Three' => '',
-                       'Subsection One-Two' => '',
-                       'Subsubsection One-Two-Four' => '',
-                       'Subsubsection One-Two-One' => '',
-                       'Subsubsection One-Two-Three' => '',
-                       'Subsubsection One-Two-Two' => '',
-                       'T2H_today' => '%s, %d %d',
-                       'Table of Contents' => '',
-                       'This document was generated by @emph{%{user}} on @emph{%{date}} using @uref{%{program_homepage}, @emph{%{program}}}.' => '',
-                       'This document was generated by @emph{%{user}} using @uref{%{program_homepage}, @emph{%{program}}}.' => '',
-                       'This document was generated on @i{%{date}} using @uref{%{program_homepage}, @i{%{program}}}.' => '',
-                       'This document was generated using @uref{%{program_homepage}, @emph{%{program}}}.' => '',
-                       'Top' => '',
-                       'Untitled Document' => '',
-                       'about (help)' => '',
-                       'beginning of this chapter or previous chapter' => '',
-                       'by @emph{%{user}}' => '',
-                       'by @emph{%{user}} on @emph{%{date}}' => '',
-                       'cover (top) of document' => '',
-                       'current' => '',
-                       'current section' => '',
-                       'first section in reading order' => '',
-                       'following node' => '',
-                       'index' => '',
-                       'last section in reading order' => '',
-                       'next chapter' => '',
-                       'next node' => '',
-                       'next section in reading order' => '',
-                       'next section on same level' => '',
-                       'node following in node reading order' => '',
-                       'node up' => '',
-                       'on @emph{%{date}}' => '',
-                       'previous node' => '',
-                       'previous section in reading order' => '',
-                       'previous section on same level' => '',
-                       'section `%{section}\' in @cite{%{book}}' => '',
-                       'see %{node_file_href}' => '',
-                       'see %{node_file_href} @cite{%{book}}' => '',
-                       'see %{node_file_href} section `%{section}\' in @cite{%{book}}' => '',
-                       'see %{reference_name}' => '',
-                       'see @cite{%{book}}' => '',
-                       'see section %{reference_name}' => '',
-                       'see section `%{section}\' in @cite{%{book}}' => '',
-                       'short table of contents' => '',
-                       'table of contents' => '',
-                       'unknown' => '',
-                       'up node' => '',
-                       'up section' => ''
-                     };
-
-$T2H_OBSOLETE_STRINGS->{'en'} = {};
-
-my $index_name = -1;
-my @index_to_hash = ('style_map', 'style_map_pre', 'style_map_texi');
-foreach my $hash (\%style_map, \%style_map_pre, \%style_map_texi, \%unformatted_text_style_map_texi)
-{
-    $index_name++;
-    my $name = $index_to_hash[$index_name];
-    foreach my $style (keys(%{$hash}))
-    {
-         next unless (ref($hash->{$style}) eq 'HASH');
-         $hash->{$style}->{'args'} = ['normal'] if (!exists($hash->{$style}->{'args'}));
-         die "Bug: args not defined for $style in $name" if (!defined($hash->{$style}->{'args'}));
-#print STDERR "DEFAULT($name, $hash) add normal as arg for $style ($hash->{$style}), $hash->{$style}->{'args'}\n";
-    }
-}
-
-sub t2h_utf8_accent($$)
-{
-    my $accent = shift;
-    my $args = shift;
-    my $style_stack = shift;
-  
-    my $text = $args->[0];
-
-    if ($accent eq 'dotless')
-    { # \x{0131}\x{0308} for @dotless{i} @" doesn't lead to NFC 00ef.
-        if (($text eq 'i') and (!defined($style_stack->[-2]) or (!defined($unicode_accents{$style_stack->[-2]})) or ($style_stack->[-2] eq 'tieaccent')))
-        {
-             return "\x{0131}";
-        }
-        #return "\x{}" if ($text eq 'j'); # not found !
-        return $text;
-    }
-        
-    return Unicode::Normalize::NFC($text . chr(hex($unicode_diacritical{$accent}))) 
-        if (defined($unicode_diacritical{$accent}));
-    return ascii_accents($text, $accent);
-}
-
-sub t2h_utf8_normal_text($)
-{
-    my $text = shift;
-    $text =~ s/---/\x{2014}/g;
-    $text =~ s/--/\x{2013}/g;
-    $text =~ s/``/\x{201C}/g;
-    $text =~ s/''/\x{201D}/g;
-    return $text;
-}
-
-sub t2h_cross_manual_normal_text($)
-{
-   my $text = shift;
-   $text = main::normalise_space($text);
-   my $result = '';
-   while ($text ne '')
-   {
-        if ($text =~ s/^([A-Za-z0-9]+)//o)
-        {
-             $result .= $1;
-        }
-        elsif ($text =~ s/^ //o)
-        {
-             $result .= '-';
-        }
-        elsif ($text =~ s/^(.)//o)
-        {
-             if (exists($ascii_character_map{$1}))
-             {
-                  $result .= '_' . lc($ascii_character_map{$1});
-             }
-             elsif ($USE_UNICODE)
-             {
-                  $result .= $1;
-             }
-             else
-             {
-                  $result .= '_' . '00' . lc(sprintf("%02x",ord($1)));
-             }
-        }
-        else
-        {
-             print STDERR "Bug: unknown character in node (likely in infinite loop)\n";
-             sleep 1;
-        }    
-   }
-   
-   return $result;
-}
-
-sub t2h_nounicode_cross_manual_accent($$)
-{
-    my $accent = shift;
-    my $args = shift;
-                                                                                
-    my $text = $args->[0];
-
-    return '_' . lc($unicode_accents{$accent}->{$text})
-        if (defined($unicode_accents{$accent}->{$text}));
-    return ($text . '_' . lc($unicode_diacritical{$accent})) 
-        if (defined($unicode_diacritical{$accent}));
-    return ascii_accents($text, $accent);
-}
-
-$USE_UNICODE = '1';
-if ($USE_UNICODE eq '1')
-{
-    $USE_UNICODE = 1;
-    eval {
-        require Encode;
-        require Unicode::Normalize; 
-        Encode->import('encode');
-    };
-    $USE_UNICODE = 0 if ($@);
-}
-
-}
-
-use vars qw(
-%value
-);
-
-# This is deprecated
-#our %user_sub;
-
-# variables which might be redefined by the user but aren't likely to be  
-# they seem to be in the main namespace
-use vars qw(
-$index_properties
-%predefined_index
-%valid_index
-%sec2level
-%code_style_map
-%region_lines
-);
-
-# Some global variables are set in the script, and used in the subroutines
-# they are in the Texi2HTML namespace, thus prefixed with Texi2HTML::.
-# see texi2html.init for details.
-
-#+++############################################################################
-#                                                                              #
-# Initialization                                                               #
-# Pasted content of File $(srcdir)/MySimple.pm: Command-line processing        #
-#                                                                              #
-#---############################################################################
-
-# leave this within comments, and keep the require statement
-# This way, you can directly run texi2html.pl, if $ENV{T2H_HOME}/texi2html.init
-# exists.
-
-# 
-package Getopt::MySimple;
-
-# Name:
-#	Getopt::MySimple.
-#
-# Documentation:
-#	POD-style (incomplete) documentation is in file MySimple.pod
-#
-# Tabs:
-#	4 spaces || die.
-#
-# Author:
-#	Ron Savage	rpsavage@ozemail.com.au.
-#	1.00	19-Aug-97	Initial version.
-#	1.10	13-Oct-97	Add arrays of switches (eg '=s@').
-#	1.20	 3-Dec-97	Add 'Help' on a per-switch basis.
-#	1.30	11-Dec-97	Change 'Help' to 'verbose'. Make all hash keys lowercase.
-#	1.40	10-Nov-98	Change width of help report. Restructure tests.
-#               1-Jul-00        Modifications for Texi2html
-
-# --------------------------------------------------------------------------
-# Locally modified by obachman (Display type instead of env, order by cmp)
-# $Id: MySimple.pm,v 1.4 2004/02/10 00:12:42 pertusus Exp $
-
-# use strict;
-# no strict 'refs';
-
-use vars qw(@EXPORT @EXPORT_OK @ISA);
-use vars qw($fieldWidth $opt $VERSION);
-
-use Exporter();
-use Getopt::Long;
-
-@ISA		= qw(Exporter);
-@EXPORT		= qw();
-@EXPORT_OK	= qw($opt);	# An alias for $self -> {'opt'}.
-
-# --------------------------------------------------------------------------
-
-$fieldWidth	= 20;
-$VERSION	= '1.41';
-
-# --------------------------------------------------------------------------
-
-sub byOrder
-{
-	my($self) = @_;
-	
-	return uc($a) cmp (uc($b));
-}
-
-# --------------------------------------------------------------------------
-
-sub dumpOptions
-{
-	my($self) = @_;
-
-	print 'Option', ' ' x ($fieldWidth - length('Option') ), "Value\n";
-
-	for (sort byOrder keys(%{$self -> {'opt'} }) )
-	{
-	  print "-$_", ' ' x ($fieldWidth - (1 + length) ), "${$self->{'opt'} }{$_}\n";
-	}
-
-	print "\n";
-
-}	# End of dumpOptions.
-
-# --------------------------------------------------------------------------
-# Return:
-#	0 -> Error.
-#	1 -> Ok.
-
-sub getOptions
-{
-	push(@_, 0) if ($#_ == 2);	# Default for $ignoreCase is 0.
-	push(@_, 1) if ($#_ == 3);	# Default for $helpThenExit is 1.
-
-	my($self, $default, $helpText, $versionText, 
-	   $helpThenExit, $versionThenExit, $ignoreCase) = @_;
-	
-	$helpThenExit = 1 unless (defined($helpThenExit));
-	$versionThenExit = 1 unless (defined($versionThenExit));
-	$ignoreCase = 0 unless (defined($ignoreCase));
-
-	$self -> {'default'}		= $default;
-	$self -> {'helpText'}		= $helpText;
-	$self -> {'versionText'}        = $versionText;
-	$Getopt::Long::ignorecase	= $ignoreCase;
-
-	unless (defined($self -> {'default'}{'help'}))
-	{
-	  $self -> {'default'}{'help'} = 
-	  { 
-	   type => ':i', 
-	   default => '',
-	   linkage => sub {$self->helpOptions($_[1]); sleep 5;exit (0) if $helpThenExit;},
-	   verbose => "print help and exit"
-	  };
-	}
-
-	unless (defined($self -> {'default'}{'version'}))
-	{
-	  $self -> {'default'}{'version'} = 
-	  { 
-	   type => '', 
-	   default => '',
-	   linkage => sub {print $self->{'versionText'};  exit (0) if $versionThenExit;},
-	   verbose => "print version and exit"
-	  };
-	}
-
-	for (keys(%{$self -> {'default'} }) )
-	{
-	  my $type = ${$self -> {'default'} }{$_}{'type'};
-	  push(@{$self -> {'type'} }, "$_$type");
-	  $self->{'opt'}->{$_} =  ${$self -> {'default'} }{$_}{'linkage'}
-            if ${$self -> {'default'} }{$_}{'linkage'};
-	}
-
-	my($result) = &GetOptions($self -> {'opt'}, @{$self -> {'type'} });
-
-        return $result unless $result;
-
-	for (keys(%{$self -> {'default'} }) )
-	{
- 	   if (! defined(${$self -> {'opt'} }{$_})) #{
-            {
- 	     ${$self -> {'opt'} }{$_} = ${$self -> {'default'} }{$_}{'default'};
-            }
-	}
-
-	$result;
-}	# End of getOptions.
-
-# --------------------------------------------------------------------------
-
-sub helpOptions
-{
-	my($self) = shift;
-	my($noHelp) = shift;
-	$noHelp = 0 unless $noHelp;
-	my($optwidth, $typewidth, $defaultwidth, $maxlinewidth, $valind, $valwidth) 
-	  = (10, 5, 9, 78, 4, 11);
-
-	print "$self->{'helpText'}" if ($self -> {'helpText'});
-
-	print ' Option', ' ' x ($optwidth - length('Option') -1 ),
-		'Type', ' ' x ($typewidth - length('Type') + 1),
-		'Default', ' ' x ($defaultwidth - length('Default') ),
-	        "Description\n";
-
-	for (sort byOrder keys(%{$self -> {'default'} }) )
-	{
-	  my($line, $help, $option, $val);
-	  $option = $_;
-	  next if ${$self->{'default'} }{$_}{'noHelp'} && ${$self->{'default'} }{$_}{'noHelp'} > $noHelp;
-          #$line = " -$_" . ' ' x ($optwidth - (2 + length) ) .
-          #      	"${$self->{'default'} }{$_}{'type'} ".
-          #      	' ' x ($typewidth - (1+length(${$self -> {'default'} }{$_}{'type'}) ));
-		$line = " --$_" . "${$self->{'default'} }{$_}{'type'}".
-			' ' x ($typewidth - (1+length(${$self -> {'default'} }{$_}{'type'}) ));
-
-                 $val = ${$self->{'default'} }{$_}{'linkage'};
-                if ($val)
-                {
-                  if (ref($val) eq 'SCALAR')
-		  {
-		    $val = $$val; 
-		  }
-		  else
-		  {
-		    $val = '';
-		  }
-                }
-		else
-		{
-		  $val = ${$self->{'default'} }{$_}{'default'};
-		}
-	        $line .= "$val  ";
-		$line .= ' ' x ($optwidth + $typewidth + $defaultwidth + 1 - length($line));
-		
-		if (defined(${$self -> {'default'} }{$_}{'verbose'}) &&
-		  ${$self -> {'default'} }{$_}{'verbose'} ne '')
-	      {
-		$help = "${$self->{'default'} }{$_}{'verbose'}";
-	      }
-	      else
-	      {
-		$help = ' ';
-	      }
-	      if ((length("$line") + length($help)) < $maxlinewidth)
-	      {
-		print $line , $help, "\n";
-	      }
-	      else
-	      {
-		print $line, "\n", ' ' x $valind, $help, "\n";
-	      }
-	      for $val (sort byOrder keys(%{${$self->{'default'}}{$option}{'values'}}))
-	      {
-	        print ' ' x ($valind + 2);
-                print $val, '  ', ' ' x ($valwidth - length($val) - 2);
-	        print ${$self->{'default'}}{$option}{'values'}{$val}, "\n";
-	      }
-	}
-
-	print <<EOT;
-Note: 'Options' may be abbreviated. 'Type' specifications mean:
- <none>| !    no argument: variable is set to 1 on -foo (or, to 0 on -nofoo)
-    =s | :s   mandatory (or, optional)  string argument
-    =i | :i   mandatory (or, optional)  integer argument
-EOT
-}	# End of helpOptions.
-
-#-------------------------------------------------------------------
-
-sub new
-{
-	my($class)				= @_;
-	my($self)				= {};
-	$self -> {'default'}	= {};
-	$self -> {'helpText'}	= '';
-	$self -> {'opt'}		= {};
-	$opt					= $self -> {'opt'};	 # An alias for $self -> {'opt'}.
-	$self -> {'type'}		= ();
-
-	return bless $self, $class;
-
-}	# End of new.
-
-# --------------------------------------------------------------------------
-
-1;
-
-# End MySimple.pm
-
-require "$ENV{T2H_HOME}/MySimple.pm"
-    if ($0 =~ /\.pl$/ &&
-        -e "$ENV{T2H_HOME}/MySimple.pm" && -r "$ENV{T2H_HOME}/MySimple.pm");
-
-#+++############################################################################
-#                                                                              #
-# Initialization                                                               #
-# Pasted content of File $(srcdir)/T2h_i18n.pm: Internationalisation           #
-#                                                                              #
-#---############################################################################
-
-# leave this within comments, and keep the require statement
-# This way, you can directly run texi2html.pl, if $ENV{T2H_HOME}/T2h_i18n.pm
-# exists.
-
-# 
-#+##############################################################################
-#
-# T2h_i18n.pm: Internationalization for texi2html
-#
-#    Copyright (C) 1999, 2000  Free Software Foundation, Inc.
-#
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-#-##############################################################################
-
-# This requires perl version 5 or higher
-require 5.0;
-
-package Texi2HTML::I18n;
-
-use strict;
-
-use vars qw(
-@ISA
-@EXPORT
-);
-
-use Exporter;
-@ISA = qw(Exporter);
-@EXPORT = qw(pretty_date);
-
-my $language;
-my $i18n_dir = 'i18n'; # name of the directory containing the per language files
-#my $translation_file = 'translations.pl'; # file containing all the translations
-#my @known_languages = ('de', 'nl', 'es', 'no', 'pt', 'fr'); # The supported
-                                               # languages
-
-########################################################################
-# Language dependencies:
-# To add a new language extend the WORDS hash and create $T2H_<...>_WORDS hash
-# To redefine one word, simply do:
-# $T2h_i18n::T2H_LANGUAGES->{<language>}->{<word>} = 'whatever' in your personal init file.
-#
-my $T2H_WORDS_EN =
-{
- # titles  of pages
- #'Table of Contents'       => 'Table of Contents',
- #'Short Table of Contents'  => 'Short Table of Contents',
- #'Index'     => 'Index',
- #'About This Document'     => 'About This Document',
- #'Footnotes' => 'Footnotes',
- #'See'             => 'See',
- #'see'             => 'see',
- #'section'         => 'section',
- 'About This Document'       => '',
- 'Table of Contents'         => '',
- 'Short Table of Contents',  => '',
- 'Index'                     => '',
- 'Footnotes'                 => '',
- 'See'                       => '',
- 'see'                       => '',
- 'section'                   => '',
- 'Top'                       => '',
- 'Untitled Document'         => '',
- # If necessary, we could extend this as follows:
- #  # text for buttons
- #  'Top_Button' => 'Top',
- #  'ToC_Button' => 'Contents',
- #  'Overview_Button' => 'Overview',
- #  'Index_button' => 'Index',
- #  'Back_Button' => 'Back',
- #  'FastBack_Button' => 'FastBack',
- #  'Prev_Button' => 'Prev',
- #  'Up_Button' => 'Up',
- #  'Next_Button' => 'Next',
- #  'Forward_Button' =>'Forward',
- #  'FastWorward_Button' => 'FastForward',
- #  'First_Button' => 'First',
- #  'Last_Button' => 'Last',
- #  'About_Button' => 'About'
- 'January' => '', 
- 'February' => '',
- 'March' => '', 
- 'April' => '',
- 'May' => '',
- 'June' => '',
- 'July' => '',
- 'August' => '',
- 'September' => '',
- 'October' => '',
- 'November' => '',
- 'December' => '', 
- 'T2H_today' => '%s, %d %d',
-};
-
-my $T2H_WORDS_DE =
-{
- 'Table of Contents'       => 'Inhaltsverzeichniss',
- 'Short Table of Contents'  => 'Kurzes Inhaltsverzeichniss',
- 'Index'     => 'Index',
- 'About This Document'     => '&Uuml;ber dieses Dokument',
- 'Footnotes' => 'Fu&szlig;noten',
- 'See'             => 'Siehe',
- 'see'             => 'siehe',
- 'section'         => 'Abschnitt',
- 'January' => 'Januar', 
- 'February' => 'Februar',
- 'March' => 'M&auml;rz', 
- 'April' => 'April',
- 'May' => 'Mai',
- 'June' => 'Juni',
- 'July' => 'Juli',
- 'August' => 'August',
- 'September' => 'September',
- 'October' => 'Oktober',
- 'November' => 'November',
- 'December' => 'Dezember', 
-};
-
-my $T2H_WORDS_NL =
-{
- 'Table of Contents'       => 'Inhoudsopgave',
- 'Short Table of Contents'  => 'Korte inhoudsopgave',
- 'Index'     => 'Index',      #Not sure ;-)
- 'About This Document'     => 'No translation available!', #No translation available!
- 'Footnotes' => 'No translation available!', #No translation available!
- 'See'             => 'Zie',
- 'see'             => 'zie',
- 'section'         => 'sectie',
- 'January' => 'Januari', 
- 'February' => 'Februari',
- 'March' => 'Maart', 
- 'April' => 'April',
- 'May' => 'Mei',
- 'June' => 'Juni',
- 'July' => 'Juli',
- 'August' => 'Augustus',
- 'September' => 'September',
- 'October' => 'Oktober',
- 'November' => 'November',
- 'December' => 'December', 
-};
-
-my $T2H_WORDS_ES =
-{
- 'Table of Contents'       => '&iacute;ndice General',
- 'Short Table of Contents'  => 'Resumen del Contenido',
- 'Index'     => 'Index',      #Not sure ;-)
- 'About This Document'     => 'No translation available!', #No translation available!
- 'Footnotes' => 'Fu&szlig;noten',
- 'See'             => 'V&eacute;ase',
- 'see'             => 'v&eacute;ase',
- 'section'         => 'secci&oacute;n',
- 'January' => 'enero', 
- 'February' => 'febrero',
- 'March' => 'marzo', 
- 'April' => 'abril',
- 'May' => 'mayo',
- 'June' => 'junio',
- 'July' => 'julio',
- 'August' => 'agosto',
- 'September' => 'septiembre',
- 'October' => 'octubre',
- 'November' => 'noviembre',
- 'December' => 'diciembre', 
-};
-
-my $T2H_WORDS_NO =
-{
- 'Table of Contents'       => 'Innholdsfortegnelse',
- 'Short Table of Contents'  => 'Kort innholdsfortegnelse',
- 'Index'     => 'Indeks',     #Not sure ;-)
- 'About This Document'     => 'No translation available!', #No translation available!
- 'Footnotes' => 'No translation available!',
- 'See'             => 'Se',
- 'see'             => 'se',
- 'section'         => 'avsnitt',
- 'January' => 'januar', 
- 'February' => 'februar',
- 'March' => 'mars', 
- 'April' => 'april',
- 'May' => 'mai',
- 'June' => 'juni',
- 'July' => 'juli',
- 'August' => 'august',
- 'September' => 'september',
- 'October' => 'oktober',
- 'November' => 'november',
- 'December' => 'desember', 
-};
-
-my $T2H_WORDS_PT =
-{
- 'Table of Contents'       => 'Sum&aacute;rio',
- 'Short Table of Contents'  => 'Breve Sum&aacute;rio',
- 'Index'     => '&Iacute;ndice', #Not sure ;-)
- 'About This Document'     => 'No translation available!', #No translation available!
- 'Footnotes' => 'No translation available!',
- 'See'             => 'Veja',
- 'see'             => 'veja',
- 'section'         => 'Se&ccedil;&atilde;o',
- 'January' => 'Janeiro', 
- 'February' => 'Fevereiro',
- 'March' => 'Mar&ccedil;o', 
- 'April' => 'Abril',
- 'May' => 'Maio',
- 'June' => 'Junho',
- 'July' => 'Julho',
- 'August' => 'Agosto',
- 'September' => 'Setembro',
- 'October' => 'Outubro',
- 'November' => 'Novembro',
- 'December' => 'Dezembro', 
-};
-
-my $T2H_WORDS_FR =
-{
- 'Table of Contents'       => 'Table des mati&egrave;res',
- 'Short Table of Contents'  => 'R&eacute;sum&eacute;e du contenu',
- 'Index'     => 'Index',
- 'About This Document'     => 'A propos de ce document',
- 'Footnotes' => 'Notes de bas de page',
- 'See'             => 'Voir',
- 'see'             => 'voir',
- 'section'         => 'section',
- 'January' => 'Janvier', 
- 'February' => 'F&eacute;vrier',
- 'March' => 'Mars', 
- 'April' => 'Avril',
- 'May' => 'Mai',
- 'June' => 'Juin',
- 'July' => 'Juillet',
- 'August' => 'Ao&ucirc;t',
- 'September' => 'Septembre',
- 'October' => 'Octobre',
- 'November' => 'Novembre',
- 'December' => 'D&eacute;cembre', 
- 'T2H_today' => 'le %2$d %1$s %3$d'
-};
-
-#$T2H_LANGUAGES =
-#{
-# 'en' => $T2H_WORDS_EN,
-# 'de' => $T2H_WORDS_DE,
-# 'nl' => $T2H_WORDS_NL,
-# 'es' => $T2H_WORDS_ES,
-# 'no' => $T2H_WORDS_NO,
-# 'pt' => $T2H_WORDS_PT,
-# 'fr' => $T2H_WORDS_FR,
-#};
-
-sub set_language($)
-{
-    my $lang = shift;
-    if (defined($lang) && exists($Texi2HTML::Config::LANGUAGES->{$lang}) && defined($Texi2HTML::Config::LANGUAGES->{$lang}))
-    {
-         $language = $lang;
-         return 1;
-    }
-    else
-    {
-         return 0;
-    }
-}
-
-
-my @MONTH_NAMES =
-    (
-     'January', 'February', 'March', 'April', 'May',
-     'June', 'July', 'August', 'September', 'October',
-     'November', 'December'
-    );
-
-my $I = \&get_string;
-
-sub pretty_date($) 
-{
-    my $lang = shift;
-    my($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst);
-
-    ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = localtime(time);
-    $year += ($year < 70) ? 2000 : 1900;
-    # obachman: Let's do it as the Americans do
-    #return($MONTH_NAMES->{$lang}[$mon] . ", " . $mday . " " . $year);
-	#return(sprintf(&$I('T2H_today'), (get_string($MONTH_NAMES[$mon]), $mday, $year)));
-	return &$I('%{month}, %{day} %{year}', { 'month' => get_string($MONTH_NAMES[$mon]),
-          'day' => $mday, 'year' => $year });
-}
-
-my $error_no_en = 0;
-sub get_string($;$$)
-{
-    my $string = shift;
-    my $arguments = shift;
-    my $state = shift;
-    my $T2H_LANGUAGES = $Texi2HTML::Config::LANGUAGES;
-    if (! exists($T2H_LANGUAGES->{'en'}))
-    {
-        unless($error_no_en)
-        {
-            print STDERR "i18n: no LANGUAGES->{'en'} hash\n";
-            $error_no_en = 1;
-        }
-    }
-    else
-    {
-        print STDERR "i18n: missing string $string\n" unless (exists ($T2H_LANGUAGES->{'en'}->{$string}));
-        if (defined ($T2H_LANGUAGES->{$language}->{$string}) and
-           ($T2H_LANGUAGES->{$language}->{$string} ne ''))
-        {
-            $string = $T2H_LANGUAGES->{$language}->{$string};
-        }
-        elsif (defined ($T2H_LANGUAGES->{'en'}->{$string}) and
-            ($T2H_LANGUAGES->{'en'}->{$string} ne ''))
-        {
-            $string = $T2H_LANGUAGES->{'en'}->{$string};
-        }
-    }
-    return main::substitute_line($string, $state) unless (defined($arguments) or !keys(%$arguments));
-    my $result = '';
-    while ($string)
-    {
-        if ($string =~ s/^([^%]*)%//)
-        {
-            $result .= $1 if (defined($1));
-            $result .= '%';
-            if ($string =~ s/^%//)
-            {
-                 $result .= '%';
-            }
-            elsif ($string =~ /^\{(\w+)\}/ and exists($arguments->{$1}))
-            {
-                 $string =~ s/^\{(\w+)\}//;
-                 if (!$state->{'keep_texi'})
-                 {
-                      $result .= "\@\{$1\@\}";
-                 }
-                 else
-                 {
-                      $result .= "\{$1\}";
-                 }
-            }
-            else
-            {
-                 $result .= '%';
-            }
-            next;
-        }
-        else 
-        {   
-            $result .= $string;
-            last;
-        }
-    }
-    if (!$state->{'keep_texi'})
-    {
-         $string = main::substitute_line($result, $state);
-    }
-    else
-    {
-         $string = $result;
-    }
-    $result = '';
-    while ($string)
-    {
-        if ($string =~ s/^([^%]*)%//)
-        {
-            $result .= $1 if (defined($1));
-            if ($string =~ s/^%//)
-            {
-                 $result .= '%';
-            }
-            elsif ($string =~ /^\{(\w+)\}/ and exists($arguments->{$1}))
-            {
-                 $string =~ s/^\{(\w+)\}//;
-                 $result .= $arguments->{$1};
-            }
-            else
-            {
-                 $result .= '%';
-            }
-            next;
-        }
-        else 
-        {   
-            $result .= $string;
-            last;
-        }
-    }
-    return $result;
-}
-
-1;
-require "$ENV{T2H_HOME}/T2h_i18n.pm"
-    if ($0 =~ /\.pl$/ &&
-        -e "$ENV{T2H_HOME}/T2h_i18n.pm" && -r "$ENV{T2H_HOME}/T2h_i18n.pm");
-
-
-{
-package Texi2HTML::LaTeX2HTML::Config;
-
-# latex2html variables
-# These variables are not used. They are here for information only, and
-# an example of config file for latex2html file is included.
-my $ADDRESS;
-my $ANTI_ALIAS;
-my $ANTI_ALIAS_TEXT;
-my $ASCII_MODE;
-my $AUTO_LINK;
-my $AUTO_PREFIX;
-my $CHILDLINE;
-my $DEBUG;
-my $DESTDIR;
-my $ERROR;
-my $EXTERNAL_FILE;
-my $EXTERNAL_IMAGES;
-my $EXTERNAL_UP_LINK;
-my $EXTERNAL_UP_TITLE;
-my $FIGURE_SCALE_FACTOR;
-my $HTML_VERSION;
-my $IMAGES_ONLY;
-my $INFO;
-my $LINE_WIDTH;
-my $LOCAL_ICONS;
-my $LONG_TITLES;
-my $MATH_SCALE_FACTOR;
-my $MAX_LINK_DEPTH;
-my $MAX_SPLIT_DEPTH;
-my $NETSCAPE_HTML;
-my $NOLATEX;
-my $NO_FOOTNODE;
-my $NO_IMAGES;
-my $NO_NAVIGATION;
-my $NO_SIMPLE_MATH;
-my $NO_SUBDIR;
-my $PAPERSIZE;
-my $PREFIX;
-my $PS_IMAGES;
-my $REUSE;
-my $SCALABLE_FONTS;
-my $SHORTEXTN;
-my $SHORT_INDEX;
-my $SHOW_SECTION_NUMBERS;
-my $SPLIT;
-my $TEXDEFS;
-my $TITLE;
-my $TITLES_LANGUAGE;
-my $TMP;
-my $VERBOSE;
-my $WORDS_IN_NAVIGATION_PANEL_TITLES;
-my $WORDS_IN_PAGE;
-
-# @T2H_L2H_INIT@
-}
-
-package main;
-
-#
-# pre-defined indices
-#
-$index_properties =
-{
- 'c' => { name => 'cp'},
- 'f' => { name => 'fn', code => 1},
- 'v' => { name => 'vr', code => 1},
- 'k' => { name => 'ky', code => 1},
- 'p' => { name => 'pg', code => 1},
- 't' => { name => 'tp', code => 1}
-};
-
-
-%predefined_index = (
-                     'cp', 'c',
-                     'fn', 'f',
-                     'vr', 'v',
-                     'ky', 'k',
-                     'pg', 'p',
-                     'tp', 't',
-	            );
-
-#
-# valid indices
-#
-%valid_index = (
-                'c', 1,
-                'f', 1,
-                'v', 1,
-                'k', 1,
-                'p', 1,
-                't', 1,
-               );
-
-#
-# commands with ---, -- '' and `` preserved
-# usefull with the old interface
-
-%code_style_map = (
-           'code'    => 1,
-           'command' => 1,
-           'env'     => 1,
-           'file'    => 1,
-           'kbd'     => 1,
-           'option'  => 1,
-           'samp'    => 1,
-           'verb'    => 1,
-);
-
-my $simple_map_ref = \%Texi2HTML::Config::simple_map;
-my $simple_map_pre_ref = \%Texi2HTML::Config::simple_map_pre;
-my $simple_map_texi_ref = \%Texi2HTML::Config::simple_map_texi;
-my $style_map_ref = \%Texi2HTML::Config::style_map;
-my $style_map_pre_ref = \%Texi2HTML::Config::style_map_pre;
-my $style_map_texi_ref = \%Texi2HTML::Config::style_map_texi;
-my $things_map_ref = \%Texi2HTML::Config::things_map;
-my $pre_map_ref = \%Texi2HTML::Config::pre_map;
-my $texi_map_ref = \%Texi2HTML::Config::texi_map;
-
-# delete from hash if we are using te new interface
-foreach my $code (keys(%code_style_map))
-{
-    delete ($code_style_map{$code}) 
-       if (ref($style_map_ref->{$code}) eq 'HASH');
-}
-
-# no paragraph in these commands
-my %no_paragraph_macro = (
-           'xref'         => 1,
-           'ref'          => 1,
-           'pxref'        => 1,
-           'inforef'      => 1,
-           'anchor'       => 1,
-);
-
-
-#foreach my $command (keys(%Texi2HTML::Config::style_map))
-#{
-#    next unless (ref($style_map_ref->{$command}) eq 'HASH');
-#    print STDERR "CMD: $command\n";
-#    die "Bug: no args for $command in style_map\n" unless defined($style_map_ref->{$command}->{'args'});
-#    die "Bug: no args for $command in style_map_pre\n" unless defined($style_map_pre_ref->{$command}->{'args'});
-#    die "Bug: non existence of args for $command in style_map_texi\n" unless (exists($style_map_texi_ref->{$command}->{'args'}));
-#    die "Bug: no args for $command in style_map_texi\n" unless defined($style_map_texi_ref->{$command}->{'args'});
-#}
-
-#
-# texinfo section names to level
-#
-%sec2level = (
-	      'top', 0,
-	      'chapter', 1,
-	      'unnumbered', 1,
-	      'chapheading', 1,
-	      'appendix', 1,
-	      'section', 2,
-	      'unnumberedsec', 2,
-	      'heading', 2,
-	      'appendixsec', 2,
-	      'subsection', 3,
-	      'unnumberedsubsec', 3,
-	      'subheading', 3,
-	      'appendixsubsec', 3,
-	      'subsubsection', 4,
-	      'unnumberedsubsubsec', 4,
-	      'subsubheading', 4,
-	      'appendixsubsubsec', 4,
-         );
-
-# the reverse mapping. There is an entry for each sectionning command.
-# The value is a ref on an array containing at each index the corresponding
-# sectionning command name.
-my %level2sec;
-{
-    my $sections = [ ];
-    my $appendices = [ ];
-    my $unnumbered = [ ];
-    my $headings = [ ];
-    foreach my $command (keys (%sec2level))
-    {
-        if ($command =~ /^appendix/)
-        {
-            $level2sec{$command} = $appendices;
-        }
-        elsif ($command =~ /^unnumbered/ or $command eq 'top')
-        {
-            $level2sec{$command} = $unnumbered;
-        }
-        elsif ($command =~ /section$/ or $command eq 'chapter')
-        {
-            $level2sec{$command} = $sections;
-        }
-        else
-        {
-            $level2sec{$command} = $headings;
-        }
-        $level2sec{$command}->[$sec2level{$command}] = $command;
-    }
-}
-
-# this are synonyms
-$sec2level{'appendixsection'} = 2;
-# sec2level{'majorheading'} is also 1 and not 0
-$sec2level{'majorheading'} = 1;
-$sec2level{'chapheading'} = 1;
-# FIXME this one could be centered...
-$sec2level{'centerchap'} = 1;
-
-# regions treated especially. The text for these regions is collected in the
-# corresponding array 
-%region_lines = (
-          'titlepage'            => [ ],
-          'documentdescription'  => [ ],
-          'copying'              => [ ],
-);
-
-# those macros aren't considered as beginning a paragraph
-my %no_line_macros = (
-    'macro' => 1,
-    'unmacro' => 1,
-    'rmacro' => 1,
-    'set' => 1,
-    'clear' => 1,
-    'titlefont' => 1,
-    'include' => 1,
-    'copying' => 1,
-    'end copying' => 1,
-    'tab' => 1,
-    'item' => 1,
-    'itemx' => 1,
-    '*' => 1,
-    'float' => 1,
-    'end float' => 1,
-    'caption' => 1,
-    'shortcaption' => 1,
-);
-
-foreach my $key (keys(%Texi2HTML::Config::misc_command))
-{
-    $no_line_macros{$key} = 1;
-}
-
-# a hash associating a format @thing / @end thing with the type of the format
-# 'complex' 'simple' 'deff' 'list' 'menu' 'paragraph_style'
-my %format_type = (); 
-
-foreach my $simple_format (keys(%Texi2HTML::Config::format_map))
-{
-   $format_type{$simple_format} = 'simple';
-   $no_line_macros{$simple_format} = 1;
-   $no_line_macros{"end $simple_format"} = 1;
-}
-foreach my $paragraph_style (keys(%Texi2HTML::Config::paragraph_style))
-{
-   $format_type{$paragraph_style} = 'paragraph_style';
-   $no_line_macros{$paragraph_style} = 1;
-   $no_line_macros{"end $paragraph_style"} = 1;
-}
-foreach my $complex_format (keys(%$Texi2HTML::Config::complex_format_map))
-{
-   $format_type{$complex_format} = 'complex';
-   $no_line_macros{$complex_format} = 1;
-   $no_line_macros{"end $complex_format"} = 1;
-}
-foreach my $table (('table', 'ftable', 'vtable', 'multitable'))
-{
-   $format_type{$table} = 'table';
-   $no_line_macros{$table} = 1;
-   $no_line_macros{"end $table"} = 1;
-}
-foreach my $def_format (keys(%Texi2HTML::Config::def_map))
-{
-   $format_type{$def_format} = 'deff';
-   $no_line_macros{$def_format} = 1;
-   $no_line_macros{"end $def_format"} = 1;
-}
-$format_type{'itemize'} = 'list';
-$format_type{'enumerate'} = 'list';
-
-$format_type{'menu'} = 'menu';
-
-$format_type{'cartouche'} = 'cartouche';
-
-$format_type{'float'} = 'float';
-
-$format_type{'quotation'} = 'quotation';
-
-$format_type{'group'} = 'group';
-
-foreach my $macro (('itemize', 'enumerate', 'menu', 'cartouche', 'float', 'quotation'))
-{ 
-   $no_line_macros{$macro} = 1;
-   $no_line_macros{"end $macro"} = 1;
-}
-
-foreach my $macro (keys(%Texi2HTML::Config::format_in_paragraph))
-{
-   $no_line_macros{$macro} = 1;
-   $no_line_macros{"end $macro"} = 1;
-}
-
-# fake format at the bottom of the stack
-$format_type{'noformat'} = '';
-
-# fake formats are formats used internally within other formats
-# we associate them with a real format, for the error messages
-my %fake_format = (
-     'line' => 'table',
-     'term' => 'table',
-     'item' => 'list or table',
-     'row' => 'multitable row',
-     'cell' => 'multitable cell',
-     'deff_item' => 'definition command',
-     'menu_comment' => 'menu',
-     'menu_description' => 'menu',
-     'menu_preformatted' => 'menu',
-  );
-
-foreach my $key (keys(%fake_format))
-{
-    $format_type{$key} = 'fake';
-}
-
-# A hash associating style @-comand with the type, 'accent', real 'style',
-# 'simple' style, or 'special'.
-my %style_type = (); 
-foreach my $style (keys(%Texi2HTML::Config::style_map))
-{
-    $style_type{$style} = 'style';
-}
-foreach my $accent (keys(%Texi2HTML::Config::unicode_accents), 'tieaccent', 'dotless')
-{
-    $style_type{$accent} = 'accent';
-}
-foreach my $simple ('ctrl', 'w', 'url')
-{
-    $style_type{$simple} = 'simple';
-}
-foreach my $special ('footnote', 'ref', 'xref', 'pxref', 'inforef', 'anchor', 'image')
-{
-    $style_type{$special} = 'special';
-}
-
-# raw formats which are expanded especially
-my @raw_regions = ('html', 'verbatim', 'tex', 'xml', 'docbook');
-
-# special raw formats which are expanded between first and second pass
-# and are replaced by specific commands. Currently used for tex. It takes
-# precedence over raw_regions.
-my @special_regions = ();
-
-# regions expanded or not depending on the value of this hash
-my %text_macros = (
-     'iftex' => 0, 
-     'ignore' => 0, 
-     'menu' => 0, 
-     'ifplaintext' => 0, 
-     'ifinfo' => 0,
-     'ifxml' => 0,
-     'ifhtml' => 0, 
-     'ifdocbook' => 0, 
-     'html' => 0, 
-     'tex' => 0, 
-     'xml' => 0,
-     'titlepage' => 1, 
-     'documentdescription' => 1, 
-     'copying' => 1, 
-     'ifnothtml' => 1, 
-     'ifnottex' => 1, 
-     'ifnotplaintext' => 1, 
-     'ifnotinfo' => 1,
-     'ifnotxml' => 1,
-     'ifnotdocbook' => 1, 
-     'direntry' => 0,
-     'verbatim' => 'raw', 
-     'ifclear' => 'value', 
-     'ifset' => 'value' 
-     );
-    
-
-
-foreach my $key (keys(%text_macros))
-{
-    unless ($text_macros{$key} eq 'raw')
-    {
-        $no_line_macros{$key} = 1;
-        $no_line_macros{"end $key"} = 1;
-    }
-}
-
-# The css formats are associated with complex format commands, and associated
-# with the 'pre_style' key
-foreach my $complex_format (keys(%$Texi2HTML::Config::complex_format_map))
-{
-    next if (defined($Texi2HTML::Config::complex_format_map->{$complex_format}->{'pre_style'}));
-    $Texi2HTML::Config::complex_format_map->{$complex_format}->{'pre_style'} = '';
-    $Texi2HTML::Config::complex_format_map->{$complex_format}->{'pre_style'} = $Texi2HTML::Config::css_map{"pre.$complex_format"} if (exists($Texi2HTML::Config::css_map{"pre.$complex_format"}));
-}
-
-#+++############################################################################
-#                                                                              #
-# Argument parsing, initialisation                                             #
-#                                                                              #
-#---############################################################################
-
-#
-# flush stdout and stderr after every write
-#
-select(STDERR);
-$| = 1;
-select(STDOUT);
-$| = 1;
-
-#FIXME my or our ?
-my $I = \&Texi2HTML::I18n::get_string;
-
-my $T2H_USER; # user running the script
-my $documentdescription; # text in @documentdescription 
-
-# shorthand for Texi2HTML::Config::VERBOSE
-my $T2H_VERBOSE;
-
-sub echo_warn($;$);
-#print STDERR "" . &$I('test i18n: \' , \a \\ %% %{unknown}a %known % %{known}  \\', { 'known' => 'a known string', 'no' => 'nope'}); exit 0;
-
-# file:        file name to locate. It can be a file path.
-# all_files:   if true collect all the files with that name, otherwise stop
-#              at first match.
-# directories: a reference on a array containing a list of directories to
-#              search the file in. default is \@texi2html_config_dirs.
-sub locate_init_file($;$$)
-{
-    my $file = shift;
-    my $all_files = shift;
-    my $directories = shift;
-
-    $directories = \@texi2html_config_dirs if !defined($directories);
-
-    if ($file =~ /^\//)
-    {
-         return $file if (-e $file and -r $file);
-    }
-    else
-    {
-         my @files;
-         foreach my $dir (@$directories)
-         {
-              next unless (-d "$dir");
-              if ($all_files)
-              {
-                  push (@files, "$dir/$file") if (-e "$dir/$file" and -r "$dir/$file");
-              }
-              else
-              {
-                  return "$dir/$file" if (-e "$dir/$file" and -r "$dir/$file");
-              }
-         }
-         return @files if ($all_files);
-    }
-    return undef;
-}
-
-# called on -init-file
-sub load_init_file
-{
-    # First argument is option
-    shift;
-    # second argument is value of options
-    my $init_file = shift;
-    my $file;
-    if ($file = locate_init_file($init_file))
-    {
-        print STDERR "# reading initialization file from $file\n"
-            if ($T2H_VERBOSE);
-        return (Texi2HTML::Config::load($file));
-    }
-    else
-    {
-        print STDERR "$ERROR Error: can't read init file $init_file\n";
-        return 0;
-    }
-}
-
-my $cmd_line_lang = 0; # 1 if lang was succesfully set by the command line 
-                       # in that case @documentlanguage is ignored.
-my $lang_set = 0; # 1 if lang was set
-
-#
-# called on -lang
-sub set_document_language ($;$$)
-{
-    my $lang = shift;
-    my $from_command_line = shift;
-    my $line_nr = shift;
-    my @files = locate_init_file("$i18n_dir/$lang", 1);
-    foreach  my $file (@files)
-    {
-        Texi2HTML::Config::load($file);
-    }
-    if (Texi2HTML::I18n::set_language($lang))
-    {
-        print STDERR "# using '$lang' as document language\n" if ($T2H_VERBOSE);
-        $Texi2HTML::Config::LANG = $lang;
-        $lang_set = 1;
-        $cmd_line_lang = 1 if ($from_command_line);
-        if (!$Texi2HTML::Config::TEST)
-        {
-            $Texi2HTML::THISDOC{'today'} = Texi2HTML::I18n::pretty_date($Texi2HTML::Config::LANG);  # like "20 September 1993";
-        }
-        else
-        {
-            $Texi2HTML::THISDOC{'today'} = 'a sunny day';
-        }
-        $things_map_ref->{'today'} = $Texi2HTML::THISDOC{'today'};
-        $pre_map_ref->{'today'} = $Texi2HTML::THISDOC{'today'};
-        $texi_map_ref->{'today'} = $Texi2HTML::THISDOC{'today'};
-    }
-    else
-    {
-        echo_error ("Language specs for '$lang' do not exists. Reverting to '$Texi2HTML::Config::LANG'", $line_nr);
-    }
-}
-
-sub set_expansion($$)
-{
-    my $region = shift;
-    my $set = shift;
-    $set = 1 if (!defined($set));
-    if ($set)
-    {
-         push (@Texi2HTML::Config::EXPAND, $region) unless (grep {$_ eq $region} @Texi2HTML::Config::EXPAND);
-    }
-    else
-    {
-         @Texi2HTML::Config::EXPAND = grep {$_ ne $region} @Texi2HTML::Config::EXPAND;
-    }
-}
-	 
-sub set_encoding($)
-{
-    my $encoding = shift;
-    if ($Texi2HTML::Config::USE_UNICODE)
-    {
-         if (! Encode::resolve_alias($encoding))
-         {
-              echo_warn("Encoding $Texi2HTML::Config::DOCUMENT_ENCODING unknown");
-              return undef;
-         }
-         print STDERR "# Using encoding " . Encode::resolve_alias($encoding) . "\n"
-             if ($T2H_VERBOSE);
-         return Encode::resolve_alias($encoding); 
-    }
-    else
-    {
-         echo_warn("Nothing specific done for encodings (due to the perl version)");
-         return undef;
-    }
-}
-
-my %cross_ref_texi_map = %Texi2HTML::Config::texi_map;
-my %cross_ref_simple_map_texi = %Texi2HTML::Config::simple_map_texi;
-my %cross_ref_style_map_texi = ();
-
-foreach my $command (keys(%Texi2HTML::Config::style_map_texi))
-{
-    $cross_ref_style_map_texi{$command} = {}; 
-    foreach my $key (keys (%{$Texi2HTML::Config::style_map_texi{$command}}))
-    {
-#print STDERR "$command, $key, $style_map_texi{$command}->{$key}\n";
-         $cross_ref_style_map_texi{$command}->{$key} = 
-              $Texi2HTML::Config::style_map_texi{$command}->{$key};
-    }
-}
-
-$cross_ref_simple_map_texi{"\n"} = ' ';
-
-
-# This function is used to construct a link name from a node name as 
-# described in the proposal I posted on texinfo-pretest.
-sub cross_manual_links($$)
-{
-    my $nodes_hash = shift;
-    my $cross_reference_hash = shift;
-
-    $simple_map_texi_ref = \%cross_ref_simple_map_texi;
-    $style_map_texi_ref = \%cross_ref_style_map_texi;
-    $texi_map_ref = \%cross_ref_texi_map;
-    my $normal_text_kept = $Texi2HTML::Config::normal_text;
-    $Texi2HTML::Config::normal_text = \&Texi2HTML::Config::t2h_cross_manual_normal_text;
-
-    foreach my $key (keys(%$nodes_hash))
-    {
-        my $node = $nodes_hash->{$key};
-        next if ($node->{'index_page'});
-        if (!defined($node->{'texi'}))
-        {
-            # begin debug section 
-            foreach my $key (keys(%$node))
-            {
-                #print STDERR "$key:$node->{$key}!!!\n";
-            }
-            # end debug section 
-        }
-        else 
-        {
-            if ($Texi2HTML::Config::USE_UNICODE)
-            {
-                 my $text = $node->{'texi'};
-#print STDERR "CROSS_MANUAL $node->{'texi'}\n";
-                 if (defined($Texi2HTML::Config::DOCUMENT_ENCODING) and 
-                      Encode::resolve_alias($Texi2HTML::Config::DOCUMENT_ENCODING) and
-                      (Encode::resolve_alias($Texi2HTML::Config::DOCUMENT_ENCODING) ne 'utf8'))
-                 {
-                      $text = Encode::decode($Texi2HTML::Config::DOCUMENT_ENCODING, $text);
-                 }
-                 $node->{'cross_manual_target'} = unicode_to_protected(Unicode::Normalize::NFC(remove_texi($text)));
-            }
-            else
-            {
-                 $node->{'cross_manual_target'} = remove_texi($node->{'texi'});
-            }
-#print STDERR "CROSS_MANUAL_TARGET $node->{'cross_manual_target'}\n";
-            unless ($node->{'external_node'})
-            {
-                if (defined($cross_reference_hash->{$node->{'cross_manual_target'}}))
-                {
-                    echo_error("Node equivalent with `$node->{'texi'}' allready used `$cross_reference_hash->{$node->{'cross_manual_target'}}'");
-                }
-                else 
-                {
-                    $cross_reference_hash->{$node->{'cross_manual_target'}} = $node->{'texi'};
-                }
-            }
-            #print STDERR "$node->{'texi'}: $node->{'cross_manual_target'}\n";
-        }
-    }
-
-    $Texi2HTML::Config::normal_text = $normal_text_kept;
-    $simple_map_texi_ref = \%Texi2HTML::Config::simple_map_texi;
-    $style_map_texi_ref = \%Texi2HTML::Config::style_map_texi;
-    $texi_map_ref = \%Texi2HTML::Config::texi_map;
-}
-
-sub unicode_to_protected($)
-{
-    my $text = shift;
-    my $result = '';
-    while ($text ne '')
-    {
-        if ($text =~ s/^([A-Za-z0-9_\-]+)//o)
-        {
-             $result .= $1;
-        }
-        elsif ($text =~ s/^(.)//o)
-        {
-             $result .= '_' . lc(sprintf("%04x",ord($1)));
-        }
-        else
-        {
-             print STDERR "Bug: unknown character in node (likely in infinite loop)\n";
-             sleep 1;
-        }    
-    }
-   
-    return $result;
-}
-
-sub cross_manual_line($)
-{
-    my $text = shift;
-#print STDERR "cross_manual_line $text\n";
-    $simple_map_texi_ref = \%cross_ref_simple_map_texi;
-    $style_map_texi_ref = \%cross_ref_style_map_texi;
-    $texi_map_ref = \%cross_ref_texi_map;
-    my $normal_text_kept = $Texi2HTML::Config::normal_text;
-    $Texi2HTML::Config::normal_text = \&Texi2HTML::Config::t2h_cross_manual_normal_text;
-    
-    my $cross_ref;
-    if ($Texi2HTML::Config::USE_UNICODE)
-    {
-         $cross_ref = unicode_to_protected(Unicode::Normalize::NFC(remove_texi($text)));
-    }
-    else
-    {
-         $cross_ref = remove_texi($text);
-    }
-
-    $Texi2HTML::Config::normal_text = $normal_text_kept;
-    $simple_map_texi_ref = \%Texi2HTML::Config::simple_map_texi;
-    $style_map_texi_ref = \%Texi2HTML::Config::style_map_texi;
-    $texi_map_ref = \%Texi2HTML::Config::texi_map;
-#print STDERR "cross_ref $cross_ref\n";
-    return $cross_ref;
-}
-
-# T2H_OPTIONS is a hash whose keys are the (long) names of valid
-# command-line options and whose values are a hash with the following keys:
-# type    ==> one of !|=i|:i|=s|:s (see GetOpt::Long for more info)
-# linkage ==> ref to scalar, array, or subroutine (see GetOpt::Long for more info)
-# verbose ==> short description of option (displayed by -h)
-# noHelp  ==> if 1 -> for "not so important options": only print description on -h 1
-#                2 -> for obsolete options: only print description on -h 2
-my $T2H_OPTIONS;
-$T2H_OPTIONS -> {'debug'} =
-{
- type => '=i',
- linkage => \$Texi2HTML::Config::DEBUG,
- verbose => 'output HTML with debuging information',
-};
-
-$T2H_OPTIONS -> {'doctype'} =
-{
- type => '=s',
- linkage => \$Texi2HTML::Config::DOCTYPE,
- verbose => 'document type which is output in header of HTML files',
- noHelp => 1
-};
-
-$T2H_OPTIONS -> {'frameset-doctype'} =
-{
- type => '=s',
- linkage => \$Texi2HTML::Config::FRAMESET_DOCTYPE,
- verbose => 'document type for HTML frameset documents',
- noHelp => 1
-};
-
-$T2H_OPTIONS -> {'test'} =
-{
- type => '!',
- linkage => \$Texi2HTML::Config::TEST,
- verbose => 'use predefined information to avoid differences with reference files',
- noHelp => 1
-};
-
-$T2H_OPTIONS -> {'dump-texi'} =
-{
- type => '!',
- linkage => \$Texi2HTML::Config::DUMP_TEXI,
- verbose => 'dump the output of first pass into a file with extension passfirst and exit',
- noHelp => 1
-};
-
-$T2H_OPTIONS -> {'macro-expand'} =
-{
- type => '=s',
- linkage => \$Texi2HTML::Config::MACRO_EXPAND,
- verbose => 'output macro expanded source in <file>',
-};
-
-$T2H_OPTIONS -> {'expand'} =
-{
- type => '=s',
- linkage => sub {set_expansion($_[1], 1);},
- verbose => 'Expand info|tex|none section of texinfo source',
- noHelp => 1,
-};
-
-$T2H_OPTIONS -> {'no-expand'} =
-{
- type => '=s',
- linkage => sub {set_expansion ($_[1], 0);},
- verbose => 'Don\'t expand the given section of texinfo source',
-};
-
-$T2H_OPTIONS -> {'noexpand'} = 
-{
- type => '=s',
- linkage => $T2H_OPTIONS->{'no-expand'}->{'linkage'},
- verbose => $T2H_OPTIONS->{'no-expand'}->{'verbose'},
- noHelp  => 1,
-};
-
-$T2H_OPTIONS -> {'ifhtml'} =
-{
- type => '!',
- linkage => sub { set_expansion('html', $_[1]); },
- verbose => "expand ifhtml and html sections",
-};
-
-$T2H_OPTIONS -> {'ifinfo'} =
-{
- type => '!',
- linkage => sub { set_expansion('info', $_[1]); },
- verbose => "expand ifinfo",
-};
-
-$T2H_OPTIONS -> {'ifxml'} =
-{
- type => '!',
- linkage => sub { set_expansion('xml', $_[1]); },
- verbose => "expand ifxml and xml sections",
-};
-
-$T2H_OPTIONS -> {'ifdocbook'} =
-{
- type => '!',
- linkage => sub { set_expansion('docbook', $_[1]); },
- verbose => "expand ifdocbook and docbook sections",
-};
-
-$T2H_OPTIONS -> {'iftex'} =
-{
- type => '!',
- linkage => sub { set_expansion('tex', $_[1]); },
- verbose => "expand iftex and tex sections",
-};
-
-$T2H_OPTIONS -> {'ifplaintext'} =
-{
- type => '!',
- linkage => sub { set_expansion('plaintext', $_[1]); },
- verbose => "expand ifplaintext sections",
-};
-
-#$T2H_OPTIONS -> {'no-ifhtml'} =
-#{
-# type => '!',
-# linkage => sub { set_expansion('html', (! $_[1])); },
-# verbose => "don't expand ifhtml and html sections",
-# noHelp => 1,
-#};
-
-#$T2H_OPTIONS -> {'no-ifinfo'} =
-#{
-# type => '!',
-# linkage => sub { set_expansion('info', (! $_[1])); },
-# verbose => "don't expand ifinfo",
-# noHelp => 1,
-#};
-
-#$T2H_OPTIONS -> {'no-ifxml'} =
-#{
-# type => '!',
-# linkage => sub { set_expansion('xml', (! $_[1])); },
-# verbose => "don't expand ifxml and xml sections",
-# noHelp => 1,
-#};
-
-#$T2H_OPTIONS -> {'no-iftex'} =
-#{
-# type => '!',
-# linkage => sub { set_expansion('tex', (! $_[1])); },
-# verbose => "don't expand iftex and tex sections",
-# noHelp => 1,
-#};
-
-#$T2H_OPTIONS -> {'no-ifplaintext'} =
-#{
-# type => '!',
-# linkage => sub { set_expansion('plaintext', (! $_[1])); },
-# verbose => "don't expand ifplaintext sections",
-# noHelp => 1,
-#};
-
-$T2H_OPTIONS -> {'invisible'} =
-{
- type => '=s',
- linkage => \$Texi2HTML::Config::INVISIBLE_MARK,
- verbose => 'use text in invisble anchor',
- noHelp  => 1,
-};
-
-$T2H_OPTIONS -> {'iso'} =
-{
- type => 'iso',
- linkage => \$Texi2HTML::Config::USE_ISO,
- verbose => 'if set, ISO8859 characters are used for special symbols (like copyright, etc)',
- noHelp => 1,
-};
-
-$T2H_OPTIONS -> {'I'} =
-{
- type => '=s',
- linkage => \@Texi2HTML::Config::INCLUDE_DIRS,
- verbose => 'append $s to the @include search path',
-};
-
-$T2H_OPTIONS -> {'P'} =
-{
- type => '=s',
- linkage => sub {unshift (@Texi2HTML::Config::PREPEND_DIRS, $_[1]);},
- verbose => 'prepend $s to the @include search path',
-};
-
-$T2H_OPTIONS -> {'top-file'} =
-{
- type => '=s',
- linkage => \$Texi2HTML::Config::TOP_FILE,
- verbose => 'use $s as top file, instead of <docname>.html',
-};
-
-
-$T2H_OPTIONS -> {'toc-file'} =
-{
- type => '=s',
- linkage => \$Texi2HTML::Config::TOC_FILE,
- verbose => 'use $s as ToC file, instead of <docname>_toc.html',
-};
-
-$T2H_OPTIONS -> {'frames'} =
-{
- type => '!',
- linkage => \$Texi2HTML::Config::FRAMES,
- verbose => 'output files which use HTML 4.0 frames (experimental)',
- noHelp => 1,
-};
-
-$T2H_OPTIONS -> {'menu'} =
-{
- type => '!',
- linkage => \$Texi2HTML::Config::SHOW_MENU,
- verbose => 'output Texinfo menus',
-};
-
-#$T2H_OPTIONS -> {'no-menu'} =
-#{
-# type => '!',
-# linkage => sub { $Texi2HTML::Config::SHOW_MENU = (! $_[1]);},
-# verbose => "don't output Texinfo menus",
-# noHelp => 1,
-#};
-
-$T2H_OPTIONS -> {'number'} =
-{
- type => '!',
- linkage => \$Texi2HTML::Config::NUMBER_SECTIONS,
- verbose => 'use numbered sections',
-};
-
-#$T2H_OPTIONS -> {'no-number'} =
-#{
-# type => '!',
-# linkage => sub { $Texi2HTML::Config::NUMBER_SECTIONS = (! $_[1]);}, 
-# verbose => 'sections not numbered',
-# noHelp => 1,
-#};
-
-$T2H_OPTIONS -> {'use-nodes'} =
-{
- type => '!',
- linkage => \$Texi2HTML::Config::USE_NODES,
- verbose => 'use nodes for sectionning',
-};
-
-$T2H_OPTIONS -> {'node-files'} =
-{
- type => '!',
- linkage => \$Texi2HTML::Config::NODE_FILES,
- verbose => 'produce one file per node for cross references'
-};
-
-$T2H_OPTIONS -> {'separated-footnotes'} =
-{
- type => '!',
- linkage => \$Texi2HTML::Config::SEPARATED_FOOTNOTES,
- verbose => 'footnotes on a separated page',
- noHelp => 1,
-};
-
-$T2H_OPTIONS -> {'toc-links'} =
-{
- type => '!',
- linkage => \$Texi2HTML::Config::TOC_LINKS,
- verbose => 'create links from headings to toc entries'
-};
-
-$T2H_OPTIONS -> {'split'} =
-{
- type => '=s',
- linkage => \$Texi2HTML::Config::SPLIT,
- verbose => 'split document on section|chapter|node else no splitting',
-};
-
-$T2H_OPTIONS -> {'sec-nav'} =
-{
- type => '!',
- linkage => \$Texi2HTML::Config::SECTION_NAVIGATION,
- verbose => 'output navigation panels for each section',
-};
-
-$T2H_OPTIONS -> {'subdir'} =
-{
- type => '=s',
- linkage => \$Texi2HTML::Config::SUBDIR,
- verbose => 'put files in directory $s, not $cwd',
- noHelp => 1,
-};
-
-$T2H_OPTIONS -> {'short-ext'} =
-{
- type => '!',
- linkage => \$Texi2HTML::Config::SHORTEXTN,
- verbose => 'use "htm" extension for output HTML files',
-};
-
-$T2H_OPTIONS -> {'prefix'} =
-{
- type => '=s',
- linkage => \$Texi2HTML::Config::PREFIX,
- verbose => 'use as prefix for output files, instead of <docname>',
-};
-
-$T2H_OPTIONS -> {'output'} =
-{
- type => '=s',
- linkage => \$Texi2HTML::Config::OUT,
- verbose => 'output goes to $s (directory if split)',
-};
-
-$T2H_OPTIONS -> {'no-validate'} = 
-{
- type => '!',
- linkage => \$Texi2HTML::Config::NOVALIDATE,
- verbose => 'suppress node cross-reference validation',
-};
-
-$T2H_OPTIONS -> {'short-ref'} =
-{
- type => '!',
- linkage => \$Texi2HTML::Config::SHORT_REF,
- verbose => 'if set, references are without section numbers',
-};
-
-$T2H_OPTIONS -> {'idx-sum'} =
-{
- type => '!',
- linkage => \$Texi2HTML::Config::IDX_SUMMARY,
- verbose => 'if set, also output index summary',
- noHelp  => 1,
-};
-
-$T2H_OPTIONS -> {'def-table'} =
-{
- type => '!',
- linkage => \$Texi2HTML::Config::DEF_TABLE,
- verbose => 'if set, \@def.. are converted using tables.',
- noHelp  => 1,
-};
-
-$T2H_OPTIONS -> {'Verbose'} =
-{
- type => '!',
- linkage=> \$Texi2HTML::Config::VERBOSE,
- verbose => 'print progress info to stdout',
-};
-
-$T2H_OPTIONS -> {'lang'} =
-{
- type => '=s',
- linkage => sub {set_document_language($_[1], 1)},
- verbose => 'use $s as document language (ISO 639 encoding)',
-};
-
-$T2H_OPTIONS -> {'ignore-preamble-text'} =
-{
-  type => '!',
-  linkage => \$Texi2HTML::Config::IGNORE_PREAMBLE_TEXT,
-  verbose => 'if set, ignore the text before @node and sectionning commands',
-  noHelp => 1,
-};
-
-$T2H_OPTIONS -> {'html-xref-prefix'} =
-{
- type => '=s',
- linkage => \$Texi2HTML::Config::EXTERNAL_DIR,
- verbose => '$s is the base dir for external manual references',
- noHelp => 1,
-};
-
-$T2H_OPTIONS -> {'l2h'} =
-{
- type => '!',
- linkage => \$Texi2HTML::Config::L2H,
- verbose => 'if set, uses latex2html for @math and @tex',
-};
-
-$T2H_OPTIONS -> {'l2h-l2h'} =
-{
- type => '=s',
- linkage => \$Texi2HTML::Config::L2H_L2H,
- verbose => 'program to use for latex2html translation',
- noHelp => 1,
-};
-
-$T2H_OPTIONS -> {'l2h-skip'} =
-{
- type => '!',
- linkage => \$Texi2HTML::Config::L2H_SKIP,
- verbose => 'if set, tries to reuse previously latex2html output',
- noHelp => 1,
-};
-
-$T2H_OPTIONS -> {'l2h-tmp'} =
-{
- type => '=s',
- linkage => \$Texi2HTML::Config::L2H_TMP,
- verbose => 'if set, uses $s as temporary latex2html directory',
- noHelp => 1,
-};
-
-$T2H_OPTIONS -> {'l2h-file'} =
-{
- type => '=s',
- linkage => \$Texi2HTML::Config::L2H_FILE,
- verbose => 'if set, uses $s as latex2html init file',
- noHelp => 1,
-};
-
-
-$T2H_OPTIONS -> {'l2h-clean'} =
-{
- type => '!',
- linkage => \$Texi2HTML::Config::L2H_CLEAN,
- verbose => 'if set, do not keep intermediate latex2html files for later reuse',
- noHelp => 1,
-};
-
-$T2H_OPTIONS -> {'D'} =
-{
- type => '=s',
- linkage => sub {$value{$_[1]} = 1;},
- verbose => 'equivalent to Texinfo "@set $s 1"',
- noHelp => 1,
-};
-
-$T2H_OPTIONS -> {'U'} =
-{
- type => '=s',
- linkage => sub {delete $value{$_[1]};},
- verbose => 'equivalent to Texinfo "@clear $s"',
- noHelp => 1,
-};
-
-$T2H_OPTIONS -> {'init-file'} =
-{
- type => '=s',
- linkage => \&load_init_file,
- verbose => 'load init file $s'
-};
-
-$T2H_OPTIONS -> {'css-include'} =
-{
- type => '=s',
- linkage => \@Texi2HTML::Config::CSS_FILES,
- verbose => 'use css file $s'
-};
-
-##
-## obsolete cmd line options
-##
-my $T2H_OBSOLETE_OPTIONS;
-
-$T2H_OBSOLETE_OPTIONS -> {'out-file'} =
-{
- type => '=s',
- linkage => sub {$Texi2HTML::Config::OUT = $_[1]; $Texi2HTML::Config::SPLIT = '';},
- verbose => 'if set, all HTML output goes into file $s, obsoleted by "-output" with different semantics',
- noHelp => 2
-};
-
-$T2H_OBSOLETE_OPTIONS -> {init_file} =
-{
- type => '=s',
- linkage => \&load_init_file,
- verbose => 'obsolete, use "-init-file" instead',
- noHelp => 2
-};
-
-$T2H_OBSOLETE_OPTIONS -> {l2h_clean} =
-{
- type => '!',
- linkage => \$Texi2HTML::Config::L2H_CLEAN,
- verbose => 'obsolete, use "-l2h-clean" instead',
- noHelp => 2,
-};
-
-$T2H_OBSOLETE_OPTIONS -> {l2h_l2h} =
-{
- type => '=s',
- linkage => \$Texi2HTML::Config::L2H_L2H,
- verbose => 'obsolete, use "-l2h-l2h" instead',
- noHelp => 2
-};
-
-$T2H_OBSOLETE_OPTIONS -> {l2h_skip} =
-{
- type => '!',
- linkage => \$Texi2HTML::Config::L2H_SKIP,
- verbose => 'obsolete, use "-l2h-skip" instead',
- noHelp => 2
-};
-
-$T2H_OBSOLETE_OPTIONS -> {l2h_tmp} =
-{
- type => '=s',
- linkage => \$Texi2HTML::Config::L2H_TMP,
- verbose => 'obsolete, use "-l2h-tmp" instead',
- noHelp => 2
-};
-
-$T2H_OBSOLETE_OPTIONS -> {out_file} =
-{
- type => '=s',
- linkage => sub {$Texi2HTML::Config::OUT = $_[1]; $Texi2HTML::Config::SPLIT = '';},
- verbose => 'obsolete, use "-out-file" instead',
- noHelp => 2
-};
-
-$T2H_OBSOLETE_OPTIONS -> {short_ref} =
-{
- type => '!',
- linkage => \$Texi2HTML::Config::SHORT_REF,
- verbose => 'obsolete, use "-short-ref" instead',
- noHelp => 2
-};
-
-$T2H_OBSOLETE_OPTIONS -> {idx_sum} =
-{
- type => '!',
- linkage => \$Texi2HTML::Config::IDX_SUMMARY,
- verbose => 'obsolete, use "-idx-sum" instead',
- noHelp  => 2
-};
-
-$T2H_OBSOLETE_OPTIONS -> {def_table} =
-{
- type => '!',
- linkage => \$Texi2HTML::Config::DEF_TABLE,
- verbose => 'obsolete, use "-def-table" instead',
- noHelp  => 2
-};
-
-$T2H_OBSOLETE_OPTIONS -> {short_ext} =
-{
- type => '!',
- linkage => \$Texi2HTML::Config::SHORTEXTN,
- verbose => 'obsolete, use "-short-ext" instead',
- noHelp  => 2
-};
-
-$T2H_OBSOLETE_OPTIONS -> {sec_nav} =
-{
- type => '!',
- linkage => \$Texi2HTML::Config::SECTION_NAVIGATION,
- verbose => 'obsolete, use "-sec-nav" instead',
- noHelp  => 2
-};
-
-$T2H_OBSOLETE_OPTIONS -> {top_file} =
-{
- type => '=s',
- linkage => \$Texi2HTML::Config::TOP_FILE,
- verbose => 'obsolete, use "-top-file" instead',
- noHelp  => 2
-};
-
-$T2H_OBSOLETE_OPTIONS -> {toc_file} =
-{
- type => '=s',
- linkage => \$Texi2HTML::Config::TOC_FILE,
- verbose => 'obsolete, use "-toc-file" instead',
- noHelp  => 2
-};
-
-$T2H_OBSOLETE_OPTIONS -> {glossary} =
-{
- type => '!',
- linkage => \$Texi2HTML::Config::USE_GLOSSARY,
-# verbose => "if set, uses section named `Footnotes' for glossary",
- verbose => "this does nothing",
- noHelp  => 2,
-};
-
-$T2H_OBSOLETE_OPTIONS -> {dump_texi} =
-{
- type => '!',
- linkage => \$Texi2HTML::Config::DUMP_TEXI,
- verbose => 'obsolete, use "-dump-texi" instead',
- noHelp => 1
-};
-
-$T2H_OBSOLETE_OPTIONS -> {frameset_doctype} =
-{
- type => '=s',
- linkage => \$Texi2HTML::Config::FRAMESET_DOCTYPE,
- verbose => 'obsolete, use "-frameset-doctype" instead',
- noHelp => 2
-};
-
-$T2H_OBSOLETE_OPTIONS -> {'no-section_navigation'} =
-{
- type => '!',
- linkage => sub {$Texi2HTML::Config::SECTION_NAVIGATION = 0;},
- verbose => 'obsolete, use -nosec_nav',
- noHelp => 2,
-};
-my $use_acc; # not used
-$T2H_OBSOLETE_OPTIONS -> {use_acc} =
-{
- type => '!',
- linkage => \$use_acc,
- verbose => 'obsolete, set to true unconditionnaly',
- noHelp => 2
-};
-$T2H_OBSOLETE_OPTIONS -> {expandinfo} =
-{
- type => '!',
- linkage => sub {push @Texi2HTML::Config::EXPAND, 'info';},
- verbose => 'obsolete, use "-expand info" instead',
- noHelp => 2,
-};
-$T2H_OBSOLETE_OPTIONS -> {expandtex} =
-{
- type => '!',
- linkage => sub {push @Texi2HTML::Config::EXPAND, 'tex';},
- verbose => 'obsolete, use "-expand tex" instead',
- noHelp => 2,
-};
-$T2H_OBSOLETE_OPTIONS -> {monolithic} =
-{
- type => '!',
- linkage => sub {$Texi2HTML::Config::SPLIT = '';},
- verbose => 'obsolete, use "-split no" instead',
- noHelp => 2
-};
-$T2H_OBSOLETE_OPTIONS -> {split_node} =
-{
- type => '!',
- linkage => sub{$Texi2HTML::Config::SPLIT = 'section';},
- verbose => 'obsolete, use "-split section" instead',
- noHelp => 2,
-};
-$T2H_OBSOLETE_OPTIONS -> {split_chapter} =
-{
- type => '!',
- linkage => sub{$Texi2HTML::Config::SPLIT = 'chapter';},
- verbose => 'obsolete, use "-split chapter" instead',
- noHelp => 2,
-};
-$T2H_OBSOLETE_OPTIONS -> {no_verbose} =
-{
- type => '!',
- linkage => sub {$Texi2HTML::Config::VERBOSE = 0;},
- verbose => 'obsolete, use -noverbose instead',
- noHelp => 2,
-};
-$T2H_OBSOLETE_OPTIONS -> {output_file} =
-{
- type => '=s',
- linkage => sub {$Texi2HTML::Config::OUT = $_[1]; $Texi2HTML::Config::SPLIT = '';},
- verbose => 'obsolete, use -out_file instead',
- noHelp => 2
-};
-
-$T2H_OBSOLETE_OPTIONS -> {section_navigation} =
-{
- type => '!',
- linkage => \$Texi2HTML::Config::SECTION_NAVIGATION,
- verbose => 'obsolete, use -sec_nav instead',
- noHelp => 2,
-};
-
-$T2H_OBSOLETE_OPTIONS -> {verbose} =
-{
- type => '!',
- linkage=> \$Texi2HTML::Config::VERBOSE,
- verbose => 'obsolete, use -Verbose instead',
- noHelp => 2
-};
-
-# read initialzation from $sysconfdir/texi2htmlrc or $HOME/.texi2htmlrc
-# obsolete.
-my @rc_files = ();
-push @rc_files, "$sysconfdir/texi2htmlrc" if defined($sysconfdir);
-push @rc_files, "$ENV{'HOME'}/.texi2htmlrc" if (defined($ENV{HOME}));
-foreach my $i (@rc_files)
-{
-    if (-e $i and -r $i)
-    {
-        print STDERR "# reading initialization file from $i\n"
-	    if ($T2H_VERBOSE);
-        print STDERR "Reading config from $i is obsolete, use texi2html/$conf_file_name instead\n";
-        Texi2HTML::Config::load($i);
-    }
-}
-
-# read initialization files
-foreach my $file (locate_init_file($conf_file_name, 1))
-{
-	print STDERR "# reading initialization file from $file\n" if ($T2H_VERBOSE);
-    Texi2HTML::Config::load($file);
-}
-
-#
-# %value hold texinfo variables, see also -D, -U, @set and @clear.
-# we predefine html (the output format) and texi2html (the translator)
-%value = 
-      (
-          'html' => 1,
-          'texi2html' => $THISVERSION,
-      );
-
-#+++############################################################################
-#                                                                              #
-# parse command-line options
-#                                                                              #
-#---############################################################################
-
-
-my $T2H_USAGE_TEXT = <<EOT;
-Usage: texi2html  [OPTIONS] TEXINFO-FILE
-Translates Texinfo source documentation to HTML.
-EOT
-my $T2H_FAILURE_TEXT = <<EOT;
-Try 'texi2html --help' for usage instructions.
-EOT
-
-my $options = new Getopt::MySimple;
-
-$T2H_OPTIONS -> {'help'} = 
-{ 
- type => ':i', 
- default => '',
- linkage => sub {$options->helpOptions($_[1]); 
-    print "\nSend bugs and suggestions to <users\@texi2html.cvshome.org>\n";
-    exit (0);},
- verbose => "print help and exit"
-};
-
-# some older version of GetOpt::Long don't have
-# Getopt::Long::Configure("pass_through")
-eval {Getopt::Long::Configure("pass_through");};
-my $Configure_failed = $@ && <<EOT;
-**WARNING: Parsing of obsolete command-line options could have failed.
-           Consider to use only documented command-line options (run
-           'texi2html --help 2' for a complete list) or upgrade to perl
-           version 5.005 or higher.
-EOT
-# FIXME getOptions is called 2 times, and thus adds 2 times the default 
-# help and version and after that warns.
-if (! $options->getOptions($T2H_OPTIONS, $T2H_USAGE_TEXT, "$THISVERSION\n"))
-{
-    print STDERR "$Configure_failed" if $Configure_failed;
-    die $T2H_FAILURE_TEXT;
-}
-if (@ARGV > 1)
-{
-    eval {Getopt::Long::Configure("no_pass_through");};
-    if (! $options->getOptions($T2H_OBSOLETE_OPTIONS, $T2H_USAGE_TEXT, "$THISVERSION\n"))
-    {
-        print STDERR "$Configure_failed" if $Configure_failed;
-        die $T2H_FAILURE_TEXT;
-    }
-}
-# $T2H_DEBUG and $T2H_VERBOSE are shorthands
-my $T2H_DEBUG = $Texi2HTML::Config::DEBUG;
-$T2H_VERBOSE = $Texi2HTML::Config::VERBOSE;
-
-#+++############################################################################
-#                                                                              #
-# evaluation of cmd line options
-#                                                                              #
-#---############################################################################
-
-# retro compatibility for $Texi2HTML::Config::EXPAND
-push (@Texi2HTML::Config::EXPAND, $Texi2HTML::Config::EXPAND) if ($Texi2HTML::Config::EXPAND);
-
-# correct %text_macros and @special_regions based on command line and init
-# variables
-$text_macros{'menu'} = 1 if ($Texi2HTML::Config::SHOW_MENU);
-
-push @special_regions, 'tex' if ($Texi2HTML::Config::L2H);
-
-foreach my $expanded (@Texi2HTML::Config::EXPAND)
-{
-    $text_macros{"if$expanded"} = 1 if (exists($text_macros{"if$expanded"}));
-    next unless (exists($text_macros{$expanded}));
-    if (grep {$_ eq $expanded} @special_regions)
-    {
-         $text_macros{$expanded} = 'special'; 
-    }
-    elsif (grep {$_ eq $expanded} @raw_regions)
-    {
-         $text_macros{$expanded} = 'raw'; 
-    }
-    else
-    {
-         $text_macros{$expanded} = 1; 
-    }
-}
-
-# handle ifnot regions
-foreach my $region (keys (%text_macros))
-{
-    next if ($region =~ /^ifnot/);
-    if ($text_macros{$region} and $region =~ /^if(\w+)$/)
-    {
-        $text_macros{"ifnot$1"} = 0;
-    }
-}
-
-if ($T2H_VERBOSE)
-{
-    print STDERR "# Expanded: ";
-    foreach my $text_macro (keys(%text_macros))
-    {
-        print STDERR "$text_macro " if ($text_macros{$text_macro});
-    }
-    print STDERR "\n";
-}
-
-# This is kept in that file although it is html formatting as it seems to 
-# be rather obsolete
-$Texi2HTML::Config::INVISIBLE_MARK = '<img src="invisible.xbm" alt="">' if $Texi2HTML::Config::INVISIBLE_MARK eq 'xbm';
-
-$T2H_DEBUG |= $DEBUG_TEXI if ($Texi2HTML::Config::DUMP_TEXI);
-
-# Construct hashes used for cross references generation
-# Do it now as the user may have changed $USE_UNICODE
-
-foreach my $key (keys(%Texi2HTML::Config::unicode_map))
-{
-    if ($Texi2HTML::Config::unicode_map{$key} ne '')
-    {
-        if ($Texi2HTML::Config::USE_UNICODE)
-        {
-             $cross_ref_texi_map{$key} = chr(hex($Texi2HTML::Config::unicode_map{$key}));
-        }
-        else
-        {
-             $cross_ref_texi_map{$key} = '_' . lc($Texi2HTML::Config::unicode_map{$key});
-        }
-    }
-}
-
-foreach my $key (keys(%cross_ref_style_map_texi))
-{
-    if ($style_type{$key} eq 'accent' 
-        and (ref($cross_ref_style_map_texi{$key}) eq 'HASH'))
-    {
-        if ($Texi2HTML::Config::USE_UNICODE)
-        {
-             $cross_ref_style_map_texi{$key}->{'function'} = \&Texi2HTML::Config::t2h_utf8_accent;
-        }
-        else
-        {
-             $cross_ref_style_map_texi{$key}->{'function'} = \&Texi2HTML::Config::t2h_nounicode_cross_manual_accent;
-        }
-    }
-}
-
-#
-# file name buisness
-#
-
-# this is directly pasted over from latex2html
-sub getcwd
-{
-    local($_) = `pwd`;
-
-    die "'pwd' failed (out of memory?)\n"
-        unless length;
-    chop;
-    $_;
-}
-
-
-my $docu_dir;            # directory of the document
-my $docu_name;           # basename of the document
-my $docu_rdir;           # directory for the output
-#my $docu_ext = "html";   # extension
-my $docu_ext = $Texi2HTML::Config::EXTENSION;   # extension
-my $docu_toc;            # document's table of contents
-my $docu_stoc;           # document's short toc
-my $docu_foot;           # document's footnotes
-my $docu_about;          # about this document
-my $docu_top;            # document top
-my $docu_doc;            # document (or document top of split)
-
-die "Need exactly one file to translate\n$T2H_FAILURE_TEXT" unless @ARGV == 1;
-my $docu = shift(@ARGV);
-if ($docu =~ /(.*\/)/)
-{
-    chop($docu_dir = $1);
-    $docu_name = $docu;
-    $docu_name =~ s/.*\///;
-}
-else
-{
-    $docu_dir = '.';
-    $docu_name = $docu;
-}
-unshift(@Texi2HTML::Config::INCLUDE_DIRS, $docu_dir);
-unshift(@Texi2HTML::Config::INCLUDE_DIRS, @Texi2HTML::Config::PREPEND_DIRS);
-$docu_name =~ s/\.te?x(i|info)?$//;
-$docu_name = $Texi2HTML::Config::PREFIX if ($Texi2HTML::Config::PREFIX);
-
-# resulting files splitting
-if ($Texi2HTML::Config::SPLIT =~ /section/i)
-{
-    $Texi2HTML::Config::SPLIT = 'section';
-}
-elsif ($Texi2HTML::Config::SPLIT =~ /node/i)
-{
-    $Texi2HTML::Config::SPLIT = 'node';
-}
-elsif ($Texi2HTML::Config::SPLIT =~ /chapter/i)
-{
-    $Texi2HTML::Config::SPLIT = 'chapter';
-}
-else
-{
-    $Texi2HTML::Config::SPLIT = '';
-}
-
-# Something like backward compatibility
-if ($Texi2HTML::Config::SPLIT and $Texi2HTML::Config::SUBDIR)
-{
-    $Texi2HTML::Config::OUT = $Texi2HTML::Config::SUBDIR;
-}
-
-# subdir
-
-die "output to STDOUT and split or frames incompatible\n" 
-    if (($Texi2HTML::Config::SPLIT or $Texi2HTML::Config::FRAMES) and ($Texi2HTML::Config::OUT eq '-'));
-
-if ($Texi2HTML::Config::SPLIT and ($Texi2HTML::Config::OUT eq ''))
-{
-    $Texi2HTML::Config::OUT = $docu_name;
-}
-
-if ($Texi2HTML::Config::SPLIT and ($Texi2HTML::Config::OUT eq '.'))
-{# This is to avoid trouble with latex2html
-    $Texi2HTML::Config::OUT = '';
-}
-
-$docu_rdir = '';
-
-if ($Texi2HTML::Config::SPLIT and ($Texi2HTML::Config::OUT ne ''))
-{
-    $Texi2HTML::Config::OUT =~ s|/*$||;
-    $docu_rdir = "$Texi2HTML::Config::OUT/"; 
-    unless (-d $Texi2HTML::Config::OUT)
-    {
-        if ( mkdir($Texi2HTML::Config::OUT, oct(755)))
-        {
-            print STDERR "# created directory $Texi2HTML::Config::OUT\n" if ($T2H_VERBOSE);
-        }
-        else
-        {
-            die "$ERROR can't create directory $Texi2HTML::Config::OUT\n";
-        }
-    }
-    print STDERR "# putting result files into directory $docu_rdir\n" if ($T2H_VERBOSE);
-}
-elsif (! $Texi2HTML::Config::SPLIT and ($Texi2HTML::Config::OUT ne ''))
-{
-    if ($Texi2HTML::Config::OUT =~ m|(.*)/|)
-    {# there is a leading directories
-        $docu_rdir = "$1/";
-        unless (-d $docu_rdir)
-        {
-            if ( mkdir($docu_rdir, oct(755)))
-            {
-                 print STDERR "# created directory $docu_rdir\n" if ($T2H_VERBOSE);
-            }
-            else
-            {
-                die "$ERROR can't create directory $docu_rdir\n";
-            }
-        }
-        print STDERR "# putting result files into directory $docu_rdir\n" if ($T2H_VERBOSE);
-    }
-    else
-    {
-        print STDERR "# putting result files into current directory \n" if ($T2H_VERBOSE);
-        $docu_rdir = '';
-    }
-}
-
-# We don't use "./" as $docu_rdir when $docu_rdir is the current directory
-# because it is problematic for latex2html. To test writability with -w, 
-# however we need a real directory.
-my $result_rdir = $docu_rdir;
-$result_rdir = "." if ($docu_rdir eq '');
-unless (-w $result_rdir)
-{
-    $docu_rdir = 'current directory' if ($docu_rdir eq '');
-    die "$ERROR $docu_rdir not writable\n";
-}
-
-# relative path leading to the working directory from the document directory
-my $path_to_working_dir = $docu_rdir;
-if ($docu_rdir ne '')
-{
-    my $cwd = getcwd;
-    my $docu_path = $docu_rdir;
-    $docu_path = $cwd . '/' . $docu_path unless ($docu_path =~ /^\//);
-    my @result = ();
-    foreach my $element (split /\//, File::Spec->canonpath($docu_path))
-    {
-        if ($element eq '')
-        {
-            push @result, '';
-        }
-        elsif ($element eq '..')
-        {
-            if (@result and ($result[-1] eq ''))
-            {
-                print STDERR "Too much .. in absolute file name\n";
-            }
-            elsif (@result and ($result[-1] ne '..'))
-            {
-                pop @result;
-            }
-            else
-            {
-                push @result, $element;
-            }
-        }
-        else
-        {
-            push @result, $element;
-        }
-    }
-    $path_to_working_dir = File::Spec->abs2rel($cwd, join ('/', @result));
-    $path_to_working_dir =~ s|.*/||;
-    $path_to_working_dir .= '/' unless($path_to_working_dir eq '');
-}
-
-# extension
-if ($Texi2HTML::Config::SHORTEXTN)
-{
-    $docu_ext = "htm";
-}
-if ($Texi2HTML::Config::TOP_FILE =~ s/\..*$//)
-{
-    $Texi2HTML::Config::TOP_FILE .= ".$docu_ext";
-}
-
-$docu_doc = "$docu_name.$docu_ext"; # document's contents
-if ($Texi2HTML::Config::SPLIT)
-{
-    # if Texi2HTML::Config::NODE_FILES is true and a node is called ${docu_name}_toc
-    # ${docu_name}_ovr... there may be trouble with the old naming scheme in
-    # very rare circumstances. This won't be fixed, the new scheme will be used
-    # soon.
-    $docu_toc   = $Texi2HTML::Config::TOC_FILE || "${docu_name}_toc.$docu_ext";
-    $docu_stoc  = "${docu_name}_ovr.$docu_ext";
-    $docu_foot  = "${docu_name}_fot.$docu_ext";
-    $docu_about = "${docu_name}_abt.$docu_ext";
-    $docu_top   = $Texi2HTML::Config::TOP_FILE || $docu_doc;
-}
-else
-{
-    if ($Texi2HTML::Config::OUT)
-    {
-        $docu_doc = $Texi2HTML::Config::OUT;
-        $docu_doc =~ s|.*/||;
-    }
-    $docu_toc = $docu_foot = $docu_stoc = $docu_about = $docu_top = $docu_doc;
-}
-
-# For use in init files
-$Texi2HTML::Config::TOP_FILE = $docu_top;
-$Texi2HTML::Config::TOC_FILE = $docu_toc;
-
-my $docu_doc_file = "$docu_rdir$docu_doc"; 
-my $docu_toc_file  = "$docu_rdir$docu_toc";
-my $docu_stoc_file = "$docu_rdir$docu_stoc";
-my $docu_foot_file = "$docu_rdir$docu_foot";
-my $docu_about_file = "$docu_rdir$docu_about";
-my $docu_top_file  = "$docu_rdir$docu_top";
-
-my $docu_frame_file =     "$docu_rdir${docu_name}_frame.$docu_ext";
-my $docu_toc_frame_file = "$docu_rdir${docu_name}_toc_frame.$docu_ext";
-
-#
-# _foo: internal variables to track @foo
-#
-foreach my $key ('_author', '_title', '_subtitle', '_shorttitlepage',
-	 '_settitle', '_setfilename', '_shorttitle', '_titlefont')
-{
-    $value{$key} = '';            # prevent -w warnings
-}
-my $index;                         # ref on a hash for the index entries
-my %indices = ();                  # hash of indices names containing 
-                                   #[ $Pages, $Entries ] (page indices and 
-                                   # raw index entries)
-my @index_labels = ();             # array corresponding with @?index commands
-                                   # constructed during pass_texi, used to
-                                   # put labels in pass_text
-#
-# initial counters
-#
-my $foot_num = 0;
-my $relative_foot_num = 0;
-my $idx_num = 0;
-my $sec_num = 0;
-my $anchor_num = 0;
-
-#
-# can I use ISO8859 characters? (HTML+)
-#
-if ($Texi2HTML::Config::USE_ISO)
-{
-    foreach my $thing (keys(%Texi2HTML::Config::iso_symbols))
-    {
-         $things_map_ref->{$thing} = $Texi2HTML::Config::iso_symbols{$thing};
-         $pre_map_ref->{$thing} = $Texi2HTML::Config::iso_symbols{$thing};
-    }
-}
-
-# process a css file
-sub process_css_file ($$)
-{
-    my $fh =shift;
-    my $file = shift;
-    my $in_rules = 0;
-    my $in_comment = 0;
-    my $in_import = 0;
-    my $in_string = 0;
-    my $rules = [];
-    my $imports = [];
-    while (<$fh>)
-    {
-	    #print STDERR "Line: $_";
-        if ($in_rules)
-        {
-            push @$rules, $_;
-            next;
-        }
-        my $text = '';
-        while (1)
-        { 
-		#sleep 1;
-		#print STDERR "${text}!in_comment $in_comment in_rules $in_rules in_import $in_import in_string $in_string: $_";
-             if ($in_comment)
-             {
-                 if (s/^(.*?\*\/)//)
-                 {
-                     $text .= $1;
-                     $in_comment = 0;
-                 }
-                 else
-                 {
-                     push @$imports, $text . $_;
-                     last;
-                 }
-             }
-             elsif (!$in_string and s/^\///)
-             { # what do '\' do here ?
-                 if (s/^\*//)
-                 {
-                     $text .= '/*';
-                     $in_comment = 1;
-                 }
-                 else
-                 {
-                     push (@$imports, $text. "\n") if ($text ne '');
-                     push (@$rules, '/' . $_);
-                     $in_rules = 1;
-                     last;
-                 }
-             }
-             elsif (!$in_string and $in_import and s/^([\"\'])//)
-             { # strings outside of import start rules
-                 $text .= "$1";
-                 $in_string = quotemeta("$1");
-             }
-             elsif ($in_string and s/^(\\$in_string)//)
-             {
-                 $text .= $1;
-             }
-             elsif ($in_string and s/^($in_string)//)
-             {
-                 $text .= $1;
-                 $in_string = 0;
-             }
-             elsif ((! $in_string and !$in_import) and (s/^([\\]?\@import)$// or s/^([\\]?\@import\s+)//))
-             {
-                 $text .= $1;
-                 $in_import = 1;
-             }
-             elsif (!$in_string and $in_import and s/^\;//)
-             {
-                 $text .= ';';
-                 $in_import = 0;
-             }
-             elsif (($in_import or $in_string) and s/^(.)//)
-             {
-                  $text .= $1;
-             }
-             elsif (!$in_import and s/^([^\s])//)
-             { 
-                  push (@$imports, $text. "\n") if ($text ne '');
-                  push (@$rules, $1 . $_);
-                  $in_rules = 1;
-                  last;
-             }
-             elsif (s/^(\s)//)
-             {
-                  $text .= $1;
-             }
-             elsif ($_ eq '')
-             {
-                  push (@$imports, $text);
-                  last;
-             }
-        } 
-    }
-    warn "$WARN string not closed in css file $file\n" if ($in_string);
-    warn "$WARN comment not closed in css file $file\n" if ($in_comment);
-    warn "$WARN \@import not finished in css file $file\n"  if ($in_import and !$in_comment and !$in_string);
-    return ($imports, $rules);
-}
-
-my @css_import_lines;
-my @css_rule_lines;
-
-# process css files
-foreach my $file (@Texi2HTML::Config::CSS_FILES)
-{
-    my $css_file_fh;
-    my $css_file;
-    if ($file eq '-')
-    {
-        $css_file_fh = \*STDIN;
-        $css_file = '-';
-    }
-    else
-    {
-         $css_file = locate_init_file ($file);
-         unless (defined($css_file))
-         {
-             warn "css file $file not found\n";
-             next;
-         }
-         unless (open (CSSFILE, "$css_file"))
-         {
-             warn "Cannot open ${css_file}: $!";
-             next;
-        }
-        $css_file_fh = \*CSSFILE;
-    }
-    my ($import_lines, $rules_lines);
-    ($import_lines, $rules_lines) = process_css_file ($css_file_fh, $css_file);
-    push @css_import_lines, @$import_lines;
-    push @css_rule_lines, @$rules_lines;
-}
-
-if ($T2H_DEBUG & $DEBUG_USER)
-{
-    if (@css_import_lines)
-    {
-        print STDERR "# css import lines\n";
-        foreach my $line (@css_import_lines)
-        {
-            print STDERR "$line";
-        }
-    }
-    if (@css_rule_lines)
-    {
-        print STDERR "# css rule lines\n";
-        foreach my $line (@css_rule_lines)
-        {
-            print STDERR "$line";
-        }
-    }
-}
-
-#
-# read texi2html extensions (if any)
-# FIXME isn't that obsolete ? (obsoleted by -init-file)
-my $extensions = 'texi2html.ext';  # extensions in working directory
-if (-f $extensions)
-{
-    print STDERR "# reading extensions from $extensions\n" if $T2H_VERBOSE;
-    require($extensions);
-}
-my $progdir;
-($progdir = $0) =~ s/[^\/]+$//;
-if ($progdir && ($progdir ne './'))
-{
-    $extensions = "${progdir}texi2html.ext"; # extensions in texi2html directory
-    if (-f $extensions)
-    {
-	print STDERR "# reading extensions from $extensions\n" if $T2H_VERBOSE;
-	require($extensions);
-    }
-}
-
-# parse texinfo cnf file for external manual specifications.
-my @texinfo_htmlxref_files = locate_init_file ($texinfo_htmlxref, 1, \@texinfo_config_dirs);
-foreach my $file (@texinfo_htmlxref_files)
-{
-    open (HTMLXREF, $file);
-    while (<HTMLXREF>)
-    {
-        my $line = $_;
-        s/[#]\s.*//;
-        s/^\s*//;
-        next if /^\s*$/;
-        my @htmlxref = split /\s+/;
-        my $manual = shift @htmlxref;
-        next if (exists($Texi2HTML::THISDOC{'htmlxref'}->{$manual}));
-        my $split_or_mono = shift @htmlxref;
-        if (!defined($split_or_mono) or ($split_or_mono ne 'split' and $split_or_mono ne 'mono'))
-        {
-            echo_warn("Bad line in $file: $line");
-            next;
-        }
-        my $href = shift @htmlxref;
-        if ($split_or_mono eq 'split')
-        {
-            $Texi2HTML::THISDOC{'htmlxref'}->{$manual}->{'split'} = 1;
-            $Texi2HTML::THISDOC{'htmlxref'}->{$manual}->{'mono'} = 0;
-        }
-        else
-        {
-            $Texi2HTML::THISDOC{'htmlxref'}->{$manual}->{'split'} = 0;
-            $Texi2HTML::THISDOC{'htmlxref'}->{$manual}->{'mono'} = 1;
-        }
-        if (defined($href))
-        {
-            if ($Texi2HTML::THISDOC{'htmlxref'}->{$manual}->{'split'})
-            {
-                $href =~ s/\/*$//;
-            }
-            $Texi2HTML::THISDOC{'htmlxref'}->{$manual}->{'href'} = $href;
-        }
-    }
-    close (HTMLXREF);
-}
-
-if ($T2H_DEBUG)
-{
-    foreach my $manual (keys(%{$Texi2HTML::THISDOC{'htmlxref'}}))
-    {
-         my $href = 'NO';
-         $href = $Texi2HTML::THISDOC{'htmlxref'}->{$manual}->{'href'} if
-            defined($Texi2HTML::THISDOC{'htmlxref'}->{$manual}->{'href'});
-         print STDERR "$manual: split $Texi2HTML::THISDOC{'htmlxref'}->{$manual}->{'split'}, href: $href\n";
-    }
-}
-
-print STDERR "# reading from $docu\n" if $T2H_VERBOSE;
-
-{
-
-package Texi2HTML::LaTeX2HTML;
-
-#########################################################################
-#
-# 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
-#
-
-# init l2h defaults for files and names
-
-# variable which shouldn't be global FIXME
-use vars qw(
-            %l2h_img
-           );
-my ($l2h_name, $l2h_latex_file, $l2h_cache_file, $l2h_html_file, $l2h_prefix);
-
-# holds the status of latex2html operations. If 0 it means that there was 
-# an error
-my $status = 0;
-my $debug;
-my $docu_rdir;
-
-#if ($Texi2HTML::Config::L2H)
-sub init($$$)
-{
-    my $docu_name = shift;
-    $docu_rdir = shift;
-    $debug = shift;
-    $l2h_name =  "${docu_name}_l2h";
-    $l2h_latex_file = "$docu_rdir${l2h_name}.tex";
-    $l2h_cache_file = "${docu_rdir}l2h_cache.pm";
-    # 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}_";
-    $status = init_to_latex();
-}
-
-##########################
-#
-# First stage: Generation of Latex file
-# Initialize with: l2h_InitToLatex
-# Add content with: l2h_ToLatex($text) --> HTML placeholder comment
-# Finish with: l2h_FinishToLatex
-#
-
-my $l2h_latex_preamble = <<EOT;
-% This document was automatically generated by the l2h extenstion of texi2html
-% DO NOT EDIT !!!
-\\documentclass{article}
-\\usepackage{html}
-\\begin{document}
-EOT
-
-my $l2h_latex_closing = <<EOT;
-\\end{document}
-EOT
-
-my %l2h_to_latex = ();
-my @l2h_to_latex = ();
-my $l2h_latex_count = 0;     # number of latex texts really stored
-my $l2h_to_latex_count = 0;  # total number of latex texts processed
-my $l2h_cached_count = 0;    # number of cached latex text
-my %l2h_cache = ();          
-#$Texi2HTML::Config::L2H = l2h_InitToLatex() if ($Texi2HTML::Config::L2H);
-
-# return used latex 1, if l2h could be initalized properly, 0 otherwise
-#sub l2h_InitToLatex
-sub init_to_latex()
-{
-    unless ($Texi2HTML::Config::L2H_SKIP)
-    {
-        unless (open(L2H_LATEX, ">$l2h_latex_file"))
-        {
-            warn "$ERROR Error l2h: Can't open latex file '$l2h_latex_file' for writing\n";
-            return 0;
-        }
-        print STDERR "# l2h: use ${l2h_latex_file} as latex file\n" if ($T2H_VERBOSE);
-        print L2H_LATEX $l2h_latex_preamble;
-    }
-    # open database for caching
-    #l2h_InitCache();
-    init_cache();
-    return  1;
-}
-
-
-# print text (1st arg) into latex file (if not already there), return
-# @tex_$number which can be later on replaced by the latex2html
-# generated text
-#sub l2h_ToLatex
-sub to_latex
-{
-    my($text) = @_;
-    my($count);
-    $l2h_to_latex_count++;
-    $text =~ s/(\s*)$//;
-    # try whether we can cache it
-    #my $cached_text = l2h_FromCache($text);
-    my $cached_text = from_cache($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 ($Texi2HTML::Config::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 "\@tex_${count} ";
-}
-
-# print closing into latex file and close it
-#sub l2h_FinishToLatex
-sub finish_to_latex()
-{
-    my ($reused);
-    $reused = $l2h_to_latex_count - $l2h_latex_count - $l2h_cached_count;
-    unless ($Texi2HTML::Config::L2H_SKIP)
-    {
-        print L2H_LATEX $l2h_latex_closing;
-        close(L2H_LATEX);
-    }
-    print STDERR "# l2h: finished to latex ($l2h_cached_count cached, $reused reused, $l2h_latex_count contents)\n" if ($T2H_VERBOSE);
-    unless ($l2h_latex_count)
-    {
-        #l2h_Finish();
-        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
-sub to_html()
-{
-    my ($call, $dotbug);
-    if ($Texi2HTML::Config::L2H_SKIP)
-    {
-        print STDERR "# l2h: skipping latex2html run\n" if ($T2H_VERBOSE);
-        return 1;
-    }
-    # Check for dot in directory where dvips will work
-    if ($Texi2HTML::Config::L2H_TMP)
-    {
-        if ($Texi2HTML::Config::L2H_TMP =~ /\./)
-        {
-            warn "$ERROR Warning l2h: l2h_tmp dir contains a dot. Use /tmp, instead\n";
-            $dotbug = 1;
-        }
-    }
-    else
-    {
-        if (main::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
-    $Texi2HTML::Config::L2H_TMP = "/tmp" if ($dotbug);
-
-    $call = $Texi2HTML::Config::L2H_L2H;
-    # use init file, if specified
-    my $init_file = main::locate_init_file($Texi2HTML::Config::L2H_FILE);
-    $call = $call . " -init_file " . $init_file if ($init_file);
-    # set output dir
-    $call .=  ($docu_rdir ? " -dir $docu_rdir" : " -no_subdir");
-    # use l2h_tmp, if specified
-    $call = $call . " -tmp $Texi2HTML::Config::L2H_TMP" if ($Texi2HTML::Config::L2H_TMP);
-    # use a given html version if specified
-    $call = $call . " -html_version $Texi2HTML::Config::L2H_HTML_VERSION" if ($Texi2HTML::Config::L2H_HTML_VERSION);
-    # 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 STDERR "# l2h: executing '$call'\n" if ($Texi2HTML::Config::VERBOSE);
-    if (system($call))
-    {
-        warn "l2h ***Error: '${call}' did not succeed\n";
-        return 0;
-    }
-    else
-    {
-        print STDERR "# l2h: latex2html finished successfully\n" if ($Texi2HTML::Config::VERBOSE);
-        return 1;
-    }
-}
-
-##########################
-# 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"
-
-my $l2h_extract_error = 0;
-my $l2h_range_error = 0;
-my @l2h_from_html;
-
-#sub l2h_InitFromHtml()
-sub init_from_html()
-{
-    local(%l2h_img);
-    my ($count, $h_line);
-
-    if (! open(L2H_HTML, "<${l2h_html_file}"))
-    {
-        print STDERR "$ERROR Error l2h: Can't open ${l2h_html_file} for reading\n";
-        return 0;
-    }
-    print STDERR "# l2h: use ${l2h_html_file} as html file\n" if ($T2H_VERBOSE);
-
-    my $l2h_html_count = 0;
-    while ($h_line = <L2H_HTML>)
-    {
-        if ($h_line =~ /^<!-- l2h_begin $l2h_name ([0-9]+) -->/)
-        {
-            $count = $1;
-            my $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);
-                    $h_content = to_cache($count, $h_content);
-                    $l2h_from_html[$count] = $h_content;
-                    $h_content = '';
-                    last;
-                }
-                $h_content = $h_content.$h_line;
-            }
-            if ($h_content)
-            {
-                print STDERR "$ERROR Warning l2h: l2h_end $l2h_name $count not found\n"
-                    if ($Texi2HTML::Config::VERBOSE);
-                close(L2H_HTML);
-                return 0;
-            }
-        }
-    }
-    print STDERR "# l2h: Got $l2h_html_count of $l2h_latex_count html contents\n"
-        if ($Texi2HTML::Config::VERBOSE);
-
-    close(L2H_HTML);
-    return 1;
-}
-
-sub latex2html()
-{
-    return unless($status);
-    return unless ($status = finish_to_latex());
-    return unless ($status = to_html());
-    return unless ($status = init_from_html());
-}
-
-# FIXME used ??
-#sub l2h_FromHtml($)
-sub from_html($)
-{
-    my($text) = @_;
-    my($done, $to_do, $count);
-    $to_do = $text;
-    $done = '';
-    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);
-            if ($debug);
-
-        #$done = l2h_ExtractFromHtml($count) . $done;
-        $done = extract_from_html($count) . $done;
-
-        $done = "<!-- l2h_begin $l2h_name $count -->".$done
-            #if ($T2H_DEBUG & $DEBUG_L2H);
-            if ($debug);
-    }
-    return $to_do.$done;
-}
-
-sub do_tex($)
-{
-    my $count = shift;
-    my $result = '';
-    $result = "<!-- l2h_begin $l2h_name $count -->"
-            #if ($T2H_DEBUG & $DEBUG_L2H);
-            if ($debug);
-    $result .= extract_from_html($count);
-    $result .= "<!-- l2h_end $l2h_name $count -->"
-            #if ($T2H_DEBUG & $DEBUG_L2H);
-            if ($debug);
-    return $result;
-}
-
-#sub l2h_ExtractFromHtml($)
-sub extract_from_html($)
-{
-    my $count = shift;
-    return $l2h_from_html[$count] if ($l2h_from_html[$count]);
-    if ($count >= 0 && $count < $l2h_latex_count)
-    {
-        # now we are in trouble
-        my $line;
-        $l2h_extract_error++;
-        print STDERR "$ERROR l2h: can't extract content $count from html\n"
-            if ($T2H_VERBOSE);
-        # try simple (ordinary) substition (without l2h)
-        #my $l_l2h = $Texi2HTML::Config::L2H;
-        $Texi2HTML::Config::L2H = 0;
-        my $l_l2h = $status;
-        $status = 0;
-        $line = $l2h_to_latex{$count};
-        $line = main::substitute_text({}, $line);
-        $line = "<!-- l2h: ". __LINE__ . " use texi2html -->" . $line
-            #if ($T2H_DEBUG & $DEBUG_L2H);
-            if ($debug);
-        #$Texi2HTML::Config::L2H = $l_l2h;
-        $status = $l_l2h;
-        return $line;
-    }
-    else
-    {
-        # now we have been incorrectly called
-        $l2h_range_error++;
-        print STDERR "$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);
-            if ($debug);
-        return "<!-- l2h: out of range count $count -->";
-    }
-}
-
-#sub l2h_FinishFromHtml()
-sub finish_from_html()
-{
-    if ($Texi2HTML::Config::VERBOSE)
-    {
-        if ($l2h_extract_error + $l2h_range_error)
-        {
-            print STDERR "# l2h: finished from html ($l2h_extract_error extract and $l2h_range_error errors)\n";
-        }
-        else
-        {
-            print STDERR "# l2h: finished from html (no errors)\n";
-        }
-    }
-}
-
-#sub l2h_Finish()
-sub finish()
-{
-    return unless($status);
-    finish_from_html();
-    #l2h_StoreCache();
-    store_cache();
-    if ($Texi2HTML::Config::L2H_CLEAN)
-    {
-        local ($_);
-        print STDERR "# l2h: removing temporary files generated by l2h extension\n"
-            if $Texi2HTML::Config::VERBOSE;
-        while (<"$docu_rdir$l2h_name"*>)
-        {
-            unlink $_;
-        }
-    }
-    print STDERR "# l2h: Finished\n" if $Texi2HTML::Config::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
-sub init_cache
-{
-    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
-sub store_cache
-{
-    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/\|/\\\|/go;
-        $value =~ s/\\\\\|/\\\|/go;
-        $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
-sub from_cache
-{
-    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
-my $maximage = 1;
-#sub l2h_ToCache($$)
-sub to_cache($$)
-{
-    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 ($T2H_DEBUG & $DEBUG_L2H);
-            unlink "$docu_rdir$src" unless ($debug);
-        }
-        $content =~ s/$src/$dest/g;
-    }
-    $l2h_cache{$l2h_to_latex[$count]} = $content;
-    return $content;
-}
-
-}
-
-#+++###########################################################################
-#                                                                             #
-# Pass texi: read source, handle variable, ignored text,                      #
-#                                                                             #
-#---###########################################################################
-
-my @fhs = ();			# hold the file handles to read
-my $input_spool;		# spooled lines to read
-my @lines = ();             # whole document
-my @lines_numbers = ();     # line number, originating file associated with 
-                            # whole document 
-my $macros;                 # macros. reference on a hash
-my %info_enclose;           # macros defined with definfoenclose
-my $texi_line_number = { 'file_name' => '', 'line_nr' => 0, 'macro' => '' };
-my @floats = ();            # floats list
-my %floats = ();            # floats by style
-
-sub initialise_state_texi($)
-{
-    my $state = shift;
-    $state->{'texi'} = 1;           # for substitute_text and close_stack: 
-                                    # 1 if pass_texi/scan_texi is to be used
-}
-
-my @first_lines = ();
-
-sub pass_texi()
-{
-    my $first_lines = 1;        # is it the first lines
-    my $state = {};
-                                # holds the informations about the context
-                                # to pass it down to the functions
-    initialise_state_texi($state);
-    my @stack;
-    my $text;
- INPUT_LINE: while (defined($_ = next_line($texi_line_number))) 
-    {
-        #
-        # remove the lines preceding \input or an @-command
-        # 
-        if ($first_lines)
-        {
-            if (/^\\input/)
-            {
-                push @first_lines, $_;
-                $first_lines = 0;
-                next;
-            }
-            if (/^\s*\@/)
-            {
-                $first_lines = 0;
-            }
-            else
-            {
-                push @first_lines, $_;
-                next;
-            }
-        }
-	#print STDERR "line_nr $texi_line_number->{'line_nr'} :$_";
-        my $chomped_line = $_;
-        if (scan_texi ($_, \$text, \@stack, $state, $texi_line_number) and chomp($chomped_line))
-        {
-        #print STDERR "scan_texi line_nr $texi_line_number->{'line_nr'}\n";
-            push (@lines_numbers, { 'file_name' => $texi_line_number->{'file_name'},
-                  'line_nr' => $texi_line_number->{'line_nr'},
-                  'macro' => $texi_line_number->{'macro'} });
-        }
-        
-        #dump_stack (\$text, \@stack, $state);
-        if ($state->{'bye'})
-        {
-            #dump_stack(\$text, \@stack, $state);
-            # close stack after bye
-            close_stack_texi_structure(\$text, \@stack, $state, $texi_line_number);
-        }
-        next if (@stack);
-        $_ = $text;
-        $text = '';
-        next if !defined($_);
-        push @lines, split_lines ($_);
-        last if ($state->{'bye'});
-    }
-    # close stack at the end of pass texi
-    close_stack_texi_structure(\$text, \@stack, $state, $texi_line_number);
-    push @lines, split_lines ($text);
-    print STDERR "# end of pass texi\n" if $T2H_VERBOSE;
-}
-
-# return the line after preserving things according to misc_command map.
-sub preserve_command($$)
-{
-    my $line = shift;
-    my $macro = shift;
-    my $text = '';
-    my $args = '';
-    my $skip_spec = '';
-    my $arg_spec = '';
-
-    $skip_spec = $Texi2HTML::Config::misc_command{$macro}->{'skip'}
-        if (defined($Texi2HTML::Config::misc_command{$macro}->{'skip'}));
-    $arg_spec = $Texi2HTML::Config::misc_command{$macro}->{'arg'}
-        if (defined($Texi2HTML::Config::misc_command{$macro}->{'arg'}));
-
-    if ($arg_spec eq 'line')
-    {
-        $text .= $line;
-        $args .= $line;
-        $line = '';
-    }
-    elsif ($arg_spec)
-    {
-        my $arg_nr = $Texi2HTML::Config::misc_command{$macro}->{'arg'};
-        while ($arg_nr)
-        {
-            $line =~ s/(\s+\S*)//o;
-            $text .= $1 if defined($1);
-            $args .= $1 if defined($1);
-            $arg_nr--;
-        }
-    }
-   
-    if ($macro eq 'bye')
-    {
-        $line = '';
-        $text = "\n";
-    }
-    elsif ($skip_spec eq 'linespace')
-    {
-        if ($line =~ /^\s*$/o)
-        {
-            $line =~ s/([ \t]*)//o;
-            $text .= $1;
-        }
-    }
-    elsif ($skip_spec eq 'linewhitespace')
-    {
-        if ($line =~ /^\s*$/o)
-        {
-            $text .= $line;
-            $line = '';
-        }	
-    }
-    elsif ($skip_spec eq 'line')
-    {
-        $text .= $line;
-        $line = '';
-    }
-    elsif ($skip_spec eq 'whitespace')
-    {
-        $line =~ s/(\s*)//o;
-        $text .=  $1;
-    }
-    elsif ($skip_spec eq 'space')
-    {
-        $line =~ s/([ \t]*)//o;
-        $text .= $1;
-    }
-    $line = '' if (!defined($line));
-    return ($line, "\@$macro" . $text, $args);
-}
-
-#+++###########################################################################
-#                                                                             #
-# Pass structure: parse document structure                                    #
-#                                                                             #
-#---###########################################################################
-
-# This is a virtual element for things appearing before @node and 
-# sectionning commands
-my $element_before_anything =
-{ 
-    'before_anything' => 1,
-    'place' => [],
-    'texi' => 'VIRTUAL ELEMENT BEFORE ANYTHING',
-};
-
-sub initialise_state_structure($)
-{
-    my $state = shift;
-    $state->{'structure'} = 1;      # for substitute_text and close_stack: 
-                                    # 1 if pass_structure/scan_structure is 
-                                    # to be used
-    $state->{'menu'} = 0;           # number of opened menus
-    $state->{'detailmenu'} = 0;     # number of opened detailed menus      
-    $state->{'level'} = 0;          # current sectionning level
-    $state->{'table_stack'} = [ "no table" ]; # a stack of opened tables/lists
-    delete ($state->{'region_lines'}) unless (defined($state->{'region_lines'}));
-}
-
-my @doc_lines = ();         # whole document
-my @doc_numbers = ();       # whole document line numbers and file names
-my @nodes_list = ();        # nodes in document reading order
-                            # each member is a reference on a hash
-my @sections_list = ();     # sections in reading order
-                            # each member is a reference on a hash
-my @elements_list = ();     # sectionning elements (nodes and sections)
-                            # in reading order. Each member is a reference
-                            # on a hash which also appears in %nodes,
-                            # @sections_list @nodes_list, @all_elements
-my @all_elements;           # all the elements in document order
-my %nodes = ();             # nodes hash. The key is the texi node name
-my %cross_reference_nodes = ();  # normalized node names
-my %sections = ();          # sections hash. The key is the section number
-                            # headings are there, although they are not elements
-my $element_top;            # Top element
-my $node_top;               # Top node
-my $node_first;             # First node
-my $element_index;          # element with first index
-my $element_chapter_index;  # chapter with first index
-my $element_first;          # first element
-my $element_last;           # last element
-
-# This is a virtual element used to have the right hrefs for index entries
-# and anchors in footnotes
-my $footnote_element = 
-{ 
-    'id' => 'SEC_Foot',
-    'file' => $docu_foot,
-    'footnote' => 1,
-    'element' => 1,
-    'place' => [],
-};
-
-#my $do_contents;            # do table of contents if true
-#my $do_scontents;           # do short table of contents if true
-my $novalidate = $Texi2HTML::Config::NOVALIDATE; # @novalidate appeared
-
-sub pass_structure()
-{
-    my $state = {};
-                                # holds the informations about the context
-                                # to pass it down to the functions
-    initialise_state_structure($state);
-    $state->{'element'} = $element_before_anything;
-    $state->{'place'} = $element_before_anything->{'place'};
-    my @stack;
-    my $text;
-    my $line_nr;
-
-    while (@lines)
-    {
-        $_ = shift @lines;
-        my $chomped_line = $_;
-        if (!chomp($chomped_line) and @lines)
-        {
-             $lines[0] = $_ . $lines[0];
-             next;
-        }
-        $line_nr = shift (@lines_numbers);
-        #print STDERR "PASS_STRUCTURE: $_";
-        if (!$state->{'raw'} and !$state->{'special'} and !$state->{'verb'})
-        {
-            my $tag = '';
-            if (/^\s*\@(\w+)\b/)
-            {
-                $tag = $1;
-            }
-
-            #
-            # analyze the tag
-            #
-            if ($tag and $tag eq 'node' or defined($sec2level{$tag}) or $tag eq 'printindex' or $tag eq 'float')
-            {
-                $_ = substitute_texi_line($_); #usefull if there is an anchor ???
-                if (@stack and $tag eq 'node' or defined($sec2level{$tag}) or
-$tag eq 'float')
-                {# in pass structure node and float shouldn't appear in formats
-                    close_stack_texi_structure(\$text, \@stack, $state, $line_nr);
-                    if (exists($state->{'region_lines'}))
-                    {
-                        push @{$region_lines{$state->{'region_lines'}->{'format'}}}, split_lines ($text);
-                    }
-                    else
-                    {
-                        push @doc_lines, split_lines ($text);
-                    }
-                    $text = '';
-                }
-                if ($tag eq 'node')
-                {
-                    my $node_ref;
-                    my $auto_directions;
-                    $auto_directions = 1 unless (/,/o);
-                    my ($node, $node_next, $node_prev, $node_up) = split(/,/, $_);
-                    $node =~ s/^\@node\s+// if ($node);
-                    if ($node)
-                    {
-                        $node = normalise_space($node);
-                        if (exists($nodes{$node}) and defined($nodes{$node})
-                             and $nodes{$node}->{'seen'})
-                        {
-                            echo_error ("Duplicate node found: $node", $line_nr);
-                            next;
-                        }
-                        else
-                        {
-                            if (exists($nodes{$node}) and defined($nodes{$node}))
-                            { # node appeared in a menu
-                                $node_ref = $nodes{$node};
-                            }
-                            else
-                            {
-                                my $first;
-                                $first = 1 if (!defined($node_ref));
-                                $node_ref = {};
-                                $node_first = $node_ref if ($first);
-                                $nodes{$node} = $node_ref;
-                            }
-                            $node_ref->{'node'} = 1;
-                            $node_ref->{'tag'} = 'node';
-                            $node_ref->{'tag_level'} = 'node';
-                            $node_ref->{'texi'} = $node;
-                            $node_ref->{'seen'} = 1;
-                            $node_ref->{'automatic_directions'} = $auto_directions;
-                            $node_ref->{'place'} = [];
-                            $node_ref->{'current_place'} = [];
-                            merge_element_before_anything($node_ref);
-                            $node_ref->{'index_names'} = [];
-                            $state->{'place'} = $node_ref->{'current_place'};
-                            $state->{'element'} = $node_ref;
-                            $state->{'after_element'} = 1;
-                            $state->{'node_ref'} = $node_ref;
-                            # makeinfo treats differently case variants of
-                            # top in nodes and anchors and in refs commands and 
-                            # refs from nodes. 
-                            if ($node =~ /^top$/i)
-                            {
-                                if (!defined($node_top))
-                                {
-                                    $node_top = $node_ref;
-                                    $node_top->{'texi'} = 'Top';
-                                    delete $nodes{$node};
-                                    $nodes{$node_top->{'texi'}} = $node_ref;
-                                }
-                                else
-                                { # All the refs are going to point to the first Top
-                                    echo_warn ("Top node allready exists", $line_nr);
-                                    #warn "$WARN Top node allready exists\n";
-                                }
-                            }
-                            unless (@nodes_list)
-                            {
-                                $node_ref->{'first'} = 1;
-                            }
-                            push (@nodes_list, $node_ref);
-                            push @elements_list, $node_ref;
-                        }
-                    }
-                    else
-                    {
-                        echo_error ("Node is undefined: $_ (eg. \@node NODE-NAME, NEXT, PREVIOUS, UP)", $line_nr);
-                        next;
-                    }
-                
-                    if ($node_next)
-                    {
-                        $node_ref->{'node_next'} = normalise_node($node_next);
-                    }
-                    if ($node_prev)
-                    {
-                        $node_ref->{'node_prev'} = normalise_node($node_prev);
-                    }
-                    if ($node_up)
-                    { 
-                        $node_ref->{'node_up'} = normalise_node($node_up);
-                    }
-                }
-                elsif (defined($sec2level{$tag}))
-                {
-                    if (/^\@$tag\s*(.*)$/)
-                    {
-                        my $name = normalise_space($1);
-                        $name = '' if (!defined($name));
-                        my $level = $sec2level{$tag};
-                        $state->{'after_element'} = 1;
-                        my ($docid, $num);
-                        if($tag ne 'top')
-                        {
-                            $sec_num++;
-                            $num = $sec_num;
-                            $docid = "SEC$sec_num";
-                        }
-                        else
-                        {
-                            $num = 0;
-                            $docid = "SEC_Top";
-                        }
-                        if ($tag !~ /heading/)
-                        {
-                            my $section_ref = { 'texi' => $name, 
-                               'level' => $level,
-                               'tag' => $tag,
-                               'sec_num' => $num,
-                               'section' => 1, 
-                               'id' => $docid,
-                               'seen' => 1,
-                               'index_names' => [],
-                               'current_place' => [],
-                               'place' => []
-                            };
-             
-                            if ($tag eq 'top')
-                            {
-                                $section_ref->{'top'} = 1;
-                                $section_ref->{'number'} = '';
-                                $sections{0} = $section_ref;
-                                $element_top = $section_ref;
-                            }
-                            $sections{$num} = $section_ref;
-                            merge_element_before_anything($section_ref);
-                            if ($state->{'node_ref'} and !exists($state->{'node_ref'}->{'with_section'}))
-                            {
-                                my $node_ref = $state->{'node_ref'};
-                                $section_ref->{'node_ref'} = $node_ref;
-                                $section_ref->{'titlefont'} = $node_ref->{'titlefont'};
-                                $node_ref->{'with_section'} = $section_ref;
-                                $node_ref->{'top'} = 1 if ($tag eq 'top');
-                            }
-                            if (! $name and $level)
-                            {
-                               echo_warn ("$tag without name", $line_nr);
-                            }
-                            push @sections_list, $section_ref;
-                            push @elements_list, $section_ref;
-                            $state->{'section_ref'} = $section_ref;
-                            $state->{'element'} = $section_ref;
-                            $state->{'place'} = $section_ref->{'current_place'};
-                            my $node_ref = "NO NODE";
-                            my $node_texi ='';
-                            if ($state->{'node_ref'})
-                            {
-                                $node_ref = $state->{'node_ref'};
-                                $node_texi = $state->{'node_ref'}->{'texi'};
-                            }
-                            print STDERR "# pass_structure node($node_ref)$node_texi, tag \@$tag($level) ref $section_ref, num,id $num,$docid\n   $name\n"
-                               if $T2H_DEBUG & $DEBUG_ELEMENTS;
-                        }
-                        else 
-                        {
-                            my $section_ref = { 'texi' => $name, 
-                                'level' => $level,
-                                'heading' => 1,
-                                'tag' => $tag,
-                                'tag_level' => $tag,
-                                'sec_num' => $sec_num, 
-                                'id' => $docid,
-                                'number' => '' };
-                            $state->{'element'} = $section_ref;
-                            push @{$state->{'place'}}, $section_ref;
-                            $sections{$sec_num} = $section_ref;
-                        }
-                    }
-                }
-                elsif ($tag eq 'float')
-                {
-                    my ($style_texi, $label_texi) = split(/,/, $_);
-                    $style_texi =~ s/^\@float\s*//;
-                    $style_texi = normalise_space($style_texi);
-                    $label_texi = undef if (defined($label_texi) and ($label_texi =~ /^\s*$/));
-                    if (defined($label_texi))
-                    {
-                        $label_texi = normalise_node($label_texi);
-                        if (exists($nodes{$label_texi}) and defined($nodes{$label_texi})
-                             and $nodes{$label_texi}->{'seen'})
-                        {
-                            echo_error ("Duplicate label found: $label_texi", $line_nr);
-                            while ($_ =~ /,/)
-                            {
-                                $_ =~ s/,.*$//;
-                            }
-                        }
-                        else
-                        {
-                            my $float = { };
-                            if (exists($nodes{$label_texi}) and defined($nodes{$label_texi}))
-                            { # float appeared in a menu
-                                $float = $nodes{$label_texi};
-                            }
-                            else
-                            {
-                                $nodes{$label_texi} = $float;
-                            }
-                            $float->{'float'} = 1;
-                            $float->{'tag'} = 'float';
-                            $float->{'texi'} = $label_texi;
-                            $float->{'seen'} = 1;
-                            $float->{'id'} = $label_texi;
-#print STDERR "FLOAT: $float $float->{'texi'}, place $state->{'place'}\n";
-                            push @{$state->{'place'}}, $float;
-                            $float->{'element'} = $state->{'element'};
-                            $state->{'float'} = $float;
-                            $float->{'style_texi'} = $style_texi;
-                            push @floats, $float;
-                        }
-                    }
-                }
-                elsif (/^\@printindex\s+(\w+)/)
-                {
-                    unless (@elements_list)
-                    {
-                        echo_warn ("Printindex before document beginning: \@printindex $1", $line_nr);
-                        next;
-                    }
-                    $state->{'after_element'} = 0;
-                    # $element_index is the first element with index
-                    $element_index = $elements_list[-1] unless (defined($element_index));
-                    # associate the index to the element such that the page
-                    # number is right
-                    my $placed_elements = [];
-                    push @{$elements_list[-1]->{'index_names'}}, { 'name' => $1, 'place' => $placed_elements };
-                    $state->{'place'} = $placed_elements;
-                }
-                if (exists($state->{'region_lines'}))
-                {
-                    push @{$region_lines{$state->{'region_lines'}->{'format'}}}, $_;
-                }
-                else
-                {
-                    push @doc_lines, $_;
-                    push @doc_numbers, $line_nr;
-                }
-                next;
-            }
-        }
-        if (scan_structure ($_, \$text, \@stack, $state, $line_nr) and !(exists($state->{'region_lines'})))
-        {
-            push (@doc_numbers, $line_nr);
-        }
-        next if (@stack);
-        $_ = $text;
-        $text = '';
-        next if (!defined($_));
-        if ($state->{'region_lines'})
-        {
-            push @{$region_lines{$state->{'region_lines'}->{'format'}}}, split_lines ($_);
-        }
-        else
-        {
-            push @doc_lines, split_lines ($_);
-        }
-    }
-    if (@stack)
-    {# close stack at the end of pass structure
-        close_stack_texi_structure(\$text, \@stack, $state, $line_nr);
-        push @doc_lines, split_lines ($text) if ($text and (!exists($state->{'region_lines'})));
-    }
-    echo_warn ("At end of document, $state->{'region_lines'}->{'number'} $state->{'region_lines'}->{'format'} not closed") if (exists($state->{'region_lines'}));
-    print STDERR "# end of pass structure\n" if $T2H_VERBOSE;
-}
-
-# split line at end of line and put each resulting line in an array
-sub split_lines($)
-{
-   my $line = shift;
-   my @result = ();
-   my $i = 0;
-   while ($line)
-   {
-       $result[$i] = '';
-       $line =~ s/^(.*)//;
-       $result[$i] .= $1;
-       $result[$i] .= "\n" if ($line =~ s/^\n//);
-       #print STDERR "$i: $result[$i]";
-       $i++;
-   }
-   return @result;
-}
-
-sub misc_command_structure($$$$)
-{
-    my $line = shift;
-    my $macro = shift;
-    my $state = shift;
-    my $line_nr = shift;
-    my $text;
-    my $args;
-
-    if ($macro eq 'lowersections')
-    {
-        my ($sec, $level);
-        while (($sec, $level) = each %sec2level)
-        {
-            $sec2level{$sec} = $level + 1;
-        }
-        $state->{'level'}--;
-    }
-    elsif ($macro eq 'raisesections')
-    {
-        my ($sec, $level);
-        while (($sec, $level) = each %sec2level)
-        {
-            $sec2level{$sec} = $level - 1;
-        }
-        $state->{'level'}++;
-    }
-    elsif ($macro eq 'contents')
-    {
-        $Texi2HTML::Config::DO_CONTENTS = 1;
-    }
-    elsif ($macro eq 'detailmenu')
-    {
-        $state->{'detailmenu'}++;
-    }
-    elsif (($macro eq 'summarycontents') or ($macro eq 'shortcontents'))
-    {
-        $Texi2HTML::Config::DO_SCONTENTS = 1;
-    }
-    elsif ($macro eq 'novalidate')
-    {
-        $novalidate = 1;
-    }
-    elsif (grep {$_ eq $macro} ('settitle','setfilename','shortitle','shorttitlepage') 
-             and ($line =~ /^\s+(.*)$/))
-    {
-        $value{"_$macro"} = substitute_texi_line($1);
-    }
-    elsif (grep {$_ eq $macro} ('author','subtitle','title')
-             and ($line =~ /^\s+(.*)$/))
-    {
-        $value{"_$macro"} .= substitute_texi_line($1)."\n";
-        push @{$Texi2HTML::THISDOC{"${macro}s"}}, substitute_texi_line($1);
-    }
-    elsif ($macro eq 'synindex' || $macro eq 'syncodeindex')
-    {
-        if ($line =~ /^\s+(\w+)\s+(\w+)/)
-        {
-            my $from = $1;
-            my $to = $2;
-            my $prefix_from = index_name2prefix($from);
-            my $prefix_to = index_name2prefix($to);
-            echo_error ("unknown from index name $from in \@$macro", $line_nr)
-                unless $prefix_from;
-            echo_error ("unknown to index name $to in \@$macro", $line_nr)
-                unless $prefix_to;
-            if ($prefix_from and $prefix_to)
-            {
-                if ($macro eq 'syncodeindex')
-                {
-                    $index_properties->{$prefix_to}->{'from_code'}->{$prefix_from} = 1;
-                }
-                else
-                {
-                    $index_properties->{$prefix_to}->{'from'}->{$prefix_from} = 1;
-                }
-            }
-        }
-        else
-        {
-            echo_error ("Bad $macro line: $line", $line_nr);
-        }
-    }
-    elsif ($macro eq 'defindex' || $macro eq 'defcodeindex')
-    {
-        if ($line =~ /^\s+(\w+)\s*$/)
-        {
-            my $name = $1;
-            $index_properties->{$name}->{'name'} = $name;
-            $index_properties->{$name}->{'code'} = 1 if $macro eq 'defcodeindex';
-        }
-        else
-        {# FIXME makeinfo don't warn ?
-            echo_error ("Bad $macro line: $line", $line_nr);
-        }
-    }
-    elsif ($macro eq 'documentlanguage')
-    {
-        if ($line =~ /\s+(\w+)/)
-        {
-            my $lang = $1;
-            set_document_language($lang, 0, $line_nr) if (!$cmd_line_lang && $lang);
-        }
-    }
-    elsif ($macro eq 'kbdinputstyle')
-    {# FIXME makeinfo ignores that with --html
-        if ($line =~ /\s+([a-z]+)/)
-        {
-            if ($1 eq 'code')
-            {
-                $style_map_ref->{'kbd'} = $style_map_ref->{'code'};
-                $style_map_pre_ref->{'kbd'} = $style_map_pre_ref->{'code'};
-                $Texi2HTML::THISDOC{'kbdinputstyle'} = $1;
-            }
-            elsif ($1 eq 'example')
-            {
-                $style_map_pre_ref->{'kbd'} = $style_map_pre_ref->{'code'};
-                $Texi2HTML::THISDOC{'kbdinputstyle'} = $1;
-            }
-            elsif ($1 ne 'distinct')
-            {
-                echo_error ("Unknown argument for \@$macro: $1", $line_nr);
-            }
-        }
-        else
-        {
-            echo_error ("Bad \@$macro", $line_nr);
-        }
-    }
-    elsif ($macro eq 'paragraphindent')
-    {
-        if ($line =~ /\s+([0-9]+)/)
-        {
-            $Texi2HTML::THISDOC{'paragraphindent'} = $1;
-        }
-        elsif (($line =~ /\s+(none)[^\w\-]/) or ($line =~ /\s+(asis)[^\w\-]/))
-        {
-            $Texi2HTML::THISDOC{'paragraphindent'} = $1;
-        }
-        else
-        {
-            echo_error ("Bad \@$macro", $line_nr);
-        }
-    }
-    elsif ($macro eq 'firstparagraphindent')
-    {
-        if (($line =~ /\s+(none)[^\w\-]/) or ($line =~ /\s+(insert)[^\w\-]/))
-        {
-            $Texi2HTML::THISDOC{'firstparagraphindent'} = $1;
-        }
-        else
-        {
-            echo_error ("Bad \@$macro", $line_nr);
-        }
-    }
-    elsif ($macro eq 'exampleindent')
-    {
-        if ($line =~ /^\s+([0-9]+)/)
-        {
-            $Texi2HTML::THISDOC{'exampleindent'} = $1;
-        }
-        elsif ($line =~ /^\s+(asis)[^\w\-]/)
-        {
-            $Texi2HTML::THISDOC{'exampleindent'} = $1;
-        }
-        else
-        {
-            echo_error ("Bad \@$macro", $line_nr);
-        }
-    }
-    elsif ($macro eq 'footnotestyle')
-    {
-        if (($line =~ /^\s+(end)[^\w\-]/) or ($line =~ /^\s+(separate)[^\w\-]/))
-        {
-            $Texi2HTML::THISDOC{'footnotestyle'} = $1;
-        }
-        else
-        {
-            echo_error ("Bad \@$macro", $line_nr);
-        }
-    }
-    elsif ($macro eq 'headings')
-    {
-        my $valid_arg = 0;
-        foreach my $possible_arg (('off','on','single','double',
-                      'singleafter','doubleafter'))
-        {
-            if ($line =~ /^\s+($possible_arg)[^\w\-]/)
-            {   
-                $valid_arg = 1;
-                $Texi2HTML::THISDOC{'headings'} = $possible_arg;
-                last;
-            }
-        }
-        unless ($valid_arg)
-        {
-            echo_error ("Bad \@$macro", $line_nr);
-        }
-    }
-    elsif ($macro eq 'setchapternewpage')
-    {
-        if (($line =~ /^\s+(on)[^\w\-]/) or ($line =~ /^\s+(off)[^\w\-]/)
-                or ($line =~ /^\s+(odd)[^\w\-]/))
-        {
-            $Texi2HTML::THISDOC{'setchapternewpage'} = $1;
-        }
-        else
-        {
-            echo_error ("Bad \@$macro", $line_nr);
-        }
-    }
-    elsif (grep {$macro eq $_} ('everyheading', 'everyfooting',
-          'evenheading', 'evenfooting', 'oddheading', 'oddfooting'))
-    {
-        my $arg = $line;
-        $arg =~ s/^\s+//;
-        $Texi2HTML::THISDOC{$macro} = $arg;
-    }
-
-    ($text, $line, $args) = preserve_command($line, $macro);
-    return ($text, $line);
-}
-
-# return the line after removing things according to misc_command map.
-# if the skipped macro has an effect it is done here
-# this is used during pass_text
-sub misc_command_text($$$$$$)
-{
-    my $line = shift;
-    my $macro = shift;
-    my $stack = shift;
-    my $state = shift;
-    my $text = shift;
-    my $line_nr = shift;
-    my ($skipped, $remaining, $args);
-    my $keep = $Texi2HTML::Config::misc_command{$macro}->{'keep'};
-
-    if ($macro eq 'detailmenu')
-    {
-        $state->{'detailmenu'}++;
-    }
-    elsif ($macro eq 'sp')
-    {
-        my $sp_number;
-        if ($line =~ /^\s+(\d+)\s/)
-        {
-            $sp_number = $1;
-        }
-        elsif ($line =~ /(\s*)$/)
-        {
-            $sp_number = '';
-        }
-        else
-        {
-            echo_error ("\@$macro needs a numeric arg or no arg", $line_nr);
-        }
-        $sp_number = 1 if ($sp_number eq '');
-        add_prev($text, $stack, &$Texi2HTML::Config::sp($sp_number, $state->{'preformatted'}));
-    }
-    elsif($macro eq 'verbatiminclude' and !$keep)
-    {
-        if ($line =~ /\s+(.+)/)
-        {
-            my $arg = $1;
-            my $file = locate_include_file($arg);
-            if (defined($file))
-            {
-                if (!open(VERBINCLUDE, $file))
-                {
-                    echo_warn ("Can't read file $file: $!",$line_nr);
-                }
-                else
-                {
-                    my $verb_text = '';
-                    while (my $line = <VERBINCLUDE>)
-                    {
-                        $verb_text .= $line;
-                    }
-                    add_prev($text, $stack, &$Texi2HTML::Config::raw('verbatim',$verb_text));
-                    close VERBINCLUDE;
-                }
-            }
-            else
-            {
-                echo_error ("Can't find $arg, skipping", $line_nr);
-            }
-        }
-        else
-        {
-            echo_error ("Bad \@$macro line: $_", $line_nr);
-        }
-    }
-    elsif ($macro eq 'need')
-    {
-        unless (($line =~ /\s+([0-9]+(\.[0-9]*)?)[^\w\-]/) or 
-                 ($line =~ /\s+(\.[0-9]+)[^\w\-]/))
-        {
-            echo_warn ("Bad \@$macro", $line_nr);
-        }
-    }
-    ($remaining, $skipped, $args) = preserve_command($line, $macro);
-    if ($keep)
-    {
-        $remaining = $args . $remaining;
-    }
-    return $remaining if ($remaining ne '');
-    return undef;
-}
-
-# merge the things appearing before the first @node or sectionning command
-# (held by element_before_anything) with the current element if not allready 
-# done 
-sub merge_element_before_anything($)
-{
-    my $element = shift;
-    if (exists($element_before_anything->{'place'}))
-    {
-        $element->{'current_place'} = $element_before_anything->{'place'};
-        $element->{'titlefont'} = $element_before_anything->{'titlefont'};
-        delete $element_before_anything->{'place'};
-        foreach my $placed_thing (@{$element->{'current_place'}})
-        {
-            $placed_thing->{'element'} = $element if (exists($placed_thing->{'element'}));
-        }
-    }
-}
-
-# find menu_prev, menu_up... for a node in menu
-sub menu_entry_texi($$$)
-{
-    my $node = shift;
-    my $state = shift;
-    my $line_nr = shift;
-    my $node_menu_ref = {};
-    if (exists($nodes{$node}))
-    {
-        $node_menu_ref = $nodes{$node};
-    }
-    else
-    {
-        $nodes{$node} = $node_menu_ref;
-        $node_menu_ref->{'texi'} = $node;
-        $node_menu_ref->{'external_node'} = 1 if ($node =~ /\(.+\)/);
-# or $novalidate);
-    }
-    #$node_menu_ref->{'menu_node'} = 1;
-    if ($state->{'node_ref'})
-    {
-        $node_menu_ref->{'menu_up'} = $state->{'node_ref'};
-        $node_menu_ref->{'menu_up_hash'}->{$state->{'node_ref'}->{'texi'}} = 1;
-    }
-    else
-    {
-        echo_warn ("menu entry without previous node: $node", $line_nr) unless ($node =~ /\(.+\)/);
-        #warn "$WARN menu entry without previous node: $node\n" unless ($node =~ /\(.+\)/);
-    }
-    return if ($state->{'detailmenu'});
-    if ($state->{'prev_menu_node'})
-    {
-        $node_menu_ref->{'menu_prev'} = $state->{'prev_menu_node'};
-        $state->{'prev_menu_node'}->{'menu_next'} = $node_menu_ref;
-    }
-    elsif ($state->{'node_ref'})
-    {
-        $state->{'node_ref'}->{'menu_child'} = $node_menu_ref;
-    }
-    $state->{'prev_menu_node'} = $node_menu_ref;
-}
-
-my %files = ();   # keys are files. This is used to avoid reusing an allready
-                  # used file name
-my %empty_indices = (); # value is true for an index name key if the index 
-                        # is empty
-my %printed_indices = (); # value is true for an index name not empty and
-                          # printed
-		  
-# find next, prev, up, back, forward, fastback, fastforward
-# find element id and file
-# split index pages
-# associate placed items (items which have links to them) with the right 
-# file and id
-# associate nodes with sections
-sub rearrange_elements()
-{
-    @all_elements = @elements_list;
-    
-    print STDERR "# find sections levels and toplevel\n"
-        if ($T2H_DEBUG & $DEBUG_ELEMENTS);
-    
-    my $toplevel = 4;
-    # correct level if raisesections or lowersections overflowed
-    # and find toplevel
-    foreach my $element (values(%sections))
-    {
-        my $level = $element->{'level'};
-        if ($level > $MAX_LEVEL)
-        {
-             $element->{'level'} = $MAX_LEVEL;
-        }
-        elsif ($level < $MIN_LEVEL and !$element->{'top'})
-        {
-             $element->{'level'} = $MIN_LEVEL;
-        }
-        else
-        {
-             $element->{'level'} = $level;
-        }
-        $element->{'toc_level'} = $element->{'level'};
-        # This is for top
-        $element->{'toc_level'} = $MIN_LEVEL if ($element->{'level'} < $MIN_LEVEL);
-        # find the new tag corresponding with the level of the section
-        $element->{'tag_level'} = $level2sec{$element->{'tag'}}->[$element->{'level'}] if ($element->{'tag'} !~ /heading/);
-        $toplevel = $element->{'level'} if (($element->{'level'} < $toplevel) and ($element->{'level'} > 0 and ($element->{'tag'} !~ /heading/)));
-        print STDERR "# section level $level: $element->{'texi'}\n" if ($T2H_DEBUG & $DEBUG_ELEMENTS);
-    }
-    
-    print STDERR "# find sections structure, construct section numbers (toplevel=$toplevel)\n"
-        if ($T2H_DEBUG & $DEBUG_ELEMENTS);
-	
-    my $in_appendix = 0;
-    # these arrays heve an element per sectionning level. 
-    my @previous_numbers = ();   # holds the number of the previous sections
-                                 # at the same and upper levels
-    my @previous_sections = ();  # holds the ref of the previous sections
-    
-    foreach my $section (@sections_list)
-    {
-        next if ($section->{'top'});
-        print STDERR "Bug level undef for ($section) $section->{'texi'}\n" if (!defined($section->{'level'}));
-        $section->{'toplevel'} = 1 if ($section->{'level'} == $toplevel);
-        # undef things under that section level
-        for (my $level = $section->{'level'} + 1; $level < $MAX_LEVEL + 1 ; $level++)
-        {
-            $previous_numbers[$level] = undef;
-            $previous_sections[$level] = undef;
-        }
-        my $number_set;
-        # find number at the current level
-        if ($section->{'tag'} =~ /appendix/ and !$in_appendix)
-        {
-            $previous_numbers[$toplevel] = 'A';
-            $in_appendix = 1;
-            $number_set = 1 if ($section->{'level'} == $toplevel);
-        }
-        if (!defined($previous_numbers[$section->{'level'}]) and !$number_set)
-        {
-            if ($section->{'tag'} =~ /unnumbered/)
-            {
-                 $previous_numbers[$section->{'level'}] = undef;
-            }
-            else
-            {
-                $previous_numbers[$section->{'level'}] = 1;
-            }
-        }
-        elsif ($section->{'tag'} !~ /unnumbered/ and !$number_set)
-        {
-            $previous_numbers[$section->{'level'}]++;
-        }
-        # construct the section number
-        $section->{'number'} = '';
-
-        unless ($section->{'tag'} =~ /unnumbered/)
-        { 
-            my $level = $section->{'level'};
-            while ($level > $toplevel)
-            {
-                my $number = $previous_numbers[$level];
-                $number = 0 if (!defined($number));
-                if ($section->{'number'})
-                {
-                    $section->{'number'} = "$number.$section->{'number'}";
-                }
-                else
-                {
-                    $section->{'number'} = $number;
-                }    
-                $level--;
-            }
-            my $toplevel_number = $previous_numbers[$toplevel];
-            $toplevel_number = 0 if (!defined($toplevel_number));
-            $section->{'number'} = "$toplevel_number.$section->{'number'}";
-        }
-        # find the previous section
-        if (defined($previous_sections[$section->{'level'}]))
-        {
-            my $prev_section = $previous_sections[$section->{'level'}];
-            $section->{'section_prev'} = $prev_section;
-            $prev_section->{'next'} = $section;
-            $prev_section->{'element_next'} = $section;
-        }
-        # find the up section
-        if ($section->{'level'} == $toplevel)
-        {
-            $section->{'up'} = undef;
-        }
-        else
-        {
-            my $level = $section->{'level'} - 1;
-            while (!defined($previous_sections[$level]) and ($level >= 0))
-            {
-                 $level--;
-            }
-            if ($level >= 0)
-            {
-                $section->{'up'} = $previous_sections[$level];
-                # 'child' is the first child
-                $section->{'up'}->{'child'} = $section unless ($section->{'section_prev'});
-            }
-            else
-            {
-                 $section->{'up'} = undef;
-            }
-        }
-        $previous_sections[$section->{'level'}] = $section;
-        # element_up is used for reparenting in case an index page 
-        # splitted a section. This is used in order to preserve the up which
-        # points to the up section. See below at index pages generation.
-        $section->{'element_up'} = $section->{'up'};
-
-        my $up = "NO_UP";
-        $up = $section->{'up'} if (defined($section->{'up'}));
-        print STDERR "# numbering section ($section->{'level'}): $section->{'number'}: (up: $up) $section->{'texi'}\n"
-            if ($T2H_DEBUG & $DEBUG_ELEMENTS);
-    }
-
-    my @node_directions = ('node_prev', 'node_next', 'node_up');
-    # handle nodes 
-    # the node_prev... are texinfo strings, find the associated node references
-    print STDERR "# Resolve nodes directions\n" if ($T2H_DEBUG & $DEBUG_ELEMENTS);
-    foreach my $node (@nodes_list)
-    {
-        foreach my $direction (@node_directions)
-        {
-            if ($node->{$direction} and !ref($node->{$direction}))
-            {
-                if ($nodes{$node->{$direction}} and $nodes{$node->{$direction}}->{'seen'})
-                {
-                     $node->{$direction} = $nodes{$node->{$direction}};
-                }
-                elsif (($node->{$direction} =~ /^\(.*\)/) or $novalidate)
-                { # ref to an external node
-                    if (exists($nodes{$node->{$direction}}))
-                    {
-                        $node->{$direction} = $nodes{$node->{$direction}};
-                    }
-                    else
-                    {
-                        # FIXME if {'seen'} this is a node appearing in the
-                        # document and a node like `(file)node'. What to 
-                        # do then ?
-                        my $node_ref = { 'texi' => $node->{$direction} };
-                        $node_ref->{'external_node'} = 1 if ($node->{$direction} =~ /^\(.*\)/);
-                        #my $node_ref = { 'texi' => $node->{$direction},
-                        #    'external_node' => 1 };
-                        $nodes{$node->{$direction}} = $node_ref;
-                        $node->{$direction} = $node_ref;
-                    }
-                }
-                else
-                {
-                     echo_warn ("$direction `$node->{$direction}' for `$node->{'texi'}' not found");
-                     delete $node->{$direction};
-                }
-            }
-        }
-    }
-
-    # find section preceding and following top 
-    my $section_before_top;   # section preceding the top node
-    my $section_after_top;       # section following the top node
-    if ($node_top)
-    {
-        my $previous_is_top = 0;
-        foreach my $element (@all_elements)
-        {
-            if ($element eq $node_top)
-            {
-                $previous_is_top = 1;
-                next;
-            }
-            if ($previous_is_top)
-            {
-                if ($element->{'section'})
-                {
-                    $section_after_top = $element;
-                    last;
-                }
-                next;
-            }
-            $section_before_top = $element if ($element->{'section'});
-        }
-    }
-    print STDERR "# section before Top: $section_before_top->{'texi'}\n" 
-        if ($section_before_top and ($T2H_DEBUG & $DEBUG_ELEMENTS));
-    print STDERR "# section after Top: $section_after_top->{'texi'}\n" 
-         if ($section_after_top and ($T2H_DEBUG & $DEBUG_ELEMENTS));
-    
-    print STDERR "# Build the elements list\n" if ($T2H_DEBUG & $DEBUG_ELEMENTS);
-    if (!$Texi2HTML::Config::USE_NODES)
-    {
-        #the only sectionning elements are sections
-        @elements_list = @sections_list;
-        # if there is no section we use nodes...
-        if (!@elements_list)
-        {
-            print STDERR "# no section\n" if ($T2H_DEBUG & $DEBUG_ELEMENTS);
-            @elements_list = @all_elements;
-        }
-        elsif (!$element_top and $node_top and !$node_top->{'with_section'})
-        { # special case for the top node if it isn't associated with 
-          # a section. The top node element is inserted between the 
-          # $section_before_top and the $section_after_top
-            $node_top->{'as_section'} = 1;
-            $node_top->{'section_ref'} = $node_top;
-            my @old_element_lists = @elements_list;
-            @elements_list = ();
-            while (@old_element_lists)
-            {
-                my $section = shift @old_element_lists;
-                if ($section_before_top and ($section eq $section_before_top))
-                {
-                    push @elements_list, $section;
-                    push @elements_list, $node_top;
-                    last;
-                }
-                elsif ($section_after_top and ($section eq $section_after_top))
-                {
-                    push @elements_list, $node_top;
-                    push @elements_list, $section;
-                    last;
-                }
-                push @elements_list, $section;
-            }
-            push @elements_list, @old_element_lists;
-        }
-        
-        foreach my $element (@elements_list)
-        {
-            print STDERR "# new section element $element->{'texi'}\n"
-                if ($T2H_DEBUG & $DEBUG_ELEMENTS);
-        }
-    }
-    else
-    {
-        # elements are sections if possible, and node if no section associated
-        my @elements = ();
-        while (@elements_list)
-        {
-            my $element = shift @elements_list;
-            if ($element->{'node'})
-            {
-                if (!defined($element->{'with_section'}))
-                {
-                    $element->{'toc_level'} = $MIN_LEVEL if (!defined($element->{'toc_level'}));
-                    print STDERR "# new node element ($element) $element->{'texi'}\n"
-                        if ($T2H_DEBUG & $DEBUG_ELEMENTS);
-                    push @elements, $element;
-                }
-            }
-            else
-            {
-                print STDERR "# new section element ($element) $element->{'texi'}\n"
-                    if ($T2H_DEBUG & $DEBUG_ELEMENTS);
-                push @elements, $element;
-            }
-        }
-        @elements_list = @elements;
-    }
-    foreach my $element (@elements_list)
-    {
-        $element->{'element'} = 1;
-    }
-    
-    # nodes are attached to the section preceding them if not allready 
-    # associated with a section
-    print STDERR "# Find the section associated with each node\n"
-        if ($T2H_DEBUG & $DEBUG_ELEMENTS);
-    my $current_section = $sections_list[0];
-    $current_section = $node_top if ($node_top and $node_top->{'as_section'} and !$section_before_top);
-    my $current;
-    foreach my $element (@all_elements)
-    {
-        if ($element->{'node'} and !$element->{'as_section'})
-        {   
-            if ($element->{'with_section'})
-            { # the node is associated with a section
-                $element->{'section_ref'} = $element->{'with_section'};
-                push @{$element->{'section_ref'}->{'nodes'}}, $element;
-            }
-            elsif (defined($current_section))
-            {
-                $current_section = $section_after_top 
-                    if ($current_section->{'node'} and $section_after_top);
-                $element->{'in_top'} = 1 if ($current_section->{'top'});
-                $element->{'section_ref'} = $current_section;
-                # nodes are considered sub elements for the purprose of 
-                # reparenting and their element_next and element_prev
-                # are next and prev node associated with the same section
-                $element->{'element_up'} = $current_section;
-                $element->{'toc_level'} = $current_section->{'toc_level'};
-                if (defined($current))
-                {
-                    $current->{'element_next'} = $element;
-                    $element->{'element_prev'} = $current;
-                }
-                $current = $element;
-                push @{$element->{'section_ref'}->{'nodes'}}, $element;
-            }
-            else
-            {
-                $element->{'toc_level'} = $MIN_LEVEL;
-            }
-        }
-        else
-        {
-            $current = undef;
-            $current_section = $element;
-            if ($element->{'node'})
-            { # Top node
-                $element->{'toc_level'} = $MIN_LEVEL;
-                push @{$element->{'section_ref'}->{'nodes'}}, $element;
-            }
-        }
-    }
-    print STDERR "# Complete nodes next prev and up based on menus and sections\n"
-        if ($T2H_DEBUG & $DEBUG_ELEMENTS);
-    foreach my $node (@nodes_list)
-    {
-        if (!$node->{'first'} and !$node->{'top'} and !$node->{'menu_up'} and ($node->{'texi'} !~ /^top$/i) and $Texi2HTML::Config::SHOW_MENU)
-        {
-            warn "$WARN `$node->{'texi'}' doesn't appear in menus\n";
-        }
-
-        # use values deduced from menus to complete missing up, next, prev
-        # or from sectionning commands if automatic sectionning
-        if ($node->{'node_up'})
-        {
-            $node->{'up'} = $node->{'node_up'};
-        }
-        elsif ($node->{'automatic_directions'} and $node->{'section_ref'} and defined($node->{'section_ref'}->{'up'}))
-        {
-            $node->{'up'} = get_node($node->{'section_ref'}->{'up'});
-        }
-        elsif ($node->{'menu_up'})
-        {
-            $node->{'up'} = $node->{'menu_up'};
-        }
-
-        if ($node->{'up'} and !$node->{'up'}->{'external_node'})
-        {
-            # We detect when the up node has no menu entry for that node, as
-            # there may be infinite loops when finding following node (see below)
-            unless (defined($node->{'menu_up_hash'}) and ($node->{'menu_up_hash'}->{$node->{'up'}->{'texi'}}))
-            {
-                print STDERR "$WARN `$node->{'up'}->{'texi'}' is up for `$node->{'texi'}', but has no menu entry for this node\n" if ($Texi2HTML::Config::SHOW_MENU);
-                push @{$node->{'up_not_in_menu'}}, $node->{'up'}->{'texi'};
-            }
-        }
-
-        # Find next node
-        if ($node->{'node_next'})
-        {
-            $node->{'next'} = $node->{'node_next'};
-        }
-        elsif ($node->{'texi'} eq 'Top')
-        { # special case as said in the texinfo manual
-            $node->{'next'} = $node->{'menu_child'} if ($node->{'menu_child'});
-        }
-        elsif ($node->{'automatic_directions'})
-        {
-            if (defined($node->{'section_ref'}))
-            {
-                my $next;
-                my $section = $node->{'section_ref'};
-                if (defined($section->{'next'}))
-                {
-                    $next = get_node($section->{'next'})
-                }
-                else 
-                {
-                    while (defined($section->{'up'}) and !defined($section->{'next'}))
-                    {
-                        $section = $section->{'up'};
-                    }
-                    if (defined($section->{'next'}))
-                    {
-                        $next = get_node($section->{'next'});
-                    }
-                }
-                $node->{'next'} = $next;
-            }
-        }
-        if (!defined($node->{'next'}) and $node->{'menu_next'})
-        {
-            $node->{'next'} = $node->{'menu_next'};
-        }
-        # Find prev node
-        if ($node->{'node_prev'})
-        {
-            $node->{'prev'} = $node->{'node_prev'};
-        }
-        elsif ($node->{'automatic_directions'})
-        {
-            if (defined($node->{'section_ref'}))
-            {
-                my $section = $node->{'section_ref'};
-                if (defined($section->{'section_prev'}))
-                {
-                    $node->{'prev'} = get_node($section->{'section_prev'});
-                }
-                elsif (defined($section->{'up'}))
-                {
-                    $node->{'prev'} = get_node($section->{'up'});
-                }
-            }
-        }
-        # next we try menus. makeinfo don't do that
-        if (!defined($node->{'prev'}) and $node->{'menu_prev'}) 
-        {
-            $node->{'prev'} = $node->{'menu_prev'};
-        }
-        # the prev node is the parent node
-        elsif (!defined($node->{'prev'}) and $node->{'menu_up'})
-        {
-            $node->{'prev'} = $node->{'menu_up'};
-        }
-    
-        # the following node is the node following in node reading order
-        # it is thus first the child, else the next, else the next following
-        # the up
-        if ($node->{'menu_child'})
-        {
-            $node->{'following'} = $node->{'menu_child'};
-        }
-        elsif ($node->{'automatic_directions'} and defined($node->{'section_ref'}) and defined($node->{'section_ref'}->{'child'}))
-        {
-            $node->{'following'} = get_node ($node->{'section_ref'}->{'child'});
-        }
-        elsif (defined($node->{'next'}))
-        {
-            $node->{'following'} = $node->{'next'};
-        }
-	else
-        {
-            my $up = $node->{'up'};
-            # in order to avoid infinite recursion in case the up node is the 
-            # node itself we use the up node as following when there isn't 
-            # a correct menu structure, here and also below.
-            $node->{'following'} = $up if (defined($up) and grep {$_ eq $up->{'texi'}} @{$node->{'up_not_in_menu'}});
-            while ((!defined($node->{'following'})) and (defined($up)))
-            {
-                if (($node_top) and ($up eq $node_top))
-                { # if we are at Top, Top is following 
-                    $node->{'following'} = $node_top;
-                    $up = undef;
-                }
-                if (defined($up->{'next'}))
-                {
-                    $node->{'following'} = $up->{'next'};
-                }
-                elsif (defined($up->{'up'}))
-                {
-                    if (! grep { $_ eq $up->{'up'}->{'texi'} } @{$node->{'up_not_in_menu'}}) 
-                    { 
-                        $up = $up->{'up'};
-                    }
-                    else
-                    { # in that case we can go into a infinite loop
-                        $node->{'following'} = $up->{'up'};
-                    }
-                }
-                else
-                {
-                    $up = undef;
-                }
-            }
-        }
-    }
-    
-    # find first and last elements before we split indices
-    # FIXME Is it right for the last element ? Or should it be the last
-    # with indices taken into account ?
-    $element_first = $elements_list[0];
-    print STDERR "# element first: $element_first->{'texi'}\n" if ($T2H_DEBUG & $DEBUG_ELEMENTS); 
-    print STDERR "# top node: $node_top->{'texi'}\n" if (defined($node_top) and
-        ($T2H_DEBUG & $DEBUG_ELEMENTS));
-    # If there is no @top section no top node the first node is the top element
-    $element_top = $node_top if (!defined($element_top) and defined($node_top));
-    $element_top = $element_first unless (defined($element_top));
-    $element_top->{'top'} = 1 if ($element_top->{'node'});
-    $element_last = $elements_list[-1];
-    print STDERR "# element top: $element_top->{'texi'}\n" if ($element_top and
-        ($T2H_DEBUG & $DEBUG_ELEMENTS));
-    
-    print STDERR "# find forward and back\n" if ($T2H_DEBUG & $DEBUG_ELEMENTS);
-    my $prev;
-    foreach my $element (@elements_list)
-    {
-        # complete the up for toplevel elements
-        if ($element->{'toplevel'} and !defined($element->{'up'}) and $element ne $element_top)
-        {
-            $element->{'up'} = $element_top;
-        }
-        # The childs are element which should be reparented in cas a chapter 
-        # is split by an index
-        push @{$element->{'element_up'}->{'childs'}}, $element if (defined($element->{'element_up'}));
-        if ($prev)
-        {
-            $element->{'back'} = $prev;
-            $prev->{'forward'} = $element;
-            $prev = $element;
-        }
-        else
-        {
-            $prev = $element;
-        }
-        # If the element is not a node, then all the node directions are copied
-        # if there is an associated node
-        if (defined($element->{'node_ref'}))
-        {
-            $element->{'nodenext'} = $element->{'node_ref'}->{'next'};
-            $element->{'nodeprev'} = $element->{'node_ref'}->{'prev'};
-            $element->{'menu_next'} = $element->{'node_ref'}->{'menu_next'};
-            $element->{'menu_prev'} = $element->{'node_ref'}->{'menu_prev'};
-            $element->{'menu_child'} = $element->{'node_ref'}->{'menu_child'};
-            $element->{'menu_up'} = $element->{'node_ref'}->{'menu_up'};
-            $element->{'nodeup'} = $element->{'node_ref'}->{'up'};
-            $element->{'following'} = $element->{'node_ref'}->{'following'};
-        }
-        elsif (! $element->{'node'})
-        { # the section has no node associated. Find the node directions using 
-          # sections
-            if (defined($element->{'next'}))
-            {
-                 $element->{'nodenext'} = get_node($element->{'next'});
-            }
-            if (defined($element->{'section_prev'}))
-            {
-                 $element->{'nodeprev'} = get_node($element->{'section_prev'});
-            }
-            if (defined($element->{'up'}))
-            {
-                 $element->{'nodeup'} = get_node($element->{'up'});
-            }
-            if ($element->{'child'})
-            {
-                $element->{'following'} = get_node($element->{'child'});
-            }
-            elsif ($element->{'next'})
-            {
-                $element->{'following'} = get_node($element->{'next'});
-            }
-            elsif ($element->{'up'})
-            {
-                my $up = $element;
-                while ($up->{'up'} and !$element->{'following'})
-                {
-                    $up = $up->{'up'};
-                    if ($up->{'next_section'})
-                    {
-                        $element->{'following'} = get_node ($up->{'next_section'});
-                    }
-                }
-            }
-        }
-        if ($element->{'node'})
-        {
-             $element->{'nodeup'} = $element->{'up'};
-             $element->{'nodeprev'} = $element->{'prev'};
-             $element->{'nodenext'} = $element->{'next'};
-        }
-    }
-
-    my @new_elements = ();
-    print STDERR "# preparing indices\n" if ($T2H_DEBUG & $DEBUG_ELEMENTS);
-
-    while(@elements_list)
-    {
-        my $element = shift @elements_list;
-        # @checked_elements are the elements included in the $element (including
-        # itself) and are searched for indices
-        my @checked_elements = ();
-        if (!$element->{'node'} or $element->{'as_section'})
-        {
-            if (!$Texi2HTML::Config::USE_NODES)
-            {
-                foreach my $node (@{$element->{'nodes'}})
-                {
-                    # we update the element index, first element with index
-                    # if it is a node
-                    $element_index = $element if ($element_index and ($node eq $element_index));
-                    push @checked_elements, $node;
-                    # we push the section itself after the corresponding node
-                    if (defined($element->{'node_ref'}) and ($node eq $element->{'node_ref'}))
-                    {
-                        push @checked_elements, $element;
-                    }
-                }
-                if (!defined($element->{'node_ref'}) and !$element->{'node'})
-                {
-                    push @checked_elements, $element;
-                }
-                $element->{'nodes'} = []; # We reset the element nodes list
-                # as the nodes may be associated below to another element if 
-                # the element is split accross several other elements/pages
-            }
-            else
-            {
-                if ($element->{'node_ref'})
-                {
-                    push @checked_elements, $element->{'node_ref'};
-                    $element_index = $element if ($element_index and ($element->{'node_ref'} eq $element_index));
-                }
-                push @checked_elements, $element;
-                $element->{'nodes'} = [];
-            }
-        }
-        else
-        {
-            push @checked_elements, $element;
-        }
-        my $checked_nodes = '';
-        foreach my $checked (@checked_elements)
-        {
-            $checked_nodes .= "$checked->{'texi'}, ";
-        }
-        print STDERR "# Elements checked for $element->{'texi'}: $checked_nodes\n" if ($T2H_DEBUG & $DEBUG_ELEMENTS);
-        # current_element is the last element holding text
-        my $current_element = { 'holder' => 1, 'texi' => 'HOLDER', 
-            'place' => [], 'indices' => [] };
-        # back is sed to find back and forward
-        my $back = $element->{'back'} if defined($element->{'back'});
-        # forward is sed to find forward of the last inserted element
-        my $forward = $element->{'forward'};
-        my $element_next = $element->{'element_next'};
-        my $index_num = 0;
-        my @waiting_elements = (); # elements (nodes) not used for sectionning 
-                                 # waiting to be associated with an element
-        foreach my $checked_element(@checked_elements)
-        {
-	    if ($checked_element->{'element'})
-            { # this is the element, we must add it
-                push @new_elements, $checked_element;
-                if ($current_element->{'holder'})
-                { # no previous element added
-                    push @{$checked_element->{'place'}}, @{$current_element->{'place'}};
-                    foreach my $index(@{$current_element->{'indices'}})
-                    {
-                        push @{$checked_element->{'indices'}}, [ { 'element' => $checked_element, 'page' => $index->[0]->{'page'}, 'name' => $index->[0]->{'name'} } ] ;
-                    }
-                }
-                else
-                {  
-                    if ($checked_element->{'toplevel'})
-                    # there was an index_page added, this index_page is toplevel.
-                    # it begun a new chapter. The element next for this 
-                    # index page (current_element) is the checked_element
-                    {
-                        $current_element->{'element_next'} = $checked_element;
-                    }
-                    $current_element->{'next'} = $checked_element;
-                    $current_element->{'following'} = $checked_element;
-                    $checked_element->{'prev'} = $current_element;
-                }
-                $current_element = $checked_element;
-                $checked_element->{'back'} = $back;
-                $back->{'forward'} = $checked_element if (defined($back));
-                $back = $checked_element;
-                push @{$checked_element->{'nodes'}}, @waiting_elements;
-                my $waiting_element;
-                while (@waiting_elements)
-                {
-                    $waiting_element = shift @waiting_elements;
-                    $waiting_element->{'section_ref'} = $checked_element;
-                }
-            }
-            elsif ($current_element->{'holder'})
-            {
-                push @waiting_elements, $checked_element;
-            }
-            else
-            {
-                push @{$current_element->{'nodes'}}, $checked_element;
-                $checked_element->{'section_ref'} = $current_element;
-            }
-            push @{$current_element->{'place'}}, @{$checked_element->{'current_place'}};
-            foreach my $index (@{$checked_element->{'index_names'}})
-            {
-                print STDERR "# Index in `$checked_element->{'texi'}': $index->{'name'}. Current is `$current_element->{'texi'}'\n"
-                    if ($T2H_DEBUG & $DEBUG_INDEX);
-                my ($Pages, $Entries) = get_index($index->{'name'});
-                if (defined($Pages))
-                {
-                    my @pages = @$Pages;
-                    my $first_page = shift @pages;
-                    # begin debug section
-                    my $back_texi = 'NO_BACK';
-                    $back_texi = $back->{'texi'} if (defined($back));
-                    print STDERR "# New index first page (back `$back_texi', current `$current_element->{'texi'}')\n" if ($T2H_DEBUG & $DEBUG_INDEX);
-                    # end debug section
-                    push @{$current_element->{'indices'}}, [ {'element' => $current_element, 'page' => $first_page, 'name' => $index->{'name'} } ];
-                    if (@pages)
-                    {
-                        if ($current_element->{'holder'})
-                        { # the current element isn't a real element. 
-                          # We add the real element 
-                          # we are in a node of a section but the element
-                          # is splitted by the index, thus we must add 
-                          # a new element which will contain the text 
-                          # between the beginning of the element and the index
-                            push @new_elements, $checked_element;
-                            print STDERR "# Add element `$element->{'texi'}' before index page\n" 
-                                if ($T2H_DEBUG & $DEBUG_INDEX);
-                            $checked_element->{'element'} = 1;
-                            $checked_element->{'level'} = $element->{'level'};
-                            $checked_element->{'toc_level'} = $element->{'toc_level'};
-                            $checked_element->{'toplevel'} = $element->{'toplevel'};
-                            $checked_element->{'up'} = $element->{'up'};
-                            $checked_element->{'element_added'} = 1;
-                            print STDERR "Bug: checked element wasn't seen" if 
-                                 (!$checked_element->{'seen'});
-                            delete $checked_element->{'with_section'};
-                            if ($checked_element->{'toplevel'})
-                            {
-                                $element->{'element_prev'}->{'element_next'} = $checked_element if (exists($element->{'element_prev'}));
-                            }
-                            push @{$checked_element->{'place'}}, @{$current_element->{'place'}};
-                            foreach my $index(@{$current_element->{'indices'}})
-                            {
-                                push @{$checked_element->{'indices'}}, [ { 'element' => $checked_element, 'page' => $index->[0]->{'page'}, 'name' => $index->[0]->{'name'} } ] ;
-                            }
-                            push @{$checked_element->{'nodes'}}, @waiting_elements;
-                            my $waiting_element;
-                            while (@waiting_elements)
-                            {
-                                $waiting_element = shift @waiting_elements;
-                                $waiting_element->{'section_ref'} = $checked_element;
-                            }
-                            $checked_element->{'back'} = $back;
-                            $back->{'forward'} = $checked_element if (defined($back));
-                            $current_element = $checked_element;
-                            $back = $checked_element;
-                        }
-                        my $index_page;
-                        while(@pages)
-                        {
-                            print STDERR "# New page (back `$back->{'texi'}', current `$current_element->{'texi'}')\n" if ($T2H_DEBUG & $DEBUG_INDEX);
-                            $index_num++;
-                            my $page = shift @pages;
-                            $index_page = { 'index_page' => 1,
-                             'texi' => "$element->{'texi'} index $index->{'name'} page $index_num",
-                             'level' => $element->{'level'},
-                             'tag' => $element->{'tag'},
-                             'tag_level' => $element->{'tag_level'},
-                             'toplevel' => $element->{'toplevel'},
-                             'up' => $element->{'up'},
-                             'element_up' => $element->{'element_up'},
-                             'element_next' => $element_next,
-                             'element_ref' => $element,
-                             'back' => $back,
-                             'prev' => $back,
-                             'next' => $current_element->{'next'},
-                             'following' => $current_element->{'following'},
-                             'nodeup' => $current_element->{'nodeup'},
-                             'nodenext' => $current_element->{'nodenext'},
-                             'nodeprev' => $back,
-                             'place' => [],
-                             'seen' => 1,
-                             'page' => $page
-                            };
-                            $index_page->{'node'} = 1 if ($element->{'node'});
-                            while ($nodes{$index_page->{'texi'}})
-                            {
-                                $nodes{$index_page->{'texi'}} .= ' ';
-                            }
-                            $nodes{$index_page->{'texi'}} = $index_page;
-                            push @{$current_element->{'indices'}->[-1]}, {'element' => $index_page, 'page' => $page, 'name' => $index->{'name'} };
-                            push @new_elements, $index_page;
-                            $back->{'forward'} = $index_page;
-                            $back->{'next'} = $index_page;
-                            $back->{'nodenext'} = $index_page;
-                            $back->{'element_next'} = $index_page unless ($back->{'top'});
-                            $back->{'following'} = $index_page;
-                            $back = $index_page;
-                            $index_page->{'toplevel'} = 1 if ($element->{'top'});
-                        }
-                        $current_element = $index_page;
-                    }
-                }
-                else
-                {
-                    print STDERR "# Empty index: $index->{'name'}\n" 
-                        if ($T2H_DEBUG & $DEBUG_INDEX);
-                    $empty_indices{$index->{'name'}} = 1;
-                }
-                push @{$current_element->{'place'}}, @{$index->{'place'}};
-            }
-        }
-        if ($forward and ($current_element ne $element))
-        {
-            $current_element->{'forward'} = $forward;
-            $forward->{'back'} = $current_element;
-        }
-        next if ($current_element eq $element or !$current_element->{'toplevel'});
-        # reparent the elements below $element, following element
-        # and following parent of element to the last index page
-        print STDERR "# Reparent `$element->{'texi'}':\n" if ($T2H_DEBUG & $DEBUG_INDEX);
-        my @reparented_elements = ();
-        @reparented_elements = (@{$element->{'childs'}}) if (defined($element->{'childs'}));
-        push @reparented_elements, $element->{'element_next'} if (defined($element->{'element_next'}));
-        foreach my $reparented(@reparented_elements)
-        {
-            next if ($reparented->{'toplevel'});
-            $reparented->{'element_up'} = $current_element;
-	    print STDERR "   reparented: $reparented->{'texi'}\n"
-                    if ($T2H_DEBUG & $DEBUG_INDEX);
-        }
-    }
-    @elements_list = @new_elements;
-    
-    print STDERR "# find fastback and fastforward\n" 
-       if ($T2H_DEBUG & $DEBUG_ELEMENTS);
-    foreach my $element (@elements_list)
-    {
-        my $up = get_top($element);
-        next unless (defined($up));
-        $element_chapter_index = $up if ($element_index and ($element_index eq $element));
-	#print STDERR "$element->{'texi'} (top: $element->{'top'}, toplevel: $element->{'toplevel'}, $element->{'element_up'}, $element->{'element_up'}->{'texi'}): up: $up, $up->{'texi'}\n";
-        # fastforward is the next element on same level than the upper parent
-        # element
-        $element->{'fastforward'} = $up->{'element_next'} if (exists ($up->{'element_next'}));
-        # if the element isn't at the highest level, fastback is the 
-        # highest parent element
-        if ($up and ($up ne $element))
-        {
-            $element->{'fastback'} = $up;
-        }
-        elsif ($element->{'toplevel'})
-        {
-            # the element is a top level element, we adjust the next
-            # toplevel element fastback
-            $element->{'fastforward'}->{'fastback'} = $element if ($element->{'fastforward'});
-        }
-    }
-    my $index_nr = 0;
-    # convert directions in direction with first letter in all caps, to be
-    # consistent with the convention used in the .init file.
-    # find id for nodes and indices
-    foreach my $element (@elements_list)
-    {
-        $element->{'this'} = $element;
-        foreach my $direction (('Up', 'Forward', 'Back', 'Next', 
-            'Prev', 'FastForward', 'FastBack', 'This', 'NodeUp', 
-            'NodePrev', 'NodeNext', 'Following' ))
-        {
-            my $direction_no_caps = $direction;
-            $direction_no_caps =~ tr/A-Z/a-z/;
-            $element->{$direction} = $element->{$direction_no_caps};
-        }
-        if ($element->{'index_page'})
-        {
-            $element->{'id'} = "INDEX" . $index_nr;
-            $index_nr++;
-        }
-    }
-    my $node_nr = 1;
-    foreach my $node (@nodes_list)
-    {
-        $node->{'id'} = 'NOD' . $node_nr;
-        $node_nr++;
-        # debug check
-        print STDERR "Bug: level defined for node `$node->{'texi'}'\n" if (defined($node->{'level'}) and !$node->{'element_added'});
-    }
-
-    # Find cross manual links as explained on the texinfo mailing list
-    cross_manual_links(\%nodes, \%cross_reference_nodes);
-    
-    foreach my $float (@floats)
-    {
-         $float->{'id'} = cross_manual_line (normalise_node($float->{'texi'}));
-         $float->{'style_id'} = cross_manual_line (normalise_space($float->{'style_texi'}));
-         my $float_style = { };
-         if (exists($floats{$float->{'style_id'}}))
-         {
-              $float_style = $floats{$float->{'style_id'}};
-         }
-         else
-         {
-              $floats{$float->{'style_id'}} = $float_style;
-         }
-         push @{$float_style->{'floats'}}, $float;
-         $float->{'absolute_nr'} = scalar(@{$float_style->{'floats'}});
-         my $up = get_top($float->{'element'});
-         if (!defined($float_style->{'current_chapter'}) or ($up->{'texi'} ne $float_style->{'current_chapter'}))
-         {
-              $float_style->{'current_chapter'} = $up->{'texi'};
-              $float_style->{'nr_in_chapter'} = 1;
-         }
-         else
-         {
-              $float_style->{'nr_in_chapter'}++;
-         }
-         if ($up->{'number'} ne '')
-         {
-              $float->{'chapter_nr'} = $up->{'number'};
-              $float->{'nr'} = $float->{'chapter_nr'} . $float_style->{'nr_in_chapter'};
-         }
-         else
-         {
-              $float->{'nr'} = $float->{'absolute_nr'};
-         }
-    }
-    
-    if ($Texi2HTML::Config::NEW_CROSSREF_STYLE)
-    { # FIXME allready done for floats?
-        foreach my $key (keys(%nodes))
-        {
-            my $node = $nodes{$key};
-            next if ($node->{'external_node'} or $node->{'index_page'});
-            $node->{'id'} = node_to_id($node->{'cross_manual_target'});
-        }
-    }
-
-    # Find node file names
-    if ($Texi2HTML::Config::NODE_FILES)
-    {
-        my $top;
-        if ($node_top)
-        {
-            $top = $node_top;
-        }
-        elsif ($element_top->{'node_ref'})
-        {
-            $top = $element_top->{'node_ref'};
-        }
-        else
-        {
-            $top = $node_first;
-        }
-        if ($top)
-        {
-            my $file = "$Texi2HTML::Config::TOP_NODE_FILE.$Texi2HTML::Config::NODE_FILE_EXTENSION";
-            $top->{'file'} = $file if ($Texi2HTML::Config::SPLIT eq 'node');
-            $top->{'node_file'} = $file;
-        }
-        foreach my $key (keys(%nodes))
-        {
-            my $node = $nodes{$key};
-            my ($file, $node_file);
-            ($file, $node_file) = &$Texi2HTML::Config::node_file_name ($node);
-            $node->{'file'} = $file if (defined($file));
-            $node->{'node_file'} = $node_file if (defined($node_file));
-#            next if ($node->{'external_node'} or $node->{'index_page'});
-#            if (defined($Texi2HTML::Config::node_file_name))
-#            {
-#                 ($node->{'file'}, $node->{'node_file'}) =
-#                      &$Texi2HTML::Config::node_file_name ($node);
-#            }
-#            else
-#            {
-#                 next if (defined($node->{'file'}));
-#                 my $name = remove_texi($node->{'texi'});
-#                 $name =~ s/[^\w\.\-]/-/g;
-#                 my $file = "${name}.$Texi2HTML::Config::NODE_FILE_EXTENSION";
-#                 $node->{'file'} = $file if (($Texi2HTML::Config::SPLIT eq 'node') and ($Texi2HTML::Config::USE_NODES or $node->{'with_section'}));
-#                 $node->{'node_file'} = $file;
-#            }
-        }
-    }
-    # find document nr and document file for sections and nodes. 
-    # Split according to Texi2HTML::Config::SPLIT.
-    # find file and id for placed elements (anchors, index entries, headings)
-    if ($Texi2HTML::Config::SPLIT)
-    {
-        my $cut_section = $toplevel;
-        my $doc_nr = -1;
-        if ($Texi2HTML::Config::SPLIT eq 'section')
-        {
-            $cut_section = 2 if ($toplevel <= 2);
-        }
-        my $top_doc_nr;
-        my $prev_nr;
-        foreach my $element (@elements_list)
-        {
-            print STDERR "# Splitting ($Texi2HTML::Config::SPLIT) $element->{'texi'}\n" if ($T2H_DEBUG & $DEBUG_ELEMENTS);
-            $doc_nr++ if (
-               ($Texi2HTML::Config::SPLIT eq 'node') or
-               (
-                 (!$element->{'node'} or $element->{'element_added'}) and ($element->{'level'} <= $cut_section)
-               )
-              );
-            $doc_nr = 0 if ($doc_nr < 0); # happens if first elements are nodes
-            $element->{'doc_nr'} = $doc_nr;
-            if ($Texi2HTML::Config::NODE_FILES and ($Texi2HTML::Config::SPLIT eq 'node'))
-            {
-                my $node = get_node($element);
-                if ($node and $node->{'file'})
-                {
-                    $element->{'file'} = $node->{'file'};
-                }
-                unless ($element->{'file'})
-                {
-                    $element->{'file'} = "${docu_name}_$doc_nr.$docu_ext";
-                    $element->{'doc_nr'} = $doc_nr;
-                }
-            }
-            else
-            {
-                $element->{'file'} = "${docu_name}_$doc_nr.$docu_ext";
-                my $is_top = 0;
-                if (defined($top_doc_nr))
-                {
-                    if ($doc_nr eq $top_doc_nr)
-                    {
-                        $element->{'file'} = "$docu_top";
-                        if ($element->{'level'} # this is an element below @top.
-                                               # It starts a new file.
-                          or ($element->{'node'} and ($element ne $node_top) and (!defined($element->{'section_ref'}) or $element->{'section_ref'} ne $element_top))
-                          )# this is a node not associated with top
-                        {
-                            $doc_nr++;
-                            $element->{'doc_nr'} = $doc_nr;
-                            $element->{'file'} = "${docu_name}_$doc_nr.$docu_ext";
-                        }
-                    }
-                }
-                elsif ($element eq $element_top or (defined($element->{'section_ref'}) and $element->{'section_ref'} eq $element_top) or (defined($element->{'node_ref'}) and !$element->{'node_ref'}->{'element_added'} and $element->{'node_ref'} eq $element_top))
-                { # the top element
-                    $is_top = 1;
-                    $element->{'file'} = "$docu_top";
-                    # if there is a previous element, we force it to be in 
-                    # another file than top
-                    $doc_nr++ if (defined($prev_nr) and $doc_nr == $prev_nr);
-                    $top_doc_nr = $doc_nr;
-                    $element->{'doc_nr'} = $doc_nr;
-                }
-                if (defined($Texi2HTML::Config::element_file_name))
-                {
-                     $element->{'file'} = 
-                         &$Texi2HTML::Config::element_file_name ($element, $is_top, $docu_name);
-                }
-            }
-            add_file($element->{'file'});
-            $prev_nr = $doc_nr;
-            foreach my $place(@{$element->{'place'}})
-            {
-                $place->{'file'} = $element->{'file'};
-                $place->{'id'} = $element->{'id'} unless defined($place->{'id'});
-            }
-            if ($element->{'nodes'})
-            {
-                foreach my $node (@{$element->{'nodes'}})
-                {
-                    $node->{'doc_nr'} = $element->{'doc_nr'};
-                    $node->{'file'} = $element->{'file'};
-                }
-            }
-            elsif ($element->{'node_ref'} and !$element->{'node_ref'}->{'element_added'})
-            {
-                $element->{'node_ref'}->{'doc_nr'} = $element->{'doc_nr'} ;
-                $element->{'node_ref'}->{'file'} = $element->{'file'};
-            }
-        }
-    }
-    else
-    {
-        add_file($docu_doc);
-        foreach my $element(@elements_list)
-        {
-            #die "$ERROR monolithic file and a node have the same file name $docu_doc\n" if ($Texi2HTML::Config::NODE_FILES and $files{$docu_doc});
-            $element->{'file'} =  "$docu_doc";
-            $element->{'doc_nr'} = 0;
-            foreach my $place(@{$element->{'place'}})
-            {
-                $place->{'file'} = "$element->{'file'}";
-                $place->{'id'} = $element->{'id'} unless defined($place->{'id'});
-            }
-        }
-        foreach my $node(@nodes_list)
-        {
-            $node->{'file'} =  "$docu_doc";
-            $node->{'doc_nr'} = 0;
-        }
-    }
-    # correct the id and file for the things placed in footnotes
-    foreach my $place(@{$footnote_element->{'place'}})
-    {
-        $place->{'file'} = $footnote_element->{'file'};
-        $place->{'id'} = $footnote_element->{'id'} unless defined($place->{'id'});
-    }
-    foreach my $file (keys(%files))
-    {
-        last unless ($T2H_DEBUG & $DEBUG_ELEMENTS);
-        print STDERR "$file: $files{$file}->{'counter'}\n";
-    }
-    foreach my $element ((@elements_list, $footnote_element))
-    {
-        last unless ($T2H_DEBUG & $DEBUG_ELEMENTS);
-        my $is_toplevel = 'not top';
-        $is_toplevel = 'top' if ($element->{'toplevel'});
-        print STDERR "$element ";
-        if ($element->{'index_page'})
-        {
-            print STDERR "index($element->{'id'}, $is_toplevel, doc_nr $element->{'doc_nr'}($element->{'file'})): $element->{'texi'}\n";
-        }
-        elsif ($element->{'node'})
-        {
-            my $added = '';
-            $added = 'added, ' if ($element->{'element_added'});
-            print STDERR "node($element->{'id'}, toc_level $element->{'toc_level'}, $is_toplevel, ${added}doc_nr $element->{'doc_nr'}($element->{'file'})) $element->{'texi'}:\n";
-            print STDERR "  section_ref: $element->{'section_ref'}->{'texi'}\n" if (defined($element->{'section_ref'}));
-        }
-        elsif ($element->{'footnote'})
-        {
-            print STDERR "footnotes($element->{'id'}, file $element->{'file'})\n";
-        }
-        else 
-        {
-            my $number = "UNNUMBERED";
-            $number = $element->{'number'} if ($element->{'number'});
-            print STDERR "$number ($element->{'id'}, $is_toplevel, level $element->{'level'}-$element->{'toc_level'}, doc_nr $element->{'doc_nr'}($element->{'file'})) $element->{'texi'}:\n";
-            print STDERR "  node_ref: $element->{'node_ref'}->{'texi'}\n" if (defined($element->{'node_ref'}));
-        }
-
-        if (!$element->{'footnote'})
-        {
-            if (!defined($files{$element->{'file'}}))
-            {
-               die "Bug: files{\$element->{'file'}} undef element $element->{'texi'}, file $element->{'file'}.";
-            }
-            print STDERR "  file: $element->{'file'} $files{$element->{'file'}}, counter $files{$element->{'file'}}->{'counter'}\n";
-        }
-        print STDERR "  TOP($toplevel) " if ($element->{'top'});
-        print STDERR "  u: $element->{'up'}->{'texi'}\n" if (defined($element->{'up'}));
-        print STDERR "  ch: $element->{'child'}->{'texi'}\n" if (defined($element->{'child'}));
-        print STDERR "  fb: $element->{'fastback'}->{'texi'}\n" if (defined($element->{'fastback'}));
-        print STDERR "  b: $element->{'back'}->{'texi'}\n" if (defined($element->{'back'}));
-        print STDERR "  p: $element->{'prev'}->{'texi'}\n" if (defined($element->{'prev'}));
-        print STDERR "  n: $element->{'next'}->{'texi'}\n" if (defined($element->{'next'}));
-        print STDERR "  n_u: $element->{'nodeup'}->{'texi'}\n" if (defined($element->{'nodeup'}));
-        print STDERR "  f: $element->{'forward'}->{'texi'}\n" if (defined($element->{'forward'}));
-        print STDERR "  follow: $element->{'following'}->{'texi'}\n" if (defined($element->{'following'}));
-	print STDERR "  m_p: $element->{'menu_prev'}->{'texi'}\n" if (defined($element->{'menu_prev'}));
-	print STDERR "  m_n: $element->{'menu_next'}->{'texi'}\n" if (defined($element->{'menu_next'}));
-	print STDERR "  m_u: $element->{'menu_up'}->{'texi'}\n" if (defined($element->{'menu_up'}));
-	print STDERR "  m_ch: $element->{'menu_child'}->{'texi'}\n" if (defined($element->{'menu_child'}));
-	print STDERR "  u_e: $element->{'element_up'}->{'texi'}\n" if (defined($element->{'element_up'}));
-	print STDERR "  n_e: $element->{'element_next'}->{'texi'}\n" if (defined($element->{'element_next'}));
-        print STDERR "  ff: $element->{'fastforward'}->{'texi'}\n" if (defined($element->{'fastforward'}));
-        if (defined($element->{'menu_up_hash'}))
-        {
-            print STDERR "  parent nodes:\n";
-            foreach my $menu_up (keys%{$element->{'menu_up_hash'}})
-            {
-                print STDERR "   $menu_up ($element->{'menu_up_hash'}->{$menu_up})\n";
-            }
-        }
-        if (defined($element->{'nodes'}))
-        {
-            print STDERR "  nodes: $element->{'nodes'} (@{$element->{'nodes'}})\n";
-            foreach my $node (@{$element->{'nodes'}})
-            {
-                my $beginning = "   ";
-                $beginning = "  *" if ($node->{'with_section'});
-                my $file = $node->{'file'};
-                $file = "file undef" if (! defined($node->{'file'}));
-                print STDERR "${beginning}$node->{'texi'} $file\n";
-            }
-        }
-        print STDERR "  places: $element->{'place'}\n";
-        foreach my $place(@{$element->{'place'}})
-        {
-            if (!$place->{'entry'} and !$place->{'float'} and !$place->{'texi'})
-            {
-                 print STDERR "BUG: unknown placed stuff ========\n";
-                 foreach my $key (keys(%$place))
-                 {
-                      print STDERR "$key: $place->{$key}\n";
-                 }
-                 print STDERR "==================================\n";
-            }
-            elsif ($place->{'entry'})
-            {
-                print STDERR "    index($place): $place->{'entry'}\n";
-            }
-            elsif ($place->{'anchor'})
-            {
-                print STDERR "    anchor: $place->{'texi'}\n";
-            }
-            elsif ($place->{'float'})
-            {
-                if (defined($place->{'texi'}))
-                {
-                    print STDERR "    float($place): $place->{'texi'}\n";
-                }
-                else
-                {
-                    print STDERR "    float($place): NO LABEL\n";
-                }
-            }
-            else
-            {
-                print STDERR "    heading: $place->{'texi'}\n";
-            }
-        }
-        if ($element->{'indices'})
-        {
-            print STDERR "  indices: $element->{'indices'}\n";
-            foreach my $index(@{$element->{'indices'}})
-            {
-                print STDERR "    $index: ";
-                foreach my $page (@$index)
-                {
-                    print STDERR "'$page->{'element'}->{'texi'}'($page->{'name'}): $page->{'page'} ";
-                }
-                print STDERR "\n";
-            }
-        }
-    }
-}
-
-sub add_file($)
-{
-    my  $file = shift;
-    if ($files{$file})
-    {
-         $files{$file}->{'counter'}++;
-    }
-    else
-    {
-         $files{$file} = { 
-           #'type' => 'section', 
-           'counter' => 1
-         };
-    }
-}
-
-# find parent element which is a top element, or a node within the top section
-sub get_top($)
-{
-   my $element = shift;
-   my $up = $element;
-   while (!$up->{'toplevel'} and !$up->{'top'})
-   {
-       $up = $up->{'element_up'};
-       if (!defined($up))
-       {
-           # If there is no section, it is normal not to have toplevel element,
-           # and it is also the case if there is a low level element before
-           # a top level element
-           print STDERR "$WARN no toplevel for $element->{'texi'} (could be normal)\n" if (@sections_list);
-           return undef;
-       }
-   }
-   return $up;
-}
-
-sub get_node($)
-{
-    my $element = shift;
-    return undef if (!defined($element));
-    return $element if ($element->{'node'});
-    return $element->{'node_ref'} if ($element->{'node_ref'} and !$element->{'node_ref'}->{'element_added'});
-    return $element;
-}
-# get the html names from the texi for all elements
-sub do_names()
-{
-    # for nodes and anchors we haven't any state defined
-    # This seems right, however, as we don't want @refs or @footnotes
-    # or @anchors within nodes, section commands or anchors.
-    foreach my $node (%nodes)
-    {
-        next if ($nodes{$node}->{'index_page'}); # some nodes are index pages.
-        $nodes{$node}->{'text'} = substitute_line ($nodes{$node}->{'texi'});
-        $nodes{$node}->{'name'} = $nodes{$node}->{'text'};
-        $nodes{$node}->{'no_texi'} = &$Texi2HTML::Config::protect_text(remove_texi($nodes{$node}->{'texi'}));
-        $nodes{$node}->{'unformatted'} = unformatted_text (undef, $nodes{$node}->{'texi'});
-        # FIXME : what to do if $nodes{$node}->{'external_node'} and
-        # $nodes{$node}->{'seen'}
-    }
-    foreach my $number (keys(%sections))
-    {
-        my $section = $sections{$number};
-        $section->{'name'} = substitute_line ($section->{'texi'});
-        $section->{'text'} = $section->{'number'} . " " . $section->{'name'};
-        $section->{'text'} =~ s/^\s*//;
-        $section->{'no_texi'} = &$Texi2HTML::Config::protect_text($section->{'number'} . " " .remove_texi($section->{'texi'}));
-        $section->{'no_texi'} =~ s/^\s*//;
-        $section->{'unformatted'} = &$Texi2HTML::Config::protect_text($section->{'number'}) . " " .unformatted_text(undef,$section->{'texi'});
-        $section->{'unformatted'} =~ s/^\s*//;
-    }
-    my $tocnr = 1;
-    foreach my $element (@elements_list)
-    {
-        if (!$element->{'top'} and !$element->{'index_page'})
-        {
-            $element->{'tocid'} = 'TOC' . $tocnr;
-            $tocnr++;
-        }
-        next if (defined($element->{'text'}));
-        if ($element->{'index_page'})
-        {
-            my $page = $element->{'page'};
-            my $sec_name = $element->{'element_ref'}->{'text'};
-            $element->{'text'} = ($page->{First} ne $page->{Last} ?
-                "$sec_name: $page->{First} -- $page->{Last}" :
-                "$sec_name: $page->{First}");
-            $sec_name = $element->{'element_ref'}->{'no_texi'};
-            $element->{'no_texi'} = &$Texi2HTML::Config::protect_text($page->{First} ne $page->{Last} ?
-                "$sec_name: $page->{First} -- $page->{Last}" :
-                "$sec_name: $page->{First}");
-            $sec_name = $element->{'element_ref'}->{'unformatted'};
-            $element->{'unformatted'} = $page->{First} ne $page->{Last} ?
-                "$sec_name: " . &$Texi2HTML::Config::protect_text("$page->{First} -- $page->{Last}") :
-                "$sec_name: " . &$Texi2HTML::Config::protect_text("$page->{First}");
-        }
-    }
-}
-
-@{$Texi2HTML::TOC_LINES} = ();            # table of contents
-@{$Texi2HTML::OVERVIEW} = ();           # short table of contents
-
-
-
-#+++############################################################################
-#                                                                              #
-# Stuff related to Index generation                                            #
-#                                                                              #
-#---############################################################################
-
-# FIXME what to do with index entries appearing in @copying 
-# @documentdescription and @titlepage
-sub enter_index_entry($$$$$$)
-{
-    my $prefix = shift;
-    my $line_nr = shift;
-    my $key = shift;
-    my $place = shift;
-    my $element = shift;
-    my $use_section_id = shift;
-    unless (exists ($index_properties->{$prefix}))
-    {
-        echo_error ("Undefined index command: ${prefix}index", $line_nr);
-        #warn "$ERROR Undefined index command: ${prefix}index\n";
-        return 0;
-    }
-    if (!exists($element->{'tag'}) and !$element->{'footnote'})
-    {
-        echo_warn ("Index entry before document: \@${prefix}index $key", $line_nr); 
-    }
-    $key =~ s/\s+$//;
-    $key =~ s/^\s*//;
-    my $entry = $key;
-    # The $key is mostly usefull for alphabetical sorting
-    $key = remove_texi($key);
-    return if ($key =~ /^\s*$/);
-    while (exists $index->{$prefix}->{$key})
-    {
-        $key .= ' ';
-    }
-    my $id = '';
-    unless ($use_section_id)
-    {
-        $id = 'IDX' . ++$idx_num;
-    }
-    $index->{$prefix}->{$key}->{'entry'} = $entry;
-    $index->{$prefix}->{$key}->{'element'} = $element;
-    $index->{$prefix}->{$key}->{'label'} = $id;
-    $index->{$prefix}->{$key}->{'prefix'} = $prefix;
-    push @$place, $index->{$prefix}->{$key};
-    print STDERR "# enter ${prefix}index '$key' with id $id ($index->{$prefix}->{$key})\n"
-        if ($T2H_DEBUG & $DEBUG_INDEX);
-    push @index_labels, $index->{$prefix}->{$key};
-    return $index->{$prefix}->{$key};
-}
-
-# returns prefix of @?index command associated with 2 letters prefix name
-# for example returns 'c' for 'cp'
-sub index_name2prefix
-{
-    my $name = shift;
-    my $prefix;
-
-    for $prefix (keys %$index_properties)
-    {
-        return $prefix if ($index_properties->{$prefix}->{'name'} eq $name);
-    }
-    return undef;
-}
-
-# get all the entries (for all the prefixes) in the $normal and $code 
-# references, formatted with @code{code } if it is a $code entry.
-sub get_index_entries($$)
-{
-    my $normal = shift;
-    my $code = shift;
-    my $entries = {};
-    foreach my $prefix (keys %$normal)
-    {
-        for my $key (keys %{$index->{$prefix}})
-        {
-            $entries->{$key} = $index->{$prefix}->{$key};
-        }
-    }
-
-    if (defined($code))
-    {
-        foreach my $prefix (keys %$code)
-        {
-            unless (exists $normal->{$prefix})
-            {
-                foreach my $key (keys %{$index->{$prefix}})
-                {
-                    $entries->{$key} = $index->{$prefix}->{$key};
-                    # use @code for code style index entry
-                    $entries->{$key}->{'entry'} = "\@code{$entries->{$key}->{entry}}";
-                }
-            }
-        }
-    }
-    return $entries;
-}
-
-# sort according to cmp if both $a and $b are alphabetical or non alphabetical, 
-# otherwise the alphabetical is ranked first
-sub by_alpha
-{
-    if ($a =~ /^[A-Za-z]/)
-    {
-        if ($b =~ /^[A-Za-z]/)
-        {
-            return lc($a) cmp lc($b);
-        }
-        else
-        {
-            return 1;
-        }
-    }
-    elsif ($b =~ /^[A-Za-z]/)
-    {
-        return -1;
-    }
-    else
-    {
-        return lc($a) cmp lc($b);
-    }
-}
-
-# returns an array of index entries pages splitted by letters
-# each page has the following members:
-# {First}            first letter on that page
-# {Last}             last letter on that page
-# {Letters}          ref on an array with all the letters for that page
-# {EntriesByLetter}  ref on a hash. Each key is a letter, with value
-#                    a ref on arrays of index entries begining with this letter
-sub get_index_pages($)
-{
-    my $entries = shift;
-    my (@Letters);
-    my ($EntriesByLetter, $Pages, $page) = ({}, [], {});
-    my @keys = sort by_alpha keys %$entries;
-
-    # each index entry is placed according to its first letter in
-    # EntriesByLetter
-    for my $key (@keys)
-    {
-        push @{$EntriesByLetter->{uc(substr($key,0, 1))}} , $entries->{$key};
-    }
-    @Letters = sort by_alpha keys %$EntriesByLetter;
-    $Texi2HTML::Config::SPLIT_INDEX = 0 unless $Texi2HTML::Config::SPLIT;
-
-    if ($Texi2HTML::Config::SPLIT_INDEX and $Texi2HTML::Config::SPLIT_INDEX =~ /^\d+$/)
-    {
-        my $i = 0;
-        my ($prev_letter);
-        for my $letter (@Letters)
-        {
-            if ($i > $Texi2HTML::Config::SPLIT_INDEX)
-            {
-                $page->{Last} = $prev_letter;
-                push @$Pages, $page;
-                $i=0;
-            }
-	    if ($i == 0)
-	    {
-		$page = {};
-		$page->{Letters} = [];
-		$page->{EntriesByLetter} = {};
-		$page->{First} = $letter;
-	    }
-            push @{$page->{Letters}}, $letter;
-            $page->{EntriesByLetter}->{$letter} = [@{$EntriesByLetter->{$letter}}];
-            $i += scalar(@{$EntriesByLetter->{$letter}});
-            $prev_letter = $letter;
-        }
-        $page->{Last} = $Letters[$#Letters];
-        push @$Pages, $page;
-    }
-    else
-    {
-        warn "$WARN Bad Texi2HTML::Config::SPLIT_INDEX: $Texi2HTML::Config::SPLIT_INDEX\n" if ($Texi2HTML::Config::SPLIT_INDEX);
-        $page->{First} = $Letters[0];
-        $page->{Last} = $Letters[$#Letters];
-        $page->{Letters} = \@Letters;
-        $page->{EntriesByLetter} = $EntriesByLetter;
-        push @$Pages, $page;
-        return $Pages;
-    }
-    return $Pages;
-}
-
-sub get_index($;$)
-{
-    my $name = shift;
-    my $line_nr = shift;
-    return (@{$indices{$name}}) if ($indices{$name});
-    my $prefix = index_name2prefix($name);
-    unless ($prefix)
-    {
-        echo_error ("Bad index name: $name", $line_nr);
-        #warn "$ERROR Bad index name: $name\n";
-        return;
-    }
-    if ($index_properties->{$prefix}->{code})
-    {
-        $index_properties->{$prefix}->{from_code}->{$prefix} = 1;
-    }
-    else
-    {
-        $index_properties->{$prefix}->{from}->{$prefix}= 1;
-    }
-
-    my $Entries = get_index_entries($index_properties->{$prefix}->{from},
-                                  $index_properties->{$prefix}->{from_code});
-    return unless %$Entries;
-    my $Pages = get_index_pages($Entries);
-    $indices{$name} = [ $Pages, $Entries ];
-    return ($Pages, $Entries);
-}
-
-my @foot_lines = ();           # footnotes
-my $copying_comment = '';      # comment constructed from text between
-                               # @copying and @end copying with licence
-my $from_encoding;             # texinfo file encoding
-my $to_encoding;               # out file encoding
-my %acronyms_like = ();        # acronyms or similar commands associated texts
-                               # the key are the commands, the values are
-                               # hash references associating shorthands to
-                               # texts.
-
-sub initialise_state($)
-{
-    my $state = shift;
-    $state->{'preformatted'} = 0 unless exists($state->{'preformatted'}); 
-    $state->{'code_style'} = 0 unless exists($state->{'code_style'}); 
-    $state->{'keep_texi'} = 0 unless exists($state->{'keep_texi'});
-    $state->{'keep_nr'} = 0 unless exists($state->{'keep_nr'});
-    $state->{'detailmenu'} = 0 unless exists($state->{'detailmenu'});     # number of opened detailed menus      
-    $state->{'format_stack'} = [ {'format' => "noformat"} ] unless exists($state->{'format_stack'});
-    $state->{'paragraph_style'} = [ '' ] unless exists($state->{'paragraph_style'}); 
-    $state->{'preformatted_stack'} = [ '' ] unless exists($state->{'preformatted_stack'}); 
-    $state->{'menu'} = 0 unless exists($state->{'menu'}); 
-    $state->{'style_stack'} = [] unless exists($state->{'style_stack'});
-    $state->{'quotation_stack'} = [] unless exists($state->{'quotation_stack'});
-    # if there is no $state->{'element'} the first element is used
-    $state->{'element'} = $elements_list[0] unless (exists($state->{'element'}) and !$state->{'element'}->{'before_anything'});
-}
-
-sub pass_text()
-{
-    my %state;
-    initialise_state (\%state);
-    my @stack;
-    my $text;
-    my $doc_nr;
-    my $in_doc = 0;
-    my $element;
-    my @text =();
-    my @section_lines = ();
-    my @head_lines = ();
-    my $one_section = 1 if (@elements_list == 1);
-
-    if (@elements_list == 0)
-    {
-        warn "$WARN empty document\n";
-        exit (0);
-    }
-
-    # We set titlefont only if the titlefont appeared in the top element
-    if (defined($element_top->{'titlefont'}))
-    {
-         $element_top->{'has_heading'} = 1;
-         $value{'_titlefont'} = $element_top->{'titlefont'};
-    }
-    
-    # prepare %Texi2HTML::THISDOC
-#    $Texi2HTML::THISDOC{'settitle_texi'} = $value{'_settitle'};
-    $Texi2HTML::THISDOC{'fulltitle_texi'} = '';
-    $Texi2HTML::THISDOC{'title_texi'} = '';
-    foreach my $possible_fulltitle (('_title', '_settitle', '_shorttitlepage', '_titlefont'))
-    {
-        if ($value{$possible_fulltitle} ne '')
-        {
-            $Texi2HTML::THISDOC{'fulltitle_texi'} = $value{$possible_fulltitle};
-            last;
-        }
-    }
-    foreach my $possible_title_texi ($value{'_settitle'}, $Texi2HTML::THISDOC{'fulltitle_texi'})
-    {
-        if ($possible_title_texi ne '')
-        {
-            $Texi2HTML::THISDOC{'title_texi'} = $possible_title_texi;
-            last;
-        }
-    }
-#    $Texi2HTML::THISDOC{'fulltitle_texi'} = $value{'_title'} || $value{'_settitle'} || $value{'_shorttitlepage'} || $value{'_titlefont'};
-#    $Texi2HTML::THISDOC{'title_texi'} = $value{'_title'} || $value{'_settitle'} || $value{'_shorttitlepage'} || $value{'_titlefont'};
-    foreach my $texi_cmd (('shorttitlepage', 'settitle', 'author',
-           'titlefont', 'subtitle', 'shorttitle'))
-    {
-        $Texi2HTML::THISDOC{$texi_cmd . '_texi'} = $value{'_' . $texi_cmd};
-    }
-    foreach my $doc_thing (('shorttitlepage', 'settitle', 'author',
-           'titlefont', 'subtitle', 'shorttitle', 'fulltitle', 'title'))
-    {
-        my $thing_texi = $Texi2HTML::THISDOC{$doc_thing . '_texi'};
-        $Texi2HTML::THISDOC{$doc_thing} = substitute_line($thing_texi);
-        $Texi2HTML::THISDOC{$doc_thing . '_no_texi'} =
-           &$Texi2HTML::Config::protect_text(remove_texi($thing_texi));
-        $Texi2HTML::THISDOC{$doc_thing . '_unformatted'} =
-           unformatted_text(undef, $thing_texi);
-    }
-#    $Texi2HTML::THISDOC{'shorttitlepage_texi'} = $value{'_shorttitlepage'};
-#    $Texi2HTML::THISDOC{'fulltitle'} = substitute_line($value{'_title'}) || substitute_line($value{'_settitle'}) || substitute_line($value{'_shorttitlepage'}) || substitute_line($value{'_titlefont'});
-#    $Texi2HTML::THISDOC{'title'} = substitute_line($value{'_settitle'}) || $Texi2HTML::THISDOC{'fulltitle'};
-#    $Texi2HTML::THISDOC{'shorttitle'} =  substitute_line($value{'_shorttitle'});
-
-    # find Top name
-    my $element_top_text = '';
-    my $top_no_texi = '';
-    my $top_unformatted = '';
-    my $top_name;
-    if ($element_top and $element_top->{'text'} and (!$node_top or ($element_top ne $node_top)))
-    {
-        $element_top_text = $element_top->{'text'};
-        $top_no_texi = $element_top->{'no_texi'};
-        $top_unformatted =  $element_top->{'unformatted'};
-    }
-    foreach my $possible_top_name ($Texi2HTML::Config::TOP_HEADING, 
-         $element_top_text, $Texi2HTML::THISDOC{'title'},
-         $Texi2HTML::THISDOC{'shorttitle'}, &$I('Top'))
-    {
-         if (defined($possible_top_name) and $possible_top_name ne '')
-         {
-             $top_name = $possible_top_name;
-             last;
-         }
-    }
-    foreach my $possible_top_no_texi ($Texi2HTML::Config::TOP_HEADING, 
-         $top_no_texi, $Texi2HTML::THISDOC{'title_no_texi'},
-         $Texi2HTML::THISDOC{'shorttitle_no_texi'}, 
-         &$I('Top',{},{'remove_texi' => 1, 'no_protection' => 1}))
-    {
-         if (defined($possible_top_no_texi) and $possible_top_no_texi ne '')
-         {
-             $top_no_texi = $possible_top_no_texi;
-             last;
-         }
-    }
-     
-    foreach my $possible_top_unformatted ($top_unformatted,
-         $Texi2HTML::THISDOC{'title_unformatted'},
-         $Texi2HTML::THISDOC{'shorttitle_unformatted'},
-         &$I('Top',{}, {'unformatted' => 1}))
-    {
-         if (defined($possible_top_unformatted) and $possible_top_unformatted ne '')
-         {
-             $top_unformatted = $possible_top_unformatted;
-             last;
-         }
-    }
-     
-     
-#    my $top_name = $Texi2HTML::Config::TOP_HEADING || $element_top_text || $Texi2HTML::THISDOC{'title'} || $Texi2HTML::THISDOC{'shorttitle'} || &$I('Top');
-
-    if ($Texi2HTML::THISDOC{'fulltitle_texi'} eq '')
-    {
-         $Texi2HTML::THISDOC{'fulltitle_texi'} = &$I('Untitled Document',{},
-           {'keep_texi' => 1});
-    }
-    $Texi2HTML::THISDOC{'title_texi'} = $Texi2HTML::THISDOC{'settitle_texi'};
-    $Texi2HTML::THISDOC{'title_texi'} = $Texi2HTML::THISDOC{'fulltitle_texi'} 
-            if ($Texi2HTML::THISDOC{'title_texi'} eq '');
-
-    foreach my $doc_thing (('fulltitle', 'title'))
-    {
-        my $thing_texi = $Texi2HTML::THISDOC{$doc_thing . '_texi'};
-        $Texi2HTML::THISDOC{$doc_thing} = substitute_line($thing_texi);
-        $Texi2HTML::THISDOC{$doc_thing . '_no_texi'} =
-           &$Texi2HTML::Config::protect_text(remove_texi($thing_texi));
-        $Texi2HTML::THISDOC{$doc_thing . '_unformatted'} =
-           unformatted_text(undef, $thing_texi);
-    }
-#    $Texi2HTML::THISDOC{'fulltitle'} = $Texi2HTML::THISDOC{'fulltitle'} || &$I('Untitled Document') ;
-#    $Texi2HTML::THISDOC{'title'} = $Texi2HTML::THISDOC{'settitle'} || $Texi2HTML::THISDOC{'fulltitle'};
-#    $Texi2HTML::THISDOC{'author'} = substitute_line($value{'_author'});
-#    $Texi2HTML::THISDOC{'titlefont'} = substitute_line($value{'_titlefont'});
-#    $Texi2HTML::THISDOC{'subtitle'} = substitute_line($value{'_subtitle'});
-
-#    $Texi2HTML::THISDOC{'title_unformatted'} = unformatted_text(undef, $Texi2HTML::THISDOC{'title_texi'});
-#    $Texi2HTML::THISDOC{'shorttitle_unformatted'} =  unformatted_text(undef, $value{'_shorttitle'});
-#    $Texi2HTML::THISDOC{'title_no_texi'} = &$Texi2HTML::Config::protect_text(remove_texi($value{'_title'})) || &$Texi2HTML::Config::protect_text(remove_texi($value{'_settitle'})) || &$Texi2HTML::Config::protect_text(remove_texi($value{'_shorttitlepage'})) || &$Texi2HTML::Config::protect_text(remove_texi($value{'_titlefont'}));
-#    $Texi2HTML::THISDOC{'shorttitle_no_texi'} =  &$Texi2HTML::Config::protect_text(remove_texi($value{'_shorttitle'}));
-
-#    my $top_no_texi = '';
-#    my $top_unformatted = '';
-#    if ($element_top and $element_top->{'no_texi'}  and (!$node_top or ($element_top ne $node_top)))
-#    {
-#        $top_no_texi = $element_top->{'no_texi'};
-#        $top_unformatted =  $element_top->{'unformatted'};
-#    }
-
-#    $top_no_texi = $Texi2HTML::Config::TOP_HEADING || $top_no_texi || $Texi2HTML::THISDOC{'title_no_texi'} || $Texi2HTML::THISDOC{'shorttitle_no_texi'} || &$I('Top',{}, {'remove_texi' => 1, 'no_protection' => 1});
-#    $top_unformatted = $top_unformatted || $Texi2HTML::THISDOC{'title_unformatted'} || $Texi2HTML::THISDOC{'shorttitle_unformatted'} || &$I('Top',{}, {'unformatted' => 1});
-#    $Texi2HTML::THISDOC{'title_unformatted'} = $Texi2HTML::THISDOC{'title_unformatted'} || &$I('Untitled Document',{},  {'unformatted' => 1});
-#    $Texi2HTML::THISDOC{'title_no_texi'} = $Texi2HTML::THISDOC{'title_no_texi'} || &$I('Untitled Document',{}, {'remove_texi' => 1, 'no_protection' => 1});
-
-    for my $key (keys %Texi2HTML::THISDOC)
-    {
-        next if (ref($Texi2HTML::THISDOC{$key}));
-print STDERR "!!$key\n" if (!defined($Texi2HTML::THISDOC{$key}));
-        $Texi2HTML::THISDOC{$key} =~ s/\s*$//;
-    }
-    $Texi2HTML::THISDOC{'program'} = $THISPROG;
-    $Texi2HTML::THISDOC{'program_homepage'} = $T2H_HOMEPAGE;
-    $Texi2HTML::THISDOC{'program_authors'} = $T2H_AUTHORS;
-    $Texi2HTML::THISDOC{'user'} = $T2H_USER;
-#    $Texi2HTML::THISDOC{'documentdescription'} = $documentdescription;
-    $Texi2HTML::THISDOC{'copying'} = $copying_comment;
-    $Texi2HTML::THISDOC{'toc_file'} = ''; 
-    $Texi2HTML::THISDOC{'toc_file'} = $docu_toc if ($Texi2HTML::Config::SPLIT); 
-    $Texi2HTML::THISDOC{'file_base_name'} = $docu_name;
-    $Texi2HTML::THISDOC{'destination_directory'} = $docu_rdir;
-    $Texi2HTML::THISDOC{'authors'} = [] if (!defined($Texi2HTML::THISDOC{'authors'}));
-    $Texi2HTML::THISDOC{'subtitles'} = [] if (!defined($Texi2HTML::THISDOC{'subtitles'}));
-    $Texi2HTML::THISDOC{'titles'} = [] if (!defined($Texi2HTML::THISDOC{'titles'}));
-    foreach my $element (('authors', 'subtitles', 'titles'))
-    {
-        my $i;
-        for ($i = 0; $i < $#{$Texi2HTML::THISDOC{$element}} + 1; $i++) 
-        {
-            chomp ($Texi2HTML::THISDOC{$element}->[$i]);
-            $Texi2HTML::THISDOC{$element}->[$i] = substitute_line($Texi2HTML::THISDOC{$element}->[$i]);
-            #print STDERR "$element:$i: $Texi2HTML::THISDOC{$element}->[$i]\n";
-        }
-    }
-    # prepare TOC, OVERVIEW
-    if ($Texi2HTML::Config::SPLIT)
-    {
-        $Texi2HTML::HREF{'Contents'} = $docu_toc.'#SEC_Contents' if @{$Texi2HTML::TOC_LINES};
-        $Texi2HTML::HREF{'Overview'} = $docu_stoc.'#SEC_Overview' if @{$Texi2HTML::OVERVIEW};
-        $Texi2HTML::HREF{'Footnotes'} = $docu_foot. '#SEC_Foot';
-        $Texi2HTML::HREF{'About'} = $docu_about . '#SEC_About' unless $one_section;
-    }
-    else
-    {
-        $Texi2HTML::HREF{'Contents'} = '#SEC_Contents' if @{$Texi2HTML::TOC_LINES};
-        $Texi2HTML::HREF{'Overview'} = '#SEC_Overview' if @{$Texi2HTML::OVERVIEW};
-        $Texi2HTML::HREF{'Footnotes'} = '#SEC_Foot';
-        $Texi2HTML::HREF{'About'} = '#SEC_About' unless $one_section;
-    }
-    
-    %Texi2HTML::NAME =
-        (
-         'First',   $element_first->{'text'},
-         'Last',    $element_last->{'text'},
-         'About',    &$I('About This Document'),
-         'Contents', &$I('Table of Contents'),
-         'Overview', &$I('Short Table of Contents'),
-         'Top',      $top_name,
-         'Footnotes', &$I('Footnotes'),
-        );
-    $Texi2HTML::NAME{'Index'} = $element_chapter_index->{'text'} if (defined($element_chapter_index));
-    $Texi2HTML::NAME{'Index'} = $Texi2HTML::Config::INDEX_CHAPTER if ($Texi2HTML::Config::INDEX_CHAPTER ne '');
-    
-    %Texi2HTML::NO_TEXI =
-        (
-         'First',   $element_first->{'no_texi'},
-         'Last',    $element_last->{'no_texi'},
-#FIXME this is not really NO_TEXI as there may be some formatting expanded
-# in &$I, using substitute_line
-         'About',    &$I('About This Document', {}, {'remove_texi' => 1, 'no_protection' => 1} ),
-         'Contents', &$I('Table of Contents', {}, {'remove_texi' => 1, 'no_protection' => 1} ),
-         'Overview', &$I('Short Table of Contents', {}, {'remove_texi' => 1, 'no_protection' => 1} ),
-         'Top',      $top_no_texi,
-         'Footnotes', &$I('Footnotes', {}, {'remove_texi' => 1, 'no_protection' => 1} ),
-        );
-    $Texi2HTML::NO_TEXI{'Index'} = $element_chapter_index->{'no_texi'} if (defined($element_chapter_index));
-    %Texi2HTML::UNFORMATTED =
-        (
-         'First',   $element_first->{'unformatted'},
-         'Last',    $element_last->{'unformatted'},
-#FIXME this is not really UNFORMATTED as there may be some formatting expanded
-# in &$I, using substitute_line
-         'About',    &$I('About This Document', {}, {'unformatted' => 1}),
-         'Contents', &$I('Table of Contents',{},  {'unformatted' => 1}),
-         'Overview', &$I('Short Table of Contents', {}, {'unformatted' => 1}),
-         'Top',      $top_unformatted,
-         'Footnotes', &$I('Footnotes', {},{'unformatted' => 1}),
-        );
-    $Texi2HTML::UNFORMATTED{'Index'} = $element_chapter_index->{'unformatted'} if (defined($element_chapter_index));
-    $Texi2HTML::TITLEPAGE = '';
-    $Texi2HTML::TITLEPAGE = substitute_text({}, @{$region_lines{'titlepage'}})
-        if (@{$region_lines{'titlepage'}});
-    &$Texi2HTML::Config::titlepage();
-
-    $to_encoding = &$Texi2HTML::Config::init_out();
-
-    ############################################################################
-    # print frame and frame toc file
-    #
-    if ( $Texi2HTML::Config::FRAMES )
-    {
-        #open(FILE, "> $docu_frame_file")
-        #    || die "$ERROR: Can't open $docu_frame_file for writing: $!\n";
-        my $FH = open_out($docu_frame_file);
-        print STDERR "# Creating frame in $docu_frame_file ...\n" if $T2H_VERBOSE;
-        &$Texi2HTML::Config::print_frame($FH, $docu_toc_frame_file, $docu_top_file);
-        close_out($FH, $docu_frame_file);
-
-        #open(FILE, "> $docu_toc_frame_file")
-        #    || die "$ERROR: Can't open $docu_toc_frame_file for writing: $!\n";
-        $FH = open_out($docu_toc_frame_file);
-        print STDERR "# Creating toc frame in $docu_frame_file ...\n" if $T2H_VERBOSE;
-        #&$Texi2HTML::Config::print_toc_frame(\*FILE, $Texi2HTML::OVERVIEW);
-        &$Texi2HTML::Config::print_toc_frame($FH, $Texi2HTML::OVERVIEW);
-        #close(FILE);
-        close_out($FH, $docu_toc_frame_file);
-    }
-
-    ############################################################################
-    #
-    #
-
-    my $FH;
-    my $index_pages;
-    my $index_pages_nr;
-    my $index_nr = 0;
-    my $line_nr;
-    my $first_section = 0; # 1 if it is the first section of a page
-    while (@doc_lines)
-    {
-        unless ($index_pages)
-        { # not in a index split over sections
-            $_ = shift @doc_lines;
-            my $chomped_line = $_;
-            if (!chomp($chomped_line) and @doc_lines)
-            { # if the line has no end of line it is concatenated with the next
-                 $doc_lines[0] = $_ . $doc_lines[0];
-                 next;
-            }
-            $line_nr = shift (@doc_numbers);
-            #print STDERR "$line_nr->{'file_name'}($line_nr->{'macro'},$line_nr->{'line_nr'}) $_" if ($line_nr);
-        }
-	#print STDERR "PASS_TEXT: $_";
-	#dump_stack(\$text, \@stack, \%state);
-        if (!$state{'raw'} and !$state{'verb'})
-        {
-            my $tag = '';
-            $tag = $1 if (/^\@(\w+)/ and !$index_pages);
-
-            if (($tag eq 'node') or defined($sec2level{$tag}) or $index_pages)
-            {
-                if (@stack or (defined($text) and $text ne ''))
-                {# in pass text node and section shouldn't appear in formats
-			#print STDERR "close_stack before \@$tag\n";
-			#print STDERR "text!$text%" if (! @stack);
-                    close_stack(\$text, \@stack, \%state, $line_nr);
-                    push @section_lines, $text;
-                    $text = '';
-                }
-                $sec_num++ if ($sec2level{$tag});
-                my $new_element;
-                my $current_element;
-                if ($tag =~ /heading/)
-                {# handle headings, they are not in element lists
-                    $current_element = $sections{$sec_num};
-                    #print STDERR "HEADING $_";
-                    if (! $element)
-                    {
-                        $new_element = shift @elements_list;
-                        $element->{'has_heading'} = 1 if ($new_element->{'top'});
-                    }
-                    else
-                    {
-                        if ($element->{'top'})
-                        {
-                            $element->{'has_heading'} = 1;
-                        }
-                        push (@section_lines, &$Texi2HTML::Config::anchor($current_element->{'id'}) . "\n");
-                        push @section_lines, &$Texi2HTML::Config::heading($current_element);
-                        next;
-                    }
-                }
-                elsif (!$index_pages)
-                {# handle node and structuring elements
-                    $current_element = shift (@all_elements);
-                    #begin debug section
-                    if ($current_element->{'node'})
-                    {
-                         print STDERR 'NODE ' . "$current_element->{'texi'}($current_element->{'file'})" if ($T2H_DEBUG & $DEBUG_ELEMENTS);
-                         print STDERR "($current_element->{'section_ref'}->{'texi'})" if ($current_element->{'section_ref'} and ($T2H_DEBUG & $DEBUG_ELEMENTS));
-                    }
-                    else
-                    {
-                         print STDERR 'SECTION ' . $current_element->{'texi'} if ($T2H_DEBUG & $DEBUG_ELEMENTS);
-                    }
-                    print STDERR ": $_" if ($T2H_DEBUG & $DEBUG_ELEMENTS);
-                    #end debug section
-
-                    # The element begins a new section if there is no previous
-                    # or it is an element and not the current one or the 
-                    # associated section (in case of node) is not the current one
-                    if (!$element 
-                      or ($current_element->{'element'} and ($current_element ne $element))
-                      or ($current_element->{'section_ref'} and ($current_element->{'section_ref'} ne $element)))
-                    {
-                         $new_element = shift @elements_list;
-                    }
-                    # begin debugging section
-                    my $section_element = $new_element;
-                    $section_element = $element unless ($section_element);
-                    if (!$current_element->{'node'} and !$current_element->{'index_page'} and ($section_element ne $current_element))
-                    {
-                         print STDERR "NODE: $element->{'texi'}\n" if ($element->{'node'});
-                         warn "elements_list and all_elements not in sync (elements $section_element->{'texi'}, all $current_element->{'texi'}): $_";
-                    }
-                    # end debugging section
-                }
-                else
-                { # this is a new index section
-                    $new_element = $index_pages->[$index_pages_nr]->{'element'};
-                    $current_element = $index_pages->[$index_pages_nr]->{'element'};
-                    print STDERR "New index page '$new_element->{'texi'}' nr: $index_pages_nr\n" if ($T2H_DEBUG & $DEBUG_ELEMENTS);
-                    my $list_element = shift @elements_list;
-                    die "element in index_pages $new_element->{'texi'} and in list $list_element->{'texi'} differs\n" unless ($list_element eq $new_element);
-                }
-                if ($new_element)
-                {
-                    $index_nr = 0;
-                    my $old = 'NO_OLD';
-                    $old = $element->{'texi'} if (defined($element));
-                    print STDERR "NEW: $new_element->{'texi'}, OLD: $old\n" if ($T2H_DEBUG & $DEBUG_ELEMENTS);
-# FIXME this should be done differently now that there could be elements
-# associated with the same file
-                    if ($element and ($new_element->{'doc_nr'} != $element->{'doc_nr'}) and @foot_lines and !$Texi2HTML::Config::SEPARATED_FOOTNOTES)
-                    { # note that this can only happen if $Texi2HTML::Config::SPLIT
-                        &$Texi2HTML::Config::foot_section (\@foot_lines);
-                        push @section_lines, @foot_lines;
-                        @foot_lines = ();
-                        $relative_foot_num = 0;
-                    }
-                    # print the element that just finished
-                    $Texi2HTML::THIS_SECTION = \@section_lines;
-                    $Texi2HTML::THIS_HEADER = \@head_lines;
-                    if ($element)
-                    {
-                        #$FH = finish_element($FH, $element, $new_element, $first_section);
-                        finish_element($FH, $element, $new_element, $first_section);
-                        $first_section = 0;
-                        @section_lines = ();
-                        @head_lines = ();
-                    }
-                    else
-                    {
-                        print STDERR "# Writing elements:" if ($T2H_VERBOSE);
-                        if ($Texi2HTML::Config::IGNORE_PREAMBLE_TEXT)
-                        {
-                             @section_lines = ();
-                             @head_lines = ();
-                        }
-                        # remove empty line at the beginning of @section_lines
-                        shift @section_lines while (@section_lines and ($section_lines[0] =~ /^\s*$/));
-                    }
-                    # begin new element
-                    my $previous_file;
-                    $previous_file = $element->{'file'} if (defined($element));
-                    $element = $new_element;
-                    $state{'element'} = $element;
-                    $Texi2HTML::THIS_ELEMENT = $element;
-                    #print STDERR "Doing hrefs for $element->{'texi'} First ";
-                    $Texi2HTML::HREF{'First'} = href($element_first, $element->{'file'});
-                    #print STDERR "Last ";
-                    $Texi2HTML::HREF{'Last'} = href($element_last, $element->{'file'});
-                    #print STDERR "Index ";
-                    $Texi2HTML::HREF{'Index'} = href($element_chapter_index, $element->{'file'}) if (defined($element_chapter_index));
-                    #print STDERR "Top ";
-                    $Texi2HTML::HREF{'Top'} = href($element_top, $element->{'file'});
-                    foreach my $direction (('Up', 'Forward', 'Back', 'Next', 
-                        'Prev', 'FastForward', 'FastBack', 'This', 'NodeUp', 
-                        'NodePrev', 'NodeNext', 'Following' ))
-                    {
-                        my $elem = $element->{$direction};
-                        $Texi2HTML::NODE{$direction} = undef;
-                        $Texi2HTML::HREF{$direction} = undef;
-                        next unless (defined($elem));
-                        #print STDERR "$direction ";
-                        if ($elem->{'node'} or $elem->{'external_node'} or $elem->{'index_page'} or !$elem->{'seen'})
-                        {
-                            $Texi2HTML::NODE{$direction} = $elem->{'text'};
-                        }
-                        elsif ($elem->{'node_ref'})
-                        {
-                            $Texi2HTML::NODE{$direction} = $elem->{'node_ref'}->{'text'};
-                        }
-                        if (!$elem->{'seen'})
-                        {
-                            $Texi2HTML::HREF{$direction} = do_external_href($elem->{'texi'});
-                        }
-                        else
-                        {
-                            $Texi2HTML::HREF{$direction} = href($elem, $element->{'file'});
-                        }
-                        $Texi2HTML::NAME{$direction} = $elem->{'text'};
-                        $Texi2HTML::NO_TEXI{$direction} = $elem->{'no_texi'};
-                        $Texi2HTML::UNFORMATTED{$direction} = $elem->{'unformatted'};
-                        #print STDERR "$direction ($element->{'texi'}): \n  NO_TEXI: $Texi2HTML::NO_TEXI{$direction}\n  NAME $Texi2HTML::NAME{$direction}\n  NODE $Texi2HTML::NODE{$direction}\n  HREF $Texi2HTML::HREF{$direction}\n\n";
-                    }
-                    #print STDERR "\nDone hrefs for $element->{'texi'}\n";
-                    $files{$element->{'file'}}->{'counter'}--;
-                    #if (! defined($FH))
-                    if (!defined($previous_file) or ($element->{'file'} ne $previous_file))
-                    {
-                        my $file = $element->{'file'};
-                        print STDERR "\n" if ($T2H_VERBOSE and !$T2H_DEBUG);
-                        print STDERR "# Writing to $docu_rdir$file " if $T2H_VERBOSE;
-                        my $do_page_head = 0;
-                        if ($files{$file}->{'filehandle'})
-                        {
-                             $FH = $files{$file}->{'filehandle'};
-                        }
-                        else
-                        {
-                             $FH = open_out("$docu_rdir$file");
-                             $files{$file}->{'filehandle'} = $FH;
-                             $do_page_head = 1;
-                        }
-                        if ($element->{'top'})
-                        {
-                             &$Texi2HTML::Config::print_Top_header($FH, $do_page_head);
-                        }
-                        else
-                        {
-                             &$Texi2HTML::Config::print_page_head($FH) if ($do_page_head);
-                             &$Texi2HTML::Config::print_chapter_header($FH) if $Texi2HTML::Config::SPLIT eq 'chapter';
-                             &$Texi2HTML::Config::print_section_header($FH) if $Texi2HTML::Config::SPLIT eq 'section';
-                        }
-                        $first_section = 1;
-                    }
-                    print STDERR "." if ($T2H_VERBOSE);
-                    print STDERR "\n" if ($T2H_DEBUG);
-                }
-                my $label = &$Texi2HTML::Config::anchor($current_element->{'id'}) . "\n";
-                if (@section_lines)
-                {
-                    push (@section_lines, $label);
-                }
-                else
-                {
-                    push @head_lines, $label;
-                }
-                if ($index_pages)
-                {
-                    push @section_lines, &$Texi2HTML::Config::heading($element);
-		    #print STDERR "Do index page $index_pages_nr\n";
-                    my $page = do_index_page($index_pages, $index_pages_nr);
-                    push @section_lines, $page;
-                    if (defined ($index_pages->[$index_pages_nr + 1]))
-                    {
-                        $index_pages_nr++;
-                    }
-                    else
-                    {
-                        $index_pages = undef;
-                    }
-                    next;
-                }
-                push @section_lines, &$Texi2HTML::Config::heading($current_element) if ($current_element->{'element'} and !$current_element->{'top'});
-                next;
-            }
-            elsif ($tag eq 'printindex')
-            {
-                s/\s+(\w+)\s*//;
-                my $name = $1;
-                close_paragraph(\$text, \@stack, \%state);
-                next if (!index_name2prefix($name) or $empty_indices{$name});
-                $printed_indices{$name} = 1;
-                print STDERR "print index $name($index_nr) in `$element->{'texi'}', element->{'indices'}: $element->{'indices'},\n" if ($T2H_DEBUG & $DEBUG_ELEMENTS or $T2H_DEBUG & $DEBUG_INDEX);
-                print STDERR "element->{'indices'}->[index_nr]: $element->{'indices'}->[$index_nr] (@{$element->{'indices'}->[$index_nr]})\n" if ($T2H_DEBUG & $DEBUG_ELEMENTS or $T2H_DEBUG & $DEBUG_INDEX);
-                $index_pages = $element->{'indices'}->[$index_nr] if (@{$element->{'indices'}->[$index_nr]} > 1);
-                $index_pages_nr = 0;
-                add_prev(\$text, \@stack, do_index_page($element->{'indices'}->[$index_nr], 0));  
-                $index_pages_nr++;
-                $index_nr++;
-                begin_paragraph (\@stack, \%state) if ($state{'preformatted'});
-                next if (@stack);
-                push @section_lines, $text;
-                $text = '';
-                next;
-            }
-            elsif ($tag eq 'contents')
-            {
-                next;
-            }
-        }
-        scan_line($_, \$text, \@stack, \%state, $line_nr);
-	#print STDERR "after scan_line: $_";
-	#dump_stack(\$text, \@stack, \%state);
-        next if (@stack);
-        if ($text ne '' )
-        { 
-            push @section_lines, $text;
-            $text = '';
-        }
-    }
-    if (@stack)
-    {# close stack at the end of pass text
-        close_stack(\$text, \@stack, \%state, $line_nr);
-    }
-    if (defined($text))
-    {
-        push @section_lines, $text;
-    }
-    print STDERR "\n" if ($T2H_VERBOSE);
-    $Texi2HTML::THIS_SECTION = \@section_lines;
-    # if no sections, then simply print document as is
-    if ($one_section)
-    {
-        if (@foot_lines)
-        {
-            &$Texi2HTML::Config::foot_section (\@foot_lines);
-            push @section_lines, @foot_lines;
-        }
-        $Texi2HTML::THIS_HEADER = \@head_lines;
-        if ($element->{'top'})
-        {
-            print STDERR "Bug: `$element->{'texi'}' level undef\n" if (!$element->{'node'} and !defined($element->{'level'}));
-            $element->{'level'} = 1 if (!defined($element->{'level'}));
-            $element->{'node'} = 0; # otherwise Texi2HTML::Config::heading may uses the node level
-            $element->{'text'} = $Texi2HTML::NAME{'Top'};
-            print STDERR "[Top]" if ($T2H_VERBOSE);
-            unless ($element->{'has_heading'})
-            {
-                unshift @section_lines, &$Texi2HTML::Config::heading($element);
-            }
-        }
-        print STDERR "# Write the section $element->{'texi'}\n" if ($T2H_VERBOSE);
-        &$Texi2HTML::Config::one_section($FH);
-        close_out($FH);
-        return;
-    }
-
-    finish_element ($FH, $element, undef, $first_section);
-
-    ############################################################################
-    # Print ToC, Overview, Footnotes
-    #
-    for my $direction (('Prev', 'Next', 'Back', 'Forward', 'Up', 'NodeUp', 
-        'NodePrev', 'NodeNext', 'Following', 'This'))
-    {
-        delete $Texi2HTML::HREF{$direction};
-        # it is better to undef in case the references to these hash entries
-        # are used, as if deleted, the
-        # references are still refering to the old, undeleted element
-        # (we could do both)
-        $Texi2HTML::NAME{$direction} = undef;
-        $Texi2HTML::NO_TEXI{$direction} = undef;
-        $Texi2HTML::UNFORMATTED{$direction} = undef;
-        $Texi2HTML::NODE{$direction} = undef;
-
-        $Texi2HTML::THIS_ELEMENT = undef;
-    }
-    if (@foot_lines)
-    {
-        print STDERR "# 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"
-        $FH = open_out ($docu_foot_file)
-            if $Texi2HTML::Config::SPLIT;
-        $Texi2HTML::HREF{'This'} = $Texi2HTML::HREF{'Footnotes'};
-        $Texi2HTML::HREF{'Footnotes'} = '#' . $footnote_element->{'id'};
-        $Texi2HTML::NAME{'This'} = $Texi2HTML::NAME{'Footnotes'};
-        $Texi2HTML::NO_TEXI{'This'} = $Texi2HTML::NO_TEXI{'Footnotes'};
-        $Texi2HTML::UNFORMATTED{'This'} = $Texi2HTML::UNFORMATTED{'Footnotes'};
-        $Texi2HTML::THIS_SECTION = \@foot_lines;
-        $Texi2HTML::THIS_HEADER = [ &$Texi2HTML::Config::anchor($footnote_element->{'id'}) . "\n" ];
-        #&$Texi2HTML::Config::print_Footnotes(\*FILE);
-        &$Texi2HTML::Config::print_Footnotes($FH);
-        #close(FILE) if $Texi2HTML::Config::SPLIT;
-        close_out($FH, $docu_foot_file) 
-            #|| die "$ERROR: Error occurred when closing $docu_foot_file: $!\n"
-               if ($Texi2HTML::Config::SPLIT);
-        $Texi2HTML::HREF{'Footnotes'} = $Texi2HTML::HREF{'This'};
-    }
-
-    if (@{$Texi2HTML::TOC_LINES})
-    {
-        print STDERR "# 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"
-        $FH = open_out ($docu_toc_file)
-            if $Texi2HTML::Config::SPLIT;
-        $Texi2HTML::HREF{'This'} = $Texi2HTML::HREF{'Contents'};
-        $Texi2HTML::HREF{'Contents'} = "#SEC_Contents";
-        $Texi2HTML::NAME{'This'} = $Texi2HTML::NAME{'Contents'};
-        $Texi2HTML::NO_TEXI{'This'} = $Texi2HTML::NO_TEXI{'Contents'};
-        $Texi2HTML::UNFORMATTED{'This'} = $Texi2HTML::UNFORMATTED{'Contents'};
-        $Texi2HTML::THIS_SECTION = $Texi2HTML::TOC_LINES;
-        $Texi2HTML::THIS_HEADER = [ &$Texi2HTML::Config::anchor("SEC_Contents") . "\n" ];
-        #&$Texi2HTML::Config::print_Toc(\*FILE);
-        #close(FILE) if $Texi2HTML::Config::SPLIT;
-        &$Texi2HTML::Config::print_Toc($FH);
-        close_out($FH, $docu_toc_file) 
-        #|| die "$ERROR: Error occurred when closing $docu_toc_file: $!\n"
-               if ($Texi2HTML::Config::SPLIT);
-        $Texi2HTML::HREF{'Contents'} = $Texi2HTML::HREF{'This'};
-    }
-
-    if (@{$Texi2HTML::OVERVIEW})
-    {
-        print STDERR "# 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"
-        $FH = open_out ($docu_stoc_file)
-            if $Texi2HTML::Config::SPLIT;
-        $Texi2HTML::HREF{This} = $Texi2HTML::HREF{Overview};
-        $Texi2HTML::HREF{Overview} = "#SEC_Overview";
-        $Texi2HTML::NAME{This} = $Texi2HTML::NAME{Overview};
-        $Texi2HTML::NO_TEXI{This} = $Texi2HTML::NO_TEXI{Overview};
-        $Texi2HTML::UNFORMATTED{This} = $Texi2HTML::UNFORMATTED{Overview};
-        $Texi2HTML::THIS_SECTION = $Texi2HTML::OVERVIEW;
-        $Texi2HTML::THIS_HEADER = [ &$Texi2HTML::Config::anchor("SEC_Overview") . "\n" ];
-        #&$Texi2HTML::Config::print_Overview(\*FILE);
-        #close(FILE) if $Texi2HTML::Config::SPLIT;
-        &$Texi2HTML::Config::print_Overview($FH);
-        close_out($FH,$docu_stoc_file) 
-         #|| die "$ERROR: Error occurred when closing $docu_stoc_file: $!\n"
-               if ($Texi2HTML::Config::SPLIT);
-        $Texi2HTML::HREF{Overview} = $Texi2HTML::HREF{This};
-    }
-    my $about_body;
-    if ($about_body = &$Texi2HTML::Config::about_body())
-    {
-        print STDERR "# 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"
-        $FH = open_out ($docu_about_file)
-            if $Texi2HTML::Config::SPLIT;
-
-        $Texi2HTML::HREF{This} = $Texi2HTML::HREF{About};
-        $Texi2HTML::HREF{About} = "#SEC_About";
-        $Texi2HTML::NAME{This} = $Texi2HTML::NAME{About};
-        $Texi2HTML::NO_TEXI{This} = $Texi2HTML::NO_TEXI{About};
-        $Texi2HTML::UNFORMATTED{This} = $Texi2HTML::UNFORMATTED{About};
-        $Texi2HTML::THIS_SECTION = [$about_body];
-        $Texi2HTML::THIS_HEADER = [ &$Texi2HTML::Config::anchor("SEC_About") . "\n" ];
-        #&$Texi2HTML::Config::print_About(\*FILE);
-        #close(FILE) if $Texi2HTML::Config::SPLIT;
-        &$Texi2HTML::Config::print_About($FH);
-        close_out($FH, $docu_stoc_file) 
-           #|| die "$ERROR: Error occurred when closing $docu_stoc_file: $!\n"
-               if ($Texi2HTML::Config::SPLIT);
-        $Texi2HTML::HREF{About} = $Texi2HTML::HREF{This};
-    }
-
-    unless ($Texi2HTML::Config::SPLIT)
-    {
-        &$Texi2HTML::Config::print_page_foot($FH);
-        close_out ($FH);
-          # || die "$ERROR: Error occurred when closing: $!\n";
-    }
-}
-
-# print section, close file and undef FH if needed.
-sub finish_element($$$$)
-{
-    my $FH = shift;
-    my $element = shift;
-    my $new_element = shift;
-    my $first_section = shift;
-#print STDERR "FINISH_ELEMENT($FH)($element->{'texi'})[$element->{'file'}] counter $files{$element->{'file'}}->{'counter'}\n";
-    if ($element->{'top'})
-    {
-        my $top_file = $docu_top_file;
-        #print STDERR "TOP $element->{'texi'}, @section_lines\n";
-        print STDERR "[Top]" if ($T2H_VERBOSE);
-        $Texi2HTML::HREF{'Top'} = href($element_top, $element->{'file'});
-        &$Texi2HTML::Config::print_Top($FH, $element->{'has_heading'});
-        my $end_page = 0;
-        if ($Texi2HTML::Config::SPLIT)
-        {
-            if (!$files{$element->{'file'}}->{'counter'})
-            {
-                $end_page = 1;
-            }
-        }
-        &$Texi2HTML::Config::print_Top_footer($FH, $end_page);
-        close_out($FH, $top_file) if ($end_page);
-    }
-    else
-    {
-        print STDERR "# do element $element->{'texi'}\n"
-           if ($T2H_DEBUG & $DEBUG_ELEMENTS);
-        &$Texi2HTML::Config::print_section($FH, $first_section);
-        if (defined($new_element) and ($new_element->{'file'} ne $element->{'file'}))
-        {
-             if (!$files{$element->{'file'}}->{'counter'})
-             {
-                 &$Texi2HTML::Config::print_chapter_footer($FH) if ($Texi2HTML::Config::SPLIT eq 'chapter');
-                 &$Texi2HTML::Config::print_section_footer($FH) if ($Texi2HTML::Config::SPLIT eq 'section');
-                 #print STDERR "Close file after $element->{'texi'}\n";
-                 &$Texi2HTML::Config::print_page_foot($FH);
-                 close_out($FH);
-             }
-             else
-             {
-                 print STDERR "counter $files{$element->{'file'}}->{'counter'} ne 0, file $element->{'file'}\n";
-             }
-             undef $FH;
-        }
-        elsif (!defined($new_element))
-        {
-            if ($Texi2HTML::Config::SPLIT)
-            { # end of last splitted section
-                &$Texi2HTML::Config::print_chapter_footer($FH) if ($Texi2HTML::Config::SPLIT eq 'chapter');
-                &$Texi2HTML::Config::print_section_footer($FH) if ($Texi2HTML::Config::SPLIT eq 'section');
-                &$Texi2HTML::Config::print_page_foot($FH);
-                close_out($FH);
-            }
-            else
-            {
-                &$Texi2HTML::Config::end_section($FH, 1);
-            }
-        }
-        elsif ($new_element->{'top'})
-        {
-            &$Texi2HTML::Config::end_section($FH, 1);
-        }
-        else
-        {
-            &$Texi2HTML::Config::end_section($FH);
-        }
-    }
-    return $FH;
-}
-
-# write to files with name the node name for cross manual references.
-sub do_node_files()
-{
-    foreach my $key (keys(%nodes))
-    {
-        my $node = $nodes{$key};
-        next unless ($node->{'node_file'});
-        my $redirection_file = $docu_doc;
-        $redirection_file = $node->{'file'} if ($Texi2HTML::Config::SPLIT);
-        if (!$redirection_file)
-        {
-             print STDERR "Bug: file for redirection for `$node->{'texi'}' don't exist\n" unless ($novalidate);
-             next;
-        }
-        next if ($redirection_file eq $node->{'node_file'});
-        my $file = "${docu_rdir}$node->{'node_file'}";
-        $Texi2HTML::NODE{'This'} = $node->{'text'};
-        $Texi2HTML::NO_TEXI{'This'} = $node->{'no_texi'};
-        $Texi2HTML::UNFORMATTED{'This'} = $node->{'no_texi'};
-        $Texi2HTML::NAME{'This'} = $node->{'text'};
-        $Texi2HTML::HREF{'This'} = "$node->{'file'}#$node->{'id'}";
-        open (NODEFILE, "> $file") || die "$ERROR Can't open $file for writing: $!\n";
-        &$Texi2HTML::Config::print_redirection_page (\*NODEFILE);
-        close NODEFILE || die "$ERROR: Can't close $file: $!\n";
-    }
-}
-
-#+++############################################################################
-#                                                                              #
-# Low level functions                                                          #
-#                                                                              #
-#---############################################################################
-
-sub locate_include_file($)
-{
-    my $file = shift;
-
-    # APA: Don't implicitely search ., to conform with the docs!
-    # return $file if (-e $file && -r $file);
-    foreach my $dir (@Texi2HTML::Config::INCLUDE_DIRS)
-    {
-        return "$dir/$file" if (-e "$dir/$file" && -r "$dir/$file");
-    }
-    return undef;
-}
-
-sub open_file($$)
-{
-    my $name = shift;
-    my $line_number = shift;
-    local *FH;
-    #if ((defined($from_encoding) and open(*FH, ":encoding($from_encoding)", $name)) or  open(*FH, $name))
-    #if ((defined($from_encoding) and open(*FH, "<:$from_encoding", $name)) or  open(*FH, $name))
-    if (open(*FH, "<$name"))
-    { 
-        if (defined($from_encoding))
-        {
-            binmode(*FH, ":encoding($from_encoding)");
-        }
-        my $file = { 'fh' => *FH, 
-           'input_spool' => { 'spool' => [], 
-                              'macro' => '' },
-           'name' => $name, 
-           'line_nr' => 0 };
-        unshift(@fhs, $file);
-        $input_spool = $file->{'input_spool'};
-        $line_number->{'file_name'} = $name;
-        $line_number->{'line_nr'} = 1;
-    }
-    else
-    {
-        warn "$ERROR Can't read file $name: $!\n";
-    }
-}
-
-sub open_out($)
-{
-    my $file = shift;
-    if ($file eq '-')
-    {
-        binmode(STDOUT, ":encoding($to_encoding)") if (defined($to_encoding));
-        return \*STDOUT;
-    }
-    #unless ((defined($to_encoding) and open(FILE, ">:encoding($to_encoding)", $file)) or open(FILE, "> $file"))
-    #my $open_style = 'bytes';
-    #$open_style = 'utf8' if (defined($to_encoding) and $to_encoding eq 'utf8');
-    #if (defined($to_encoding) and $to_encoding eq 'utf8')
-    #{
-    #     $open_style = 'utf8'; 
-    #     print STDERR "$open_style\n";
-    #}
-    #unless ((defined($to_encoding) and open(FILE, ">:$open_style", $file)) or open(FILE, "> $file"))
-    unless (open(FILE, ">$file"))
-    {
-        die "$ERROR Can't open $file for writing: $!\n";
-    }
-    if (defined($to_encoding))
-    {
-        if ($to_encoding eq 'utf8')
-        {
-            binmode(FILE, ':utf8');
-        }
-	else
-        {
-            binmode(FILE, ':bytes');
-        }
-        binmode(FILE, ":encoding($to_encoding)");
-    }
-    return \*FILE;
-}
-
-sub close_out($;$)
-{
-    my $FH = shift;
-    my $file = shift;
-    $file = '' if (!defined($file));
-    return if ($Texi2HTML::Config::OUT eq '');
-    close ($FH) || die "$ERROR: Error occurred when closing $file: $!\n";
-}
-
-sub next_line($)
-{
-    my $line_number = shift;
-    while (@fhs)
-    {
-        my $file = $fhs[0];
-        $line_number->{'file_name'} = $file->{'name'};
-        $input_spool = $file->{'input_spool'};
-        if (@{$input_spool->{'spool'}})
-        {
-             $line_number->{'macro'} = $file->{'input_spool'}->{'macro'};
-             $line_number->{'line_nr'} = $file->{'line_nr'};
-             my $line = shift(@{$input_spool->{'spool'}});
-             print STDERR "# unspooling $line" if ($T2H_DEBUG & $DEBUG_MACROS);
-             return($line);
-        }
-        else
-        {
-             $file->{'input_spool'}->{'macro'} = '';
-             $line_number->{'macro'} = '';
-        }
-        my $fh = $file->{'fh'};
-        no strict "refs";
-        my $line = <$fh>;
-        use strict "refs";
-        my $chomped_line = $line;
-        $file->{'line_nr'}++ if (defined($line) and chomp($chomped_line));
-        $line_number->{'line_nr'} = $file->{'line_nr'};
-        return($line) if (defined($line));
-        no strict "refs";
-        close($fh);
-        use strict "refs";
-        shift(@fhs);
-    }
-    return(undef);
-}
-
-# echo a warning
-sub echo_warn($;$)
-{
-    my $text = shift;
-    chomp ($text);
-    my $line_number = shift;
-    warn "$WARN $text " . format_line_number($line_number) . "\n";
-}
-
-sub echo_error($;$)
-{
-    my $text = shift;
-    chomp ($text);
-    my $line_number = shift;
-    warn "$ERROR $text " . format_line_number($line_number) . "\n";
-}
-
-sub format_line_number($)
-{
-    my $line_number = shift;
-    my $macro_text = '';
-    #$line_number = undef;
-    return '' unless (defined($line_number));
-    $macro_text = " in $line_number->{'macro'}" if ($line_number->{'macro'} ne '');
-    my $file_text = '(';
-    $file_text = "(in $line_number->{'file_name'} " if ($line_number->{'file_name'} ne $docu);
-    return "${file_text}l. $line_number->{'line_nr'}" . $macro_text . ')';
-}
-
-# to debug, dump the result of pass_texi and pass_structure in a file
-sub dump_texi($$;$$)
-{
-    my $lines = shift;
-    my $pass = shift;
-    my $numbers = shift;
-    my $file = shift;
-    $file = "$docu_rdir$docu_name" . ".pass$pass" if (!defined($file));
-    unless (open(DMPTEXI, ">$file"))
-    {
-         warn "Can't open $file for writing: $!\n";
-    }
-    print STDERR "# Dump texi\n" if ($T2H_VERBOSE);
-    my $index = 0;
-    foreach my $line (@$lines)
-    {
-        my $number_information = '';
-        my $chomped_line = $line;
-        $number_information = "$numbers->[$index]->{'file_name'}($numbers->[$index]->{'macro'},$numbers->[$index]->{'line_nr'}) " if (defined($numbers));
-        print DMPTEXI "${number_information}$line";
-        $index++ if (chomp($chomped_line));
-    }
-    close DMPTEXI;
-}
- 
-# return next tag on the line
-sub next_tag($)
-{
-    my $line = shift;
-    if ($line =~ /^\s*\@(["'~\@\}\{,\.!\?\s\*\-\^`=:\|\/])/o or $line =~ /^\s*\@([a-zA-Z]\w*)([\s\{\}\@])/ or $line =~ /^\s*\@([a-zA-Z]\w*)$/)
-    {
-        return ($1);
-    }
-    return '';
-}
-
-sub top_stack($)
-{
-    my $stack = shift;
-    return undef unless(@$stack);
-    return $stack->[-1];
-}
-
-# return the next element with balanced {}
-sub next_bracketed($$)
-{
-    my $line = shift;
-    my $line_nr = shift;
-    my $opened_braces = 0;
-    my $result = '';
-    my $spaces;
-    if ($line =~ /^(\s*)$/)
-    {
-        return ('','',$1);
-    }
-    while ($line !~ /^\s*$/)
-    {
-#print STDERR "next_bracketed($opened_braces): $result !!! $line";
-        if (!$opened_braces)
-        { # beginning of item
-            $line =~ s/^(\s*)//;
-            $spaces = $1;
-            #if ($line =~ s/^([^\{\}\s]+)//)
-            if ($line =~ s/^([^\{\}]+?)(\s+)/$2/ or $line =~ s/^([^\{\}]+?)$//)
-            {
-                $result = $1;
-                $result =~ s/\s*$//;
-                return ($result, $line, $spaces);
-            }
-            elsif ($line =~ s/^([^\{\}]+?)([\{\}])/$2/)
-            {
-                $result = $1;
-            }
-        }
-        elsif($line =~ s/^([^\{\}]+)//)
-        {
-            $result .= $1;
-        }
-        if ($line =~ s/^([\{\}])//)
-        {
-            my $brace = $1;
-            $opened_braces++ if ($brace eq '{');
-            $opened_braces-- if ($brace eq '}');
-    
-            if ($opened_braces < 0)
-            {
-                echo_error("too much '}' in specification", $line_nr);
-                $opened_braces = 0;
-                next;
-            }
-            $result .= $brace;
-            return ($result, $line, $spaces) if ($opened_braces == 0);
-        }
-    }
-    if ($opened_braces)
-    {
-        echo_error("'{' not closed in specification", $line_nr);
-        return ($result . ( '}' x $opened_braces), '', $spaces);
-    }
-    print STDERR "BUG: at the end of next_bracketed\n";
-    return undef;
-}
-
-# do a href using file and id and taking care of ommitting file if it is 
-# the same
-# element: structuring element to point to
-# file: current file
-sub href($$)
-{
-    my $element = shift;
-    my $file = shift;
-    return '' unless defined($element);
-    my $href = '';
-    print STDERR "Bug: $element->{'texi'}, id undef\n" if (!defined($element->{'id'}));
-    print STDERR "Bug: $element->{'texi'}, file undef\n" if (!defined($element->{'file'}));
-#foreach my $key (keys(%{$element}))
-#{
-#   my $value = 'UNDEF'; $value =  $element->{$key} if defined($element->{$key});
-#   print STDERR "$key: $value\n";
-#}print STDERR "\n";
-    $href .= $element->{'file'} if (defined($element->{'file'}) and $file ne $element->{'file'});
-    $href .= "#$element->{'id'}" if (defined($element->{'id'}));
-    return $href;
-}
-
-sub normalise_space($)
-{
-    return undef unless (defined ($_[0]));
-    my $text = shift;
-    $text =~ s/\s+/ /go;
-    $text =~ s/ $//;
-    $text =~ s/^ //;
-    return $text;
-}
-
-sub normalise_node($)
-{
-    return undef unless (defined ($_[0]));
-    my $text = shift;
-    $text = normalise_space($text);
-    $text =~ s/^top$/Top/i;
-    return $text;
-}
-
-sub do_math($;$)
-{
-    #return l2h_ToLatex("\$".$_[0]."\$");
-    return Texi2HTML::LaTeX2HTML::to_latex("\$".$_[0]."\$");
-}
-
-sub do_anchor_label($$$$)
-{
-    my $command = shift;
-    #my $anchor = shift;
-    my $args = shift;
-    my $anchor = $args->[0];
-    my $style_stack = shift;
-    my $state = shift;
-    my $line_nr = shift;
-
-    return '' if ($state->{'multiple_pass'});
-    $anchor = normalise_node($anchor);
-    return &$Texi2HTML::Config::anchor($nodes{$anchor}->{'id'});
-}
-
-sub get_format_command($)
-{
-    my $format = shift;
-    my $command = '';
-    my $format_name = '';
-    my $term = 0;
-    my $item_nr;
-    my $paragraph_number;
-    my $enumerate_type;
-    my $number;
-    
-    if (defined($format) and ref($format) eq "HASH")
-    {
-         $command = $format->{'command'};
-         $command = '' if (!defined($command));
-         $paragraph_number = \$format->{'paragraph_number'};
-         $format_name =  $format->{'format'};
-         $term = 1 if ($format->{'term'}); #This should never happen
-         $item_nr = $format->{'item_nr'};
-         $enumerate_type =  $format->{'spec'};
-         $number = $format->{'number'};
-    }
-    return ($format_name, $command, $paragraph_number, $term, $item_nr, 
-        $enumerate_type, $number);
-}
-
-sub do_paragraph($$)
-{
-    my $text = shift;
-    my $state = shift;
-    my ($format, $paragraph_command, $paragraph_number, $term, $item_nr, 
-        $enumerate_type, $number) = get_format_command ($state->{'paragraph'});
-    delete $state->{'paragraph'};
-    my $paragraph_command_formatted;
-    $state->{'paragraph_nr'}--;
-    (print STDERR "Bug text undef in do_paragraph", return '') unless defined($text);
-    my $align = '';
-    $align = $state->{'paragraph_style'}->[-1] if ($state->{'paragraph_style'}->[-1]);
-    
-    if (exists($style_map_ref->{$paragraph_command}) and
-       !exists($Texi2HTML::Config::special_list_commands{$format}->{$paragraph_command}))
-    { 
-        if ($format eq 'itemize')
-        {
-            chomp ($text);
-            $text = do_simple($paragraph_command, $text, $state, [$text]);
-            $text = $text . "\n";
-        }
-    }
-    elsif (exists($things_map_ref->{$paragraph_command}))
-    {
-        $paragraph_command_formatted = do_simple($paragraph_command, '', $state);
-    }
-    return &$Texi2HTML::Config::paragraph($text, $align, $paragraph_command, $paragraph_command_formatted, $paragraph_number, $format, $item_nr, $enumerate_type, $number);
-}
-
-sub do_preformatted($$)
-{
-    my $text = shift;
-    my $state = shift;
-    my ($format, $leading_command, $preformatted_number, $term, $item_nr, $enumerate_type, 
-         $number) = get_format_command($state->{'preformatted_format'});
-    delete ($state->{'preformatted_format'});
-    my $leading_command_formatted;
-    my $pre_style = '';
-    my $class = '';
-    $pre_style = $state->{'preformatted_stack'}->[-1]->{'pre_style'} if ($state->{'preformatted_stack'}->[-1]->{'pre_style'});
-    $class = $state->{'preformatted_stack'}->[-1]->{'class'};
-    print STDERR "BUG: !state->{'preformatted_stack'}->[-1]->{'class'}\n" unless ($class);
-    if (exists($style_map_ref->{$leading_command}) and
-       !exists($Texi2HTML::Config::special_list_commands{$format}->{$leading_command}) and ($style_type{$leading_command} eq 'style'))
-    {
-        $text = do_simple($leading_command, $text, $state,[$text]) if ($format eq 'itemize');
-    }
-    elsif (exists($things_map_ref->{$leading_command}))
-    {
-        $leading_command_formatted = do_simple($leading_command, '', $state);
-    }
-    return &$Texi2HTML::Config::preformatted($text, $pre_style, $class, $leading_command, $leading_command_formatted, $preformatted_number, $format, $item_nr, $enumerate_type, $number);
-}
-
-sub do_external_href($)
-{
-    my $texi_node = shift;
-    my $file = '';
-    my $node_id = '';
-    my $node_xhtml_id = '';
-    if ($texi_node =~ s/^\((.+?)\)//)
-    {
-         $file = $1;
-    }
-    $texi_node = normalise_node($texi_node);
-    if ($texi_node ne '')
-    {
-         if (exists($nodes{$texi_node}) and ($nodes{$texi_node}->{'cross_manual_target'})) 
-         {
-               $node_id = $nodes{$texi_node}->{'cross_manual_target'};
-         }
-         else 
-         {
-               $node_id = cross_manual_line($texi_node);
-         }
-         $node_xhtml_id = node_to_id($node_id);
-    }
-    return &$Texi2HTML::Config::external_href($texi_node, $node_id, 
-        $node_xhtml_id, $file);
-}
-
-# transform node for cross ref name to id suitable for xhtml.
-sub node_to_id($)
-{
-    my $cross_ref_node_name = shift;
-    $cross_ref_node_name =~ s/^([0-9_])/g_t$1/;
-    return $cross_ref_node_name;
-}
-
-# return 1 if the following tag shouldn't begin a line
-sub no_line($)
-{
-    my $line = shift;
-    my $next_tag = next_tag($line);
-    return 1 if (($line =~ /^\s*$/) or $no_line_macros{$next_tag} or 
-       (($next_tag =~ /^(\w+?)index$/) and ($1 ne 'print')) or 
-       (($line =~ /^\@end\s+(\w+)/) and  $no_line_macros{"end $1"}));
-    return 0;
-}
-
-sub no_paragraph($$)
-{
-    my $state = shift;
-    my $line = shift;
-    return ($state->{'paragraph'} or $state->{'preformatted'} or $state->{'remove_texi'} or no_line($line) or $state->{'no_paragraph'});
-}
-
-sub automatic_preformatted($$)
-{
-    my $state = shift;
-    my $macro = shift;
-    return ($state->{'preformatted'} and 
-        !$Texi2HTML::Config::format_in_paragraph{$macro});
-}
-
-# handle raw formatting, ignored regions...
-sub do_text_macro($$$$)
-{
-    my $type = shift;
-    my $line = shift;
-    my $state = shift;
-    my $line_nr = shift;
-    my $value;
-    #print STDERR "do_text_macro $type\n";
-
-    if (not $text_macros{$type})
-    { # ignored text
-        $state->{'ignored'} = $type;
-        #print STDERR "IGNORED\n";
-    }
-    elsif ($text_macros{$type} eq 'raw' or $text_macros{$type} eq 'special')
-    {
-        $state->{'raw'} = $type;
-        #print STDERR "RAW\n";
-    }
-    elsif ($text_macros{$type} eq 'value')
-    {
-        if (($line =~ s/(\s+)($VARRE)$//) or ($line =~ s/(\s+)($VARRE)(\s)//))
-        {
-            $value = $1 . $2;
-            $value .= $3 if defined($3);
-            if ($type eq 'ifclear')
-            {
-                if (defined($value{$2}))
-                {
-                    $state->{'ignored'} = $type;
-                }
-                else
-                {
-                    push @{$state->{'text_macro_stack'}}, $type;
-                }
-            }
-            elsif ($type eq 'ifset')
-            {
-                unless (defined($value{$2}))
-                {
-                    $state->{'ignored'} = $type;
-                }
-                else
-                {
-                    push @{$state->{'text_macro_stack'}}, $type;
-                }
-            }
-        }
-        else
-        {
-            echo_error ("Bad $type line: $line", $line_nr);
-            #warn "$ERROR Bad $type line: $line";
-        }
-    }
-    else
-    {
-        push @{$state->{'text_macro_stack'}}, $type;
-    }
-    my $text = "\@$type";
-    $text .= $value if defined($value); 
-    return ($line, $text);
-}
-
-# do regions handled specially, currently only tex, going throug latex2html
-sub do_special ($$)
-{
-    my $style = shift;
-    my $text = shift;
-    if ($style eq 'tex')
-    {
-        # add space to the end -- tex(i2dvi) does this, as well
-        #return (l2h_ToLatex($text . " "));
-        return (Texi2HTML::LaTeX2HTML::to_latex($text . " "));
-    }
-}
-
-sub do_insertcopying($)
-{
-    my $state = shift;
-    return '' unless @{$region_lines{'copying'}};
-    return substitute_text(duplicate_state($state), @{$region_lines{'copying'}});
-}
-
-sub get_deff_index($$$)
-{
-    my $tag = shift;
-    my $line = shift;
-    my $line_nr = shift;
-   
-    $tag =~ s/x$// if $tag =~ /x$/;
-    my ($style, $category, $name, $type, $class, $arguments);
-    ($style, $category, $name, $type, $class, $arguments) = parse_def($tag, $line, $line_nr); 
-    # FIXME -- --- ''... should be protected for name and maybe class
-    $name = &$Texi2HTML::Config::definition_category($name, $class, $style);
-    return undef if (!$name or ($name =~ /^\s*$/));
-    return ($style, $name);
-}
-
-sub parse_def($$$)
-{
-    my $tag = shift;
-    my $line = shift;
-    my $line_nr = shift;
-
-    if (!ref ($Texi2HTML::Config::def_map{$tag}))
-    {
-        # substitute shortcuts for definition commands
-        my $substituted = $Texi2HTML::Config::def_map{$tag};
-        $substituted =~ s/(\w+)//;
-        $tag = $1;
-        $line = $substituted . $line;
-    }
-#print STDERR "PARSE_DEF $line";
-    my ($category, $name, $type, $class, $arguments);
-    my @args = @{$Texi2HTML::Config::def_map{$tag}};
-    my $style = shift @args;
-    while (@args)
-    {
-        my $arg = shift @args;
-        if (defined($arg))
-        {
-            # backward compatibility, it was possible to have a { in front.
-            $arg =~  s/^\{//;
-            my $item;
-            my $spaces;
-            ($item, $line,$spaces) = next_bracketed($line, $line_nr);
-            last if (!defined($item));
-            $item =~ s/^\{(.*)\}$/$1/ if ($item =~ /^\{/);
-            if ($arg eq 'category')
-            {
-                $category = $item;
-            }
-            elsif ($arg eq 'name')
-            {
-                $name = $item;
-            }
-            elsif ($arg eq 'type')
-            {
-                $type = $item;
-            }
-            elsif ($arg eq 'class')
-            {
-                $class = $item;
-            }
-            elsif ($arg eq 'arg')
-            { 
-                $line = $spaces . $item . $line;
-            }
-        }
-        else
-        {
-        #    chomp ($line);
-        #    $line =~ s/\s*$//;
-        #    $arguments = $line if ($line ne '');
-            last;
-        }
-    }
-    #return ($style, $category, $name, $type, $class, $arguments);
-#print STDERR "PARSE_DEF (style $style, category $category, name $name, type $type, class $class, line $line)\n";
-    return ($style, $category, $name, $type, $class, $line);
-}
-
-#FIXME this is rather fragile.
-sub begin_deff_item($$;$)
-{
-    my $stack = shift;
-    my $state = shift;
-    my $no_paragraph = shift;
-    return if ($state->{'cmd_line'});
-    #print STDERR "DEF push deff_item for $state->{'deff'}\n";
-    push @$stack, { 'format' => 'deff_item', 'text' => '' };
-    # there is no paragraph when a new deff just follows the deff we are
-    # opening
-    begin_paragraph($stack, $state) if ($state->{'preformatted'} and !$no_paragraph);
-    $state->{'deff'} = undef;
-    delete($state->{'deff'});
-    #dump_stack(undef, $stack, $state);
-}
-
-sub begin_paragraph($$)
-{
-    my $stack = shift;
-    my $state = shift;
-
-    my $command = 1;
-    my $top_format = top_format($stack);
-    if (defined($top_format))
-    {
-        $command = $top_format;
-    }
-    if ($state->{'preformatted'})
-    {
-        push @$stack, {'format' => 'preformatted', 'text' => '' };
-        $state->{'preformatted_format'} = $command if ($command ne '1');
-        push @$stack, @{$state->{'paragraph_macros'}} if $state->{'paragraph_macros'};
-        delete $state->{'paragraph_macros'};
-        return;
-    }
-    $state->{'paragraph'} = $command;
-    $state->{'paragraph_nr'}++;
-    push @$stack, {'format' => 'paragraph', 'text' => '' };
-    # if there are macros which weren't closed when the previous 
-    # paragraph was closed we reopen them here
-    push @$stack, @{$state->{'paragraph_macros'}} if $state->{'paragraph_macros'};
-    delete $state->{'paragraph_macros'};
-}
-
-sub parse_format_command($$)
-{
-    my $line = shift;
-    my $tag = shift;
-    my $command = 'asis';
-    if (($line =~ /^\s*\@([A-Za-z]\w*)(\{\})?$/ or $line =~ /^\s*\@([A-Za-z]\w*)(\{\})?\s/) and ($things_map_ref->{$1} or defined($style_map_ref->{$1})))
-    {
-        $line =~ s/^\s*\@([A-Za-z]\w*)(\{\})?\s*//;
-        $command = $1;
-    }
-    return ('', $command) if ($line =~ /^\s*$/);
-    chomp $line;
-    $line = substitute_text ({'keep_nr' => 1, 'keep_texi' => 1, 'check_item' => $tag}, $line);
-    return ($line, $command);
-}
-
-sub parse_enumerate($)
-{
-    my $line = shift;
-    my $spec;
-    if ($line =~ /^\s*(\w)\b/ and ($1 ne '_'))
-    {
-        $spec = $1;
-        $line =~ s/^\s*(\w)\s*//;
-    }
-    return ($line, $spec);
-}
-
-sub parse_multitable($$)
-{
-    my $line = shift;
-    my $line_nr = shift;
-    # first find the table width
-    my $table_width = 0;
-    if ($line =~ s/^\s+\@columnfractions\s+//)
-    {
-        my @fractions = split /\s+/, $line;
-        $table_width = $#fractions + 1;
-        while (@fractions)
-        {
-            my $fraction = shift @fractions;
-            unless ($fraction =~ /^(\d*\.\d+)|(\d+)\.?$/)
-            { 
-                echo_error ("column fraction not a number: $fraction", $line_nr);
-                #warn "$ERROR column fraction not a number: $fraction";
-            }
-        }
-    }
-    else
-    {
-        my $element;
-        my $line_orig = $line;
-        while ($line !~ /^\s*$/)
-        {
-            my $spaces;
-            ($element, $line, $spaces) = next_bracketed($line, $line_nr);
-            if ($element =~ /^\{/)
-            {
-                $table_width++; 
-            }
-            else
-            {
-                echo_error ("garbage in multitable specification: $element", $line_nr);
-            }
-        }
-    }
-    return ($table_width);
-}
-
-sub end_format($$$$$)
-{
-    my $text = shift;
-    my $stack = shift;
-    my $state = shift;
-    my $format = shift;
-    my $line_nr = shift;
-    #print STDERR "END FORMAT $format\n";
-    #dump_stack($text, $stack, $state);
-    #sleep 1;
-    close_menu($text, $stack, $state, $line_nr) if ($format_type{$format} eq 'menu');
-    if (($format_type{$format} eq 'list') or ($format_type{$format} eq 'table'))
-    { # those functions return if they detect an inapropriate context
-        add_item($text, $stack, $state, $line_nr, '', 1); # handle lists
-        add_term($text, $stack, $state, $line_nr, 1); # handle table
-        add_line($text, $stack, $state, $line_nr, 1); # handle table
-        add_row($text, $stack, $state, $line_nr); # handle multitable
-    }
-
-    #print STDERR "END_FORMAT\n";
-    #dump_stack($text, $stack, $state);
-	
-    my $format_ref = pop @$stack;
-    
-    # debug
-    if (!defined($format_ref->{'text'}))
-    {
-        push @$stack, $format_ref;
-        print STDERR "Bug: text undef in end_format $format\n";
-        dump_stack($text, $stack, $state);
-        pop @$stack;
-    }
-    
-    if (defined($Texi2HTML::Config::def_map{$format}))
-    {
-        close_stack($text, $stack, $state, $line_nr, undef, 'deff_item') unless ($format_ref->{'format'} eq 'deff_item');
-        add_prev($text, $stack, &$Texi2HTML::Config::def_item($format_ref->{'text'}));
-        $format_ref = pop @$stack; # pop deff
-        if (!defined($format_ref->{'format'}) or !defined($Texi2HTML::Config::def_map{$format_ref->{'format'}}))
-        {
-             print STDERR "Bug: not a def* under deff_item\n";
-             push (@$stack, $format_ref);
-             dump_stack($text, $stack, $state);
-             pop @$stack;  
-        }
-        elsif ($format_ref->{'format'} ne $format)
-        {
-             echo_warn ("Waiting for \@end $format_ref->{'format'}, found \@end $format", $line_nr);
-        }
-        add_prev($text, $stack, &$Texi2HTML::Config::def($format_ref->{'text'}));
-    }
-    elsif ($format_type{$format} eq 'cartouche')
-    {
-        add_prev($text, $stack, &$Texi2HTML::Config::cartouche($format_ref->{'text'}));
-    }
-    elsif ($format eq 'float')
-    {
-        if (!defined($state->{'float'}))
-        {
-             echo_warn ("Waiting for \@end $format_ref->{'format'}, found \@end $format", $line_nr);
-        }
-        else
-        {
-            my ($caption_lines, $shortcaption_lines) = &$Texi2HTML::Config::caption_shortcaption($state->{'float'});
-            my ($caption_text, $shortcaption_text);
-            $caption_text = substitute_text(duplicate_state($state), @$caption_lines) if (defined($caption_lines));
-            $shortcaption_text = substitute_text(duplicate_state($state), @$shortcaption_lines) if (defined($shortcaption_lines));
-            add_prev($text, $stack, &$Texi2HTML::Config::float($format_ref->{'text'}, $state->{'float'}, $caption_text, $shortcaption_text));
-            delete $state->{'float'};
-        }
-    }
-    elsif ($format_type{$format} eq 'menu')
-    {
-        if ($state->{'preformatted'})
-        {
-            # end the fake complex format
-            $state->{'preformatted'}--;
-            pop @{$state->{'preformatted_stack'}};
-            pop @$stack;
-        }
-        $state->{'menu'}--;
-        add_prev($text, $stack, &$Texi2HTML::Config::menu($format_ref->{'text'}));
-    }
-    elsif ($format_type{$format} eq 'complex')
-    {
-        $state->{'preformatted'}--;
-        pop @{$state->{'preformatted_stack'}};
-        # debug
-        if (!defined($Texi2HTML::Config::complex_format_map->{$format_ref->{'format'}}->{'begin'}))
-        {
-            print STDERR "Bug undef $format_ref->{'format'}" . "->{'begin'} (for $format...)\n";
-            dump_stack ($text, $stack, $state);
-        }
-        #print STDERR "before $format\n";
-        #dump_stack ($text, $stack, $state);
-        add_prev($text, $stack, &$Texi2HTML::Config::complex_format($format_ref->{'format'}, $format_ref->{'text'}));
-        #print STDERR "after $format\n";
-        #dump_stack ($text, $stack, $state);
-    }
-    elsif (($format_type{$format} eq 'table') or ($format_type{$format} eq 'list'))
-    {
-	    #print STDERR "CLOSE $format ($format_ref->{'format'})\n$format_ref->{'text'}\n";
-        pop @{$state->{'format_stack'}};
-	#dump_stack($text, $stack, $state); 
-        if ($format_ref->{'format'} ne $format)
-        {
-             echo_warn ("Waiting for \@end $format_ref->{'format'}, found \@end $format", $line_nr);
-        }
-        if ($Texi2HTML::Config::format_map{$format})
-        { # table or list has a simple format
-            add_prev($text, $stack, end_simple_format($format_ref->{'format'}, $format_ref->{'text'}));
-        }
-        else
-        { # table or list handler defined by the user
-            add_prev($text, $stack, &$Texi2HTML::Config::table_list($format_ref->{'format'}, $format_ref->{'text'}, $format_ref->{'command'}));
-        }
-    } 
-    elsif ($format eq 'quotation')
-    {
-        my $quotation_args = pop @{$state->{'quotation_stack'}};
-        add_prev($text, $stack, &$Texi2HTML::Config::quotation($format_ref->{'text'}, $quotation_args->{'text'}, $quotation_args->{'style_texi'}, $quotation_args->{'style_id'}));
-    }
-    elsif ($format_type{$format} eq 'paragraph_style')
-    {
-        if ($state->{'paragraph_style'}->[-1] eq $format)
-        {
-            pop @{$state->{'paragraph_style'}};
-        }
-        add_prev($text, $stack, &$Texi2HTML::Config::paragraph_style_command($format_ref->{'format'},$format_ref->{'text'}));
-    }
-    elsif (exists($Texi2HTML::Config::format_map{$format}))
-    {
-        if ($format_ref->{'format'} ne $format)
-        { # FIXME hasn't that case been handled before ?
-             echo_warn ("Waiting for \@end $format_ref->{'format'}, found \@end $format", $line_nr);
-        }
-        add_prev($text, $stack, end_simple_format($format_ref->{'format'}, $format_ref->{'text'}));
-    }
-    else
-    {
-        echo_warn("Unknown format $format", $line_nr);
-    }
-    # We restart the preformatted format which was stopped by the format
-    # if in preformatted
-    if (automatic_preformatted($state,$format))
-    {
-	    #print STDERR "restart preformatted, $format\n";
-        begin_paragraph($stack, $state);
-    }
-}
-
-sub do_text($;$)
-{
-    my $text = shift;
-    my $state = shift;
-    return $text if ($state->{'keep_texi'});
-    if (defined($state) and !$state->{'preformatted'} and !$state->{'code_style'})
-    {
-        # in normal text `` and '' serve as quotes, --- is for a long dash 
-        # and -- for a medium dash.
-        # (see texinfo.txi, @node Conventions)
-        $text = &$Texi2HTML::Config::normal_text($text);
-    }
-    if ($state->{'no_protection'})
-    {
-        return $text;
-    }
-    return &$Texi2HTML::Config::protect_text($text);
-}
-
-sub end_simple_format($$)
-{
-    my $tag = shift;
-    my $text = shift;
-
-    my $element = $Texi2HTML::Config::format_map{$tag};
-    return &$Texi2HTML::Config::format($tag, $element, $text);
-}
-
-sub close_menu($$$$)
-{
-    my $text = shift;
-    my $stack = shift;
-    my $state = shift;
-    my $line_nr = shift;
-    if ($state->{'menu_comment'})
-    {
-	    #print STDERR "close MENU_COMMENT Before close_stack\n";
-	    #dump_stack($text, $stack, $state);
-        close_stack($text, $stack, $state, $line_nr, undef, 'menu_comment');
-        # close_paragraph isn't needed in most cases, but A preformatted may 
-        # appear after close_stack if we closed a format, as formats reopen
-        # preformatted. However it is empty and close_paragraph will remove it
-        close_paragraph($text, $stack, $state); 
-        my $menu_comment = pop @$stack;
-        if (!$menu_comment->{'format'} or $menu_comment->{'format'} ne 'menu_comment')
-        {
-            warn "Bug waiting for menu_comment, got $menu_comment->{'format'}\n"; 
-            dump_stack($text, $stack, $state);
-        }
-        add_prev($text, $stack, &$Texi2HTML::Config::menu_comment($menu_comment->{'text'}));
-        pop @{$state->{'preformatted_stack'}};
-        $state->{'preformatted'}--;
-        $state->{'menu_comment'}--;
-    }
-    if ($state->{'menu_entry'})
-    {
-        close_stack($text, $stack,$state, $line_nr, undef, 'menu_description');
-        my $descr = pop(@$stack);
-        print STDERR "# close_menu: close description\n" if ($T2H_DEBUG & $DEBUG_MENU);
-        add_prev($text, $stack, menu_description($descr->{'text'}, $state));
-        delete $state->{'menu_entry'};
-    }
-}
-
-# Format menu link, the  
-sub do_menu_link($$;$)
-{
-    my $state = shift;
-    my $line_nr = shift;
-    my $simple = shift;
-    my $menu_entry = $state->{'menu_entry'};
-    my $file = $state->{'element'}->{'file'};
-    my $node_name = normalise_node($menu_entry->{'node'});
-    
-    my $substitution_state = duplicate_state($state);
-    my $name = substitute_line($menu_entry->{'name'}, $substitution_state);
-    my $node = substitute_line($menu_entry->{'node'}, $substitution_state);
-
-    if (($name ne '') and !$state->{'preformatted'} and $Texi2HTML::Config::AVOID_MENU_REDUNDANCY)
-    {
-        $name = '' unless (clean_text(remove_texi($menu_entry->{'name'}))
-            ne clean_text(remove_texi($menu_entry->{'node'})))
-    }
-
-    my $entry = '';
-    my $href;
-    my $element = $nodes{$node_name};
-    if ($element->{'seen'})
-    {
-        if ($element->{'with_section'})
-        {
-            $element = $element->{'with_section'};
-        }
-    
-        #print STDERR "SUBHREF in menu for $element->{'texi'}\n";
-        $href = href($element, $file);
-        if (! $element->{'node'})
-        {
-            $entry = $element->{'text'}; # this is the section name without number
-            $entry = $element->{'name'} if (!$Texi2HTML::Config::NUMBER_SECTIONS);
-            $entry = "$Texi2HTML::Config::MENU_SYMBOL $entry" if (($entry ne '') and (!defined($element->{'number'}) or ($element->{'number'} =~ /^\s*$/)) and $Texi2HTML::Config::UNNUMBERED_SYMBOL_IN_MENU);
-        }
-    }
-    elsif ($menu_entry->{'node'} =~ /^\s*\(.*\)/ or $novalidate)
-    {#FIXME this is wrong for $novalidate
-        # menu entry points to another info manual
-        #$href = $nodes{$node_name}->{'file'};
-        $href = do_external_href($node_name);
-    }
-    else
-    {
-        echo_error ("Unknown node in menu entry `$node_name'", $line_nr);
-    }
-    return &$Texi2HTML::Config::menu_link($entry, $state, $href, $node, $name, $menu_entry->{'ending'}) unless ($simple);
-    return &$Texi2HTML::Config::simple_menu_link($entry, $state->{'preformatted'}, $href, $node, $name, $menu_entry->{'ending'});
-}
-
-sub menu_description($$)
-{
-    my $descr = shift;
-    my $state = shift;
-    my $menu_entry = $state->{'menu_entry'};
-    my $node_name = normalise_node($menu_entry->{'node'});
-
-    my $element = $nodes{$node_name};
-    if ($element->{'seen'})
-    {
-        if ($element->{'with_section'})
-        {
-            $element = $element->{'with_section'};
-        }
-        if ($Texi2HTML::Config::AVOID_MENU_REDUNDANCY && ($descr ne '') && !$state->{'preformatted'})
-        {
-            $descr = '' if (clean_text($element->{'name'}) eq clean_text($descr));
-        }
-    }
-    return &$Texi2HTML::Config::menu_description($descr, $state);
-}
-
-sub clean_text($)
-{
-    my $text = shift;
-    $text =~ s/[^\w]//g;
-    return $text;
-}
-
-sub do_xref($$$$)
-{
-    my $macro = shift;
-    #my $text = shift;
-    my $args = shift;
-    my $style_stack = shift;
-    my $state = shift;
-    my $line_nr = shift;
-
-    my $result = '';
-    #$text =~ s/\s+/ /gos; # remove useless spaces and newlines
-    #my @args = split(/\s*,\s*/, $text);
-    my @args = @$args;
-    #print STDERR "DO_XREF: $macro\n";
-    my $j = 0;
-    for ($j = 0; $j <= $#$args; $j++)
-    {
-         $args[$j] = normalise_space($args[$j]);
-    #     print STDERR " ($j)$args[$j]\n";
-    }
-    #$args[0] = normalise_space($args[0]);
-    $args[0] = '' if (!defined($args[0]));
-    my $node_texi = normalise_node($args[0]);
-    # a ref to a node in an info manual
-    if ($args[0] =~ s/^\(([^\)]+)\)\s*//)
-    {
-        if ($macro eq 'inforef')
-        {
-            $args[2] = $1 unless ($args[2]);
-        }
-        else
-        {
-            $args[3] = $1 unless ($args[3]);
-        }
-    }
-    if (($macro ne 'inforef') and $args[3])
-    {
-        $node_texi = "($args[3])" . normalise_node($args[0]);
-    }
-
-    if ($macro eq 'inforef')
-    {
-        if ((@args < 1) or ($args[0] eq ''))
-        {
-            echo_error ("Need a node name for \@$macro", $line_nr);
-            return '';
-        }
-        if (@args > 3)
-        {
-            echo_warn ("Too much arguments for \@$macro", $line_nr);
-        }
-        $args[2] = '' if (!defined($args[2]));
-        $args[1] = '' if (!defined($args[1]));
-        $node_texi = "($args[2])$args[0]";
-    }
-    
-    my $i;
-    my $new_state = duplicate_state($state);
-    $new_state->{'keep_texi'} = 0;
-    $new_state->{'keep_nr'} = 0;
-    for ($i = 0; $i < 5; $i++)
-    {
-        $args[$i] = substitute_line($args[$i], $new_state);
-    }
-    #print STDERR "(@args)\n";
-    
-    if (($macro eq 'inforef') or ($args[3] ne '') or ($args[4] ne ''))
-    {# external ref
-        if ($macro eq 'inforef')
-        {
-            $macro = 'xref';
-            $args[3] = $args[2];
-        }
-        my $href = '';
-        my $node_file = '';
-        if ($args[3] ne '')
-        {
-            $href = do_external_href($node_texi);
-            $node_file = "($args[3])$args[0]";
-        }
-        my $section = '';
-        if ($args[4] ne '')
-        {
-            $section = $args[0];
-            if ($args[2] ne '')
-            {
-                $section = $args[2];
-            }
-        }
-        $result = &$Texi2HTML::Config::external_ref($macro, $section, $args[4], $node_file, $href, $args[1]);
-    }
-    else
-    {
-        my $element = $nodes{$node_texi};
-        if ($element and $element->{'seen'})
-        {
-            if ($element->{'with_section'})
-            {
-                $element = $element->{'with_section'};
-            }
-            my $file = '';
-            if (defined($state->{'element'}))
-            {
-                $file = $state->{'element'}->{'file'};
-            }
-            else
-            {
-                echo_warn ("\@$macro not in text (in anchor, node, section...)", $line_nr);
-                # if Texi2HTML::Config::SPLIT the file is '' which ensures a href with the file
-                # name. if ! Texi2HTML::Config::SPLIT the 2 file will be the same thus there
-                # won't be the file name
-                $file = $element->{'file'} unless ($Texi2HTML::Config::SPLIT);
-            }
-	    #print STDERR "SUBHREF in ref `$node_texi': $_";
-            my $href = href($element, $file);
-            my $section = $args[2];
-            $section = $args[1] if ($section eq '');
-            my $name = $section;
-            my $short_name = $section;
-            if ($section eq '')
-            {
-                $name = $element->{'name'};
-                $short_name = $args[0];
-            }
-            $result = &$Texi2HTML::Config::internal_ref ($macro, $href, $short_name, $name, $element->{'section'});
-        }
-        else
-        {
-           if (($node_texi eq '') or !$novalidate)
-           {
-               echo_error ("Undefined node `$node_texi' in \@$macro", $line_nr);
-               my $text = '';
-               for (my $i = 0; $i < @$args -1; $i++)
-               {
-                    $text .= $args->[$i] .',';
-               }
-               $text .= $args->[-1];
-               $result = "\@$macro"."{${text}}";
-           }
-           else
-           {
-               $result = &$Texi2HTML::Config::external_ref($macro, '', '', $args[0], do_external_href($node_texi), $args[1]);
-           }
-        }
-    }
-    return $result;
-}
-
-sub do_acronym_like($$$$$)
-{
-    my $command = shift;
-    my $args = shift;
-    my $acronym_texi = shift @$args;
-    my $explanation = shift @$args;
-    my $style_stack = shift;
-    my $state = shift;
-    my $line_nr = shift;
-
-    my $explanation_lines;
-    my $explanation_text;
-    my $explanation_unformatted;
-
-    if (defined($explanation))
-    {
-        $explanation =~ s/^\s*//;
-        $explanation =~ s/\s*$//;
-        $explanation = undef if ($explanation eq '');
-    }
-    $acronym_texi =~ s/^\s*//;
-    $acronym_texi =~ s/\s*$//;
-    
-    return '' if ($acronym_texi eq '');
-    
-    my $with_explanation = 0;
-    my $normalized_text =  cross_manual_line (normalise_node($acronym_texi));
-    if (defined($explanation))
-    {
-        $with_explanation = 1;
-        $acronyms_like{$command}->{$normalized_text} = $explanation;
-    }
-    elsif (exists($acronyms_like{$command}->{$normalized_text}))
-    {
-        $explanation = $acronyms_like{$command}->{$normalized_text};
-    }
-
-    if (defined($explanation))
-    {
-         @$explanation_lines = map {$_ = $_."\n"} split (/\n/, $explanation);
-         my $text = '';
-         foreach my $line(@$explanation_lines)
-         {
-              $line .= ' ' if (chomp ($line));
-              $text .= $line
-         }
-         $text =~ s/ $//;
-         my $unformatted_state = duplicate_state($state);
-         $unformatted_state->{'unformatted'} = 1;
-         $explanation_unformatted = substitute_line($text, $unformatted_state);
-         $explanation_text = substitute_line($text, duplicate_state($state));
-    }
-    return &$Texi2HTML::Config::acronym_like($command, $acronym_texi, substitute_line ($acronym_texi, duplicate_state($state)), 
-       $with_explanation, $explanation_lines, $explanation_text, $explanation_unformatted);
-}
-
-sub do_caption_shortcaption($$$$$)
-{
-    my $command = shift;
-    my $args = shift;
-    my $text = $args->[0];
-    my $style_stack = shift;
-    my $state = shift;
-    my $line_nr = shift;
-
-    if (!exists($state->{'float'}))
-    {
-#dump_stack(\"", [], $state);
-         echo_error("\@$command outside of float", $line_nr);
-         return '';
-    }
-    my $float = $state->{'float'};
-    my @texi_lines = map {$_ = $_."\n"} split (/\n/, $text);
-    $float->{"${command}_texi"} = \@texi_lines;
-    return '';
-}
-
-sub do_float_line($$$$$)
-{
-    my $command = shift;
-    my $args = shift;
-    my @args = @$args;
-    my $style_texi = shift @args;
-    my $label_texi = shift @args;
-    my $style_stack = shift;
-    my $state = shift;
-    my $line_nr = shift;
-
-    $style_texi = undef if (defined($style_texi) and $style_texi=~/^\s*$/);
-    $label_texi = undef if (defined($label_texi) and $label_texi=~/^\s*$/);
-    if (defined($label_texi))
-    {
-         #my $id = cross_manual_line($label_texi);
-         $state->{'float'} = $nodes{normalise_node($label_texi)};
-         #print STDERR "float: $state->{'float'}, $state->{'float'}->{'texi'}\n";
-    }
-    else 
-    {
-         $state->{'float'} = { 'float' => 1 };
-         if (defined($style_texi))
-         {
-              $state->{'float'}->{'style_texi'} = normalise_space($style_texi);
-              $state->{'float'}->{'style_id'} = cross_manual_line($style_texi);
-              $state->{'float'}->{'style'} = substitute_line($style_texi);
-         }
-         #print STDERR "float: (no label) $state->{'float'}\n";
-    }
-    return '';
-}
-
-sub do_quotation_line($$$$$)
-{
-    my $command = shift;
-    my $args = shift;
-    my @args = @$args;
-    my $style_texi = shift @args;
-    my $text_texi = shift @args;
-    my $style_stack = shift;
-    my $state = shift;
-    my $line_nr = shift;
-    my $text;
-
-    $style_texi = undef if (defined($style_texi) and $style_texi=~/^\s*$/);
-    $text_texi = undef if (defined($text_texi) and $text_texi=~/^\s*$/);
-    if (defined($style_texi) and !defined($text_texi))
-    {
-         $text_texi = $style_texi;
-         $style_texi = undef;
-    }
-    if (defined($text_texi))
-    {
-         $text = substitute_line($text_texi, duplicate_state($state));
-         $text =~ s/\s*$//;
-    }
-    my $quotation_args = { 'style_texi' => $style_texi, 'text' => $text, 'text_texi' => $text_texi };
-    if (defined($style_texi))
-    {
-         $quotation_args->{'style_id'} = cross_manual_line(normalize_space($style_texi));
-    }
-    push @{$state->{'quotation_stack'}}, $quotation_args;
-    $state->{'prepend_text'} = &$Texi2HTML::Config::quotation_prepend_text($style_texi, $text_texi);
-    return '';
-}
-
-sub do_def_line($$$$$)
-{
-    my $command = shift;
-    my $args = shift;
-    my @args = @$args;
-    my $arguments = shift @args;
-    my $style_stack = shift;
-    my $state = shift;
-    my $line_nr = shift;
-
-    $state->{'deff'}->{'arguments'} = $arguments;
-    return '';
-}
-
-sub do_footnote($$$$)
-{
-    my $command = shift;
-    my $args = shift;
-    my $text = $args->[0];
-    my $style_stack = shift;
-    my $state = shift;
-    my $line_nr = shift;
-
-    $text .= "\n";
-    $foot_num++;
-    $relative_foot_num++;
-    my $docid  = "DOCF$foot_num";
-    my $footid = "FOOT$foot_num";
-    my $from_file = '';
-    if ($state->{'element'} and $Texi2HTML::Config::SPLIT and $Texi2HTML::Config::SEPARATED_FOOTNOTES)
-    { 
-        $from_file = $state->{'element'}->{'file'};
-    }
-    my %state;
-    initialise_state (\%state); 
-    if ($Texi2HTML::Config::SEPARATED_FOOTNOTES)
-    {
-        $state{'element'} = $footnote_element;
-    }
-    else
-    {
-        $state{'element'} = $state->{'element'};
-    }
-    my $file = '';
-    $file = $docu_foot if ($Texi2HTML::Config::SPLIT and $Texi2HTML::Config::SEPARATED_FOOTNOTES);
-    
-    # FIXME use split_lines ? It seems to work like it is now ?
-    my @lines = substitute_text(\%state, map {$_ = $_."\n"} split (/\n/, $text));
-    my ($foot_lines, $foot_label) = &$Texi2HTML::Config::foot_line_and_ref ($foot_num,
-         $relative_foot_num, $footid, $docid, $from_file, $file, \@lines, $state);
-    push(@foot_lines, @{$foot_lines});
-    return $foot_label;
-}
-
-sub do_image($$$$)
-{
-    # replace images
-    my $command = shift;
-    my $args = shift;
-    my $text = $args->[0];
-    my $style_stack = shift;
-    my $state = shift;
-    my $line_nr = shift;
-    $text =~ s/\s+/ /gos; # remove useless spaces and newlines
-    my @args = split (/\s*,\s*/, $text);
-    my $base = $args[0];
-    if ($base eq '')
-    {
-         echo_error ("no file argument for \@image", $line_nr);
-         #warn "$ERROR no file argument for \@image\n";
-         return '';
-    }
-    $args[4] = '' if (!defined($args[4]));
-    $args[3] = '' if (!defined($args[3]));
-    my $image;
-    my $file_name;
-    $image = locate_include_file("$base.$args[4]") if (defined($args[4]) and ($args[4] ne ''));
-    if (defined($image))
-    {
-         $file_name = "$base.$args[4]";
-    }
-    elsif ($image = locate_include_file("$base.png"))
-    {
-         $file_name = "$base.png";
-    }
-    elsif ($image = locate_include_file("$base.jpg"))
-    {
-         $file_name = "$base.jpg";
-    }
-    elsif ($image = locate_include_file("$base.gif"))
-    {
-         $file_name = "$base.gif";
-    }
-    else 
-    {
-        $image = "$base.jpg";
-        $image = "$base.$args[4]" if (defined($args[4]) and ($args[4] ne ''));
-        $file_name = $image;
-        echo_error ("no image file for $base, (using $image)", $line_nr); 
-        #warn "$ERROR no image file for $base, (using $image) : $text\n"; 
-    } # FIXME use full file name for alt instead of base when there is no
-      # alttext ?
-    if ($args[3] =~ /\S/)
-    {
-        # FIXME makeinfo don't do that.
-        $args[3] = do_text($args[3]);
-        $base = $args[3] if ($args[3] =~ /\S/);
-    }
-    return &$Texi2HTML::Config::image(
-    &$Texi2HTML::Config::protect_text($path_to_working_dir . $image),
-    &$Texi2HTML::Config::protect_text($base), 
-    $state->{'preformatted'}, &$Texi2HTML::Config::protect_text($file_name));
-}
-
-sub duplicate_state($)
-{
-    my $state = shift;
-    my $new_state = { 'element' => $state->{'element'}, 
-           'preformatted' => $state->{'preformatted'}, 
-           'code_style' => $state->{'code_style'}, 
-           'keep_texi' => $state->{'keep_texi'}, 
-           'keep_nr' => $state->{'keep_nr'}, 
-           'preformatted_stack' => $state->{'preformatted_stack'} 
-    };
-    return $new_state;
-}
-
-sub expand_macro($$$$$)
-{
-    my $name = shift;
-    my $args = shift;
-    my $end_line = shift;
-    my $line_nr = shift;
-    my $state = shift;
-
-    my $index = 0;
-    foreach my $arg (@$args)
-    { # expand @macros in arguments
-        $args->[$index] = substitute_text({'texi' => 1, 'arg_expansion' => 1}, split_lines($arg));
-        $index++;
-    }
-    my $macrobody = $macros->{$name}->{'Body'};
-    my $formal_args = $macros->{$name}->{'Args'};
-    my $args_index =  $macros->{$name}->{'Args_index'};
-    my $i;
-    
-    die "Bug end_line not defined" if (!defined($end_line));
-    
-    for ($i=0; $i<=$#$formal_args; $i++)
-    {
-        $args->[$i] = "" unless (defined($args->[$i]));
-        print STDERR "# arg($i): $args->[$i]\n" if ($T2H_DEBUG & $DEBUG_MACROS);
-    }
-    echo_error ("too much arguments for macro $name", $line_nr) if (defined($args->[$i + 1]));
-    #warn "$ERROR too much arguments for macro $name" if (defined($args->[$i + 1]));
-    my $result = '';
-    while ($macrobody)
-    {
-        if ($macrobody =~ s/^([^\\]*)\\//o)
-        {
-            $result .= $1 if defined($1);
-            if ($macrobody =~ s/^\\//)
-            {
-                $result .= '\\';
-            }
-            elsif ($macrobody =~ s/^(\@end\sr?macro)$// or $macrobody =~ s/^(\@end\sr?macro\s)// or $macrobody =~ s/^(\@r?macro\s+\w+\s*.*)//)
-            { # \ protect @end macro
-                $result .= $1;
-            }
-            elsif ($macrobody =~ s/^([^\\]*)\\//)
-            {
-               my $arg = $1;
-               if (defined($args_index->{$arg}))
-               {
-                   $result .= $args->[$args_index->{$arg}];
-               }
-               else
-               {
-                   warn "$ERROR \\ not followed by \\ or an arg but by $arg in macro\n";
-                   $result .= '\\' . $arg;
-               }
-            }
-            next;
-        }
-        $result .= $macrobody;
-        last;
-    }
-    #$result .= $end_line;
-    my @result = split(/^/m, $result);
-    #my $first_line = shift (@result);
-    if ($state->{'arg_expansion'})
-    {
-        unshift @{$state->{'spool'}}, (@result, $end_line);
-    }
-    else
-    {
-        unshift @{$input_spool->{'spool'}}, (@result, $end_line);
-        $input_spool->{'macro'} = $name if ($input_spool->{'macro'} eq '');
-    }
-    if ($T2H_DEBUG & $DEBUG_MACROS)
-    {
-        print STDERR "# macro expansion result:\n";
-        #print STDERR "$first_line";
-        foreach my $line (@result)
-        {
-            print STDERR "$line";
-        }
-        print STDERR "# macro expansion result end\n";
-    }
-    #return $first_line;
-}
-
-sub do_index_summary_file($)
-{
-    my $name = shift;
-    my ($Pages, $Entries) = get_index($name);
-    &$Texi2HTML::Config::index_summary_file_begin ($name, $printed_indices{$name});
-    #open(FHIDX, ">$docu_rdir$docu_name" . "_$name.idx")
-    #   || die "Can't open > $docu_rdir$docu_name" . "_$name.idx for writing: $!\n";
-    #print STDERR "# writing $name index summary in $docu_rdir$docu_name" . "_$name.idx...\n" if $T2H_VERBOSE;
-    print STDERR "# writing $name index summary\n" if $T2H_VERBOSE;
-
-    foreach my $key (sort keys %$Entries)
-    {
-        #print FHIDX "$key\t$Entries->{$key}->{href}\n";
-        my $entry = $Entries->{$key};
-        my $label = $entry->{'element'};
-        my $entry_element = $label;
-        # notice that we use the section associated with a node even when 
-        # there is no with_section, i.e. when there is another node preceding
-        # the sectionning command.
-        # However when it is the Top node, we use the node instead.
-        # (for the Top node, 'section_ref' is himself, and 'as_section' is 
-        # true)
-        $entry_element = $entry_element->{'section_ref'} if ($entry_element->{'node'} and $entry_element->{'section_ref'} and !$entry_element->{'section_ref'}->{'as_section'});
-        my $origin_href = $entry->{'file'};
-   #print STDERR "$entry $entry->{'entry'}, real elem $label->{'texi'}, section $entry_element->{'texi'}, real $label->{'file'}, entry file $entry->{'file'}\n";
-        if ($entry->{'label'})
-        { 
-             $origin_href .= '#' . $entry->{'label'};
-        }
-        else
-        {
-            # If the $label element and the $index entry are on the same
-            # file the label is prefered. If they aren't on the same file
-            # the entry id is choosed as it means that the label element
-            # and the index entry are separated by a printindex.
-            print STDERR "id undef ($entry) entry: $entry->{'entry'}, label: $label->{'text'}\n"  if (!defined($entry->{'id'}));
-            if ($entry->{'file'} eq $label->{'file'})
-            {
-                $origin_href .= '#' . $label->{'id'};
-            }
-            else
-            {
-                $origin_href .= '#' . $entry->{'id'} ;
-            }
-        }
-        #print STDERR "SUBHREF in index summary file for $entry_element->{'texi'}\n";
-        #print FHIDX '' . 
-        &$Texi2HTML::Config::index_summary_file_entry ($name,
-          $key, $origin_href, 
-          substitute_line($entry->{'entry'}), $entry->{'entry'},
-          href($entry_element, ''),
-          $entry_element->{'text'},
-          $printed_indices{$name});
-    }
-    &$Texi2HTML::Config::index_summary_file_end ($name, $printed_indices{$name});
-}
-
-sub do_index_page($$;$)
-{
-    my $index_elements = shift;
-    my $nr = shift;
-    my $page = shift;
-    my $index_element = $index_elements->[$nr];
-    my $summary = do_index_summary($index_element->{'element'}, $index_elements);
-    my $entries = do_index_entries($index_element->{'element'}, $index_element->{'page'}, $index_element->{'name'});
-    return $summary . $entries . $summary;
-}
-
-sub do_index_summary($$)
-{
-    my $element = shift;
-    my $index_elements = shift;
-
-    my @letters;
-    my @symbols;
-
-    for my $index_element_item (@$index_elements)
-    {
-        my $index_element = $index_element_item->{'element'};
-        my $file = '';
-        $file .= $index_element->{'file'} if ($index_element->{'file'} ne $element->{'file'});
-        my $index = 0;
-        for my $letter (@{$index_element_item->{'page'}->{Letters}})
-        {
-            if ($letter =~ /^[A-Za-z]/)
-            {
-                push @letters, &$Texi2HTML::Config::summary_letter($letter, $file, "$index_element->{'id'}" . "_$index");
-            }
-            else
-            {
-                push @symbols, &$Texi2HTML::Config::summary_letter($letter, $file, "$index_element->{'id'}" . "_$index");
-            }
-            $index++;
-        }
-    }
-    return &$Texi2HTML::Config::index_summary(\@letters, \@symbols);
-}
-
-sub do_index_entries($$$)
-{
-    my $element = shift;
-    my $page = shift;
-    my $name = shift;
- 
-    my $letters = '';
-    my $index = 0;
-    for my $letter (@{$page->{'Letters'}})
-    {
-       my $entries = '';
-       for my $entry (@{$page->{'EntriesByLetter'}->{$letter}})
-       {
-           my $label = $entry->{'element'};
-           my $entry_element = $label;
-           # notice that we use the section associated with a node even when 
-           # there is no with_section, i.e. when there is another node preceding
-           # the sectionning command.
-           # However when it is the Top node, we use the node instead.
-           # (for the Top node, 'section_ref' is himself, and 'as_section' is 
-           # true)
-           $entry_element = $entry_element->{'section_ref'} if ($entry_element->{'node'} and $entry_element->{'section_ref'} and !$entry_element->{'section_ref'}->{'as_section'});
-           my $origin_href = '';
-           $origin_href = $entry->{'file'} if ($Texi2HTML::Config::SPLIT and $entry->{'file'} ne $element->{'file'});
-	   #print STDERR "$entry $entry->{'entry'}, real elem $label->{'texi'}, section $entry_element->{'texi'}, real $label->{'file'}, entry file $entry->{'file'}\n";
-           if ($entry->{'label'})
-           { 
-               $origin_href .= '#' . $entry->{'label'};
-           }
-	   else
-           {
-               # If the $label element and the $index entry are on the same
-               # file the label is prefered. If they aren't on the same file
-               # the entry id is choosed as it means that the label element
-               # and the index entry are separated by a printindex.
-               print STDERR "id undef ($entry) entry: $entry->{'entry'}, label: $label->{'text'}\n"  if (!defined($entry->{'id'}));
-               if ($entry->{'file'} eq $label->{'file'})
-               {
-                   $origin_href .= '#' . $label->{'id'};
-               }
-               else
-               {
-                   $origin_href .= '#' . $entry->{'id'} ;
-               }
-           }
-	   #print STDERR "SUBHREF in index for $entry_element->{'texi'}\n";
-           $entries .= &$Texi2HTML::Config::index_entry ($origin_href, 
-                     substitute_line($entry->{'entry'}),
-                     href($entry_element, $element->{'file'}),
-                     $entry_element->{'text'});
-        }
-        $letters .= &$Texi2HTML::Config::index_letter ($letter, "$element->{'id'}" . "_$index", $entries);
-        $index++;
-    }
-    return &$Texi2HTML::Config::print_index($letters, $name);
-}
-
-# remove texi commands, replacing with what seems adequate. see simple_map_texi
-# and texi_map.
-# Doesn't protect html
-sub remove_texi(@)
-{
-    return substitute_text ({ 'remove_texi' => 1, 'no_protection' => 1 }, @_);
-}
-
-# Same as remove texi but protect text and use special maps for @-commands
-sub unformatted_text($@)
-{
-    my $state = shift;
-    $state = {} if (!defined($state));
-    $state->{'remove_texi'} = 1;
-    $simple_map_texi_ref = \%Texi2HTML::Config::unformatted_text_simple_map_texi;
-    $style_map_texi_ref = \%Texi2HTML::Config::unformatted_text_style_map_texi;
-    $texi_map_ref = \%Texi2HTML::Config::unformatted_text_texi_map;
-    my $text = substitute_text ($state, @_);
-    $simple_map_texi_ref = \%Texi2HTML::Config::simple_map_texi;
-    $style_map_texi_ref = \%Texi2HTML::Config::style_map_texi;
-    $texi_map_ref = \%Texi2HTML::Config::texi_map;
-    return $text;
-}
-
-sub enter_table_index_entry($$$$)
-{
-    my $text = shift;
-    my $stack = shift;
-    my $state = shift;
-    my $line_nr = shift;
-    if ($state->{'item'} and ($state->{'table_stack'}->[-1] =~ /^(v|f)table$/))
-    {
-         my $index = $1;
-         my $macro = $state->{'item'};
-         delete $state->{'item'};
-         close_stack($text, $stack, $state, $line_nr, undef, 'index_item');
-         my $item = pop @$stack;
-         my $element = $state->{'element'};
-         $element = $state->{'node_ref'} unless ($element);
-         #print STDERR "enter_table_index_entry $item->{'text'}";
-         enter_index_entry($index, $line_nr, $item->{'text'}, $state->{'place'}, $element, 0);
-         add_prev($text, $stack, "\@$macro" . $item->{'text'});
-    }
-}
-
-sub scan_texi($$$$;$)
-{
-    my $line = shift;
-    my $text = shift;
-    my $stack = shift;
-    my $state = shift;
-    my $line_nr = shift;
-    
-    die "stack not an array ref"  unless (ref($stack) eq "ARRAY");
-    local $_ = $line;
-
-    while(1)
-    {
-        # scan_texi
-        #print STDERR "WHILE:$_";
-        #dump_stack($text, $stack, $state);
-
-        # In ignored region
-        if ($state->{'ignored'})
-        {
-            my $line;
-            if (s/^(.*?\@end\s+$state->{'ignored'})//)
-            {
-                 $line = $1;
-                 if (s/^$// or s/(\s+)//)
-                 {
-                     $line = $line . $1 if (defined($1));
-                 }
-                 elsif (/[^\@]/)
-                 {
-                      $_ .= $line;
-                      $line = undef;
-                 }
-            }
-            if (defined($line))
-            {
-                 delete $state->{'ignored'};
-                 #dump_stack($text, $stack, $state);
-                 # MACRO_ARG => keep ignored text
-                 if ($state->{'arg_expansion'})
-                 {
-                     #add_prev ($text, $stack, $1);
-                     add_prev ($text, $stack, $line);
-                     next;
-                 }
-                 return if /^\s*$/o;
-                 next;
-            }
-            add_prev ($text, $stack, $_) if ($state->{'arg_expansion'});
-            return;
-        }
-
-        # in macro definition
-        if (defined($state->{'macro'}))
-        {
-            if (s/^([^\\\@]*\\)//)
-            {# I believe it is correct, although makeinfo don't do that.
-                 $state->{'macro'}->{'Body'} .= $1;
-                 if (s/^\\//)
-                 {
-                      $state->{'macro'}->{'Body'} .= '\\';
-                      next;
-                 }
-                 elsif (s/^(\@end\sr?macro)$//o or s/^(\@end\sr?macro\s)//o
-                      or s/^(\@r?macro\s+\w+\s*.*)//o) 
-                 {
-                      $state->{'macro'}->{'Body'} .= $1;
-                      next;
-                 }
-            }
-            #if (s/^(.*?)\@end\sr?macro$//o or s/^(.*?)\@end\sr?macro\s+//o)
-            if (s/^(\@end\sr?macro)$//o or s/^(\@end\sr?macro\s+)//o)
-            {
-                 $state->{'macro_inside'}--;
-                 if ($state->{'macro_inside'})
-                 {
-                     $state->{'macro'}->{'Body'} .= $1;
-                     next;
-                 }
-                 #$state->{'macro'}->{'Body'} .= $1 if defined($1) ;
-                 chomp $state->{'macro'}->{'Body'};
-                 print STDERR "# end macro def. Body:\n$state->{'macro'}->{'Body'}"
-                     if ($T2H_DEBUG & $DEBUG_MACROS);
-                 delete $state->{'macro'};
-                 return if (/^\s*$/);
-                 next;
-            }
-            elsif(/^(\@r?macro\s+\w+\s*.*)/)
-            {
-                 $state->{'macro'}->{'Body'} .= $_;
-                 $state->{'macro_inside'}++;
-                 return;
-            }
-            elsif (s/^\@(.)//)
-            {
-                 $state->{'macro'}->{'Body'} .= '@' . $1;
-                 next;
-            }
-            elsif (s/^\@//)
-            {
-                 $state->{'macro'}->{'Body'} .= '@';
-                 next;
-            }
-            else
-            {
-                 s/([^\@\\]*)//;
-                 $state->{'macro'}->{'Body'} .= $1 if (defined($1));
-                 if (/^$/)
-                 {
-                      $state->{'macro'}->{'Body'} .= $_;
-                      return;
-                 }
-                 next;
-                 #$state->{'macro'}->{'Body'} .= $_ if defined($_) ;
-                 #return;
-            }
-        }
-        # in macro arguments parsing/expansion
-        if (defined($state->{'macro_name'}))
-        {
-            my $special_chars = quotemeta ('\{}');
-            my $multi_args = 0;
-            my $formal_args = $macros->{$state->{'macro_name'}}->{'Args'};
-            $multi_args = 1 if ($#$formal_args >= 1);
-            $special_chars .= quotemeta(',') if ($multi_args);
-            if ($state->{'macro_args'}->[-1] eq '')
-            {
-                s/^\s*//o;
-            }
-            if (s/^([^$special_chars]*)([$special_chars])//)
-            {
-                $state->{'macro_args'}->[-1] .= $1 if defined($1);
-                # \ protects any character in macro arguments
-                if ($2 eq '\\')
-                {
-                    print STDERR "# macro call: protected char\n" if ($T2H_DEBUG & $DEBUG_MACROS);
-                    if (s/^(.)//)
-                    {
-                        $state->{'macro_args'}->[-1] .= $1;
-                    }
-                    else
-                    {
-                        $state->{'macro_args'}->[-1] .= '\\';
-                    }
-                }
-                elsif ($2 eq ',')
-                { # separate args
-                    print STDERR "# macro call: new arg\n" if ($T2H_DEBUG & $DEBUG_MACROS);
-                    s/^\s*//o;
-                    push @{$state->{'macro_args'}}, '';
-                }
-                elsif ($2 eq '}')
-                { # balanced } ends the macro call, otherwise it is in the arg
-                    $state->{'macro_depth'}--;
-                    if ($state->{'macro_depth'} == 0)
-                    { 
-                        print STDERR "# expanding macro $state->{'macro_name'}\n" if ($T2H_DEBUG & $DEBUG_MACROS);
-                        $_ = expand_macro($state->{'macro_name'}, $state->{'macro_args'}, $_, $line_nr, $state);
-                        delete $state->{'macro_name'};
-                        delete $state->{'macro_depth'};
-                        delete $state->{'macro_args'};
-                        return;
-                    }
-                    else
-                    {
-                        print STDERR "# macro call: closing }\n" if ($T2H_DEBUG & $DEBUG_MACROS);
-                        add_text('}', \$state->{'macro_args'}->[-1]);
-                    }
-                }
-                elsif ($2 eq '{')
-                {
-                    print STDERR "# macro call: opening {\n" if ($T2H_DEBUG & $DEBUG_MACROS);
-                    $state->{'macro_depth'}++;
-                    add_text('{', \$state->{'macro_args'}->[-1]);
-                }
-                next;
-            }
-            print STDERR "# macro call: end of line\n" if ($T2H_DEBUG & $DEBUG_MACROS);
-            $state->{'macro_args'}->[-1] .= $_;
-            return;
-        }
-
-        # in a raw format, verbatim, tex or html
-        if ($state->{'raw'}) 
-        {
-            my $tag = $state->{'raw'};
-
-            # debugging
-            if (! @$stack or ($stack->[-1]->{'style'} ne $tag))
-            {
-                print STDERR "Bug: raw or special: $tag but not on top of stack\n";
-                print STDERR "line: $_";
-                dump_stack($text, $stack, $state);
-                exit 1;
-            }
-	    
-            if (s/^(.*?)(\@end\s$tag)$// or s/^(.*?)(\@end\s$tag\s)//)
-            {
-                add_prev ($text, $stack, $1);
-                my $end = $2;
-                my $style = pop @$stack;
-                if ($style->{'text'} !~ /^\s*$/ or $state->{'arg_expansion'})
-                {
-                    my $after_macro = '';
-                    $after_macro = ' ' unless (/^\s*$/);
-                    add_prev ($text, $stack, $style->{'text'} . $end . $after_macro);
-                    delete $state->{'raw'};
-                }
-                next;
-            }
-            else
-            {
-                 add_prev ($text, $stack, $_);
-                 last;
-            }
-        }
-
-        # in a @verb{ .. } macro
-        if (defined($state->{'verb'}))
-        {
-            my $char = quotemeta($state->{'verb'});
-            if (s/^(.*?)$char\}/\}/)
-            {
-                 add_prev($text, $stack, $1 . $state->{'verb'});
-                 $stack->[-1]->{'text'} = $state->{'verb'} . $stack->[-1]->{'text'};
-                 delete $state->{'verb'};
-                 next;
-            }
-            else
-            {
-                 add_prev($text, $stack, $_);
-                 last;
-            }
-        }
-	
-        # an @end tag
-        if (s/^([^{}@]*)\@end(\s+)([a-zA-Z]\w*)//)
-        {
-            add_prev($text, $stack, $1);
-            my $space = $2;
-            my $end_tag = $3;
-            if (defined($state->{'text_macro_stack'})
-               and @{$state->{'text_macro_stack'}}
-               and ($end_tag eq $state->{'text_macro_stack'}->[-1]))
-            {
-                pop @{$state->{'text_macro_stack'}};
-                # we keep menu and titlepage for the following pass
-                if ((($end_tag eq 'menu') and $text_macros{'menu'}) or ($region_lines{$end_tag}) or $state->{'arg_expansion'})
-                {
-                     add_prev($text, $stack, "\@end${space}$end_tag");
-                }
-                else
-                {
-                    #print STDERR "End $end_tag\n";
-                    #dump_stack($text, $stack, $state);
-                    return if (/^\s*$/);
-                }
-            }
-            elsif ($text_macros{$end_tag})
-            {
-                echo_error ("\@end $end_tag without corresponding element", $line_nr);
-            }
-            else
-            {
-                add_prev($text, $stack, "\@end${space}$end_tag");
-            }
-            next;
-        }
-        elsif (s/^([^{}@]*)\@(["'~\@\}\{,\.!\?\s\*\-\^`=:\|\/])//o or s/^([^{}@]*)\@([a-zA-Z]\w*)([\s\{\}\@])/$3/o or s/^([^{}@]*)\@([a-zA-Z]\w*)$//o)
-        {
-            add_prev($text, $stack, $1);
-            my $macro = $2;
-	    #print STDERR "MACRO $macro\n";
-            $state->{'bye'} = 1 if ($macro eq 'bye');
-            if (defined($Texi2HTML::Config::misc_command{$macro}) and 
-                 !$Texi2HTML::Config::misc_command{$macro}->{'texi'}
-                 and $macro ne 'documentencoding')
-            {
-                 my ($line, $args);
-                 ($_, $line, $args) = preserve_command($_, $macro);
-                 add_prev ($text, $stack, $line); 
-                 next;
-            }
-            # pertusus: it seems that value substitution are performed after
-            # macro argument expansions: if we have 
-            # @set comma ,
-            # and a call to a macro @macro {arg1 @value{comma} arg2}
-            # the macro arg is arg1 , arg2 and the comma don't separate
-            # args. Likewise it seems that the @value are not expanded
-            # in macro definitions
-
-            # track variables
-            my $value_macro = 1;
-            if ($macro eq 'set' and  s/^(\s+)($VARRE)(\s+)(.*)$//o)
-            {
-                if ($state->{'arg_expansion'})
-                {
-                    my $line = "\@$macro" . $1.$2.$3;
-                    $line .= $4 if (defined($4));
-                    add_prev($text, $stack, $line); 
-                    next;
-                }
-                $value{$2} = $4;
-            }
-            elsif ($macro eq 'clear' and s/^(\s+)($VARRE)//o)
-            {
-                if ($state->{'arg_expansion'})
-                {
-                    add_prev($text, $stack, "\@$macro" . $1 . $2);
-                    next; 
-                }
-                delete $value{$2};
-            }
-            else
-            {
-                 $value_macro = 0;
-            }
-            if ($value_macro)
-            {
-                return if (/^\s*$/);
-                next;
-            }
-	    
-            if ($macro =~ /^r?macro$/)
-            { #FIXME what to do if 'arg_expansion' is true (ie within another
-              # macro call arguments ?
-                if (/^\s+(\w+)\s*(.*)/)
-                {
-                    my $name = $1;
-                    if (exists($macros->{$name}))
-                    {
-                         echo_warn ("macro `$name' allready defined " . 
-                             format_line_number($macros->{$name}->{'line_nr'}) . " redefined", $line_nr);
-                    }
-                    $state->{'macro_inside'} = 1;
-                    my @args = ();
-                    @args = split(/\s*,\s*/ , $1)
-                       if ($2 =~ /^\s*{\s*(.*?)\s*}\s*/);
-                    # keep the context information of the definition
-                    $macros->{$name}->{'line_nr'} = { 'file_name' => $line_nr->{'file_name'}, 
-                         'line_nr' => $line_nr->{'line_nr'}, 'macro' => $line_nr->{'macro'} } if (defined($line_nr));
-                    $macros->{$name}->{'Args'} = \@args;
-                    my $arg_index = 0;
-                    my $debug_msg = '';
-                    foreach my $arg (@args)
-                    { # when expanding macros, the argument index is retrieved
-                      # with Args_index
-                        $macros->{$name}->{'Args_index'}->{$arg} = $arg_index;
-                        $debug_msg .= "$arg($arg_index) ";
-                        $arg_index++;
-                    }
-                    $macros->{$name}->{'Body'} = '';
-                    $state->{'macro'} = $macros->{$name};
-                    print STDERR "# macro def $name: $debug_msg\n"
-                     if ($T2H_DEBUG & $DEBUG_MACROS);
-                }
-                else
-                {
-                    echo_error ("Bad macro defintion $_", $line_nr);
-                    #warn "$ERROR Bad macro defintion $_";
-                }
-                return;
-            }
-            elsif (defined($text_macros{$macro}))
-            {
-                my $tag;
-                ($_, $tag) = do_text_macro ($macro, $_, $state, $line_nr);
-                # if it is a raw formatting command or a menu command
-                # we must keep it for later
-                my $macro_kept;
-                if ($state->{'raw'} or (($macro eq 'menu') and $text_macros{'menu'}) or (exists($region_lines{$macro})) or $state->{'arg_expansion'})
-                {
-                    add_prev($text, $stack, $tag);
-                    $macro_kept = 1;
-                }
-                if ($state->{'raw'})
-                {
-                    push @$stack, { 'style' => $macro, 'text' => '' };
-                }
-                next if $macro_kept;
-                #dump_stack ($text, $stack, $state);
-                return if (/^\s*$/);
-            }
-            elsif ($macro eq 'value')
-            {
-                if (s/^{($VARRE)}//)
-                {
-                    if ($state->{'arg_expansion'})
-                    {
-                        add_prev($text, $stack, "\@$macro" . '{' . $1 . '}');
-                        next;
-                    }
-                    $_ = get_value($1) . $_;
-                }
-                else
-                {
-                    if ($state->{'arg_expansion'})
-                    {
-                        add_prev($text, $stack, "\@$macro");
-                        next;
-                    }
-                    echo_error ("bad \@value macro", $line_nr);
-                    #warn "$ERROR bad \@value macro";
-                }
-            }
-            elsif ($macro eq 'definfoenclose')
-            {
-                if ($state->{'arg_expansion'})
-                {
-                    add_prev($text, $stack, "\@$macro" . $_);
-                    return;
-                }
-                if (s/^\s+([a-z]+)\s*,\s*([^\s]+)\s*,\s*([^\s]+)//)
-                {
-                     $info_enclose{$1} = [ $2, $3 ];
-                }
-                else
-                {
-                     echo_error("Bad \@$macro", $line_nr);
-                }
-                return if (/^\s*$/);
-                s/^\s*//;
-            }
-            elsif ($macro eq 'include')
-            {
-                if ($state->{'arg_expansion'})
-                {
-                    add_prev($text, $stack, "\@$macro" . $_);
-                    return;
-                }
-                #if (s/^\s+([\/\w.+-]+)//o)
-                if (s/^(\s+)(.*)//o)
-                {
-                    my $file = locate_include_file($2);
-                    if (defined($file))
-                    {
-                        open_file($file, $line_nr);
-                        print STDERR "# including $file\n" if $T2H_VERBOSE;
-                    }
-                    else
-                    {
-                        echo_error ("Can't find $2, skipping", $line_nr);
-                        #warn "$ERROR Can't find $1, skipping\n";
-                    }
-                }
-                else
-                {
-                    echo_error ("Bad include line: $_", $line_nr);
-                    return;
-                } # makeinfo remove the @include but not the end of line
-                # FIXME verify if it is right
-                #return if (/^\s*$/);
-            }
-            elsif ($macro eq 'documentencoding')
-            {
-                if (s/(\s+)([0-9\w\-]+)//)
-                {
-                    my $encoding = $2;
-                    $Texi2HTML::Config::DOCUMENT_ENCODING = $encoding;
-                    $from_encoding = set_encoding($encoding);
-                    if (defined($from_encoding))
-                    {
-                        foreach my $file (@fhs)
-                        {
-                            binmode($file->{'fh'}, ":encoding($from_encoding)");
-                        }
-                    }
-                }
-                add_prev($text, $stack, "\@$macro" . $1 . $2);
-            }
-            elsif ($macro eq 'unmacro')
-            { #FIXME with 'arg_expansion' should it be passed unmodified ?
-                delete $macros->{$1} if (s/^\s+(\w+)//);
-                return if (/^\s*$/);
-                s/^\s*//;
-            }
-            elsif (exists($macros->{$macro}))
-            {
-                my $ref = $macros->{$macro}->{'Args'};
-                # we remove any space/new line before the argument
-                if (s/^\s*{\s*//)
-                {
-                    $state->{'macro_args'} = [ "" ];
-                    $state->{'macro_name'} = $macro;
-                    $state->{'macro_depth'} = 1;
-                }
-                elsif ($#$ref >= 1)
-                { # no brace -> no arg
-                    $_ = expand_macro ($macro, [], $_, $line_nr, $state);
-                    return;
-                }
-                else
-                { # macro with one arg on the line
-                    chomp $_;
-                    $_ = expand_macro ($macro, [$_], "\n", $line_nr, $state);
-                    return;
-                }
-            }
-            elsif ($macro eq ',')
-            {# the @, causes problems when `,' separates things (in @node, @ref)
-                $_ = "\@m_cedilla" . $_;
-            }
-            elsif (s/^{//)
-            {
-                if ($macro eq 'verb')
-                {
-                    if (/^$/)
-                    {
-                        echo_error ("verb at end of line", $line_nr);
-                        #warn "$ERROR verb at end of line";
-                    }
-                    else
-                    {
-                        s/^(.)//;
-                        $state->{'verb'} = $1;
-                    }
-                }
-                push (@$stack, { 'style' => $macro, 'text' => '' });
-            }
-            else
-            {
-                add_prev($text, $stack, "\@$macro");
-            }
-            next;
-        }
-        #elsif(s/^([^{}@]*)\@(.)//o)
-        elsif(s/^([^{}@]*)\@([^\s\}\{\@]*)//o)
-        {
-            # No need to warn here it is done later
-            add_prev($text, $stack, $1 . "\@$2");
-            next;
-        }
-        elsif (s/^([^{}]*)([{}])//o)
-        {
-            add_prev($text, $stack, $1);
-            if ($2 eq '{')
-            {
-                push @$stack, { 'style' => '', 'text' => '' };
-            }
-            else
-            {
-                if (@$stack)
-                {
-                    my $style = pop @$stack;
-                    my $result;
-                    if (($style->{'style'} ne '') and exists($info_enclose{$style->{'style'}}) and !$state->{'arg_expansion'})
-                    {
-                         $result = $info_enclose{$style->{'style'}}->[0] . $style->{'text'} . $info_enclose{$style->{'style'}}->[1];      
-                    }              
-                    elsif ($style->{'style'} ne '')
-                    {
-                         $result = '@' . $style->{'style'} . '{' . $style->{'text'} . '}';
-                    }
-                    else
-                    {
-                        $result = '{' . $style->{'text'};
-                        # don't close { if we are closing stack as we are not 
-                        # sure this is a licit { ... } construct.
-                        $result .= '}' unless ($state->{'close_stack'} or $state->{'arg_expansion'});
-                    }
-                    add_prev ($text, $stack, $result);
-                    #print STDERR "MACRO end $style->{'style'} remaining: $_";
-                    next;
-                }
-                else
-                {
-                    # we warn in the last pass
-                    #echo_error ("'}' without opening '{', before: $_", $line_nr);
-                    #warn "$ERROR '}' without opening '{' line: $line";
-                    add_prev ($text, $stack, '}');
-                }
-            }
-        }
-        else
-        {
-            #print STDERR "END_LINE $_";
-            add_prev($text, $stack, $_);
-            last;
-        }
-    }
-    return 1;
-}
-
-sub scan_structure($$$$;$)
-{
-    my $line = shift;
-    my $text = shift;
-    my $stack = shift;
-    my $state = shift;
-    my $line_nr = shift;
-
-    die "stack not an array ref"  unless (ref($stack) eq "ARRAY");
-    local $_ = $line;
-    #print STDERR "SCAN_STRUCTURE: $line";
-    #dump_stack ($text, $stack, $state); 
-    if (!$state->{'raw'} and !$state->{'special'} and (!exists($state->{'region_lines'})))
-    { 
-        if (!$state->{'verb'} and $state->{'menu'} and /^\*/o)
-        {
-        # new menu entry
-            delete ($state->{'after_element'});
-            my $menu_line = $_;
-            my $node;
-            if (/^\*\s+($NODERE)::/)
-            {
-                $node = $1;
-            }
-            elsif (/^\*\s+([^:]+):\s*([^\t,\.\n]+)[\t,\.\n]/)
-            {
-                #$name = $1;
-                $node = $2;
-            }
-            if ($node)
-            {
-                menu_entry_texi(normalise_node($node), $state, $line_nr);
-            }
-        }
-        if (/\S/ and !no_line($_))
-        {
-            delete $state->{'after_element'};
-        }
-    }
-
-    while(1)
-    {
-        # scan structure
-	#print STDERR "WHILE\n";
-	#dump_stack($text, $stack, $state);
-
-        # as texinfo 4.5
-        # verbatim might begin at another position than beginning
-        # of line, and end verbatim might too. To end a verbatim section
-        # @end verbatim must have exactly one space between end and verbatim
-        # things following end verbatim are not ignored.
-        #
-        # html might begin at another position than beginning
-        # of line, but @end html must begin the line, and have
-        # exactly one space. Things following end html are ignored.
-        # tex and ignore works like html
-        #
-        # ifnothtml might begin at another position than beginning
-        # of line, and @end  ifnothtml might too, there might be more
-        # than one space between @end and ifnothtml but nothing more on 
-        # the line.
-        # @end itemize, @end ftable works like @end ifnothtml.
-        # except that @item on the same line than @end vtable doesn't work
-        # 
-        # text right after the itemize before an item is displayed.
-        # @item might be somewhere in a line. 
-        # strangely @item on the same line than @end vtable doesn't work
-        # there should be nothing else than a command following @itemize...
-        #
-        # see more examples in formatting directory
-
-        if ($state->{'raw'} or $state->{'special'}) 
-        {
-            my $tag = $state->{'raw'};
-            $tag = $state->{'special'} unless $tag;
-            if (! @$stack or ($stack->[-1]->{'style'} ne $tag))
-            {
-                print STDERR "Bug: raw or special: $tag but not on top of stack\n";
-                print STDERR "line: $_";
-                dump_stack($text, $stack, $state);
-                exit 1;
-            }
-            if (s/^(.*?)\@end\s$tag$// or s/^(.*?)\@end\s$tag\s//)
-            {
-                add_prev ($text, $stack, $1);
-                my $style = pop @$stack;
-                if ($state->{'special'})
-                {
-                    delete $state->{'special'};
-                    if ($style->{'text'} !~ /^\s*$/)
-                    {
-                        add_prev ($text, $stack, do_special($style->{'style'}, $style->{'text'}));
-                    }
-                    
-                }
-                else
-                {
-                    my $after_macro = '';
-                    $after_macro = ' ' unless (/^\s*$/);
-                    add_prev ($text, $stack, $style->{'text'} . "\@end $state->{'raw'}" . $after_macro);
-                    delete $state->{'raw'};
-                }
-                unless (no_line($_))
-                {
-                    delete ($state->{'after_element'});
-                }
-                next;
-            }
-            else
-            {
-                add_prev ($text, $stack, $_);
-                last unless ($state->{'special'}); 
-                return;
-            }
-        }
-	
-        if (defined($state->{'verb'}))
-        {
-            my $char = quotemeta($state->{'verb'});
-            if (s/^(.*?)$char\}/\}/)
-            {
-                add_prev($text, $stack, $1 . $state->{'verb'});
-                $stack->[-1]->{'text'} = $state->{'verb'} . $stack->[-1]->{'text'};
-                delete $state->{'verb'};
-                next;
-            }
-            else
-            {
-                add_prev($text, $stack, $_);
-                last;
-            }
-        }
-	
-        unless (no_line($_))
-        {
-            delete $state->{'after_element'};
-        }
-        if (s/^([^{}@]*)\@end\s+([a-zA-Z]\w*)//)
-        {
-            add_prev($text, $stack, $1);
-            my $end_tag = $2;
-            $state->{'detailmenu'}-- if ($end_tag eq 'detailmenu' and $state->{'detailmenu'});
-            if (defined($state->{'text_macro_stack'}) 
-               and @{$state->{'text_macro_stack'}} 
-               and ($end_tag eq $state->{'text_macro_stack'}->[-1]))
-            {
-                pop @{$state->{'text_macro_stack'}};
-                if (exists($region_lines{$end_tag}))
-                {
-                     print STDERR "Bug: end_tag $end_tag ne $state->{'region_lines'}->{'format'}" 
-                         if ( $end_tag ne $state->{'region_lines'}->{'format'});
-                     $state->{'region_lines'}->{'number'}--;
-                     if ($state->{'region_lines'}->{'number'} == 0)
-                     {
-                         $state->{'after_element'} = 1;
-                         delete $state->{'after_element'} unless 
-                             ($state->{'region_lines'}->{'after_element'});
-                         delete $state->{'region_lines'}->{'number'};
-                         delete $state->{'region_lines'}->{'format'};
-                         delete $state->{'region_lines'}->{'after_element'};
-                         delete $state->{'region_lines'};
-                     }
-		     #dump_stack($text, $stack, $state); 
-                }
-                if ($end_tag eq 'menu')
-                {
-                    add_prev($text, $stack, "\@end $end_tag");
-                    $state->{'menu'}--;
-                }
-                else
-                {
-			#print STDERR "End $end_tag\n";
-			#dump_stack($text, $stack, $state);
-                    return if (/^\s*$/);
-                }
-            }
-            elsif ($text_macros{$end_tag})
-            {
-                echo_error ("\@end $end_tag without corresponding element", $line_nr);
-                #dump_stack($text, $stack, $state);
-            }
-            else
-            {
-                if ($end_tag eq 'float' and $state->{'float'})
-                {
-                    delete $state->{'float'};
-                }
-                elsif ($end_tag eq $state->{'table_stack'}->[-1])
-                {
-                    enter_table_index_entry($text, $stack, $state, $line_nr);
-                    pop @{$state->{'table_stack'}};
-                }
-                #add end tag
-                add_prev($text, $stack, "\@end $end_tag");
-            }
-            next;
-        }
-        #elsif (s/^([^{}@]*)\@([a-zA-Z]\w*|["'~\@\}\{,\.!\?\s\*\-\^`=:\/])//o)
-        elsif (s/^([^{}@]*)\@(["'~\@\}\{,\.!\?\s\*\-\^`=:\|\/])//o or s/^([^{}@]*)\@([a-zA-Z]\w*)([\s\{\}\@])/$3/o or s/^([^{}@]*)\@([a-zA-Z]\w*)$//o)
-        {
-            add_prev($text, $stack, $1);
-            my $macro = $2;
-            #print STDERR "MACRO $macro\n";
-            if (defined($Texi2HTML::Config::misc_command{$macro}))
-            {
-                 my $line;
-                 ($_, $line) = misc_command_structure($_, $macro, $state, 
-                       $line_nr);
-                 add_prev ($text, $stack, $line); 
-                 next;
-            }
-
-            if ($macro =~ /^(\w+?)index/ and ($1 ne 'print') and ($1 ne 'syncode') and ($1 ne 'syn') and ($1 ne 'def') and ($1 ne 'defcode'))
-            {
-                my $index_prefix = $1;
-                if (/^\s+(.*)/)
-                {
-                    my $key = $1;
-                    $_ = substitute_texi_line($_);
-                    my $index_entry = enter_index_entry($index_prefix, $line_nr, $key, $state->{'place'}, $state->{'element'}, $state->{'after_element'});
-                    if ($index_entry)
-                    {
-                        add_prev ($text, $stack, "\@$macro" .  $_);
-                        last;
-                    }
-                    elsif (!defined($index_entry))
-                    {
-                        echo_warn ("Bad index entry: $_", $line_nr);
-                        #warn "$WARN Bad index entry: $_";
-                    }
-                }
-                else
-                {
-                     echo_warn ("empty index entry", $line_nr);
-                     #warn "$WARN empty index entry\n";
-                }
-                return;
-            }
-            elsif (defined($text_macros{$macro}))
-            {
-		    #print STDERR "TEXT_MACRO: $macro\n";
-                if ($text_macros{$macro} eq 'special')
-                {
-                     $state->{'special'} = $macro;
-                }
-                elsif ($text_macros{$macro} eq 'raw')
-                {
-                    $state->{'raw'} = $macro;
-                    #print STDERR "RAW\n";
-                }
-                elsif ($format_type{$macro} and $format_type{$macro} eq 'menu')
-                {
-                    $state->{'menu'}++;
-                    delete ($state->{'prev_menu_node'});
-                    push @{$state->{'text_macro_stack'}}, $macro;
-                    #print STDERR "MENU (text_macro_stack: @{$state->{'text_macro_stack'}})\n";
-                }
-                elsif (exists($region_lines{$macro}))
-                {
-                    if (exists($state->{'region_lines'}) and ($state->{'region_lines'}->{'format'} ne $macro))
-                    {
-                         echo_error("\@$macro not allowed within $state->{'region_lines'}->{'format'}", $line_nr);
-                         next;
-                    }
-                    if (!exists($state->{'region_lines'}))
-                    {
-                         $state->{'region_lines'}->{'format'} = $macro;
-                         $state->{'region_lines'}->{'number'} = 1;
-                         $state->{'region_lines'}->{'after_element'} = 1 if ($state->{'after_element'});
-                    }
-                    else
-                    {
-                         $state->{'region_lines'}->{'number'}++;
-                    }
-                    push @{$state->{'text_macro_stack'}}, $macro;
-                }
-                # if it is a raw formatting command or a menu command
-                # we must keep it for later
-                my $macro_kept;
-                if ($state->{'raw'} or ($macro eq 'menu'))
-                {
-                    add_prev($text, $stack, "\@$macro");
-                    $macro_kept = 1;
-                }
-                if ($state->{'raw'} or $state->{'special'})
-                {
-                    push @$stack, { 'style' => $macro, 'text' => '' };
-                }
-                next if $macro_kept;
-                #dump_stack ($text, $stack, $state);
-                return if (/^\s*$/);
-            }
-            elsif (defined($Texi2HTML::Config::def_map{$macro}))
-            {
-                #We must enter the index entries
-                my ($prefix, $entry) = get_deff_index($macro, $_, $line_nr);
-                enter_index_entry($prefix, $line_nr, $entry, $state->{'place'}, $state->{'element'}, 0) if ($prefix and defined($entry));
-                s/(.*)//;
-                add_prev($text, $stack, "\@$macro" . $1);
-            }
-            elsif ($macro =~ /^itemx?$/)
-            {
-                enter_table_index_entry($text, $stack, $state, $line_nr);
-                if ($state->{'table_stack'}->[-1] =~ /^(v|f)table$/)
-                {
-                    $state->{'item'} = $macro;
-                    push @$stack, { 'format' => 'index_item', 'text' => "" };
-                }
-                else
-                {
-                    add_prev($text, $stack, "\@$macro");
-                }
-            }
-            elsif ($format_type{$macro} and ($format_type{$macro} eq 'table' or $format_type{$macro} eq 'list'))
-            { # We must enter the index entries of (v|f)table thus we track
-              # in which table we are
-                push @{$state->{'table_stack'}}, $macro;
-                add_prev($text, $stack, "\@$macro");
-            }
-            elsif (s/^{//)
-            {
-                if ($macro eq 'verb')
-                {
-                    if (/^$/)
-                    {
-                        # We allready warned in pass texi
-                        #warn "$ERROR verb at end of line";
-                    }
-                    else
-                    {
-                        s/^(.)//;
-                        $state->{'verb'} = $1;
-                    }
-                }
-                elsif ($macro eq 'footnote' and $Texi2HTML::Config::SEPARATED_FOOTNOTES)
-                {
-                    $state->{'footnote_element'} = $state->{'element'};
-                    $state->{'footnote_place'} = $state->{'place'};
-                    $state->{'element'} = $footnote_element;
-                    $state->{'place'} = $footnote_element->{'place'};
-                }
-                push (@$stack, { 'style' => $macro, 'text' => '' });
-            }
-            else
-            {
-                add_prev($text, $stack, "\@$macro");
-            }
-            next;
-        }
-        #elsif(s/^([^{}@]*)\@(.)//o)
-        elsif(s/^([^{}@]*)\@([^\s\}\{\@]*)//o)
-        {
-            add_prev($text, $stack, $1 . "\@$2");
-            next;
-        }
-        elsif (s/^([^{}]*)([{}])//o)
-        {
-            add_prev($text, $stack, $1);
-            if ($2 eq '{')
-            {
-                push @$stack, { 'style' => '', 'text' => '' };
-            }
-            else
-            {
-                if (@$stack)
-                {
-                    my $style = pop @$stack;
-                    my $result;
-                    if ($style->{'style'} eq 'anchor')
-                    {
-                        my $anchor = $style->{'text'};
-                        $anchor = normalise_node($anchor);
-                        if ($nodes{$anchor})
-                        {
-                            echo_error ("Duplicate node for anchor found: $anchor", $line_nr);
-                            next;
-                        }
-                        $anchor_num++;
-                        $nodes{$anchor} = { 'anchor' => 1, 'seen' => 1, 'texi' => $anchor, 'id' => 'ANC' . $anchor_num};
-                        push @{$state->{'place'}}, $nodes{$anchor};
-                    }
-                    elsif ($style->{'style'} eq 'footnote')
-                    {
-                        if ($Texi2HTML::Config::SEPARATED_FOOTNOTES)
-                        {
-                            $state->{'element'} = $state->{'footnote_element'};
-                            $state->{'place'} = $state->{'footnote_place'};
-                        }
-                    }
-                    elsif ($style->{'style'} eq 'math' and $Texi2HTML::Config::L2H)
-                    {
-                        add_prev ($text, $stack, do_math($style->{'text'}));
-                        next;
-                    }
-                    elsif ($style->{'style'} eq 'caption' or $style->{'style'}
-eq 'shortcaption' and $state->{'float'})
-                    {
-                         my @texi_lines = map {$_ = $_."\n"} split (/\n/, $style->{'text'});
-                         $state->{'float'}->{$style->{'style'} . "_texi"} = \@texi_lines;
-                    }
-                    if (($style->{'style'} eq 'titlefont') and ($style->{'text'} =~ /\S/))
-                    {
-                        $state->{'element'}->{'titlefont'} = $style->{'text'} unless ((exists($state->{'region_lines'}) and ($state->{'region_lines'}->{'format'} eq 'titlepage')) or defined($state->{'element'}->{'titlefont'})) ;
-                    }
-                    if ($style->{'style'})
-                    {
-                         $result = '@' . $style->{'style'} . '{' . $style->{'text'} . '}';
-                    }
-                    else
-                    {
-                        $result = '{' . $style->{'text'};
-                        # don't close { if we are closing stack as we are not
-                        # sure this is a licit { ... } construct.
-                        $result .= '}' unless $state->{'close_stack'};
-                    }
-                    add_prev ($text, $stack, $result);
-                    #print STDERR "MACRO end $style->{'style'} remaining: $_";
-                    next;
-                }
-                else
-                {
-                    # We warn in the last pass
-                    #warn "$ERROR '}' without opening '{' line: $line";
-                    #echo_error ("'}' without opening '{' line: $line", $line_nr);
-                    add_prev ($text, $stack, '}');
-                }
-            }
-        }
-        else
-        {
-            #print STDERR "END_LINE $_";
-            add_prev($text, $stack, $_);
-            enter_table_index_entry($text, $stack, $state, $line_nr);
-            last;
-        }
-    }
-    return 1;
-}
-
-sub scan_line($$$$;$)
-{
-    my $line = shift;
-    my $text = shift;
-    my $stack = shift;
-    my $state = shift;
-    my $line_nr = shift;
-
-    die "stack not an array ref"  unless (ref($stack) eq "ARRAY");
-    local $_ = $line;
-    #print STDERR "SCAN_LINE: $line";
-    #dump_stack($text, $stack,  $state );
-    my $new_menu_entry; # true if there is a new menu entry
-    my $menu_description_in_format; # true if we are in a menu description 
-                                # but in another format section (@table....)
-    if (defined($state->{'prepend_text'}))
-    {
-        $_ = $state->{'prepend_text'} . $_;
-        $state->{'prepend_text'} = undef;
-        delete $state->{'prepend_text'};
-    }
-    if (defined($state->{'end_of_line_protected'}))
-    {
-        #print STDERR "END_OF_LINE_PROTECTED, $_";
-        #dump_stack($text, $stack, $state);
-        delete $state->{'end_of_line_protected'};
-    }
-    if (!$state->{'raw'} and !$state->{'verb'} and $state->{'menu'})
-    { # new menu entry
-        my ($node, $name, $ending);
-        if (s/^\*(\s+$NODERE)(::)//o)
-        {
-            $node = $1;
-            $ending = $2;
-        }
-        elsif (s/^\*(\s+[^:]+):(\s*[^\t,\.\n]+)([\t,\.\n])//o)
-        {
-            $name = $1;
-            $node = $2;
-            $ending = $3;
-        }
-        if ($node)
-        {
-            my $top_stack = top_stack($stack);
-            if ($top_stack and $top_stack->{'format'} and 
-                (
-                 ($top_stack->{'format'} eq 'menu_description') or
-                 ($top_stack->{'format'} eq 'menu') or
-                 (($top_stack->{'format'} eq 'preformatted') and (stack_order($stack, 'preformatted', 'menu_comment'))) or
-                 ($top_stack->{'format'} eq 'menu_preformatted') or
-                 ($top_stack->{'format'} eq 'menu_comment')
-                )
-               )
-            { # we are in a normal menu state.
-                close_menu($text, $stack, $state, $line_nr);
-                $new_menu_entry = 1;
-                $state->{'menu_entry'} = { 'name' => $name, 'node' => $node,
-                   'ending' => $ending };
-                add_prev ($text, $stack, do_menu_link($state, $line_nr));
-                print STDERR "# New menu entry: $node\n" if ($T2H_DEBUG & $DEBUG_MENU);
-                push @$stack, {'format' => 'menu_description', 'text' => ''};
-            }
-            else
-            { # we are within a macro or a format. In that case we use
-              # a simplified formatting of menu which should be right whatever
-              # the context
-                my $menu_entry = $state->{'menu_entry'};
-                $state->{'menu_entry'} = { 'name' => $name, 'node' => $node,
-                   'ending' => $ending };
-                add_prev ($text, $stack, do_menu_link($state, $line_nr, 1));
-                $state->{'menu_entry'} = $menu_entry;
-            }
-        }
-    }
-    # we're in a menu entry description
-    if ($state->{'menu_entry'} and !$new_menu_entry)
-    {
-        my $top_stack = top_stack($stack);
-        if (/^\s+\S.*$/ or (!$top_stack->{'format'} or ($top_stack->{'format'} ne 'menu_description')))
-        { # description continues
-            $menu_description_in_format = 1 if ($top_stack->{'format'} and ($top_stack->{'format'} ne 'menu_description'));
-            print STDERR "# Description continues\n" if ($T2H_DEBUG & $DEBUG_MENU);
-	    #dump_stack ($text, $stack, $state);
-        }
-        else
-        { # enter menu comment after menu entry
-            if (!$top_stack->{'format'} or ($top_stack->{'format'} ne 'menu_description'))
-            {
-                print STDERR "Bug: begin menu comment but previous isn't menu_description\n";
-                dump_stack ($text, $stack, $state);
-            }
-            print STDERR "# Menu comment begins\n" if ($T2H_DEBUG & $DEBUG_MENU);
-	    #dump_stack ($text, $stack, $state);
-            my $descr = pop(@$stack);
-            add_prev ($text, $stack, menu_description($descr->{'text'}, $state));
-            delete $state->{'menu_entry'};
-            unless (/^\s*\@end\s+menu\b/)
-            {
-                $state->{'menu_comment'}++;
-                push @$stack, {'format' => 'menu_comment', 'text' => ''};
-                push @{$state->{'preformatted_stack'}}, {'pre_style' => $Texi2HTML::Config::MENU_PRE_STYLE, 'class' => 'menu-comment' };
-                $state->{'preformatted'}++;
-                begin_paragraph($stack, $state);
-            }
-	    #dump_stack ($text, $stack, $state);
-        }
-    }
-    if ($state->{'open_paragraph'} and !$state->{'no_paragraph'})
-    {
-         delete $state->{'open_paragraph'};
-         if ($state->{'preformatted'} or !no_paragraph($state,$_))
-         {
-             begin_paragraph($stack, $state);
-         }
-    }
-    if (($state->{'menu_entry'} and !$menu_description_in_format) or $state->{'raw'} or $state->{'preformatted'}  or $state->{'no_paragraph'} or $state->{'keep_texi'} or $state->{'remove_texi'})
-    { # empty lines are left unmodified
-        if (/^\s*$/)
-        {
-             add_prev($text, $stack, $_);
-             return;
-        }
-        else
-        {
-            my $next_tag = next_tag($_);
-            if ($state->{'deff'} and !defined($Texi2HTML::Config::def_map{$next_tag}))
-            {
-                 begin_deff_item($stack, $state);
-            }
-        }
-    }
-    else
-    { #FIXME @syncodeindex cp fn
-      # on a line should also end paragraphs.	    
-        if (/^\s*$/)
-        {
-            #ignore the line if it just follows a deff
-            return if ($state->{'deff'});
-                    
-            if ($state->{'paragraph'})
-            { # An empty line ends a paragraph
-                close_paragraph($text, $stack, $state, $line_nr);
-                add_prev($text, $stack, &$Texi2HTML::Config::empty_line($_));
-		return 1;
-            }
-            else
-            {
-                add_prev($text, $stack, &$Texi2HTML::Config::empty_line($_));
-		return 1;
-            }
-        }
-        else
-        {
-            #print STDERR "a line not empty and not in no paragraph format\n";
-            my $next_tag = next_tag($_);
-            if ($state->{'deff'} and !defined($Texi2HTML::Config::def_map{$next_tag}))
-            { # finish opening the deff, as this is not a deff tag, it can't be 
-              # a deff macro with x
-                begin_deff_item($stack, $state);
-            }
-            #print STDERR "NEXT_TAG $next_tag:$_";
-            if (!no_paragraph($state,$_))
-            { # index entries, @html and @* don't trigger new paragraph beginning
-              # otherwise we begin a new paragraph
-	        #print STDERR "begin paragraph\n";
-                begin_paragraph($stack, $state);
-            }
-        }
-    }
-
-    while(1)
-    {
-        # scan_line
-        #print STDERR "WHILE: $_";
-        #dump_stack($text, $stack, $state);
-        # we're in a raw format (html, tex if !L2H, verbatim)
-        if (defined($state->{'raw'})) 
-        {
-            (dump_stack($text, $stack, $state), die "Bug for raw ($state->{'raw'})") if (! @$stack or ! ($stack->[-1]->{'style'} eq $state->{'raw'}));
-            if (s/^(.*?)\@end\s$state->{'raw'}$// or s/^(.*?)\@end\s$state->{'raw'}\s+//)
-            # don't protect html, it is done by Texi2HTML::Config::raw if needed
-            {
-                print STDERR "# end raw $state->{'raw'}\n" if ($T2H_DEBUG & $DEBUG_FORMATS);
-                add_prev ($text, $stack, $1);
-                my $style = pop @$stack;
-                if ($style->{'text'} !~ /^\s*$/)
-                {
-                    if ($state->{'remove_texi'})
-                    {
-                        add_prev ($text, $stack, $style->{'text'});
-                    }
-                    elsif ($state->{'keep_texi'})
-                    {
-                        add_prev ($text, $stack, $style->{'text'} . "\@end $state->{'raw'}");
-                    }
-                    else
-                    { 
-                        add_prev($text, $stack, &$Texi2HTML::Config::raw($style->{'style'}, $style->{'text'}));
-                    }
-                }
-                if (!$state->{'keep_texi'} and !$state->{'remove_texi'})
-                {
-                    # reopen preformatted if it was interrupted by the raw format
-                    # if raw format is html the preformatted wasn't interrupted
-                    begin_paragraph($stack, $state) if ($state->{'preformatted'} and (!$Texi2HTML::Config::format_in_paragraph{$state->{'raw'}})); 
-                    delete $state->{'raw'};
-                    return if (/^\s*$/);
-                }
-                delete $state->{'raw'};
-                next;
-            }
-            else
-            {
-                print STDERR "#within raw $state->{'raw'}:$_" if ($T2H_DEBUG & $DEBUG_FORMATS);
-                add_prev ($text, $stack, $_);
-                last;
-            }
-        }
-
-        # we are within a @verb
-        if (defined($state->{'verb'}))
-        {
-            my $char = quotemeta($state->{'verb'});
-            if (s/^(.*?)$char\}/\}/)
-            {
-                 if ($state->{'keep_texi'})
-                 {
-                     add_prev($text, $stack, $1 . $state->{'verb'});
-                     $stack->[-1]->{'text'} = $state->{'verb'} . $stack->[-1]->{'text'};
-                 }
-                 elsif ($state->{'remove_texi'})
-                 {
-                     add_prev($text, $stack, $1);
-                 }
-                 else
-                 {
-                     add_prev($text, $stack, do_text($1, $state));
-                 }
-                 delete $state->{'verb'};
-                 next;
-            }
-            else
-            {
-                 add_prev($text, $stack, $_);
-                 last;
-            }
-        }
-
-        # We handle now the end tags 
-        if ($state->{'keep_texi'} and s/^([^{}@]*)\@end\s+([a-zA-Z]\w*)//)
-        {
-            my $end_tag = $2;
-            add_prev($text, $stack, $1 . "\@end $end_tag");
-            next;
-        }
-        elsif ($state->{'remove_texi'} and s/^([^{}@]*)\@end\s+([a-zA-Z]\w*)//)
-        {
-            add_prev($text, $stack, $1);
-            next;
-        }
-	
-        if (s/^([^{}@,]*)\@end\s+([a-zA-Z]\w*)\s// or s/^([^{}@,]*)\@end\s+([a-zA-Z]\w*)$//)
-        {
-            add_prev($text, $stack, do_text($1, $state));
-            my $end_tag = $2;
-	    #print STDERR "END_MACRO $end_tag\n";
-	    #dump_stack ($text, $stack, $state);
-            
-            # First we test if the stack is not empty.
-            # Then we test if the end tag is a format tag.
-            # If so, we close the styles.
-            # We then close paragraphs and preformatted at top of the stack.
-            # We handle the end tag (even when it was not the tag which appears
-            # on the top of the stack; in that case we close anything 
-            # until that element)
-            $state->{'detailmenu'}-- if ($end_tag eq 'detailmenu' and $state->{'detailmenu'});
-            # FIXME handle in sub skip
-            next if (defined($Texi2HTML::Config::misc_command{"end $end_tag"}));
-            my $top_stack = top_stack($stack);
-            if (!$top_stack)
-            {
-                echo_error ("\@end $end_tag without corresponding opening", $line_nr);
-                add_prev($text, $stack, "\@end $end_tag");
-                next;
-            }
-
-            if (!$format_type{$end_tag})
-            {
-                echo_warn ("Unknown \@end $end_tag", $line_nr);
-                #warn "$ERROR Unknown \@end $end_tag\n";
-                add_prev($text, $stack, "\@end $end_tag");
-                next;
-            }
-            unless ($Texi2HTML::Config::format_in_paragraph{$end_tag})
-            {
-                close_paragraph($text, $stack, $state, $line_nr); 
-            }
-
-            $top_stack = top_stack($stack);
-            if (!$top_stack or (!defined($top_stack->{'format'})))
-            {
-                echo_error ("\@end $end_tag without corresponding opening element", $line_nr);
-                add_prev($text, $stack, "\@end $end_tag");
-                next;
-            }
-            # Warn if the format on top of stack is not compatible with the 
-            # end tag, and find the end tag.
-            unless (
-                ($top_stack->{'format'} eq $end_tag)
-                or
-                ( 
-                 ($format_type{$end_tag} eq 'menu') and
-                 (
-                  ($top_stack->{'format'} eq 'menu_preformatted') or
-                  ($top_stack->{'format'} eq 'menu_comment') or
-                  ($top_stack->{'format'} eq 'menu_description')
-                 )
-                ) or
-                ( 
-                 ($end_tag eq 'multitable') and 
-                 (
-                  ($top_stack->{'format'} eq 'cell') or
-                  ($top_stack->{'format'} eq 'null')
-                 )
-                ) or
-                ( 
-                 ($format_type{$end_tag} eq 'list' ) and 
-                 ($top_stack->{'format'} eq 'item')
-                ) or
-                (
-                 (
-                  ($format_type{$end_tag} eq 'table') and 
-                  ($end_tag ne 'multitable')
-                 ) and 
-                 (
-                   ($top_stack->{'format'} eq 'term') or
-                   ($top_stack->{'format'} eq 'line') 
-                 )
-                ) or
-                (
-                 (defined($Texi2HTML::Config::def_map{$end_tag})) and 
-                 ($top_stack->{'format'} eq 'deff_item')
-                ) or
-                (
-                 ($end_tag eq 'row') and 
-                 ($top_stack->{'format'} eq 'cell')
-                )
-               )
-            {
-                my $waited_format = $top_stack->{'format'};
-                $waited_format = $fake_format{$top_stack->{'format'}} if ($format_type{$top_stack->{'format'}} eq 'fake');
-                echo_error ("waiting for end of $waited_format, found \@end $end_tag", $line_nr);
-                close_stack($text, $stack, $state, $line_nr, undef, $end_tag);
-                # an empty preformatted may appear when closing things as
-                # when closed, formats reopen the preformatted environment
-                # in case there is some text following, but we know it isn't 
-                # the case here, thus we can close paragraphs.
-                close_paragraph($text, $stack, $state);
-                my $new_top_stack = top_stack($stack);
-                next unless ($new_top_stack and defined($new_top_stack->{'format'}) and (($new_top_stack->{'format'} eq $end_tag) 
-                   or (($format_type{$new_top_stack->{'format'}} eq 'fake') and ($fake_format{$new_top_stack->{'format'}} eq $format_type{$end_tag}))));
-            }
-            # We should now be able to handle the format
-            if (defined($format_type{$end_tag}) and $format_type{$end_tag} ne 'fake')
-            {
-                end_format($text, $stack, $state, $end_tag, $line_nr);
-            }
-            else 
-            { # this is a fake format, ie a format used internally, inside
-              # a real format. We do nothing, hoping the real format will
-              # get closed, closing the fake internal formats
-		    #print STDERR "FAKE \@end $end_tag\n";
-		    #add_prev($text, $stack, "\@end $end_tag");
-            }
-            next;
-        }
-        # This is a macro
-	#elsif (s/^([^{}@]*)\@([a-zA-Z]\w*|["'~\@\}\{,\.!\?\s\*\-\^`=:\/])//o)
-        elsif (s/^([^{},@]*)\@(["'~\@\}\{,\.!\?\s\*\-\^`=:\|\/])//o or s/^([^{}@,]*)\@([a-zA-Z]\w*)([\s\{\}\@])/$3/o or s/^([^{},@]*)\@([a-zA-Z]\w*)$//o)
-        {
-            add_prev($text, $stack, do_text($1, $state));
-            my $macro = $2;
-	    #print STDERR "MACRO $macro\n";
-	    #dump_stack ($text, $stack, $state);
-            # This is a macro added by close_stack to mark paragraph end
-            if ($macro eq 'end_paragraph')
-            {
-                my $top_stack = top_stack($stack);
-                if (!$top_stack or !$top_stack->{'format'} 
-                    or ($top_stack->{'format'} ne 'paragraph'))
-                {
-                    print STDERR "Bug: end_paragraph but no paragraph to end\n";
-                    dump_stack ($text, $stack, $state);
-                    next;
-                }
-                s/^\s//;
-                my $paragraph = pop @$stack;
-                add_prev ($text, $stack, do_paragraph($paragraph->{'text'}, $state));
-                next;
-            }
-            # Handle macro added by close_stack to mark preformatted region end
-            elsif ($macro eq 'end_preformatted')
-            {
-                my $top_stack = top_stack($stack);
-                if (!$top_stack or !$top_stack->{'format'} 
-                    or ($top_stack->{'format'} ne 'preformatted'))
-                {
-                    print STDERR "Bug: end_preformatted but no preformatted to end\n";
-                    dump_stack ($text, $stack, $state);
-                    next;
-                }
-                my $paragraph = pop @$stack;
-                s/^\s//;
-                add_prev ($text, $stack, do_preformatted($paragraph->{'text'}, $state));
-                next;
-            }
-            if (defined($Texi2HTML::Config::misc_command{$macro}))
-            {
-                # This strange condition is there because for an argument
-                # appearing on an @itemize line, appended to an @item 
-                # we don't want to keep @c or @comment as otherwise it eats
-                # the line. Other commands could do that too but then the user
-                # deserves what he gets.
-                if (($state->{'keep_texi'} and 
-                       (!$state->{'check_item'} or ($macro ne 'c' and $macro ne 'comment'))) 
-                     or $state->{'remove_texi'})
-                {
-                    my ($line, $args);
-                    ($_, $line, $args) = preserve_command($_, $macro);
-                    if ($state->{'keep_texi'})
-                    {
-                        add_prev($text, $stack, $line);
-                    }
-                    next;
-                }
-                my $keep = $Texi2HTML::Config::misc_command{$macro}->{'keep'};
-                $_ = misc_command_text($_, $macro, $stack, $state, $text, $line_nr);
-                return unless (defined($_));
-                unless ($keep)
-                {
-                     begin_paragraph($stack, $state) if 
-                       (!no_paragraph($state,$_));
-                     next;
-                }
-            }
-#            if ($macro eq 'sp')
-#            {
-#                my ($space1, $sp_number, $space2);
-#                if (s/^(\s+)(\d+)(\s*)//)
-#                {
-#                    $space1 = $1;
-#                    $sp_number = $2;
-#                    $space2 = $3;
-#                }
-#                elsif (s/(\s*)$//)
-#                {
-#                    $space1 = $1;
-#                    $sp_number = '';
-#                    $space2 = '';
-#                }
-#                else
-#                {
-#                    next if ($state->{'remove_texi'});
-#                    if ($state->{'keep_texi'})
-#                    {
-#                        add_prev($text, $stack, "\@$macro");
-#                        next;
-#                    }
-#                    echo_error ("\@$macro needs a numeric arg or no arg", $line_nr);
-#                    next;
-#                }
-#                next if ($state->{'remove_texi'});
-#                if ($state->{'keep_texi'})
-#                {
-#                    add_prev($text, $stack, "\@$macro" . $space1 . $sp_number . $space2);
-#                    next;
-#                }
-#                $sp_number = 1 if ($sp_number eq '');
-#                add_prev($text, $stack, &$Texi2HTML::Config::sp($sp_number, $state->{'preformatted'}));
-#                next;
-#            }
-            #if ($macro eq 'verbatiminclude' or $macro eq 'listoffloats')
-            if ($macro eq 'listoffloats')
-            {
-                if ($state->{'keep_texi'})
-                {
-                    if (s/(.*)//o)
-                    {
-                        add_prev($text, $stack, "\@$macro" . $1);
-                    }
-                    next;
-                }
-                return undef if ($state->{'remove_texi'});
-                
-                if (s/^(\s+)(.*)//o)
-                {
-                    my $arg = $2;
-#                    if ($macro eq 'verbatiminclude')
-#                    {
-#                        my $file = locate_include_file($arg);
-#                        if (defined($file))
-#                        {
-#                            if (!open(VERBINCLUDE, $file))
-#                            {
-#                                echo_warn ("Can't read file $file: $!",$line_nr);
-#                            }
-#                            else
-#                            {
-#                                my $verb_text = '';
-#                                while (my $line = <VERBINCLUDE>)
-#                                {
-#                                    $verb_text .= $line;
-#                                }
-#                                add_prev($text, $stack, &$Texi2HTML::Config::raw('verbatim',$verb_text));
-#                                close VERBINCLUDE;
-#                            }
-#                        }
-#                        else
-#                        {
-#                            echo_error ("Can't find $arg, skipping", $line_nr);
-#                        }
-#                    }
-#                    elsif ($macro eq 'listoffloats')
-#                    {
-                         my $style_id = cross_manual_line (normalise_space($arg));
-                         my $style = substitute_line (&$Texi2HTML::Config::listoffloats_style($arg));
-                         if (exists ($floats{$style_id}))
-                         {
-                              close_paragraph($text, $stack, $state, $line_nr);
-                              my @listoffloats_entries = ();
-                              foreach my $float (@{$floats{$style_id}->{'floats'}})
-                              {
-                                   my $float_style = substitute_line(&$Texi2HTML::Config::listoffloats_float_style($arg, $float));
-                                   my $caption_lines = &$Texi2HTML::Config::listoffloats_caption($float);
-                                   my $caption = substitute_text({ 'multiple_pass' => 1 }, @$caption_lines);
-                                   push @listoffloats_entries, &$Texi2HTML::Config::listoffloats_entry($arg, $float, $float_style, $caption, href($float, $state->{'element'}->{'file'}));
-                              }
-                              add_prev($text, $stack, &$Texi2HTML::Config::listoffloats($arg, $style, \@listoffloats_entries));
-                         }
-                         else
-                         {
-                              echo_warn ("Unknown float style $arg", $line_nr); 
-                         }
-#                    }
-                }
-                else
-                {
-                    echo_error ("Bad \@$macro line: $_", $line_nr);
-                } 
-                return undef;
-            }
-            # This is a @macroname{...} construct. We add it on top of stack
-            # It will be handled when we encounter the '}'
-            if (s/^{//)
-            {
-                if ($macro eq 'verb')
-                {
-                    if (/^$/)
-                    {
-                        # Allready warned 
-                        #warn "$ERROR verb at end of line";
-                    }
-                    else
-                    {
-                        s/^(.)//;
-                        $state->{'verb'} = $1;
-                    }
-                } #FIXME what to do if remove_texi and anchor/ref/footnote ?
-                elsif ($macro eq 'm_cedilla' and !$state->{'keep_texi'})
-                {
-                    $macro = ',';
-                }
-                push (@$stack, { 'style' => $macro, 'text' => '', 'arg_nr' => 0 });
-                $state->{'no_paragraph'}++ if ($no_paragraph_macro{$macro});
-                open_arg($macro, 0, $state);
-                push (@{$state->{'style_stack'}}, $macro) if (defined($style_type{$macro}) and (($style_type{$macro} eq 'style') or ($style_type{$macro} eq 'accent')));
-                next;
-            }
-
-            # special case if we are checking items
-
-            if ($state->{'check_item'} and ($macro =~ /^itemx?$/ or $macro eq 'headitem'))
-            {
-                echo_error("\@$macro on \@$state->{'check_item'} line", $line_nr);
-                next;
-            }
-
-            # if we're keeping texi unmodified we can do it now
-            if ($state->{'keep_texi'})
-            {
-                # We treat specially formats accepting {} on command line
-                if ($macro eq 'multitable' or defined($Texi2HTML::Config::def_map{$macro}))
-                {
-                     add_prev($text, $stack, "\@$macro" . $_);
-                     $_ = '';
-                     next;
-                }
-                # @ at the end of line may protect te end of line even when
-                # keeping texi
-                if ($macro eq "\n")
-                {
-                     $state->{'end_of_line_protected'} = 1;
-                     #print STDERR "PROTECTING END OF LINE\n";
-                }
-
-                add_prev($text, $stack, "\@$macro");
-                if ($text_macros{$macro} and $text_macros{$macro} eq 'raw')
-                {
-                    $state->{'raw'} = $macro;
-                    push (@$stack, {'style' => $macro, 'text' => ''});
-                }
-                next;
-            }
-            # If we are removing texi, the following macros are not removed 
-            # as is but modified
-
-            # a raw macro beginning
-            if ($text_macros{$macro} and $text_macros{$macro} eq 'raw')
-            {
-                if (!$Texi2HTML::Config::format_in_paragraph{$macro})
-                { # close paragraph before verbatim (and tex if !L2H)
-                    close_paragraph($text, $stack, $state, $line_nr);
-                }
-                $state->{'raw'} = $macro;
-                push (@$stack, {'style' => $macro, 'text' => ''});
-                return if (/^\s*$/);
-                next;
-            }
-            my $simple_macro = 1;
-            # An accent macro
-            if (exists($Texi2HTML::Config::accent_map{$macro}))
-            {
-                if (s/^(\S)//o)
-                {
-                    add_prev($text, $stack, do_simple($macro, $1, $state, [ $1 ], $line_nr));
-                }
-                else
-                { # The accent is at end of line
-                    add_prev($text, $stack, do_text($macro, $state));
-                }
-            }
-            # an @-command which should be like @command{}. We handle it...
-            elsif ($things_map_ref->{$macro})
-            {
-                echo_warn ("$macro requires {}", $line_nr);
-                add_prev($text, $stack, do_simple($macro, '', $state));
-            }
-            # an @-command like @command
-            elsif (defined($simple_map_ref->{$macro}))
-            {
-                add_prev($text, $stack, do_simple($macro, '', $state));
-            }
-            else
-            {
-                 $simple_macro = 0;
-            }
-            if ($simple_macro)
-            {# if the macro didn't triggered a paragraph start it might now
-                begin_paragraph($stack, $state) if 
-                   ($no_line_macros{$macro} and !no_paragraph($state,$_));
-                next;
-            }
-            # the following macros are not modified but just ignored 
-            # if we are removing texi
-            if ($macro =~ /^tex_(\d+)$/o)
-            {
-                add_prev($text, $stack, Texi2HTML::LaTeX2HTML::do_tex($1));
-                next;
-            }
-            if ($state->{'remove_texi'})
-            {
-                 if ((($macro =~ /^(\w+?)index$/) and ($1 ne 'print')) or 
-                      ($macro eq 'itemize') or ($macro =~ /^(|v|f)table$/)
-                      or ($macro eq 'multitable') or ($macro eq 'quotation'))
-                 {
-                      return;
-                 }
-                 elsif ($macro eq 'enumerate')
-                 {
-                      my $spec;
-                      ($_, $spec) = parse_enumerate ($_);
-                      return if (/^\s*$/);
-                      next;
-                 }
-                 elsif (defined($Texi2HTML::Config::def_map{$macro}))
-                 {
-                     my ($style, $category, $name, $type, $class, $arguments);
-                     ($style, $category, $name, $type, $class, $arguments) = parse_def($macro, $_, $line_nr); 
-                     # FIXME maybe a call to substitute_line with state would
-                     # be better ?
-                     $category = remove_texi($category) if (defined($category));
-                     # FIXME -- --- ''... should be protected (not by makeinfo)
-                     $name = remove_texi($name) if (defined($name));
-                     # FIXME -- --- ''... should be protected (not by makeinfo)
-                     $type = remove_texi($type) if (defined($type));
-                     # FIXME -- --- ''... should be protected (not by makeinfo)
-                     $class = remove_texi($class) if (defined($class));
-                     # FIXME -- --- ''... should be protected 
-                     $arguments = remove_texi($arguments) if (defined($arguments));
-                     chomp($arguments);
-                     add_prev($text, $stack, &$Texi2HTML::Config::def_line_no_texi($category, $name, $type, $arguments));
-                     return;
-                }
-                next;
-            }
-            if (($macro =~ /^(\w+?)index$/) and ($1 ne 'print'))
-            {
-                add_prev($text, $stack, do_index_entry_label($state,$line_nr));
-                return;
-            }
-            # a macro which triggers paragraph closing
-            if ($macro eq 'insertcopying')
-            {
-                close_paragraph($text, $stack, $state, $line_nr);
-                add_prev($text, $stack, do_insertcopying($state));
-                # reopen a preformatted format if it was interrupted by the macro
-                begin_paragraph ($stack, $state) if ($state->{'preformatted'});
-                return;
-            }
-            if ($macro =~ /^itemx?$/ or ($macro eq 'headitem'))
-            {
-		    #print STDERR "ITEM: $_";
-		    #dump_stack($text, $stack, $state);
-                # these functions return true if the context was their own
-                abort_empty_preformatted($stack, $state);
-                # FIXME let the user be able not to close the paragraph
-                close_paragraph($text, $stack, $state, $line_nr);
-                my $format;
-                if ($format = add_item($text, $stack, $state, $line_nr, $_))
-                { # handle lists
-                }
-                elsif ($format = add_term($text, $stack, $state, $line_nr))
-                {# handle table
-                }
-                elsif ($format = add_line($text, $stack, $state, $line_nr)) 
-                {# handle table
-                }
-                if ($format)
-                {
-                    if (defined($format->{'appended'}))
-                    { 
-                        $_ = $format->{'appended'} . ' ' . $_ if ($format->{'appended'} ne '');
-                    }
-                    if (defined($format->{'command'}))
-                    { 
-                         open_arg($format->{'command'},0, $state);
-                    }
-                    next;
-                }
-                $format = add_row ($text, $stack, $state, $line_nr); # handle multitable
-                unless ($format)
-                {
-                    echo_warn ("\@$macro outside of table or list", $line_nr);
-                    next;
-                }
-                push @$stack, {'format' => 'row', 'text' => '', 'item_cmd' => $macro };
-                if ($format->{'max_columns'})
-                {
-                    push @$stack, {'format' => 'cell', 'text' => ''};
-                    $format->{'cell'} = 1;
-                    
-                    if (!no_paragraph($state,$_) or automatic_preformatted($state,$macro))
-                    {
-                        begin_paragraph($stack, $state);
-                    }
-                }
-                else
-                {
-                    echo_warn ("\@$macro in empty multitable", $line_nr);
-                }
-                next;
-            }
-            if ($macro eq 'tab')
-            {
-                # FIXME let the user be able not to close the paragraph
-                abort_empty_preformatted($stack, $state);
-                close_paragraph($text, $stack, $state, $line_nr);
-                my $format = add_cell ($text, $stack, $state);
-                #print STDERR "tab, $format->{'cell'}, max $format->{'max_columns'}\n";
-                if (!$format)
-                {
-                    echo_warn ("\@tab outside of multitable", $line_nr);
-                    #warn "$WARN \@tab outside of multitable\n";
-                }
-                elsif (!$format->{'max_columns'})
-                {
-                    echo_warn ("\@$macro in empty multitable", $line_nr);
-                    #warn "$WARN \@$macro in empty multitable\n";
-                    push @$stack, {'format' => 'null', 'text' => ''};
-                    next;
-                }
-                elsif ($format->{'cell'} > $format->{'max_columns'})
-                {
-                    echo_warn ("too much \@$macro (multitable has only $format->{'max_columns'} column(s))", $line_nr);
-                    #warn "$WARN cell over table width\n";
-                    push @$stack, {'format' => 'null', 'text' => ''};
-                    next;
-                }
-                else
-                {
-                    push @$stack, {'format' => 'cell', 'text' => ''};
-                }
-                if (!no_paragraph($state,$_) or automatic_preformatted($state,$macro))
-                {
-                    begin_paragraph($stack, $state);
-                }
-                next;
-            }
-            # Macro opening a format (table, list, deff, example...)
-            if ($format_type{$macro} and ($format_type{$macro} ne 'fake'))
-            {
-                unless ($Texi2HTML::Config::format_in_paragraph{$macro})
-                {
-                    close_paragraph($text, $stack, $state, $line_nr);
-                }
-                #print STDERR "begin $macro\n";
-                # A deff like macro
-                if (defined($Texi2HTML::Config::def_map{$macro}))
-                {
-                    if ($state->{'deff'} and ("$state->{'deff'}->{'command'}x" eq $macro))
-                    {
-                         $macro =~ s/x$//o;
-                         #print STDERR "DEFx $macro\n";
-                    }
-                    else
-                    {
-                         # The previous @def command isn't the same @def
-                         # command. We begin the item for the previous @def
-                         # command and immediatly open the new one.
-                         begin_deff_item($stack, $state, 1) if ($state->{'deff'});
-                         $macro =~ s/x$//o;
-                         #print STDERR "DEF begin $macro\n";
-                         push @$stack, { 'format' => $macro, 'text' => '' };
-                    }
-                    #print STDERR "BEGIN_DEFF $macro\n";
-                    #dump_stack ($text, $stack, $state);
-                    $state->{'deff'}->{'command'} = $macro;
-                    my ($style, $category, $name, $type, $class, $arguments);
-                    #($style, $category, $name, $type, $class, $arguments) = parse_def($macro, $_, $line_nr); 
-                    ($style, $category, $name, $type, $class, $_) = parse_def($macro, $_, $line_nr); 
-                    #print STDERR "AFTER parse_def $_";
-                    # duplicate_state ?
-                    #$category = substitute_line($category) if (defined($category));
-                    $state->{'deff'}->{'style'} = $style;
-                    $state->{'deff'}->{'category'} = substitute_line($category) if (defined($category));
-                    # FIXME -- --- ''... should be protected (not by makeinfo)
-                    #$name = substitute_line($name) if (defined($name));
-                    $state->{'deff'}->{'name'} = substitute_line($name) if (defined($name));
-                    # FIXME -- --- ''... should be protected (not by makeinfo)
-                    #$type = substitute_line($type) if (defined($type));
-                    $state->{'deff'}->{'type'} = substitute_line($type) if (defined($type));
-                    # FIXME -- --- ''... should be protected (not by makeinfo)
-                    #$class = substitute_line($class) if (defined($class));
-                    $state->{'deff'}->{'class'} = substitute_line($class) if (defined($class));
-                    # FIXME -- --- ''... should be protected 
-                    open_cmd_line($stack, $state, ['keep'], \&do_def_line);
-                    next;
-                    #$arguments = substitute_line($arguments) if (defined($arguments));
-                    #$category = &$Texi2HTML::Config::definition_category($category, $class, $style);
-                    #if (! $category) # category cannot be 0
-                    #{
-                    #    echo_warn("Bad definition line $_", $line_nr);
-                    #    return;
-                    #}
-                    #my $index_label = main::do_index_entry_label ($state) if ($name ne '');
-                    #add_prev ($text, $stack, &$Texi2HTML::Config::def_line($category, $name, $type, $arguments, $index_label));
-                    #return;
-                }
-                elsif ($format_type{$macro} eq 'menu')
-                {
-                    # if we are allready in a menu we must close it first
-                    # in order to close the menu comments and entries
-                    close_menu($text, $stack, $state, $line_nr);
-                    $state->{'menu'}++;
-                    push @$stack, { 'format' => $macro, 'text' => '' };
-                    if ($state->{'preformatted'})
-                    {
-                    # Start a fake complex format in order to have a given pre style
-                        $state->{'preformatted'}++;
-                        push @$stack, { 'format' => 'menu_preformatted', 'text' => '', 'pre_style' => $Texi2HTML::Config::MENU_PRE_STYLE };
-                        push @{$state->{'preformatted_stack'}}, {'pre_style' => $Texi2HTML::Config::MENU_PRE_STYLE, 'class' => 'menu-preformatted' };
-                    }
-                }
-                elsif (exists ($Texi2HTML::Config::complex_format_map->{$macro}))
-                {
-                    $state->{'preformatted'}++;
-                    my $format = { 'format' => $macro, 'text' => '', 'pre_style' => $Texi2HTML::Config::complex_format_map->{$macro}->{'pre_style'} };
-                    push @{$state->{'preformatted_stack'}}, {'pre_style' =>$Texi2HTML::Config::complex_format_map->{$macro}->{'pre_style'}, 'class' => $macro };
-                    push @$stack, $format;
-                    unless ($Texi2HTML::Config::format_in_paragraph{$macro})
-                    {
-                        begin_paragraph($stack, $state);
-                    }
-                }
-                elsif ($Texi2HTML::Config::paragraph_style{$macro})
-                {
-                    # if there are only spaces after the @center, then the end 
-                    # of line has allready been removed and the code triggered
-                    # by end of line for @center closing won't be called.
-                    # thus we don't open it (opening @center means pushing it
-                    # on the paragraph_style stack)
-                    next if (($macro eq 'center') and /^\s*$/); 
-                    push @{$state->{'paragraph_style'}}, $macro;
-                    push (@$stack, { 'format' => $macro, 'text' => '' }) unless ($macro eq 'center');
-                    if (!no_paragraph($state,$_) or automatic_preformatted($state,$macro))
-                    {
-                        begin_paragraph($stack, $state);
-                    }
-                }
-                elsif (($format_type{$macro} eq 'list') or ($format_type{$macro} eq 'table'))
-                {
-                    my $format;
-		    #print STDERR "BEGIN $macro\n";
-		    #dump_stack($text, $stack, $state);
-                    if (($macro eq 'itemize') or ($macro =~ /^(|v|f)table$/))
-                    {
-                        my $command;
-                        my $appended;
-                        ($appended, $command) = parse_format_command($_,$macro);
-                        $format = { 'format' => $macro, 'text' => '', 'command' => $command, 'appended' => $appended, 'term' => 0 };
-                        $_ = '';
-                    }
-                    elsif ($macro eq 'enumerate')
-                    {
-                        my $spec;
-                        ($_, $spec) = parse_enumerate ($_);
-                        $spec = 1 if (!defined($spec)); 
-                        $format = { 'format' => $macro, 'text' => '', 'spec' => $spec, 'item_nr' => 0 };
-                    }
-                    elsif ($macro eq 'multitable')
-                    {
-                        my $max_columns = parse_multitable ($_, $line_nr);
-                        if (!$max_columns)
-                        {
-                            echo_warn ("empty multitable", $line_nr);
-			    #warn "$WARN empty multitable\n";
-                            $max_columns = 0;
-                        }
-                        $format = { 'format' => $macro, 'text' => '', 'max_columns' => $max_columns, 'cell' => 1 };
-                    }
-                    $format->{'first'} = 1;
-                    $format->{'paragraph_number'} = 0;
-                    push @$stack, $format;
-                    push @{$state->{'format_stack'}}, $format;
-                    if ($macro =~ /^(|v|f)table$/)
-                    {
-                        push @$stack, { 'format' => 'line', 'text' => ''};
-                    }
-                    elsif ($macro eq 'multitable')
-                    {
-                        if ($format->{'max_columns'})
-                        {
-                            push @$stack, { 'format' => 'row', 'text' => '', 'item_cmd' => $macro };
-                            push @$stack, { 'format' => 'cell', 'text' => ''};
-                        }
-                        else 
-                        {
-                            # multitable without row... We use the special null
-                            # format which content is ignored
-                            push @$stack, { 'format' => 'null', 'text' => ''};
-                            push @$stack, { 'format' => 'null', 'text' => ''};
-                        }
-                    }
-                    if ($format_type{$macro} eq 'list')
-                    {
-                        push @$stack, { 'format' => 'item', 'text' => ''};
-                    }
-                    if (($macro ne 'multitable') and 
-                          !no_paragraph($state,$_) or automatic_preformatted($state,$macro))
-                    {
-                        begin_paragraph($stack, $state);
-                    }
-                    return if ($format_type{$macro} eq 'table' or $macro eq 'itemize');
-                }
-                elsif ($macro eq 'float' or $macro eq 'quotation')
-                {
-                    push @$stack, {'format' => $macro, 'text' => '' };
-                    if ($macro eq 'float')
-                    {
-                         open_cmd_line($stack, $state, ['keep','keep'], \&do_float_line);
-                    }
-                    elsif ($macro eq 'quotation')
-                    {
-                         open_cmd_line($stack, $state, ['keep','keep'], \&do_quotation_line);
-                    }
-                    #print STDERR "Begin cmd_line\n";
-                    #dump_stack($text, $stack, $state);
-                    next;
-                }
-                # keep this one at the end as there are some other formats
-                # which are also in format_map
-                elsif (defined($Texi2HTML::Config::format_map{$macro}) or ($format_type{$macro} eq 'cartouche'))
-                {
-                    push @$stack, { 'format' => $macro, 'text' => '' };
-                    if (!no_paragraph($state,$_) or automatic_preformatted($state,$macro))
-                    {
-                        begin_paragraph($stack, $state); 
-                    }
-                }
-                return if (/^\s*$/);
-                next;
-            }
-            $_ = do_unknown ($macro, $_, $text, $stack, $state, $line_nr);
-            next;
-        }
-        elsif(s/^([^{}@,]*)\@([^\s\}\{\@]*)//o)
-        { # A macro with a character which shouldn't appear in macro name
-            add_prev($text, $stack, do_text($1, $state));
-            $_ = do_unknown ($2, $_, $text, $stack, $state, $line_nr);
-            #add_prev($text, $stack, do_text($1 ."\@$2", $state));
-            next;
-        }
-        elsif (s/^([^{},]*)([{}])//o or ($state->{'cmd_line'} and /^([^{},]*)$/))
-        {
-            my $leading_text = $1;
-            my $brace = $2;
-            if (!defined($brace))#in a command line
-            {
-                if (/^$/ and $state->{'end_of_line_protected'} and $state->{'deff'})
-                {
-                     return;
-                }
-                chomp $leading_text;
-            }
-            # a brace closed, at the end of line. If in cmd_line we remove
-            # the end of line, such that the end of line is detected
-            elsif ($state->{'cmd_line'} and /^$/)
-            {
-                chomp $_;
-            }
-            add_prev($text, $stack, do_text($leading_text, $state));
-#if ($state->{'cmd_line'}){print STDERR "CMD_LINE\n"; dump_stack($text, $stack, $state);}
-            if (defined($brace) and ($brace eq '{'))
-            {
-                add_prev($text, $stack, '{');
-                unless ($state->{'keep_texi'} or $state->{'remove_texi'})
-                {
-                    echo_error ("'{' without macro before: $_", $line_nr);
-                }
-            }
-            else
-            { # A @macroname{ ...} is closed
-                if (@$stack and defined($stack->[-1]->{'style'}))
-                {
-                    my $macro = $stack->[-1]->{'style'};
-                    if (($macro eq 'cmd_line') and  $brace and ($brace eq '}'))
-                    {
-                         add_prev($text, $stack, '}');
-                         unless ($state->{'keep_texi'} or $state->{'remove_texi'})
-                         {
-                             echo_error ("A '}' without opening '{' before: $_", $line_nr);
-                         }
-                         next;
-                    }
-                    my $style = pop @$stack;
-                    my $result;
-                    if (ref($style_map_ref->{$macro}) eq 'HASH')
-                    {
-                         push (@{$style->{'args'}}, $style->{'text'});
-                         $style->{'fulltext'} .= $style->{'text'};
-                         my $number = 0;
-                         #foreach my $arg(@{$style->{'args'}})
-                         #{
-                              #print STDERR "  $number: $arg\n";
-                         #     $number++;
-                         #}
-                         $style->{'text'} = $style->{'fulltext'};
-                         $state->{'keep_texi'} = 0 if (#$state->{'keep_texi'} 
-                             ($style_map_ref->{$macro}->{'args'}->[$style->{'arg_nr'}] eq 'keep') 
-                             and ($state->{'keep_nr'} == 1));
-                    }
-                    $state->{'no_paragraph'}-- if ($no_paragraph_macro{$macro});
-                    if ($macro)
-                    {
-                        $style->{'no_close'} = 1 if ($state->{'no_close'});
-                        if ($state->{'keep_texi'})
-                        { # don't expand macros in anchor and ref
-                            close_arg ($macro, $style->{'arg_nr'}, $state);
-                            $result = '@' . $macro . '{' . $style->{'text'} . '}';
-                        }
-                        else
-                        {
-                            if ($style_map_ref->{$macro} and !$style->{'no_close'} and (defined($style_type{'$macro'})) and (($style_type{'$macro'} eq 'style') or ($style_type{'$macro'} eq 'accent')))
-                            {
-                                my $style = pop @{$state->{'style_stack'}};
-                                print STDERR "Bug: $style on 'style_stack', not $macro\n" if ($style ne $macro);
-                            }
-                            $result = do_simple($macro, $style->{'text'}, $state, $style->{'args'}, $line_nr, $style->{'no_open'}, $style->{'no_close'});
-                            if ($state->{'code_style'} < 0)
-                            {
-                                echo_error ("Bug: negative code_style: $state->{'code_style'}, line:$_", $line_nr);
-                            }
-                        }
-                    }
-                    else
-                    {
-                        #$result = $style->{'text'} . '}';
-                        print STDERR "Bug: empty style in pass_text\n";
-                    }
-                    add_prev($text, $stack, $result);
-                    if ($state->{'cmd_line'} and ($style->{'style'} eq 'cmd_line'))
-                    {
-                        if ($state->{'deff'})
-                        {
-#print STDERR "DO DEFF $state->{'deff'}->{'command'} $state->{'deff'}->{'arguments'}\n";
-                             my $def_style = $state->{'deff'}->{'style'};
-                             my $category = $state->{'deff'}->{'category'};
-                             my $class = $state->{'deff'}->{'class'};
-                             my $type = $state->{'deff'}->{'type'};
-                             my $name = $state->{'deff'}->{'name'};
-                             #my $arguments = $state->{'deff'}->{'arguments'};
-                             my $arguments; 
-                             $arguments = substitute_line($state->{'deff'}->{'arguments'}) if (defined($state->{'deff'}->{'arguments'}));
-
-                             $category = &$Texi2HTML::Config::definition_category($category, $class, $def_style);
-                             if (! $category) # category cannot be 0
-                             {
-                                  echo_warn("Bad definition line $_", $line_nr);
-                                  delete $state->{'cmd_line'};
-                                  return '';
-                             }
-                             my $index_label = do_index_entry_label ($state,$line_nr) if ($name ne '');
-                             add_prev($text, $stack, &$Texi2HTML::Config::def_line($category, $name, $type, $arguments, $index_label));
-                        }
-                        else
-                        # we've got to mark paragraph here as the following
-                        # line will determine whether or not we open a paragraph
-                        {
-                             $state->{'open_paragraph'} = 1; 
-                        }
-                        delete $state->{'cmd_line'};
-                        $state->{'no_paragraph'}--;
-                        return;
-                    }
-                    next;
-                }
-                else
-                {
-                    echo_error("'}' without opening '{' before: $_", $line_nr);
-                    # we cannot be in cmd_line as the stack is empty
-                    if ($state->{'cmd_line'})
-                    {
-                        print STDERR "Bug: state->{'cmd_line'} true but stack empty\n";
-                        dump_stack($text, $stack, $state);
-                        delete $state->{'cmd_line'};
-                    }
-                    add_prev($text, $stack, '}') if ($state->{'keep_texi'});
-                }
-            }
-        }
-        elsif (s/^([^,]*)([,])//o)
-        {
-             add_prev($text, $stack, do_text($1, $state));
-             my $comma = $2;
-             if ($state->{'cmd_line'} and !@$stack)
-             {
-                 print STDERR "Bug: state->{'cmd_line'} = $state->{'cmd_line'} but no stack\n";
-                 dump_stack($text, $stack, $state);
-             }
-             if (@$stack and defined($stack->[-1]->{'style'})
-                  and (ref($style_map_ref->{$stack->[-1]->{'style'}}) eq 'HASH'))
-             {
-                  my $macro = $stack->[-1]->{'style'};
-                  my $style_args = $style_map_ref->{$macro}->{'args'};
-                  if (defined($style_args->[$stack->[-1]->{'arg_nr'} + 1]))
-                  {
-                       push (@{$stack->[-1]->{'args'}}, $stack->[-1]->{'text'});
-                       $stack->[-1]->{'fulltext'} .= $stack->[-1]->{'text'} . do_text(',', $state);
-                       $stack->[-1]->{'text'} = '';
-                       close_arg ($macro, $stack->[-1]->{'arg_nr'}, $state);
-                       $stack->[-1]->{'arg_nr'}++;
-                       open_arg ($macro, $stack->[-1]->{'arg_nr'}, $state);
-                       next;
-                  }
-             }
-             add_prev($text, $stack, do_text(',', $state));
-        }
-        else
-        { # no macro nor '}', but normal text
-            add_prev($text, $stack, do_text($_, $state));
-            #print STDERR "END LINE: $_";
-            #dump_stack($text, $stack, $state);
-            
-            # @item line is closed by end of line
-            add_term($text, $stack, $state, $line_nr);
-            # FIXME test @center @item and @item @center 
-            if ($state->{'paragraph_style'}->[-1] eq 'center' and !$state->{'close_stack'})
-            {
-                close_paragraph($text, $stack, $state, $line_nr);
-                pop @{$state->{'paragraph_style'}};
-                #$_ = $/ if (chomp($_));
-                $_ = '';
-                next;
-            }
-            last;
-        }
-    }
-    return 1;
-}
-
-sub open_arg($$$)
-{
-    my $macro = shift;
-    my $arg_nr = shift;
-    my $state = shift;
-    if (ref($style_map_ref->{$macro}) eq 'HASH')
-    {
-         my $arg = $style_map_ref->{$macro}->{'args'}->[$arg_nr];
-         if ($arg eq 'code' and !$state->{'keep_texi'})
-         {
-             $state->{'code_style'}++;
-         }
-         elsif ($arg eq 'keep')
-         {
-             $state->{'keep_nr'}++;
-             $state->{'keep_texi'} = 1;
-         }
-    }
-    elsif ($code_style_map{$macro} and !$state->{'keep_texi'})
-    {
-         $state->{'code_style'}++;
-    }
-}
-
-sub close_arg($$$)
-{
-    my $macro = shift;
-    my $arg_nr = shift;
-    my $state = shift;
-    if (ref($style_map_ref->{$macro}) eq 'HASH')
-    {
-         my $arg = $style_map_ref->{$macro}->{'args'}->[$arg_nr];
-         if ($arg eq 'code' and !$state->{'keep_texi'})
-         {
-             $state->{'code_style'}--;
-         }
-         elsif ($arg eq 'keep')
-         {
-             $state->{'keep_nr'}--;
-             $state->{'keep_texi'} = 0 if ($state->{'keep_nr'} == 0);
-         }
-#print STDERR "c $arg_nr $macro $arg $state->{'code_style'}\n";
-    }
-    elsif ($code_style_map{$macro} and !$state->{'keep_texi'})
-    {
-         $state->{'code_style'}--;
-    }
-}
-
-sub open_cmd_line($$$$)
-{
-    my $stack = shift;
-    my $state = shift;
-    my $args = shift;
-    my $function = shift;
-    push @$stack, {'style' => 'cmd_line', 'text' => '', 'arg_nr' => 0};
-    foreach my $hash (\%Texi2HTML::Config::style_map, \%Texi2HTML::Config::style_map_pre, \%Texi2HTML::Config::style_map_texi, \%Texi2HTML::Config::unformatted_text_style_map_texi)
-    {
-         $hash->{'cmd_line'}->{'args'} = $args;
-         $hash->{'cmd_line'}->{'function'} = $function;
-    }
-    $state->{'no_paragraph'}++;
-    open_arg ('cmd_line', 0, $state);
-    $state->{'cmd_line'} = 1;
-}
-
-sub get_value($)
-{
-    my $value = shift;
-    return $value{$value} if ($value{$value});
-    return "No value for $value";
-} 
-
-sub add_term($$$$;$)
-{
-    my $text = shift;
-    my $stack = shift;
-    my $state = shift;
-    my $line_nr = shift;
-    my $end = shift;
-    return unless (exists ($state->{'format_stack'}));
-    my $format = $state->{'format_stack'}->[-1];
-    return unless (($format_type{$format->{'format'}} eq 'table') and ($format->{'format'} ne 'multitable' ) and $format->{'term'});
-    #print STDERR "ADD_TERM\n";
-    # we set 'term' = 0 early such that if we encounter an end of line
-    # during close_stack we don't try to do the term once more
-    $state->{'format_stack'}->[-1]->{'term'} = 0;
-    $format->{'paragraph_number'} = 0;
-    # no <pre> allowed in <dt>, thus it is possible there is a @t added
-    # to have teletype in preformatted.
-    if ($state->{'preformatted'} and $stack->[-1]->{'style'} and ($stack->[-1]->{'style'} eq 't'))
-    {
-        my $style = pop @$stack;
-        add_prev($text, $stack, do_simple($style->{'style'}, $style->{'text'}, $state, [$style->{'text'}]));
-    }
-
-    #dump_stack($text, $stack, $state);
-    close_stack($text, $stack, $state, $line_nr, undef, 'term');
-    my $term = pop @$stack;
-    my $command_formatted;
-    chomp ($term->{'text'});
-    if (exists($style_map_ref->{$format->{'command'}}) and 
-       !exists($Texi2HTML::Config::special_list_commands{$format->{'format'}}->{$format->{'command'}}) and ($style_type{$format->{'command'}} eq 'style'))
-    {
-         my $leading_spaces = '';
-         my $trailing_spaces = '';
-         $term->{'text'}  =~ s/^(\s*)//;
-         $leading_spaces = $1 if (defined($1));
-         $term->{'text'}  =~ s/(\s*)$//;
-         $trailing_spaces = $1 if (defined($1));
-         $term->{'text'} = do_simple($format->{'command'}, $term->{'text'}, $state, [$term->{'text'}]); 
-         $term->{'text'} = $leading_spaces. $term->{'text'} .$trailing_spaces;
-    }
-    elsif (exists($things_map_ref->{$format->{'command'}}))
-    {
-        $command_formatted = do_simple($format->{'command'}, '', $state);
-    }
-    my $index_label;
-    if ($format->{'format'} =~ /^(f|v)/)
-    {
-        $index_label = do_index_entry_label($state,$line_nr);
-        print STDERR "Bug: no index entry for $text" unless defined($index_label);
-    }
-    add_prev($text, $stack, &$Texi2HTML::Config::table_item($term->{'text'}, $index_label,$format->{'format'},$format->{'command'}, $command_formatted));
-    #add_prev($text, $stack, &$Texi2HTML::Config::table_item($term->{'text'}, $index_entry, $state));
-    unless ($end)
-    {
-        push (@$stack, { 'format' => 'line', 'text' => '' });
-        begin_paragraph($stack, $state) if ($state->{'preformatted'});
-    }
-    return $format;
-}
-
-sub add_row($$$$)
-{
-    my $text = shift;
-    my $stack = shift;
-    my $state = shift;
-    my $line_nr = shift;
-    my $format = $state->{'format_stack'}->[-1];
-    return unless ($format->{'format'} eq 'multitable');
-    if ($format->{'cell'} > $format->{'max_columns'})
-    {
-        close_stack($text, $stack, $state, $line_nr, undef, 'null');
-        pop @$stack;
-    }
-    unless ($format->{'max_columns'})
-    { # empty multitable
-        pop @$stack; # pop 'row'
-        return $format;
-    }
-    if ($format->{'first'})
-    { # first row
-        $format->{'first'} = 0;
-        #dump_stack($text, $stack, $state);
-	#if ($stack->[-1]->{'format'} and ($stack->[-1]->{'format'} eq 'paragraph') and ($stack->[-1]->{'text'} =~ /^\s*$/) and ($format->{'cell'} == 1))
-        if ($stack->[-1]->{'format'} and ($stack->[-1]->{'format'} eq 'cell') and ($stack->[-1]->{'text'} =~ /^\s*$/) and ($format->{'cell'} == 1))
-        {
-            pop @$stack;
-            pop @$stack;
-	    #pop @$stack;
-            return $format;
-        }
-    }
-    add_cell($text, $stack, $state);
-    my $row = pop @$stack;    
-    add_prev($text, $stack, &$Texi2HTML::Config::row($row->{'text'}, $row->{'item_cmd'}));
-    return $format;
-}
-
-sub add_cell($$$$)
-{
-    my $text = shift;
-    my $stack = shift;
-    my $state = shift;
-    my $line_nr = shift;
-    my $format = $state->{'format_stack'}->[-1];
-    return unless ($format->{'format'} eq 'multitable');
-    if ($format->{'cell'} <= $format->{'max_columns'})
-    {
-        close_stack($text, $stack, $state, $line_nr, undef, 'cell');
-        my $cell = pop @$stack;
-        my $row = top_stack($stack);
-        print STDERR "Bug: top_stack of cell not a row\n" if (!defined($row) or !defined($row->{'format'}) or ($row->{'format'} ne 'row'));
-        add_prev($text, $stack, &$Texi2HTML::Config::cell($cell->{'text'}, $row->{'item_cmd'}));
-        $format->{'cell'}++;
-    }
-    return $format;
-}
-
-sub add_line($$$$;$)
-{
-    my $text = shift;
-    my $stack = shift;
-    my $state = shift;
-    my $line_nr = shift;
-    my $end = shift;
-    my $format = $state->{'format_stack'}->[-1]; 
-    return unless ($format_type{$format->{'format'}} eq 'table' and ($format->{'format'} ne 'multitable') and ($format->{'term'} == 0));
-    #print STDERR "ADD_LINE\n";
-    #dump_stack($text, $stack, $state);
-    # as in pre the end of line are kept, we must explicitely abort empty
-    # preformatted, close_stack doesn't abort the empty preformatted regions.
-    abort_empty_preformatted($stack, $state) if ($format->{'first'});
-    close_stack($text, $stack, $state, $line_nr, undef, 'line');
-    my $line = pop @$stack;
-    $format->{'paragraph_number'} = 0;
-    my $first = 0;
-    $first = 1 if ($format->{'first'});
-    if ($first)
-    {
-        $format->{'first'} = 0;
-        # we must have <dd> or <dt> following <dl> thus we do a 
-        # &$Texi2HTML::Config::table_line here too, although it could have been nice to
-        # have a normal paragraph.
-        add_prev($text, $stack, &$Texi2HTML::Config::table_line($line->{'text'})) if ($line->{'text'} =~ /\S/o);
-    }
-    else
-    {
-        add_prev($text, $stack, &$Texi2HTML::Config::table_line($line->{'text'}));
-    }
-    unless($end)
-    {
-        push (@$stack, { 'format' => 'term', 'text' => '' });
-        # we cannot have a preformatted in table term (no <pre> in <dt>)
-        # thus we set teletyped style @t if there is no pre_style
-        push (@$stack, { 'style' => 't', 'text' => '' }) if ($state->{'preformatted'} and (!$state->{'preformatted_stack'}->[-1]->{'pre_style'}));
-        #push (@$stack, { 'style' => $format->{'command'}, 'text' => $format->{'appended'} });
-    }
-    $format->{'term'} = 1;
-    return $format;
-}
-
-sub add_item($$$$;$)
-{
-    my $text = shift;
-    my $stack = shift;
-    my $state = shift;
-    my $line_nr = shift;
-    my $line = shift;
-    my $end = shift;
-    my $format = $state->{'format_stack'}->[-1];
-    return unless ($format_type{$format->{'format'}} eq 'list');
-    #print STDERR "ADD_ITEM: \n";
-    # as in pre the end of line are kept, we must explicitely abort empty
-    # preformatted, close_stack doesn't do that.
-    abort_empty_preformatted($stack, $state) if ($format->{'first'});
-    close_stack($text, $stack, $state, $line_nr, undef, 'item');
-    $format->{'paragraph_number'} = 0;
-    if ($format->{'format'} eq 'enumerate')
-    {
-         $format->{'number'} = '';
-         my $spec = $format->{'spec'};
-         $format->{'item_nr'}++;
-         if ($spec =~ /^[0-9]$/)
-         {
-              $format->{'number'} = $spec + $format->{'item_nr'} - 1;
-         }
-         else
-         {
-              my $base_letter = ord('a');
-              $base_letter = ord('A') if (ucfirst($spec) eq $spec);
-
-              my @letter_ords = decompose(ord($spec) - $base_letter + $format->{'item_nr'} - 1, 26);
-              foreach my $ord (@letter_ords)
-              {#FIXME? we go directly to 'ba' after 'z', and not 'aa'
-               #because 'ba' is 1,0 and 'aa' is 0,0.
-                   $format->{'number'} = chr($base_letter + $ord) . $format->{'number'};
-              }
-         }
-    }
-    
-    #dump_stack ($text, $stack, $state);
-    my $item = pop @$stack;
-    # the element following ol or ul must be li. Thus even though there
-    # is no @item we put a normal item.
-
-    # don't do an item if it is the first and it is empty
-    if (!$format->{'first'} or ($item->{'text'} =~ /\S/o))
-    {
-        my $formatted_command;
-        if (defined($format->{'command'}) and exists($things_map_ref->{$format->{'command'}}))
-        {
-             $formatted_command = do_simple($format->{'command'}, '', $state);
-        }
-	#chomp($item->{'text'});
-        add_prev($text, $stack, &$Texi2HTML::Config::list_item($item->{'text'},$format->{'format'},$format->{'command'}, $formatted_command, $format->{'item_nr'}, $format->{'spec'}, $format->{'number'}));
-    } 
-    if ($format->{'first'})
-    {
-        $format->{'first'} = 0;
-    }
-
-    # Now prepare the new item
-    unless($end)
-    {
-        push (@$stack, { 'format' => 'item', 'text' => '' });
-        begin_paragraph($stack, $state) unless (!$state->{'preformatted'} and no_line($line));
-    }
-    return $format;
-}
-
-# format ``simple'' macros, that is macros without arg or style macros
-sub do_simple($$$;$$$$)
-{
-    my $macro = shift;
-    my $text = shift;
-    my $state = shift;
-    my $args = shift;
-    my $line_nr = shift;
-    my $no_open = shift;
-    my $no_close = shift;
-    my $result;
-    
-    my $arg_nr = 0;
-    $arg_nr = @$args - 1 if (defined($args));
-    
-#print STDERR "DO_SIMPLE $macro $arg_nr $args @$args\n" if (defined($args));
-    if (defined($simple_map_ref->{$macro}))
-    {
-        # \n may in certain circumstances, protect end of lines
-        if ($macro eq "\n")
-        {
-             $state->{'end_of_line_protected'} = 1;
-             #print STDERR "PROTECTING END OF LINE\n";
-        }
-        if ($state->{'keep_texi'})
-        {
-             return "\@$macro";
-        }
-        elsif ($state->{'remove_texi'})
-        {
-#print STDERR "DO_SIMPLE remove_texi $macro\n";
-             return  $simple_map_texi_ref->{$macro};
-        }
-        elsif ($state->{'preformatted'})
-        {
-             return $simple_map_pre_ref->{$macro};
-        }
-        else
-        {
-             return $simple_map_ref->{$macro};
-        }
-    }
-    if (defined($things_map_ref->{$macro}))
-    {
-        if ($state->{'keep_texi'})
-        {
-             $result = "\@$macro" . '{}';
-        }
-        elsif ($state->{'remove_texi'})
-        {
-             $result =  $texi_map_ref->{$macro};
-#print STDERR "DO_SIMPLE remove_texi texi_map $macro\n";
-        }
-        elsif ($state->{'preformatted'})
-        {
-             $result = $pre_map_ref->{$macro};
-        }
-        else 
-        {
-             $result = $things_map_ref->{$macro};
-        }
-        return $result . $text;
-    }
-    elsif (defined($style_map_ref->{$macro}))
-    {
-        if ($state->{'keep_texi'})
-        {
-             $result = "\@$macro" . '{' . $text . '}';
-        }
-        else 
-        {
-             my $style;
-             if ($state->{'remove_texi'})
-             {
-#print STDERR "REMOVE $macro, $style_map_texi_ref->{$macro}, fun $style_map_texi_ref->{$macro}->{'function'} remove cmd " . \&Texi2HTML::Config::t2h_remove_command . " ascii acc " . \&t2h_default_ascii_accent;
-                  $style = $style_map_texi_ref->{$macro};
-             }
-             elsif ($state->{'preformatted'})
-             {
-                  $style = $style_map_pre_ref->{$macro};
-             }
-             else
-             {
-                  $style = $style_map_ref->{$macro};
-             }
-             if (defined($style))
-             {                           # known style
-                  $result = &$Texi2HTML::Config::style($style, $macro, $text, $args, $no_close, $no_open, $line_nr, $state, $state->{'style_stack'});
-             }
-             if (!$no_close)
-             { 
-                  close_arg($macro,$arg_nr, $state);
-             }
-        }
-        return $result;
-    }
-    # Unknown macro
-    $result = '';
-    my ($done, $result_text, $message) = &$Texi2HTML::Config::unknown_style($macro, $text);
-    if ($done)
-    {
-         echo_warn($message, $line_nr) if (defined($message));
-         if (defined($result_text))
-         {
-             $result = $result_text;
-         }
-    }
-    else 
-    { 
-        unless ($no_open)
-        { # we warn only if no_open is true, i.e. it is the first time we 
-          # close the macro for a multiline macro
-             echo_warn ("Unknown command with braces `\@$macro'", $line_nr);
-             $result = do_text("\@$macro") . "{";
-        }
-        $result .= $text;
-        $result .= '}' unless ($no_close);
-    }
-    return $result;
-}
-
-sub do_unknown($$$$$$)
-{
-    my $macro = shift;
-    my $line = shift;
-    my $text = shift;
-    my $stack = shift;
-    my $state = shift;
-    my $line_nr = shift;
-    my ($result_line, $result, $result_text, $message) = &$Texi2HTML::Config::unknown($macro, $line);
-    if ($result)
-    {
-         add_prev ($text, $stack, $result_text) if (defined($result_text));
-         echo_warn($message, $line_nr) if (defined($message));
-         return $result_line;
-    }
-    else
-    {
-         echo_warn ("Unknown command `\@$macro' (left as is)", $line_nr);
-         add_prev ($text, $stack, do_text("\@$macro"));
-         return $line;
-    }
-}
-
-# used only during @macro processing
-sub add_text($@)
-{
-    my $string = shift;
-
-    return if (!defined($string));
-    foreach my $scalar_ref (@_)
-    {
-        next unless defined($scalar_ref);
-        if (!defined($$scalar_ref))
-        {
-            $$scalar_ref = $string;
-        }
-        else
-        {
-            $$scalar_ref .= $string;
-        }
-        return;
-    }
-}
-
-sub add_prev ($$$)
-{
-    my $text = shift;
-    my $stack = shift;
-    my $string = shift;
-
-    unless (defined($text) and ref($text) eq "SCALAR")
-    {
-       die "text not a SCALAR ref: " . ref($text) . "";
-    }
-    #if (!defined($stack) or (ref($stack) ne "ARRAY"))
-    #{
-    #    $string = $stack;
-    #    $stack = [];
-    #}
-    
-    return if (!defined($string));
-    if (@$stack)
-    {
-        $stack->[-1]->{'text'} .= $string;
-        return;
-    }
-
-    if (!defined($$text))
-    {
-         $$text = $string;
-    }
-    else
-    {
-         $$text .= $string;
-    }
-}
-
-sub close_stack_texi_structure($$$$)
-{
-    my $text = shift;
-    my $stack = shift;
-    my $state = shift;
-    my $line_nr = shift;
-
-    return undef unless (@$stack or $state->{'raw'} or $state->{'macro'} or $state->{'macro_name'} or $state->{'ignored'});
-
-    my $stack_level = $#$stack + 1;
-    my $string = '';
-    
-    if ($state->{'ignored'})
-    {
-        $string .= "\@end $state->{'ignored'} ";
-        echo_warn ("closing $state->{'ignored'}", $line_nr); 
-    }
-    if ($state->{'texi'})
-    {
-        if ($state->{'macro'})
-        {
-            $string .= "\@end macro ";
-            echo_warn ("closing macro", $line_nr); 
-        }
-        elsif ($state->{'macro_name'})
-        {
-            $string .= ('}' x $state->{'macro_depth'}) . " ";
-            echo_warn ("closing $state->{'macro_name'} ($state->{'macro_depth'} braces missing)", $line_nr); 
-        }
-        elsif ($state->{'verb'})
-        {
-            echo_warn ("closing \@verb", $line_nr); 
-            $string .= $state->{'verb'} . '}';
-        }
-        elsif ($state->{'raw'})
-        {
-            echo_warn ("closing \@$state->{'raw'} raw format", $line_nr);
-            $string .= "\@end $state->{'raw'} ";
-        }
-        if ($string ne '')
-        {
-            #print STDERR "scan_texi ($string)\n";
-            scan_texi ($string, $text, $stack, $state, $line_nr);
-            $string = '';
-        }
-    }
-    elsif ($state->{'verb'})
-    {
-        $string .= $state->{'verb'};
-    }
-
-    while ($stack_level--)
-    {
-          my $stack_text = $stack->[$stack_level]->{'text'};
-          $stack_text = '' if (!defined($stack_text));
-          if ($stack->[$stack_level]->{'format'})
-          {
-               my $format = $stack->[$stack_level]->{'format'};
-               if ($format eq 'index_item')
-               {
-                    enter_table_index_entry($text, $stack, $state, $line_nr);
-                    next;
-               }
-               elsif (!defined($format_type{$format}) or ($format_type{$format} ne 'fake'))
-               {
-                    $stack_text = "\@$format\n" . $stack_text;
-               }
-          }
-          elsif (defined($stack->[$stack_level]->{'style'}))
-          {
-              my $style = $stack->[$stack_level]->{'style'};
-              if ($style ne '')
-              {
-                   $stack_text = "\@$style\{" . $stack_text;
-              }
-              else
-              {
-                   $stack_text = "\{" . $stack_text;
-              }
-         }
-         pop @$stack;
-         add_prev($text, $stack, $stack_text);
-    }
-    $stack = [ ];
-    $stack_level = 0;
-    #return ($text, [ ], $state);
-
-    $state->{'close_stack'} = 1;
-    if ($string ne '')
-    {
-        if ($state->{'texi'})
-        {
-            #print STDERR "scan_texi in close_stack ($string)\n";
-            scan_texi($string, $text, $stack, $state, $line_nr);
-        }
-        elsif ($state->{'structure'})
-        {
-            #print STDERR "scan_structure in close_stack ($string)\n";
-            scan_structure($string, $text, $stack, $state, $line_nr);
-        }
-    }
-    delete $state->{'close_stack'};
-}
-
-
-# close the stack, closing macros and formats left open.
-# the precise behavior of the function depends on $close_paragraph:
-#  undef   -> close everything
-#  defined -> remove empty paragraphs, close until the first format or paragraph.
-#      1          -> don't close styles, duplicate stack of styles not closed
-# FIXME never used
-#      ''         -> close styles, don't duplicate
-
-# if a $format is given the stack is closed according to $close_paragraph but
-# if $format is encountered the closing stops
-
-sub close_stack($$$$;$$$)
-{
-    my $text = shift;
-    my $stack = shift;
-    my $state = shift;
-    my $line_nr = shift;
-    my $close_paragraph = shift;
-    my $format = shift;
-    # FIXME this is not used
-    my $search_style = shift;
-    my $new_stack;
-    
-    # cancel paragraph states
-    $state->{'paragraph_style'} = [ '' ] unless (defined($close_paragraph) or defined($format));
-    #print STDERR "sub_close_stack\n";
-    return $new_stack unless (@$stack);
-    
-    my $stack_level = $#$stack + 1;
-    my $string = '';
-    my $verb = '';
-    
-    if ($state->{'verb'})
-    {
-        $string .= $state->{'verb'};
-        $verb = $state->{'verb'};
-    }
-
-    #debugging
-    #my $print_format = 'NO FORMAT';
-    #$print_format = $format if ($format);
-    #my $print_close_paragraph = 'close everything';
-    #$print_close_paragraph = 'close paragraph without duplicating' if (defined($close_paragraph));
-    #$print_close_paragraph = $close_paragraph if ($close_paragraph);
-    #print STDERR "Close_stack: format $print_format, close_paragraph: $print_close_paragraph\n";
-    
-    while ($stack_level--)
-    {
-        if ($stack->[$stack_level]->{'format'})
-        {
-            my $stack_format = $stack->[$stack_level]->{'format'};
-            last if (defined($close_paragraph) or (defined($format) and $stack_format eq $format));
-            # We silently close paragraphs, preformatted sections and fake formats
-            if ($stack_format eq 'paragraph')
-            {
-                $string .= "\@end_paragraph ";
-            }
-            elsif ($stack_format eq 'preformatted')
-            {
-                $string .= "\@end_preformatted ";
-            }
-            else
-            {
-                if ($fake_format{$stack_format})
-                {
-                    warn "# Closing a fake format `$stack_format'\n" if ($T2H_VERBOSE);
-                }
-                else
-                {
-                    echo_warn ("closing `$stack_format'", $line_nr); 
-                    #dump_stack ($text, $stack, $state);
-                    #warn "$WARN closing `$stack_format'\n"; 
-                }
-                $string .= "\@end $stack_format ";
-            }
-        }
-        else
-        {
-            my $style =  $stack->[$stack_level]->{'style'};
-            last if (defined($search_style) and $style eq $search_style);
-            # FIXME images, footnotes, xrefs, anchors with $close_paragraphs ?
-            if ($close_paragraph)
-            { #duplicate the stack
-                if (exists($style_type{$style}) and ($style_type{$style} eq 'style') or (!exists($style_type{$style})))
-                {
-                    push @$new_stack, { 'style' => $style, 'text' => '', 'no_open' => 1, 'arg_nr' => 0 };
-                    $string .= '} ';
-                }
-                elsif (exists($style_type{$style}) and ($style_type{$style} eq 'simple'))
-                {
-                    $string .= '} ';
-                }
-            }
-            else
-            {
-                dump_stack ($text, $stack, $state) if (!defined($style)); 
-                $string .= '}';
-                echo_warn ("closing $style", $line_nr) if ($style); 
-            }
-        }
-    }
-    $state->{'no_close'} = 1 if ($close_paragraph);
-    $state->{'close_stack'} = 1;
-    if ($string ne '')
-    {
-            #print STDERR "scan_line in CLOSE_STACK ($string)\n";
-            #dump_stack ($text, $stack, $state);
-         scan_line($string, $text, $stack, $state, $line_nr);
-    }
-    delete $state->{'no_close'};
-    delete $state->{'close_stack'};
-    $state->{'verb'} = $verb if (($verb ne '') and $close_paragraph);
-    return $new_stack;
-}
-
-# given a stack and a list of formats, return true if the stack contains 
-# these formats, first on top
-sub stack_order($@)
-{
-    my $stack = shift;
-    my $stack_level = $#$stack + 1;
-    while (@_)
-    {
-        my $format = shift;
-        while ($stack_level--)
-        {
-            if ($stack->[$stack_level]->{'format'})
-            {
-                if ($stack->[$stack_level]->{'format'} eq $format)
-                {
-                    $format = undef;
-                    last;
-                }
-                else
-                {
-                    return 0;
-                }
-            }
-        }
-        return 0 if ($format);
-    }
-    return 1;
-}	
-
-sub top_format($)
-{
-    my $stack = shift;
-    my $stack_level = $#$stack + 1;
-    while ($stack_level--)
-    {
-        if ($stack->[$stack_level]->{'format'} and !$fake_format{$stack->[$stack_level]->{'format'}})
-        {
-             return $stack->[$stack_level];
-        }
-    }
-    return undef;
-}
-
-sub close_paragraph($$$;$)
-{
-    my $text = shift;
-    my $stack = shift;
-    my $state = shift;
-    my $line_nr = shift;
-    #my $macro = shift;
-    #print STDERR "CLOSE_PARAGRAPH\n";
-    #dump_stack($text, $stack, $state);
-    my $new_stack = close_stack($text, $stack, $state, $line_nr, 1);
-    my $top_stack = top_stack($stack);
-    if ($top_stack and !defined($top_stack->{'format'}))
-    { #debug
-         print STDERR "Bug: no format on top stack\n";
-         dump_stack($text, $stack, $state);
-    }
-    if ($top_stack and ($top_stack->{'format'} eq 'paragraph'))
-    {
-        my $paragraph = pop @$stack;
-        add_prev($text, $stack, do_paragraph($paragraph->{'text'}, $state));
-        $state->{'paragraph_macros'} = $new_stack;
-        return 1;
-	#return "\@$macro ";
-    }
-    elsif ($top_stack and ($top_stack->{'format'} eq 'preformatted'))
-    {
-        my $paragraph = pop @$stack;
-        add_prev($text, $stack, do_preformatted($paragraph->{'text'}, $state));
-        $state->{'paragraph_macros'} = $new_stack;
-        return 1;
-	#return "\@$macro ";
-    }
-    return;
-}
-
-sub abort_empty_preformatted($$)
-{
-    my $stack = shift;
-    my $state = shift;
-    if (@$stack and $stack->[-1]->{'format'} 
-       and ($stack->[-1]->{'format'} eq 'preformatted')
-       and ($stack->[-1]->{'text'} !~ /\S/))
-    {
-        pop @$stack;
-        return 1;
-    }
-    return 0;
-}
-
-# for debugging
-sub dump_stack($$$)
-{
-    my $text = shift;
-    my $stack = shift;
-    my $state = shift;
-
-    if (defined($$text))
-    {
-        print STDERR "text: $$text\n";
-    }
-    else
-    {
-        print STDERR "text: UNDEF\n";
-    }
-    print STDERR "state: ";
-    foreach my $key (keys(%$state))
-    {
-        my $value = 'UNDEF';
-        $value = $state->{$key} if (defined($state->{$key}));
-        print STDERR "$key: $value ";
-    }
-    print STDERR "\n";
-    my $stack_level = $#$stack + 1;
-    while ($stack_level--)
-    {
-        print STDERR " $stack_level-> ";
-        foreach my $key (keys(%{$stack->[$stack_level]}))
-        {
-            my $value = 'UNDEF';
-            $value = $stack->[$stack_level]->{$key} if 
-                (defined($stack->[$stack_level]->{$key}));
-            print STDERR "$key: $value ";
-        }
-        print STDERR "\n";
-    }
-    if (defined($state->{'format_stack'}))
-    {
-        print STDERR "format_stack: ";
-        foreach my $format (@{$state->{'format_stack'}})
-        {
-            print STDERR "$format->{'format'} ";
-        }
-        print STDERR "\n";
-    }
-}
-
-# for debugging 
-sub print_elements($)
-{
-    my $elements = shift;
-    foreach my $elem(@$elements)
-    {
-        if ($elem->{'node'})
-        {
-            print STDERR "node-> $elem ";
-        }
-        else
-        {
-            print STDERR "chap=> $elem ";
-        }
-        foreach my $key (keys(%$elem))
-        {
-            my $value = "UNDEF";
-            $value = $elem->{$key} if (defined($elem->{$key}));
-            print STDERR "$key: $value ";
-        }
-        print STDERR "\n";
-    }
-}
-
-sub substitute_line($;$)
-{
-    my $line = shift;
-    my $state = shift;
-    $state = {} if (!defined($state));
-    $state->{'no_paragraph'} = 1;
-    return unformatted_text($state, $line) if ($state->{'unformatted'});
-    return substitute_text($state, $line);
-}
-
-sub substitute_text($@)
-{
-    my $state = shift;
-    my @stack = ();
-    my $text = '';
-    my $result = '';
-    if ($state->{'structure'})
-    {
-        initialise_state_structure($state);
-    }
-    elsif ($state->{'texi'})
-    {
-        initialise_state_texi($state);
-    }
-    else
-    {
-        initialise_state($state);
-    }
-    $state->{'spool'} = [];
-    #print STDERR "SUBST_TEXT begin\n";
-    
-    while (@_ or @{$state->{'spool'}})
-    {
-        my $line;
-        if (@{$state->{'spool'}})
-        {
-             $line = shift @{$state->{'spool'}};
-        }
-        else
-        {
-            $line = shift @_;
-        }
-        next unless (defined($line));
-        if ($state->{'structure'})
-        {
-            scan_structure ($line, \$text, \@stack, $state);
-        }
-        elsif ($state->{'texi'})
-        {
-            scan_texi ($line, \$text, \@stack, $state);
-        }
-        else
-        {
-            scan_line($line, \$text, \@stack, $state);
-        }
-        next if (@stack);
-        $result .= $text;
-        $text = '';
-    }
-    # FIXME could we have the line number ?
-    # close stack in substitute_text
-    if ($state->{'texi'} or $state->{'structure'})
-    {
-         close_stack_texi_structure(\$text, \@stack, $state, undef);
-    }
-    else
-    {
-         close_stack(\$text, \@stack, $state, undef);
-    }
-    #print STDERR "SUBST_TEXT end\n";
-    return $result . $text;
-}
-
-sub substitute_texi_line($)
-{
-    my $text = shift;  
-    my @text = substitute_text({'structure' => 1}, $text);
-    my @result = ();
-    while (@text)
-    {
-        push @result,  split (/\n/, shift (@text));
-    }
-    return '' unless (@result);
-    my $result = shift @result;
-    return $result . "\n" unless (@result);
-    foreach my $line (@result)
-    {
-        chomp $line;
-        $result .= ' ' . $line;
-    }
-    return $result . "\n";
-}
-
-sub print_lines($;$)
-{
-    my ($fh, $lines) = @_;
-    $lines = $Texi2HTML::THIS_SECTION unless $lines;
-    my @cnt;
-    my $cnt;
-    for my $line (@$lines)
-    {
-        print $fh $line;
-	if (defined($Texi2HTML::Config::WORDS_IN_PAGE) and ($Texi2HTML::Config::SPLIT eq 'node'))
-        {
-            @cnt = split(/\W*\s+\W*/, $line);
-            $cnt += scalar(@cnt);
-        }
-    }
-    return $cnt;
-}
-
-sub do_index_entry_label($$)
-{
-    my $state = shift;
-    my $line_nr = shift;
-    my $entry = shift @index_labels;
-    return '' if ($state->{'multiple_pass'});
-    if (!defined($entry))
-    {
-        echo_warn ("Not enough index entries !", $line_nr);
-        return '';
-    }
-    
-    print STDERR "[(index) $entry->{'entry'} $entry->{'label'}]\n"
-        if ($T2H_DEBUG & $DEBUG_INDEX);
-    return &$Texi2HTML::Config::index_entry_label ($entry->{'label'}, $state->{'preformatted'}, substitute_line($entry->{'entry'}), $index_properties->{$entry->{'prefix'}}->{'name'}); 
-}
-
-# decompose a decimal number on a given base. The algorithm looks like
-# the division with growing powers (division suivant les puissances
-# croissantes) ?
-sub decompose($$)
-{  
-    my $number = shift;
-    my $base = shift;
-    my @result = ();
-
-    return (0) if ($number == 0);
-    my $power = 1;
-    my $remaining = $number;
-
-    while ($remaining)
-    {
-         my $factor = $remaining % ($base ** $power);
-         $remaining -= $factor;
-         push (@result, $factor / ($base ** ($power - 1)));
-         $power++;
-    }
-    return @result;
-}
-
-# main processing is called here
-set_document_language('en') unless ($lang_set);
-# APA: There's got to be a better way:
-$T2H_USER = &$I('unknown');
-
-if ($Texi2HTML::Config::TEST)
-{
-    # to generate files similar to reference ones to be able to check for
-    # real changes we use these dummy values if -test is given
-    $T2H_USER = 'a tester';
-    $THISPROG = 'texi2html';
-    setlocale( LC_ALL, "C" );
-} 
-else
-{ 
-    # the eval prevents this from breaking on system which do not have
-    # a proper getpwuid implemented
-    eval { ($T2H_USER = (getpwuid ($<))[6]) =~ s/,.*//;}; # Who am i
-    # APA: Provide Windows NT workaround until getpwuid gets
-    # implemented there.
-    $T2H_USER = $ENV{'USERNAME'} unless defined $T2H_USER;
-}
-    
-open_file($docu, $texi_line_number);
-Texi2HTML::LaTeX2HTML::init($docu_name, $docu_rdir, $T2H_DEBUG & $DEBUG_L2H)
- if ($Texi2HTML::Config::L2H);
-pass_texi();
-dump_texi(\@lines, 'texi', \@lines_numbers) if ($T2H_DEBUG & $DEBUG_TEXI);
-if (defined($Texi2HTML::Config::MACRO_EXPAND))
-{
-    my @texi_lines = (@first_lines, @lines);
-    dump_texi(\@texi_lines, '', undef, $Texi2HTML::Config::MACRO_EXPAND);
-}
-pass_structure();
-if ($T2H_DEBUG & $DEBUG_TEXI)
-{
-    dump_texi(\@doc_lines, 'first', \@doc_numbers);
-    if (defined($Texi2HTML::Config::MACRO_EXPAND and $Texi2HTML::Config::DUMP_TEXI))
-    {
-        unshift (@doc_lines, @first_lines);
-        push (@doc_lines, "\@bye\n");
-        dump_texi(\@doc_lines, '', undef, $Texi2HTML::Config::MACRO_EXPAND . ".first");
-    }
-}
-exit(0) if ($Texi2HTML::Config::DUMP_TEXI or defined($Texi2HTML::Config::MACRO_EXPAND));
-rearrange_elements();
-do_names();
-if (@{$region_lines{'documentdescription'}} and (!defined($Texi2HTML::Config::DOCUMENT_DESCRIPTION)))
-{
-    my $documentdescription = remove_texi(@{$region_lines{'documentdescription'}}); 
-    my @documentdescription = split (/\n/, $documentdescription);
-    $Texi2HTML::Config::DOCUMENT_DESCRIPTION = shift @documentdescription;
-    chomp $Texi2HTML::Config::DOCUMENT_DESCRIPTION;
-    foreach my $line (@documentdescription)
-    {
-        chomp $line;
-        $Texi2HTML::Config::DOCUMENT_DESCRIPTION .= ' ' . $line;
-    }
-}
-# do copyright notice inserted in comment at the begining of the files
-if (@{$region_lines{'copying'}})
-{
-    $copying_comment = &$Texi2HTML::Config::copying_comment($region_lines{'copying'});
-    #$copying_comment = remove_texi(@{$region_lines{'copying'}});
-    #$copying_comment = &$Texi2HTML::Config::comment($copying_comment);
-}
-&$Texi2HTML::Config::toc_body(\@elements_list);
-#&$Texi2HTML::Config::toc_body(\@elements_list, $do_contents, $do_scontents);
-&$Texi2HTML::Config::css_lines(\@css_import_lines, \@css_rule_lines);
-$sec_num = 0;
-#$Texi2HTML::Config::L2H = l2h_FinishToLatex() if ($Texi2HTML::Config::L2H);
-#$Texi2HTML::Config::L2H = l2h_ToHtml()        if ($Texi2HTML::Config::L2H);
-#$Texi2HTML::Config::L2H = l2h_InitFromHtml()  if ($Texi2HTML::Config::L2H);
-Texi2HTML::LaTeX2HTML::latex2html();
-pass_text();
-#do_node_files() if ($Texi2HTML::Config::SPLIT ne 'node' and $Texi2HTML::Config::NODE_FILES);
-if ($Texi2HTML::Config::IDX_SUMMARY)
-{
-    foreach my $entry (keys(%$index_properties))
-    {
-         my $name = $index_properties->{$entry}->{'name'};
-         do_index_summary_file($name) 
-            unless ($empty_indices{$name});
-    }
-}
-do_node_files() if ($Texi2HTML::Config::NODE_FILES);
-#l2h_FinishFromHtml() if ($Texi2HTML::Config::L2H);
-#l2h_Finish() if($Texi2HTML::Config::L2H);
-Texi2HTML::LaTeX2HTML::finish();
-&$Texi2HTML::Config::finish_out();
-print STDERR "# that's all folks\n" if $T2H_VERBOSE;
-
-exit(0);
-
-
-##############################################################################
-
-# These next few lines are legal in both Perl and nroff.
-
-.00 ;                           # finish .ig
-
-'di			\" finish diversion--previous line must be blank
-.nr nl 0-1		\" fake up transition to first page again
-.nr % 0			\" start at page 1
-'; __END__ ############# From here on it's a standard manual page ############
-    .so ${prefix}/man/man1/texi2html.1
diff --git a/Master/bin/alpha-linux/texi2pdf b/Master/bin/alpha-linux/texi2pdf
index 492128325db..a030a74ed9f 100755
--- a/Master/bin/alpha-linux/texi2pdf
+++ b/Master/bin/alpha-linux/texi2pdf
@@ -1,12 +1,12 @@
 #!/bin/sh
-# $Id: texi2pdf,v 1.1 2004/07/11 01:02:35 karl Exp $
+# $Id: texi2pdf,v 1.2 2005/01/28 01:52:04 karl Exp $
 # Written by Thomas Esser.  Public domain.
 # Execute texi2dvi --pdf.
 
-test -f /bin/sh5 && test -z "$RUNNING_SH5" \
+test -f /bin/ksh && test -z "$RUNNING_KSH" \
   && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
-  && { RUNNING_SH5=true; export RUNNING_SH5; exec /bin/sh5 $0 ${1+"$@"}; }
-unset RUNNING_SH5
+  && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; }
+unset RUNNING_KSH
 
 test -f /bin/bsh && test -z "$RUNNING_BSH" \
   && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \
diff --git a/Master/bin/alpha-linux/texindex b/Master/bin/alpha-linux/texindex
index 04bcdcb629f..4ee60948da9 100755
--- a/Master/bin/alpha-linux/texindex
+++ b/Master/bin/alpha-linux/texindex
diff --git a/Master/bin/alpha-linux/texindy b/Master/bin/alpha-linux/texindy
new file mode 120000
index 00000000000..e9a29f8828c
--- /dev/null
+++ b/Master/bin/alpha-linux/texindy
@@ -0,0 +1 @@
+../../texmf/scripts/xindy/texindy.pl
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/texlinks b/Master/bin/alpha-linux/texlinks
index f84f55a95bd..48657905634 100755
--- a/Master/bin/alpha-linux/texlinks
+++ b/Master/bin/alpha-linux/texlinks
@@ -6,11 +6,15 @@
 # the lines given in fmtutil.cnf.
 
 # History:
+#   (Further changes in ChangeLog.)
+#   Tue Oct  9 14:23:01 BST 2007
+#      Added unlink option (-u) to aid OpenBSD package uninstall
+#      Edd Barrett <vext01@gmail.com>
 #   Sun Aug 28 21:41:06 CEST 2005
 #      remove special cases for csplain,cslatex,pdfcslatex,pdfcsplain
 #   Fr Apr  8 19:15:05 CEST 2005
 #      cleanup now has an argument for the return code
-#   So Mär 27 18:52:06 CEST 2005
+#   So Mar 27 18:52:06 CEST 2005
 #       honor $TMPDIR, $TEMP and $TMP, not just $TMP
 #   Mon May 10 20:52:48 CEST 2004
 #       kpseaccess instead of access
@@ -35,33 +39,30 @@ export PATH
 test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 cnf=fmtutil.cnf   # name of the config file
-version=1169050907 # seconds since `00:00:00 1970-01-01 UTC'
-                   # date '+%s' (with GNU date)
+version=20080528.1847 # utc timestamp 
 progname=texlinks
 
-usage='texlinks [options] [directories]
+usage='Usage: texlinks [OPTION]... [DIRECTORY]...
 
 Create symbolic links format -> engine according to fmtutil setup.
 
-Valid options:
-  --help
-  -h                    show this help text
-  --version             show version string
-  --cnffile file
-  -f file               use file as config file (default: fmtutil.cnf)
-  --verbose
-  -v                    set verbose mode on (default: off)
-  --multiplatform
-  -m                    operate in all platform specific directories
+Mandatory arguments to long options are mandatory for short options too.
+  -h, --help           show this help text
+  --version            show version string
+  -f, --cnffile FILE   use FILE as config file (default: fmtutil.cnf)
+  -v, --verbose        enable verbose messages (default: off)
+  -m, --multiplatform  operate in all platform specific directories
                         (default: operate only in directory for this platform)
-  --silent
-  -s                    silently skip over existing scripts / binaries
-                        instead of creating a warning
+  -s, --silent         silently skip existing scripts / binaries
+                        (default: issue warning)
+  -u, --unlink	       remove symlinks created by texlinks
 
-directories is an optional list of directories in which to operate.
-If no directories are specified the list of directories depends on the
---multiplatform option.
-'
+The DIRECTORY arguments are an optional list of directories in which to
+operate.  If no directories are specified and --multiplatform is
+likewise not specified, the directory of this script itself is used.
+With --multiplatform, all child dirs of an upper-level bin/ dir are used.
+
+Report bugs to tex-k@tug.org.'
 
 ###############################################################################
 # abort(errmsg)
@@ -140,7 +141,7 @@ install_link()
         fi
         if test -f $selfautoloc/mf && test -f $selfautoloc/mf-nowin; then
           # have both mf and mf-nowin binaries.  no link.
-          verbose_echo "metafont symlink $src -> $dest skipped (special case)"
+          verbose_echo "skipped metafont symlink $src -> $dest (special case)"
           return
         fi
       fi
@@ -149,7 +150,8 @@ install_link()
 
   case $src in
     */cont-??|*/metafun|*/mptopdf)
-      verbose_echo "symlink $src -> $dest skipped (special case)"
+      # context includes wrapper scripts that create/run these.
+      verbose_echo "skipped ConTeXtish symlink $src -> $dest (special case)"
       ;;
     *)
       test "x$src" != "x`(ls -ld $src | awk '{print $NF}') 2>/dev/null`" &&
@@ -205,6 +207,24 @@ upd_symlinkdir()
 }
 
 ###############################################################################
+# rm_link()
+#   Delete a previously installed link
+###############################################################################
+rm_link()
+{
+  link=$1;
+  if test -e $link; then
+    if test -h $link; then
+      verbose_do rm -Rf $link
+    else
+      verbose_echo "kept $link, since not a symlink"
+    fi
+  else
+    verbose_echo "skipped $link, non-existent"
+  fi
+}
+
+###############################################################################
 # main()
 #   parse commandline arguments, initialize variables,
 #   switch into temp. direcrory, execute desired command
@@ -217,6 +237,7 @@ main()
 
   multiplatform=false
   verbose=false
+  unlink=false
   silent=false
   thisdir=`pwd`
   : ${KPSE_DOT=$thisdir}; export KPSE_DOT
@@ -232,6 +253,7 @@ main()
       --v*|-v) verbose=true;;
       --s*|-s) silent=true;;
       --m*|-m) multiplatform=true;;
+      --u*|-u) unlink=true;;
       -*) errmsg "fmtutil: unknown option \`$1' ignored.";;
       *)  break;;
     esac
@@ -278,9 +300,14 @@ main()
 
       test "x$fmt" = "x$engine" && continue
       if test -f "$d/$engine"; then
-        install_link "$engine" "$d/$fmt"
+        case $unlink in
+        true)
+          rm_link "$d/$fmt";;
+        *)
+          install_link "$engine" "$d/$fmt";;
+        esac
       else
-        verbose_echo "$d/$engine: engine does not exist. Skipping..."
+        verbose_echo "skipped $d/$engine, engine does not exist"
       fi
 
       # restore positional arguments:
diff --git a/Master/bin/alpha-linux/texlua b/Master/bin/alpha-linux/texlua
new file mode 120000
index 00000000000..8d727021583
--- /dev/null
+++ b/Master/bin/alpha-linux/texlua
@@ -0,0 +1 @@
+luatex
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/tftopl b/Master/bin/alpha-linux/tftopl
index edbe4886f0d..5d7b9a8a04e 100755
--- a/Master/bin/alpha-linux/tftopl
+++ b/Master/bin/alpha-linux/tftopl
diff --git a/Master/bin/alpha-linux/thumbpdf b/Master/bin/alpha-linux/thumbpdf
index 832e4e76717..98a72428616 100755..120000
--- a/Master/bin/alpha-linux/thumbpdf
+++ b/Master/bin/alpha-linux/thumbpdf
@@ -1,1562 +1 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q'
-  if 0;
-use strict;
-$^W=1; # turn warning on
-#
-# thumbpdf.pl
-#
-# Copyright (C) 1999-2005 Heiko Oberdiek.
-#
-# This work may be distributed and/or modified under the
-# conditions of the LaTeX Project Public License, either version 1.3
-# of this license or (at your option) any later version.
-# The latest version of this license is in
-#   http://www.latex-project.org/lppl.txt
-# and version 1.3 or later is part of all distributions of LaTeX
-# version 2003/12/01 or later.
-#
-# This work has the LPPL maintenance status "maintained".
-#
-# This Current Maintainer of this work is Heiko Oberdiek.
-#
-# See file "readme.txt" for a list of files that belong to this project.
-#
-# This file "thumbpdf.pl" may be renamed to "thumbpdf"
-# for installation purposes.
-#
-my $file        = "thumbpdf.pl";
-my $program     = uc($&) if $file =~ /^\w+/;
-my $version     = "3.8";
-my $date        = "2005/07/06";
-my $author      = "Heiko Oberdiek";
-my $copyright   = "Copyright (c) 1999-2005 by $author.";
-#
-# Reqirements: Perl5, Ghostscript
-# History:
-#   1999/02/14 v1.0: First release.
-#   1999/02/23 v1.1:
-#    * Looking for the media box to calculate the resolution
-#      for Ghostscript
-#    * new option --resolution
-#   1999/03/01 v1.2:
-#    * optimization: indirect objects for length values removed.
-#    * "first line" from epstopdf
-#   1999/03/12 v1.3:
-#    * Copyright: LPPL
-#   1999/05/05 v1.4:
-#    * Detecting of cygwin32 environment.
-#    * Minor corrections of output of error messages.
-#    * Sharing RGB objects.
-#   1999/06/13 v1.5:
-#    * gs detection extended.
-#   1999/07/27 v1.6
-#   1999/08/08 v1.7:
-#    * \immediate before \pdfobj (pdfTeX 0.14a)
-#   1999/09/09 v1.8
-#   1999/09/06 v1.9:
-#    * Check for direct /Length values (for jpg images)
-#   2000/01/11 v1.10:
-#    * Bug fix: /Length (direct) as last entry.
-#    * Direct /Length in RGB objects supported.
-#   2000/01/19 v1.11:
-#    * "for (my $j=0;...;...)"  replaced by "my $j; for($j=0;...;...)",
-#      because there exist perl versions that have problems with.
-#   2000/02/11 v1.12:
-#    * Option `clean' added.
-#    * The name of thumbnail data file: jobname.tnd,
-#      if thumbpdf is called: thumbpdf jobname[.pdf] [options]
-#   2000/02/22 v2.0:
-#    * pdfmark support for dvips/ps2pdf route added.
-#    * <jobname>.tpt replaces thumbdta.tex (for pdfTeX)
-#      <jobname>.tpm (for pdfmark)
-#      <jobname>.top replaces thumbopt.tex
-#    * Options `useps', `modes' added,
-#      `makedef' renamed to `makedata'.
-#   2000/02/28 v2.1:
-#    * Environment variable `THUMBPDF' supported.
-#   2000/03/07 v2.2:
-#    * Support for Distiller 3 and 4, the streams are uncompressed.
-#    * Call of gs is changed in order to show the currently processed
-#      page number of the pdf file.
-#    * Option --printgscmd creates the command line file `thumbpdf.gs'
-#      for the Ghostscript call.
-#   2000/03/22 v2.3:
-#    * Bug fix: --useps now works.
-#   2000/04/10 v2.4:
-#    * Fix for ActiveState Perl 5.6.0: uc line changed, fork removed.
-#      (Thanks to Andreas Buehmann <andreas.buehmann@gmx.de>.)
-#    * Version test for thumbpdf.tex added for users that
-#      mix versions, sigh.
-#   2000/07/29 v2.5:
-#    * `save' trick in call of ghostscript.
-#    * Undocumented option --gspages added.
-#   2000/09/27 v2.6
-#   2000/10/27 v2.7:
-#    * -dFIXEDMEDIA=0 added in gs call
-#   2001/01/12 v2.8:
-#    * Bug fix in dvips mode and active option `level2':
-#      pack parameter corrected for little-endian machines.
-#    * /Rotate in pdf pages:
-#      ghostscript versions around 6.01 have added a hack
-#      in /pdfshowpage_setpage, that ignores the /Rotate entry.
-#      A patch is added to disable the hack.
-#    * Ghostscript uses the MediaBox for calculating the
-#      page size. For version 6.50 a patch is added to use
-#      the /CropBox instead.
-#   2001/03/29 v2.9:
-#    * Option --password added.
-#   2001/04/02 v2.10
-#   2001/04/26 v2.11
-#    * Option --antialias added (suggestion of Juergen Bausa).
-#   2002/01/11 v3.0
-#    * Syntax of option --antialias changed (see readme.txt).
-#    * Support for VTeX's PS mode added.
-#    * Greek mode added (see readme.txt).
-#    * Signal handlers added for cleanup.
-#   2002/05/26 v3.1
-#    * SIG_HUP unkown in Windows.
-#    * Bug fix: The signal function for __DIE__ "cleanup" aborts
-#      before the error message of "die" is printed.
-#      Replaced by "clean" that does not contain "exit 1".
-#    * Small bug fix in mode detection and mode "vtex"
-#      removed from list. "vtexpdfmark" was detected,
-#      "vtex" did not work and perhaps it will be used
-#      later for VTeX in PDF mode.
-#   2002/05/26 v3.2
-#    * Fix: "MacOS/X: darwin" is now not interpreted as
-#      Windows.
-#   2003/03/19 v3.3
-#    * Fix for gs 8.00 in mode dvips:
-#      THB_DistillerPatch also applied to ghostscript >= 8.00.
-#   2003/06/06 v3.4
-#    * Bug fix, two forgotten "pop"s added for Distiller case.
-#   2004/10/24 v3.5
-#    * Revert Cygwin detection: is unix (request by Jan Nieuwenhuizen).
-#    * LPPL 1.3.
-#   2004/11/19 v3.6
-#    * Bug fix for dvips mode and gs < 8.00 (/stackunderflow in pop).
-#   2004/11/19 v3.7:
-#    * For easier debugging, the special thumbpdf objects of
-#      thumbpdf.pdf are now valid PDF objects (dictionaries).
-#    * Remove of extra '\n' before "endstream" that is added
-#      by pdfTeX 1.20a.
-#   2005/07/06 v3.8:
-#    * Fix because of pdfTeX 1.30.
-#
-
-### program identification
-my $title = "$program $version, $date - $copyright\n";
-
-### error strings
-my $Error = "!!! Error:"; # error prefix
-
-### string constants for Ghostscript run
-# get Ghostscript command name
-my $GS = "gs";
-$GS = "gs386"    if $^O =~ /dos/i;
-$GS = "gsos2"    if $^O =~ /os2/i;
-$GS = "gswin32c" if $^O =~ /mswin32/i;
-
-# Windows detection (no SIGHUP)
-my $Win = 0;
-$Win = 1 if $^O =~ /mswin32/i;
-
-my $gspages = 1;
-$gspages = 0 if $^O =~ /dos/i;
-
-### variables
-my $jobname      = "";
-my $jobfile      = "";
-my $pdftexfile   = "";
-my $pdfmarkfile  = "";
-my $psext        = ".ps";
-my $pdfext       = ".pdf";
-my $pdftexext    = ".tpt";
-my $pdfmarkext   = ".tpm";
-my $thumbprefix  = "thb";
-my $envvar       = "THUMBPDF";
-my $pdffile      = "thumbpdf.pdf";
-my $logfile      = "thumbpdf.log";
-my $texfile      = "thumbpdf";
-my $package      = "thumbpdf.sty";
-my $readme       = "readme.txt";
-my $gscnffile    = "thumbpdf.gs";
-my $gssection    = "section I. `Known Problems'";
-my @cleanlist    = ();
-my $resolution   = 9;
-my $mode_pdftex  = 0;
-my $mode_pdfmark = 0;
-my $antialias_default = "4";
-my @arglist      = @ARGV;
-my $gskidrunning = 0;
-
-### option variables
-my @bool = ("false", "true");
-$::opt_device     = "png16m";
-$::opt_compress   = "10";
-$::opt_resolution = "";
-$::opt_modes      = "pdftex";
-$::opt_gscmd      = "";
-$::opt_level2     = 0;
-$::opt_help       = 0;
-$::opt_quiet      = 0;
-$::opt_debug      = 0;
-$::opt_verbose    = 0;
-$::opt_useps      = 0;
-$::opt_printgscmd = 0;
-$::opt_gspages    = $gspages; # undocumented
-$::opt_makepng    = 1;
-$::opt_makepdf    = 1;
-$::opt_makedata   = 1;
-$::opt_clean      = 1;
-$::opt_password   = "";
-$::opt_antialias  = $antialias_default;
-$::opt_greek      = 0;
-
-my $usage = <<"END_OF_USAGE";
-${title}Syntax:   \L$program\E [options] <jobname[.pdf|.ps]>
-Function: Support of thumbnails for pdfTeX or dvips/ps2pdf (pdfmark).
-          Thumbnails are generated by Ghostscript and the result is
-          written to data files for package `$package':
-          `<jobname>$pdftexext' (pdfTeX), `<jobname>$pdfmarkext' (pdfmark)
-Options:                                                         (defaults:)
-  --help          print usage
-  --(no)quiet     suppress messages                              ($bool[$::opt_quiet])
-  --(no)verbose   verbose printing                               ($bool[$::opt_verbose])
-  --(no)debug     debug informations                             ($bool[$::opt_debug])
-  --(no)makepng   make thumbnails `$thumbprefix*.png'                     ($bool[$::opt_makepng])
-  --(no)makepdf   make `$pdffile' with thumbnails as images  ($bool[$::opt_makepdf])
-  --(no)makedata  make data file(s) for package `$package'   ($bool[$::opt_makedata])
-  --(no)clean     clear temp files                               ($bool[$::opt_clean])
-  --(no)useps     `makepng' uses `.ps' instead of `.pdf' file    ($bool[$::opt_useps])
-  --(no)level2    `<jobname>.tpm' with ps level 2 features       ($bool[$::opt_level2])
-  --(no)greek     text in greek style (experimental)             ($bool[$::opt_greek])
-  --antialias <num1>[num2] anti-aliasing, 0 = disable, 4 = max   ($::opt_antialias)
-  --device|png [png]<dev>  Ghostscript device for thumbnails,
-                           dev = mono, gray, 16, 256, 16m        ($::opt_device)
-  --resolution <res>       thumbnail resolution for makepng      ($resolution)
-  --compress <n>           thumbnail compress level, n = 0..10   ($::opt_compress)
-  --modes <mode>[,mode]    mode=pdftex|pdfmark|dvips|ps2pdf|
-                                vtexpdfmark|all                  ($::opt_modes)
-  --password apassword     for an encrypted pdf file             ($::opt_password)
-END_OF_USAGE
-
-### environment variable THUMBPDF
-if ($ENV{$envvar}) {
-  unshift(@ARGV, split(/\s+/, $ENV{$envvar}));
-}
-
-### process options
-my @OrgArgv = @ARGV;
-use Getopt::Long;
-GetOptions(
-  "help!",
-  "quiet!",
-  "debug!",
-  "verbose!",
-  "device|png=s",
-  "gscmd=s",
-  "level2!",
-  "compress=i",
-  "resolution=f",
-  "modes=s",
-  "useps!",
-  "printgscmd!",
-  "gspages!",
-  "makepng!",
-  "makepdf!",
-  "makedata!",
-  "clean!",
-  "password=s",
-  "antialias=s",
-  "greek!"
-) or die $usage;
-!$::opt_help or die $usage;
-@ARGV < 2 or die "$usage$Error Too many files!\n";
-@ARGV == 1 or die "$usage$Error Missing jobname!\n";
-
-$::opt_device = "png$::opt_device" unless $::opt_device =~ /^png/;
-$::opt_quiet = 0 if $::opt_verbose;
-$::opt_clean = 0 if $::opt_debug or !$::opt_makepdf or !$::opt_makedata;
-
-$::opt_compress = 0 if $::opt_compress < 0;
-$::opt_compress = 10 if $::opt_compress > 10;
-my $J = "^^J";
-$J = "" if $::opt_compress == 10;
-
-$::opt_antialias = $antialias_default if $::opt_antialias eq "";
-$::opt_antialias =~ /^[0124][0124]?$/ or
-  die "$usage$Error Wrong value for option --antialias!\n";
-$::opt_antialias .= $::opt_antialias if length($::opt_antialias) < 2;
-my $AntiAliasText     = substr($::opt_antialias, 0, 1);
-my $AntiAliasGraphics = substr($::opt_antialias, 1, 1);
-$AntiAliasText     = "1" if $AntiAliasText     eq "0";
-$AntiAliasGraphics = "1" if $AntiAliasGraphics eq "0";
-
-$GS = $::opt_gscmd if $::opt_gscmd;
-$gspages = $::opt_gspages;
-
-### get modes
-$::opt_modes = "\L$::opt_modes\E";
-$::opt_modes =~ s/dvips/pdfmark/g;
-$::opt_modes =~ s/ps2pdf/pdfmark/g;
-$::opt_modes =~ s/vtexpdfmark/pdfmark/g;
-$::opt_modes =~ s/vtexpdfmark/pdfmark/g;
-if ($::opt_modes =~ /pdftex/)
-{
-  $mode_pdftex = 1;
-  $::opt_modes =~ s/pdftex//g;
-}
-if ($::opt_modes =~ /pdfmark/)
-{
-  $mode_pdfmark = 1;
-  $::opt_modes =~ s/pdfmark//g;
-}
-if ($::opt_modes =~ /all/)
-{
-  $mode_pdftex = 1;
-  $mode_pdfmark = 1;
-  $::opt_modes =~ s/all//g;
-}
-$::opt_modes =~ s/\s+//g;
-$::opt_modes =~ s/,+/,/g;
-$::opt_modes =~ s/^,//;
-$::opt_modes =~ s/,$//;
-if ($::opt_modes ne "")
-{
-  die "$usage$Error Unknown mode(s): `$::opt_modes'\n";
-}
-if ($::opt_makedata)
-{
-  $mode_pdftex or $mode_pdfmark or
-    die "$usage$Error Missing mode!\n";
-}
-
-### get jobname
-$jobname = $ARGV[0];
-if ($::opt_useps)
-{
-  $jobname =~ s/\.ps$//i;
-  $jobname =~ s/\\/\//g;
-  $jobfile = $jobname . $psext;
-}
-else
-{
-  $jobname =~ s/\.pdf$//i;
-  $jobname =~ s/\\/\//g;
-  $jobfile = $jobname . $pdfext;
-}
-$pdftexfile  = $jobname . $pdftexext;
-$pdfmarkfile = $jobname . $pdfmarkext;
-
-print $title unless $::opt_quiet;
-
-print "* jobname: `$jobname'\n" if $::opt_verbose;
-
-if ($::opt_debug) {
-  print <<"END_DEB";
-* OSNAME: $^O
-* PERL_VERSION: $]
-* ARGV: @OrgArgv
-END_DEB
-}
-
-### set signals
-$SIG{__DIE__} = \&clean;
-setsignals(\&cleanup);
-
-my $MaxThumb = 0;
-
-###
-### make thumbnails
-###
-if ($::opt_makepng)
-{
-  print "*** make png files / run Ghostscript ***\n"
-    unless $::opt_quiet or $::opt_printgscmd;
-  if ($::opt_useps)
-  {
-    print "* ps file: $jobfile\n" if $::opt_verbose;
-  }
-  else
-  {
-    print "* pdf file: $jobfile\n" if $::opt_verbose;
-  }
-  print "* Ghostscript command: `$GS'\n" .
-        "* Ghostscript png device: `$::opt_device'\n" if $::opt_verbose;
-
-  if ($::opt_resolution)
-  {
-    $resolution = $::opt_resolution
-  }
-  else
-  {
-    # looking for MediaBox
-
-    my $max_x = 0;
-    my $max_y = 0;
-    {
-      my $MB = $jobfile;
-      open(MB, $MB) or die "$Error Cannot open `$MB'!\n";
-      binmode(MB);
-      my $xy_patt = '[\-\.\d]';
-      while (<MB>)
-      {
-        if (/\/MediaBox\s*\[\s*($xy_patt+)\s+($xy_patt+)\s+($xy_patt+)\s+($xy_patt+)\s*\]/)
-        {
-          my $x = $3 - $1;
-          my $y = $4 - $2;
-          $max_x = $x if $x > $max_x;
-          $max_y = $y if $y > $max_y;
-        }
-      }
-      close(MB);
-    }
-    if ($max_x <= 0 || $max_y <= 0)
-    {
-      print "!!! Warning: MediaBox not found, " .
-            "using default resolution: $resolution DPI\n";
-    }
-    else
-    {
-      print "* Max. Size of MediaBox: $max_x x $max_y\n" if $::opt_verbose;
-
-      my $rx = 106 * 72 / $max_x;
-      my $ry = 106 * 72 / $max_y;
-      $resolution = $rx;
-      $resolution = $ry if $ry < $rx;
-      print "* Resolution: $resolution DPI\n" if $::opt_verbose;
-    }
-  }
-
-# Ghostscript's pdfshowpage_setpage is patched for solving
-# some problems:
-# * gs6.0* includes a hack that ignores the /Rotate entry
-#   in the PDF page, if OutputFile is set.
-#   gs6.50 does not need a fix and it is not applied,
-#   because pdfshowpage_setpage does not contain /OutputFile.
-# * If /CropBox is set, then it should be used instead
-#   of the /MediaBox entry. Because the CropBox area should
-#   be part of the MediaBox, the MediaBox is overwritten
-#   with the CropBox values for generating the thumbnails.
-# The fixes are only applied for versions >= 6.0, because
-# gs5.50 gets a /PageSize problem with this fix.
-#
-  my $SetPageHack = <<'SET_PAGE_HACK';
-currentglobal true setglobal
-false
-/product where {
-  pop
-  product (Ghostscript) search {
-    pop pop pop
-    revision 600 ge {
-      pop true
-    } if
-  }{pop} ifelse
-} if
-{ /pdfdict where {
-    pop
-    pdfdict begin
-      /pdfshowpage_setpage
-      [ pdfdict /pdfshowpage_setpage get
-        { dup type /nametype eq
-          { dup /OutputFile eq
-            { pop /AntiRotationHack
-            }{
-              dup /MediaBox eq revision 650 ge and
-              { /THB.CropHack {
-                  1 index /CropBox pget
-                  { 2 index exch /MediaBox exch put
-                  } if
-                } def
-                /THB.CropHack cvx
-              } if
-            } ifelse
-          } if
-        } forall
-      ] cvx def
-    end
-  } if
-} if
-setglobal
-SET_PAGE_HACK
-
-  my $Greek = "";
-  $Greek = <<'END_GREEK' if $::opt_greek;
-currentglobal true setglobal
-userdict begin
-  % * Patch for `show'
-  /THB_ORG_show {show} bind def
-  /THB_greekstring
-  /.charboxpath where
-  {
-    pop
-    {
-      currentpoint newpath moveto
-      true .charboxpath closepath fill
-    } bind def
-  }{
-    {
-      {
-        1 string dup 0 4 -1 roll put
-        dup stringwidth pop exch
-        true charpath flattenpath pathbbox
-        2 index sub exch 3 index sub exch rectfill
-        0 rmoveto
-      } forall
-    } bind def
-  } ifelse
-  /show {
-    currentfont /FontType get 1 eq
-    {
-      dup
-      gsave
-        % assuming white background
-        [ currentrgbcolor ]
-        { 1 add 2 div } forall
-        setrgbcolor
-        THB_greekstring
-      grestore
-      stringwidth pop 0 rmoveto
-    }{
-      THB_ORG_show
-    } ifelse
-  } bind def
-
-  % * Patch for the PDF case
-  userdict /GS_PDF_ProcSet known
-  {
-    % GS_PDF_ProcSet is readonly, so it will be copied first
-    GS_PDF_ProcSet length 10 add dict dup
-    GS_PDF_ProcSet {
-      put dup
-    } forall
-    /GS_PDF_ProcSet exch def
-    dup
-    begin
-      % `setshowstate' contains the use of `show', so it has to
-      % be overwritten, because it was defined with `bind'.
-      % The definition is taken from `pdf_ops.ps'.
-      revision 710 lt
-      { % 5.50, 6.51, 7.00, 7.02
-
-/setshowstate
- { WordSpacing 0 eq TextSpacing 0 eq and
-    { TextRenderingMode 0 eq
-       { { setfillstate show } }
-       { { false charpath textrenderingprocs TextRenderingMode get exec } }
-      ifelse
-    }
-    { TextRenderingMode 0 eq
-       { WordSpacing 0 eq
-          { { setfillstate TextSpacing exch 0 exch ashow } }
-          { TextSpacing 0 eq
-             { { setfillstate WordSpacing exch 0 exch 32 exch widthshow } }
-             { { setfillstate WordSpacing exch TextSpacing exch 0 32 4 2 roll 0 exch awidthshow } }
-            ifelse
-          }
-         ifelse
-       }
-       { { WordSpacing TextSpacing
-                        % Implement the combination of t3 and false charpath.
-                        % Note that we must use cshow for this, because we
-                        % can't parse multi-byte strings any other way.
-                        % Stack: string xword xchar
-            { pop pop (x) dup 0 3 index put false charpath
-                        % Stack: xword xchar ccode
-              3 copy 32 eq { add } { exch pop } ifelse 0 rmoveto pop
-            }
-           4 -1 roll cshow pop pop
-           textrenderingprocs TextRenderingMode get exec
-         }
-       }
-      ifelse
-    }
-   ifelse /Show gput
- } bdef
-
-      }{ % 7.10
-
-/setshowstate
- { WordSpacing 0 eq TextSpacing 0 eq and
-    { TextRenderingMode 0 eq
-       { { setfillstate show } }
-       { { false charpath textrenderingprocs TextRenderingMode get exec } }
-      ifelse
-    }
-    { TextRenderingMode 0 eq
-       { WordSpacing 0 eq
-          { { setfillstate TextSpacing 0 Vexch 3 -1 roll ashow } }
-          { TextSpacing 0 eq
-            { { setfillstate WordSpacing 0 Vexch 32 4 -1 roll widthshow } }
-            { { setfillstate WordSpacing 0 Vexch 32
-                 TextSpacing 0 Vexch 6 -1 roll awidthshow } }
-            ifelse
-          }
-         ifelse
-       }
-       { { WordSpacing TextSpacing
-                        % Implement the combination of t3 and false charpath.
-                        % Note that we must use cshow for this, because we
-                        % can't parse multi-byte strings any other way.
-                        % Stack: string xword xchar
-            { pop pop (x) dup 0 3 index put false charpath
-                        % Stack: xword xchar ccode
-             3 copy 32 eq { add } { exch pop } ifelse 0 Vexch rmoveto pop
-            }
-           4 -1 roll cshow pop pop
-           textrenderingprocs TextRenderingMode get exec
-         }
-       }
-      ifelse
-    }
-   ifelse /Show gput
- } bdef
-
-      } ifelse
-    end
-    readonly pop
-  } if
-end
-setglobal
-END_GREEK
-
-  my $SetPassword = "";
-  $SetPassword = "/PDFPassword($::opt_password)def" if $::opt_password;
-
-  my $PSHeader = "save pop $SetPassword $SetPageHack $Greek";
-  $PSHeader =~ s/%\s.*\n/ /g;
-  $PSHeader =~ s/\s+/ /g;
-  $PSHeader =~ s/\s+([\(\/\[\]\{\}])/$1/g;
-  $PSHeader =~ s/([\)\[\]\{\}])\s+/$1/g;
-  $PSHeader =~ s/\s+$//;
-
-  my $AntiAlias = "";
-  $AntiAlias = "\n-dTextAlphaBits=$AntiAliasText\n" .
-               "-dGraphicsAlphaBits=$AntiAliasGraphics"
-    if $::opt_antialias;
-
-  my $gs_cmd = <<"GS_CMD_END";
-$GS$AntiAlias
--dNOPAUSE
--dBATCH
--sDEVICE=$::opt_device
--r$resolution
--sOutputFile=$thumbprefix%d.png
--c "$PSHeader"
--f $jobfile
-GS_CMD_END
-  # The trick with `save' comes from `ps2pdf':
-  # Doing an initial `save' helps keep fonts from being flushed
-  # between pages.
-
-  if ($::opt_printgscmd)
-  {
-    open(GSCNF, ">$gscnffile") or die "$Error Cannot open `$gscnffile'!\n";
-    $gs_cmd =~ s/^[^\r\n]+[\r\n]+//;
-    print GSCNF $gs_cmd;
-    close(GSCNF);
-    my $options = "@arglist";
-    $options =~ s/\s*--?pr[intgscmd]*\s*/ /i;
-    $options =~ s/^\s+//;
-    $options =~ s/\s+$//;
-    print <<"END_PERL" if $::opt_verbose;
-* Perl interpreter: $^X
-* Perl script: $0
-END_PERL
-    print <<"END_GS";
-1. Run `Ghostscript' manually:
-   ==> $GS \@$gscnffile
-2. Call `thumbpdf' again with the additional option `--nomakepng':
-   ==> thumbpdf --nomakepng $options
-END_GS
-    exit(0);
-  }
-
-  chomp($gs_cmd);
-  $gs_cmd =~ s/\n/ /mg;
-  print "> $gs_cmd\n" if $::opt_verbose;
-
-  if ($::opt_debug)
-  {
-    if ($gspages)
-    {
-      print "* Ghostscript with page numbers\n";
-    }
-    else
-    {
-      print "* Ghostscript without page numbers\n";
-    }
-  }
-
-  setsignals(\&gscleanup);
-  my $capture = "";
-  if ($gspages)
-  {
-    my $newline = 0;
-    open(KID, "$gs_cmd|") or die "$Error Cannot open Ghostscript ($!)!\n";
-    *::GSKID = *KID;
-    $gskidrunning = 1;
-    my $orgbar = $|;
-    $|=1;
-    while (<KID>)
-    {
-      $capture .= $_;
-      if ($::opt_verbose)
-      {
-        print;
-      }
-      else
-      {
-        if (!$::opt_quiet)
-        {
-          print if /^Processing pages/;
-          if (/^Page\s+(\d+)/)
-          {
-            print " " if $newline;
-            $newline = 1;
-            print "[$1]";
-          }
-        }
-      }
-    }
-    $gskidrunning =0;
-    if (!close(KID))
-    {
-      if ($!)
-      {
-        die "$Error Closing Ghostscript ($!)!\n";
-      }
-      else
-      {
-        my $exitvalue = $? >> 8;
-        die "$Error Closing Ghostscript (exit status: $exitvalue)!\n";
-      }
-    }
-    print "\n" if $newline;
-    $| = $orgbar;
-  }
-  else # without pages
-  {
-    $capture = `$gs_cmd`;
-    if (!defined($capture))
-    {
-      die "$Error Cannot execute Ghostscript!\n";
-    }
-    print $capture if $::opt_verbose;
-  }
-
-  if ($capture =~ /Error:\s*(.*)\n/)
-  {
-    die <<"END_DIE";
-$Error `$1' (Ghostscript)!
-See `$readme', $gssection, for further information.
-END_DIE
-  }
-  if ($capture =~ /Unknown device:\s*(.*)\n/)
-  {
-    die "$Error Unknown device `$1' (Ghostscript)!\n";
-  }
-  if ($?)
-  {
-    my $exitvalue = $?;
-    if ($exitvalue > 255)
-    {
-      $exitvalue >>= 8;
-      die "$Error Closing Ghostscript (exit status: $exitvalue)!\n";
-    }
-    die "$Error Closing Ghostscript ($exitvalue)!\n";
-  }
-  if ($capture =~ /Processing pages \d+ through (\d+)./)
-  {
-    $MaxThumb = $1;
-  }
-  print "* max. page: $MaxThumb\n" if $::opt_debug;
-  setsignals(\&cleanup);
-}
-
-###
-### make thumbpdf.pdf file
-###
-if ($::opt_makepdf)
-{
-  print "*** make `$pdffile' / run pdfTeX ***\n" unless $::opt_quiet;
-
-  if ($MaxThumb > 0)
-  {
-    my $i;
-    for ($i=1; $i<=$MaxThumb; $i++)
-    {
-      push(@cleanlist, "$thumbprefix$i.png");
-    }
-  }
-  else
-  {
-    # get max thumb number to speed up the pdfTeX run
-    $MaxThumb = 0;
-    foreach (glob("$thumbprefix*.png"))
-    {
-      next unless /$thumbprefix(\d+).png/;
-      $MaxThumb = $1 if $1 > $MaxThumb;
-      push(@cleanlist, $_);
-    }
-  }
-
-  push(@cleanlist, $logfile);
-  push(@cleanlist, $pdffile);
-
-  my $compress = $::opt_compress;
-  $compress = 9 if $::opt_compress == 10;
-  my $cmd = "pdftex \"" .
-            "\\nonstopmode" .
-            "\\pdfcompresslevel$compress" .
-            "\\def\\thumbjob{$jobname}" .
-            "\\def\\thumbmax{$MaxThumb}" .
-            "\\input $texfile" .
-            "\"";
-  print "> $cmd\n" if $::opt_verbose;
-  my @capture = `$cmd`;
-  if (!defined(@capture))
-  {
-    die "$Error Cannot execute pdfTeX!\n";
-  }
-  if ($::opt_verbose)
-  {
-    print @capture;
-  }
-  else
-  {
-    foreach (@capture)
-    {
-      print if /^!\s/;
-    }
-  }
-  if ($?)
-  {
-    my $exitvalue = $?;
-    if ($exitvalue > 255)
-    {
-      $exitvalue >>= 8;
-      die "$Error Closing pdfTeX (exit status: $exitvalue)!\n";
-    }
-    die "$Error Closing pdfTeX ($exitvalue)!\n";
-  }
-  # test version
-  my $versionfound = 0;
-  foreach (@capture)
-  {
-    if (/File:.*thumbpdf.*(\d\d\d\d\/\d\d\/\d\d)\s+v(\d+\.\d+)/)
-    {
-      $versionfound = 1;
-      if ($1 ne $date or $2 ne $version) {
-        print <<"END_WARN";
-!!! Warning: Version of `thumbpdf.tex' does not match with perl script!
-    Current `thumbpdf.tex': $1 v$2
-    Please install version: $date v$version
-END_WARN
-      }
-    }
-  }
-  print "!!! Warning: Version of `thumbpdf.tex' not found!\n"
-    if !$versionfound;
-
-  $_ = pop(@cleanlist);
-}
-
-###
-### parse thumbpdf.pdf
-###
-
-if ($::opt_makedata)
-{
-  push(@cleanlist, $pdffile);
-
-  print "*** parse `$pdffile' ***\n" unless $::opt_quiet;
-
-### reading file and parse obj structure
-
-  my @objno = (); # obj number
-  my @objdict = (); # boolean, object is dict
-  my @objtext = (); # text of object
-  my @objstream = (); # stream of object if any
-  my $maxobj = 0;
-
-  my @getobjindex = (); # $getobj[obj number] ==> index for $obj...[index]
-
-  # open file
-  my $PDF = $pdffile;
-  open(PDF, $PDF) or die "$Error Cannot open `$PDF'!\n";
-  binmode(PDF);
-  my $lineno = 0;
-
-  # read header
-  $_ = <PDF>; $lineno++;
-  $_ or die "$Error Cannot read header of `$PDF' or file is empty!\n";
-  /^%PDF/ or die "$Error No PDF specification found!\n";
-  print "* pdf header: $_" if ($::opt_debug);
-
-  # read body objects
-  my $count = 0;
-  while (<PDF>)
-  {
-    $lineno++;
-    
-    # continue, if comment line (2nd line of PDF output by pdfTeX 1.30)
-    next if /^%/;
-
-    # stop at xref
-    last if /^xref$/;
-
-    # scan first obj line
-    /^(\d+)\s+0\s+obj\s*(<<)?$/ or
-      die "$Error `obj' expected on line $lineno!\n";
-    $objno[$count] = $1;
-    $getobjindex[$1] = $count;
-    $objdict[$count] = ($2); # boolean (if $2 exists)
-    my $stream = 0;
-    print "* obj $objno[$count]" .
-      (($objdict[$count]) ? " (dict)" : "") .
-      "\n" if $::opt_debug;
-
-    # get obj
-    $objtext[$count] = "";
-    while (<PDF>)
-    {
-      $lineno++;
-
-      if ($objdict[$count])
-      {
-        if (/^>>/)
-        {
-          last if /^>>\s+endobj$/; # obj without stream
-
-          # get stream
-          $_ = <PDF>; $lineno++;
-          /^stream$/ or die "$Error `stream' expected on line $lineno!\n";
-
-          print "* stream\n" if $::opt_debug;
-          $objstream[$count] = "";
-          while (<PDF>)
-          {
-            $lineno++;
-
-            if (/(.*)endstream$/)
-            {
-              $objstream[$count] .= $1;
-              last;
-            }
-            $objstream[$count] .= $_;
-          }
-
-          $_ = <PDF>; $lineno++;
-          /^endobj$/ or die "$Error `endobj' expected on line $lineno!\n";
-          last;
-        }
-      }
-      else # no dict
-      {
-        last if /^endobj$/;
-      }
-      $objtext[$count] .= $_;
-    }
-    $count++;
-  }
-  close(PDF);
-  $maxobj = $count;
-  print "* $maxobj objects found.\n" if $::opt_debug;
-
-### get thumbnail page numbers
-  my @thumbpageno = ();
-  my $found = 0;
-  foreach (@objtext)
-  {
-    if (/^<<\/ListThumbs\s+(.+)>>$/)
-    {
-      $_ = $1;
-      chomp;
-      @thumbpageno = split / /; # split(/ /, $_);
-      print "* ListThumbs: @thumbpageno\n" if $::opt_debug;
-      $found = 1;
-      last;
-    }
-  }
-  $found or die "$Error `/ListThumbs' not found!\n";
-  {
-    my $j;
-    for ($j=0; $j<@thumbpageno; $j++)
-    {
-      $thumbpageno[$j] = $1 if $thumbpageno[$j] =~ /^{(.+)}$/;
-    }
-  }
-
-### identify thumb objects
-
-  my @thumbobj = ();    # index for @obj... with image stream
-  my @thumblength = (); # stream length values
-  my @thumbrgbobj = (); # index for @obj... with rgb stream
-  my @thumbrgblength = (); # rgb stream length values
-  my $maxthumb = 0;
-
-  $count = 0;
-  my $i;
-  for ($i=0; $i<$maxobj; $i++)
-  {
-    if ($objtext[$i] =~
-        /^\/Type\s+\/XObject\n\/Subtype\s+\/Image\n/m)
-    {
-      $thumbobj[$count] = $i;
-      $_ = $';
-      $objtext[$i] = $_;
-
-      # check width and height
-      /\/Width\s+(\d+)\n\/Height\s+(\d+)/m or
-        die "$Error width/height of thumbnail not found!\n";
-      print "* Size: $1x$2\n" if $::opt_debug;
-      print "==> Width ($1) " .
-            "of thumbnail `$thumbpageno[$count]' " .
-            "is larger than recommended (106).\n"
-        if $1 > 106;
-      print "==> Height ($2) " .
-            "of thumbnail `$thumbpageno[$count]' " .
-            "is larger than recommended (106).\n"
-        if $2 > 106;
-
-      # get stream length
-      if (/\/Length\s+(\d+)\s+([\/\>]|$)/m)
-      {
-        $thumblength[$count] = $1;
-        print "* Length (direct): $1\n" if $::opt_debug;
-        # remove whitespace after length obj
-        $objtext[$i] =~ s/(\/Length\s+\d+)\s+\n/$1\n/;
-      }
-      else # looking for indirect reference
-      {
-        /\/Length\s+(\d+)\s+0\s+R/m or
-          die "$Error `/Length' entry not found!\n";
-        # save obj text for later correction
-        my $objpre = $`;
-        my $objpost = $';
-        # look for length obj
-        $getobjindex[$1] or die "$Error Length obj not found!\n";
-        $objtext[$getobjindex[$1]] =~ /^(\d+)$/m or
-          die "$Error length value not found!\n";
-        $thumblength[$count] = $1;
-        print "* Length (indirect): $1\n" if $::opt_debug;
-        # insert obj length directly:
-        $objtext[$i] = $objpre . "/Length $1" . $objpost;
-      }
-
-      # remove \n from end of stream
-      if ($thumblength[$count] < length($objstream[$i])) {
-        chop($objstream[$i]);
-      }
-
-      # check /Indexed /DeviceRGB
-      if ($objtext[$i] =~
-        /\/ColorSpace\s+\[\/Indexed\s+\/DeviceRGB\s+(\d+)\s+(\d+)\s+0\s+R\]/m)
-      {
-        # correct thumb object text
-        $objtext[$i] =
-          "$`/ColorSpace [/Indexed /DeviceRGB $1 \\the\\pdflastobj\\ 0 R]$'";
-        # get RGB obj number
-        $getobjindex[$2] or die "$Error RGB object not found!\n";
-        $_ = $getobjindex[$2];
-        $thumbrgbobj[$count] = $_;
-        # get stream length
-        if ($objtext[$_] =~ /\/Length\s+(\d+)\s+([\/\>]|$)/m)
-        {
-          $thumbrgblength[$count] = $1;
-          print "* RGB length (direct): $1\n" if $::opt_debug;
-          $objtext[$_] =~ s/(\/Length\s+\d+)\s+\n/$1\n/;
-        }
-        else # looking for indirect reference
-        {
-          $objtext[$_] =~ /\/Length\s+(\d+)\s+0\s+R/m or
-            die "$Error Length entry of rgb object not found\n";
-          # save obj text for later correction
-          my $objrgbpre = $`;
-          my $objrgbpost = $';
-          # get rgb stream length
-          $getobjindex[$1] or die "$Error RGB length object not found!\n";
-          $objtext[$getobjindex[$1]] =~ /^(\d+)$/m or
-            die "$Error length value not found!\n";
-          $thumbrgblength[$count] = $1;
-          print "* RGB length (indirect): $1\n" if $::opt_debug;
-          # insert RGB object length directly:
-          $objtext[$_] = $objrgbpre . "/Length $1" . $objrgbpost;
-        }
-      }
-
-      $count++;
-    }
-  }
-  $maxthumb = $count;
-
-  if ($maxthumb != @thumbpageno)
-  {
-    my $pagecount = @thumbpageno;
-    die "$Error $maxthumb thumbnails found, but there should be $pagecount!\n";
-  }
-  print "* $maxthumb thumbnails found.\n" if $::opt_verbose;
-
-
-###
-### write data files
-###
-
-  my $timestamp;
-  {
-    my ($sec, $min, $hour, $mday, $mon, $year) = localtime();
-    $mon++;
-    $year += 1900;
-    $timestamp = sprintf("%04d/%02d/%02d %02d:%02d:%02d",
-      $year, $mon, $mday, $hour, $min, $sec);
-  }
-  if ($mode_pdftex)
-  {
-    print "*** write `$pdftexfile' (pdfTeX thumbnail data) ***\n"
-      unless $::opt_quiet;
-    my $DTA_PT = $pdftexfile;
-    open(DTA_PT, ">$DTA_PT") or die "$Error Cannot open `$DTA_PT'!\n";
-    binmode(DTA_PT);
-    print DTA_PT <<"END_DTA";
-% File: $DTA_PT
-% Producer: $program $version
-% Mode: pdftex
-% Date: $timestamp
-END_DTA
-  }
-  my $maxpagethumb;
-  my $dictbegin;
-  if ($mode_pdfmark)
-  {
-    print "*** write `$pdfmarkfile' (pdfmark thumbnail data) ***\n"
-      unless $::opt_quiet;
-    my $DTA_PM = $pdfmarkfile;
-    open(DTA_PM, ">$DTA_PM") or die "$Error Cannot open `$DTA_PM'!\n";
-    binmode(DTA_PM);
-
-    # write tex part
-    print DTA_PM <<"END_DTA";
-% \\iffalse
-% File: $DTA_PM
-% Producer: $program $version
-% Mode: pdfmark
-% Date: $timestamp
-% \\fi
-END_DTA
-
-    # looking for max. number of regular thumbnails
-    $maxpagethumb = $maxthumb;
-    for ($i=0; $i<$maxobj; $i++)
-    {
-      if ($objtext[$i] =~ /<<\/MaxThumbNumber\s+(\d+)>>/)
-      {
-        $maxpagethumb = $1;
-        last;
-      }
-    }
-
-    # write TeX part
-    for ($i=$maxpagethumb; $i<$maxthumb; $i++)
-    {
-      print DTA_PM "% \\DefThisThumb{$thumbpageno[$i]}\n";
-    }
-
-    # write PostScript header
-    my $dictstart = <<'END_DICT';
-  4 dict begin
-  /enddict {
-    counttomark 2 idiv dup dict begin {def} repeat pop
-    currentdict end
-  } bind def
-END_DICT
-    chomp($dictstart);
-    $dictbegin = "[";
-    my $dictend = "enddict";
-    my $filter = "";
-    my $read = "readhexstring";
-    if ($::opt_level2)
-    {
-      $dictstart = "  3 dict begin";
-      $dictbegin = "<<";
-      $dictend = ">>";
-      $filter = " /ASCII85Decode filter";
-      $read = "readstring";
-    }
-
-    print DTA_PM <<"END_DTA";
-% \\endinput
-% TeX part ends here
-
-% PostScript definitions
-END_DTA
-
-    my $PS_Header = <<"END_HEAD";
-%
-% Default definition of pdfmark
-/pdfmark where {pop} {userdict /pdfmark /cleartomark load put} ifelse
-%
-% Check the version of Ghostscript. If it is below 6.0,
-% the commands, that produce the thumbnails, are defined
-% to be dummies.
-%
-true
-/product where {
-  pop
-  product (Ghostscript) search {
-    pop pop pop
-    revision 600 lt {
-      (!!! Warning (thumbpdf): Ghostscript 6.0 required for thumbnails!\\n)
-      print pop false
-    } if
-  }{pop} ifelse
-} if
-{
-% Syntax: <thumb object> thisTHB -
-% thisTHB is used globally, so it is defined in the current
-% dictionary (perhaps userdict should explicitly be set).
-  /thisTHB {[ exch /Thumb exch /PAGE pdfmark} bind def
-$dictstart
-% Syntax: <page object> <thumb object> pagethumb -
-  /pagethumb {
-    [ 3 1 roll $dictbegin exch /Thumb exch $dictend /PUT pdfmark
-  } bind def
-% Syntax: <thumb object> <stream length>
-%         <mark> <key value pairs> streamobj -
-%
-% Distiller ignores the compression of previously compressed
-% streams and uses its own settings. Therefore for Distiller
-% the streams are uncompressed.
-% Now ghostscript versions greater than 8 behave in the same way
-% as Distiller. Therefore detection for this versions is added.
-% The detection and patch for distiller require features of level 2
-% and the filter /FlateDecode (level 3), that is used by pdfTeX's
-% compression.
-  /THB_DistillerPatch false def
-  /languagelevel where {
-    pop
-    languagelevel 2 ge {
-      product (Distiller) search {pop pop pop true}{pop false} ifelse
-      product (Ghostscript) search {
-        pop pop pop
-        revision 800 ge
-      }{pop false} ifelse
-      or
-      {
-        (FlateDecode) {
-          pop
-% Syntax: <dict> THB_DistillerPatch <dict> false
-%         <dict> THB_DistillerPatch <dict> <filter>
-          /THB_DistillerPatch {
-            dup /Filter known {
-              dup dup /Filter get exch /Filter undef
-            }{false} ifelse
-          } bind def
-        } (FlateDecode) /Filter resourceforall
-      } if
-    } if
-  } if
-  /streamobj {
-    $dictend exch
-% Stack: <thumb> <dict> <length>
-    3 -1 roll dup
-% Stack: <dict> <length> <thumb> <thumb>
-    [ /_objdef 3 -1 roll /type /stream /OBJ pdfmark
-% Stack: <dict> <length> <thumb>
-    dup dup 5 -1 roll
-% Stack: <length> <thumb> <thumb> <thumb> <dict>
-    THB_DistillerPatch
-% Stack: <length> <thumb> <thumb> <thumb> <dict> <filter/false>
-    [ 4 -2 roll /PUT pdfmark
-% Stack: <length> <thumb> <thumb> <filter/false>
-    [ 3 1 roll currentfile${filter}
-% Stack: <length> <thumb> [ <thumb> <filter/false> <file>
-      6 -1 roll string $read pop
-% Stack: <thumb> [ <thumb> <filter/false> <string>
-      exch dup type /booleantype ne {true} if {filter} if
-% Stack: <thumb> [ <thumb> <file>
-      /PUT pdfmark
-% Stack: <thumb>
-    [ exch /CLOSE pdfmark
-  } bind def
-}{
-% Syntax: <thumb object> thisTHB -
-  /thisTHB {pop} bind def
-  2 dict begin
-% Syntax: <page object> <thumb object> pagethumb -
-  /pagethumb {pop pop} bind def
-% Syntax: <thumb object> <stream length>
-%         <mark> <key value pairs> streamobj -
-  /streamobj {
-    cleartomark exch pop
-    string currentfile${filter}
-    exch $read pop pop
-  } bind def
-} ifelse
-END_HEAD
-    $PS_Header =~ s/%[^\r\n]*[\r\n]+//gm;
-    print DTA_PM $PS_Header;
-    print DTA_PM <<"END_DTA";
-
-% adding thumbnails to pages
-END_DTA
-
-    for ($i=0; $i<$maxpagethumb; $i++)
-    {
-      print DTA_PM <<"END_DTA";
-{Page$thumbpageno[$i]} {THB$thumbpageno[$i]} pagethumb
-END_DTA
-    }
-    print DTA_PM "\n% thumbnail data\n";
-  }
-
-  for ($i=0; $i<$maxthumb; $i++)
-  {
-    # rgb object
-    if ($thumbrgbobj[$i])
-    {
-      # find the same rgb object
-      my $j;
-      for ($j=0; $j<$i; $j++)
-      {
-        next unless $thumbrgbobj[$j];
-        next unless $objtext[$thumbrgbobj[$j]] eq
-                    $objtext[$thumbrgbobj[$i]];
-        next unless $objstream[$thumbrgbobj[$j]] eq
-                    $objstream[$thumbrgbobj[$i]];
-        last;
-      }
-      if ($j==$i) # not found
-      {
-        if ($mode_pdftex)
-        {
-          {
-            my $rgbstream = pdftexstream($objstream[$thumbrgbobj[$i]]);
-            my $dict = $objtext[$thumbrgbobj[$i]];
-            if ($::opt_compress == 10)
-            {
-              chomp($dict);
-              $dict =~ s/\n([^\/])/^^J\n$1/mg;
-              $dict =~ s/[ ]+\//\//mg;
-            }
-            else
-            {
-              $dict =~ s/\n/^^J\n/mg;
-            }
-            print DTA_PT <<"END_DTA";
-\\immediate\\pdfobj{<<$J
-$dict>>$J
-stream^^J
-$rgbstream
-endstream}
-\\DefRGB{$i}
-END_DTA
-          }
-        }
-        if ($mode_pdfmark)
-        {
-          {
-            my $rgbstream = pdfmarkstream($objstream[$thumbrgbobj[$i]]);
-            my $rgblength = $thumbrgblength[$i];
-            my $dict = $objtext[$thumbrgbobj[$i]];
-            $dict =~ s/\/Length\s+\d+\s*//;
-            $dict =~ s/^\s+//;
-            $dict =~ s/\s+$//;
-            print DTA_PM <<"END_DTA";
-{RGB_$i} $rgblength $dictbegin
-$dict
-streamobj
-$rgbstream
-END_DTA
-          }
-        }
-      }
-      else # $j with same rgb obj
-      {
-        $objtext[$thumbobj[$i]] =~
-          s/\\the\\pdflastobj/\\UseRGB{$j}/;
-        print "* Reuses RGB object $j for $i\n" if $::opt_debug;
-      }
-    }
-
-    # thumb object
-    if ($mode_pdftex)
-    {
-      {
-        my $dict = $objtext[$thumbobj[$i]];
-        if ($::opt_compress == 10)
-        {
-          chomp($dict);
-          $dict =~ s/\n([^\/])/^^J\n$1/mg;
-          $dict =~ s/[ ]+\//\//mg;
-          $dict =~ s/[ ]+\[/\[/mg;
-        }
-        else
-        {
-          $dict =~ s/\n/^^J\n/mg;
-        }
-        my $stream = pdftexstream($objstream[$thumbobj[$i]]);
-        print DTA_PT <<"END_DTA";
-\\immediate\\pdfobj{<<$J
-$dict>>$J
-stream^^J
-$stream
-endstream}
-\\DefThumb{$thumbpageno[$i]}
-END_DTA
-      }
-    }
-    if ($mode_pdfmark)
-    {
-      {
-        my $stream = pdfmarkstream($objstream[$thumbobj[$i]]);
-        my $length = $thumblength[$i];
-        my $dict = $objtext[$thumbobj[$i]];
-        $dict =~ s/\\the\\pdflastobj\\\s*\d+\s*R/{RGB_$i}/;
-        $dict =~ s/\\UseRGB{(\d+)}\\\s*\d+\s*R/{RGB_$1}/;
-        $dict =~ s/\/Length\s+\d+\s*//;
-        $dict =~ s/^\s+//;
-        $dict =~ s/\s+$//;
-        my $thismarker = "";
-        $thismarker = "_", if $i >= $maxpagethumb;
-        print DTA_PM <<"END_DTA";
-{THB$thismarker$thumbpageno[$i]} $length $dictbegin
-$dict
-streamobj
-$stream
-END_DTA
-      }
-    }
-  }
-
-  if ($mode_pdftex)
-  {
-    print DTA_PT "\\endinput\n";
-    close(DTA_PT);
-  }
-  if ($mode_pdfmark)
-  {
-    print DTA_PM <<"END_DTA";
-end
-% end of thumbnail data file
-END_DTA
-    close(DTA_PM);
-  }
-}
-
-sub pdftexstream
-{
-  my $str = "";
-  my $mod = 0;
-  foreach (split(//, $_[0]))
-  {
-    my $num = ord($_);
-    if    ($num == 13)  { $str .= '\\/'; }
-    elsif ($num < 32)   { $str .= '^^' . chr($num + 64); }
-    elsif ($num == 32)  { $str .= '\\~'; } # space
-    elsif ($num == 37)  { $str .= '\\%'; } # percent
-    elsif ($num == 92)  { $str .= '\\\\'; } # backslash
-    elsif ($num == 94)  { $str .= '\\+'; } # caret
-    elsif ($num == 123) { $str .= '\\{'; } # curly brace left
-    elsif ($num == 125) { $str .= '\\}'; } # curly brace right
-    else  { $str .= $_; }
-    $mod++;
-    if ($mod == 26)
-    {
-      $mod = 0;
-      $str .= "\n";
-    }
-  }
-  chomp $str;
-  return $str;
-}
-
-sub pdfmarkstream
-{
-  my $str;
-  if ($::opt_level2)
-  {
-    my $s = $_[0];
-    my $len = length($s);
-    $str = "";
-    my $i;
-    for ($i=0; $i<$len-4; $i+=4)
-    {
-      $_ = ASCII85Encode(substr($s, $i, 4));
-      s/!!!!!/z/;
-      $str .= $_;
-    }
-    my $r = $len % 4;
-    if ($r)
-    {
-      $_ = substr($s, $i, $r) . "\000\000\000";
-      $_ = ASCII85Encode(substr($_, 0, 4));
-      $str .= substr($_, 0, $r+1);
-    }
-    $str =~ s/(.{60})/$1\n/g;
-    chomp($str);
-    $str .= "~>";
-  }
-  else
-  {
-    $str = uc(unpack('H*', $_[0]));
-    $str =~ s/(.{60})/$1\n/g;
-    chomp($str);
-  }
-  return $str;
-}
-
-sub ASCII85Encode
-{
-  my $val = unpack("N", $_[0]);
-  my @c;
-  $c[4] = $val % 85 + 33;
-  $val = int($val/85);
-  $c[3] = $val % 85 + 33;
-  $val = int($val/85);
-  $c[2] = $val % 85 + 33;
-  $val = int($val/85);
-  $c[1] = $val % 85 + 33;
-  $c[0] = int($val/85) + 33;
-  return pack("C*", @c);
-}
-
-sub setsignals {
-  my $func = $_[0];
-  $SIG{'HUP'}   = $func unless $Win;
-  $SIG{'INT'}   = $func;
-  $SIG{'QUIT'}  = $func;
-  $SIG{'TERM'}  = $func;
-}
-
-sub clean {
-  if ($::opt_clean) {
-    print "*** clear temp files ***\n" unless $::opt_quiet;
-    foreach (@cleanlist) {
-      unlink;
-    }
-  }
-}
-
-sub cleanup {
-  print "\n" unless $::opt_quiet;
-  clean();
-  exit 1;
-}
-
-sub gscleanup {
-  print "\n" unless $::opt_quiet;
-  clean();
-  close(::GSKID) if $gskidrunning;
-  foreach (glob("$thumbprefix*.png")) {
-    unlink;
-  }
-  exit 1;
-}
-
-clean();
-
-print "*** ready. ***\n" unless $::opt_quiet;
-
-__END__
+../../texmf-dist/scripts/thumbpdf/thumbpdf.pl
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/tie b/Master/bin/alpha-linux/tie
index 18f62ad6f5d..fc70c65bee7 100755
--- a/Master/bin/alpha-linux/tie
+++ b/Master/bin/alpha-linux/tie
diff --git a/Master/bin/alpha-linux/ttf2afm b/Master/bin/alpha-linux/ttf2afm
index 759b761f606..3d5655c0579 100755
--- a/Master/bin/alpha-linux/ttf2afm
+++ b/Master/bin/alpha-linux/ttf2afm
diff --git a/Master/bin/alpha-linux/ttf2pk b/Master/bin/alpha-linux/ttf2pk
index c303663c46d..8aaa72846b1 100755
--- a/Master/bin/alpha-linux/ttf2pk
+++ b/Master/bin/alpha-linux/ttf2pk
diff --git a/Master/bin/alpha-linux/ttf2tfm b/Master/bin/alpha-linux/ttf2tfm
index 12602a26b5d..4c019f63836 100755
--- a/Master/bin/alpha-linux/ttf2tfm
+++ b/Master/bin/alpha-linux/ttf2tfm
diff --git a/Master/bin/alpha-linux/ttftotype42 b/Master/bin/alpha-linux/ttftotype42
index 49ed3a25d17..b8804e37585 100755
--- a/Master/bin/alpha-linux/ttftotype42
+++ b/Master/bin/alpha-linux/ttftotype42
diff --git a/Master/bin/alpha-linux/vftovp b/Master/bin/alpha-linux/vftovp
index f44fde6e982..b1fcc49d155 100755
--- a/Master/bin/alpha-linux/vftovp
+++ b/Master/bin/alpha-linux/vftovp
diff --git a/Master/bin/alpha-linux/vpe b/Master/bin/alpha-linux/vpe
index 9eb52b69e3c..ed1727b6ff8 100755..120000
--- a/Master/bin/alpha-linux/vpe
+++ b/Master/bin/alpha-linux/vpe
@@ -1,421 +1 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q'
-  if 0;
-use strict;
-#
-# vpe.pl
-#
-# Copyright (C) 2000 Heiko Oberdiek.
-#
-# This program may be distributed and/or modified under the
-# conditions of the LaTeX Project Public License, either version 1.2
-# of this license or (at your option) any later version.
-# The latest version of this license is in
-#   http://www.latex-project.org/lppl.txt
-# and version 1.2 or later is part of all distributions of LaTeX
-# version 1999/12/01 or later.
-#
-# See file "vpe.txt" for a list of files that belong to this project.
-#
-# This file "vpe.pl" may be renamed to "vpe"
-# for installation purposes.
-#
-my $file        = "vpe.pl";
-my $program     = uc($&) if $file =~ /^\w+/;
-my $version     = "0.1";
-my $date        = "2000/09/15";
-my $author      = "Heiko Oberdiek";
-my $copyright   = "Copyright (c) 2000 by $author.";
-#
-# History:
-#   2000/09/15 v0.1: First release.
-#
-
-### program identification
-my $title = "$program $version, $date - $copyright\n";
-
-### editor call
-# %F: file name
-# %L: line number
-my $EditorCall = "xterm -e joe +%d %s";
-$EditorCall = $ENV{TEXEDIT} if $ENV{TEXEDIT};
-$EditorCall = $ENV{VPE} if $ENV{VPE};
-
-### error strings
-my $Error = "!!! Error:"; # error prefix
-
-my $usage = <<"END_OF_USAGE";
-${title}
-Depending on the name of the script `vpe' works in four modes:
-
-* [vpe] Syntax: vpe <pdf file>[.pdf]
-  The pdf file is scanned for actions created by VTeX,
-  that start an editor with the source file at the
-  specified line under Windows.
-  A symbol link is made from the source file name
-  extended by the extension `.vpe' to this script.
-  The line number is encoded in the path and the
-  action is changed to start this script.
-
-* [sty] Internal for vpe.sty:
-  Syntax: vpe --sty [--progname=...] <latex file> <vpe file>
-
-* [system] Internal for vpe.sty:
-  Syntax: vpe --system <vpe file>
-
-* [launch] Syntax: <source file name>.vpe
-  The script decodes the line number in the path of
-  the source file name and starts an editor with
-  this file at that line number.
-
-Options:
-  --help:     print usage.
-  --verbose:  print additional informations during running.
-  --force:    force symbol links
-  --delete:   delete symbol links
-  --sty:      internal for `vpe.sty' (get absolute file name and lines)
-  --system:   internal for `vpe.sty' (get system info linux or win)
-  --progname: latex, pdflatex, elatex, pdfelatex
-END_OF_USAGE
-
-### options
-$::opt_verbose = 0;
-$::opt_help = 0;
-$::opt_force = 0;
-$::opt_delete = 0;
-$::opt_sty = 0;
-$::opt_system = 0;
-$::opt_progname = "latex";
-use Getopt::Long;
-GetOptions(
-  "help!",
-  "verbose!",
-  "force!",
-  "delete!",
-  "sty!",
-  "system!",
-  "progname=s",
-) or die $usage;
-if ($::opt_help) {
-  die $usage;
-}
-
-if ($::opt_sty and $::opt_system) {
-  die "$usage" .
-      "$Error Options --sty and --system cannot used together!\n";
-}
-
-###################
-### launch mode ###
-###################
-if ($0 =~ /\.vpe/) {
-
-  @ARGV == 0 or
-    die "$usage$Error Too many arguments [launch mode]!\n";
-
-  my $file = "";
-  $0 =~ m|(^[\./]+\./)(.+)\.vpe$| or
-    die "$Error Cannot extract line number ($0)!\n";
-  my $str = $1;
-  $file = "/$2";
-
-  my $line = "";
-  while ($str ne "") {
-    $str =~ m|^(/*)(\.?)\./(.*)$| or
-      die "$Error Parse error!\n";
-    $line .= length($1) + (($2 eq ".") ? 5 : 0);
-    $str = $3;
-  }
-
-  my $callstr = $EditorCall;
-  $EditorCall =~ s/%s/$file/;
-  $EditorCall =~ s/%d/$line/;
-  print "File: $file, line: $line\n" if $::opt_verbose;
-  exec($EditorCall);
-  exit 1;
-}
-
-###
-### used by both sty and system mode:
-###
-my $system = "linux";
-$system = "" if $^O =~ /os2/i;
-$system = "" if $^O =~ /mac/i;
-$system = "win" if $^O =~ /dos/i;
-$system = "win" if $^O =~ /win/i;
-
-################
-### sty mode ###
-################
-if ($::opt_sty) {
-
-  @ARGV == 2 or
-    die "$usage$Error Wrong arguments [sty mode]!\n";
-
-  my $vpefile = $ARGV[1];
-  print "VPE file: $vpefile\n" if $::opt_verbose;
-
-  my $file = `kpsewhich -progname=$::opt_progname $ARGV[0]`;
-  chomp $file;
-  if (!($file =~ m|^/| or $file =~ m|^\w:|)) {
-    use Cwd;
-    $file = cwd() . "/" . $file;
-    $file =~ s|/[^/]+/\.\./|/|g;
-    $file =~ s|/\./|/|g;
-  }
-  -f $file or
-    die "$Error Cannot find file `$file' [sty mode]!\n";
-  print "File: $file\n" if $::opt_verbose;
-
-  my $last = 0;
-  if (open(IN, $file)) {
-    while (<IN>) {
-      $last++;
-    }
-  }
-  if ($last == 0) {
-    $last = 10000;
-  }
-  print "Last line: $last\n" if $::opt_verbose;
-
-  open(OUT, ">>$vpefile") or
-    die "$Error Cannot open file `$vpefile`!\n";
-  print OUT "\\vpeentry{$file}{$last}\n";
-
-  exit 1;
-}
-
-###################
-### system mode ###
-###################
-if ($::opt_system) {
-
-  @ARGV == 1 or
-    die "$usage$Error Wrong arguments [system mode]!\n";
-
-  my $vpefile = $ARGV[0];
-  print "VPE file: $vpefile\n" if $::opt_verbose;
-
-  open(OUT, ">>$vpefile") or
-    die "$Error Cannot open file `$vpefile`!\n";
-  print OUT "\\vpesystem{$system}\n";
-
-  exit 1;
-}
-
-################
-### vpe mode ###
-################
-if (@ARGV < 1) {
-  die "$usage$Error Missing pdf file [vpe mode]!\n";
-}
-if (@ARGV > 2) {
-  die "$usage$Error Too many arguments [vpe mode]!\n";
-}
-
-my $pdffile = $ARGV[0];
-if (!-f $pdffile) {
-  my $name = $pdffile;
-  $pdffile .= ".pdf";
-  -f $pdffile or
-    die "$Error File `$name' not found [vpe mode]!\n";
-}
-
-open(IN, "+<$pdffile") or
-  die "$Error Cannot open `$pdffile' [vpe mode]!\n";
-binmode(IN);
-my %symlinks = ();
-while (<IN>) {
-
-  if (m|/F\([\./]*(/.*)\.vpe\)|) {
-    $symlinks{$1} = 1;
-    next;
-  }
-
-  my $do = 0;
-  my ($action, $file, $line, $type);
-  # my $color; # only for debugging
-
-  if (m|^
-        /A \s* << \s*
-          /Type \s* /Action \s*
-          /S \s* /Launch \s*
-          /Win \s* << \s*
-            /F \s* \(aftcomp.exe\) \s*
-            /P \s* \("(.*)\" \s+ \d+\-(\d+)\) \s*
-          >> \s*
-        >> \s*
-        $
-       |x
-  ) {
-    $action = $_;
-    $file = $1;
-    $line = $2;
-    # $color = "/C[0 0 1]"; # only for debugging
-    $type = "aftcomp";
-    $do = 1;
-  }
-
-  if (m|^
-        /A \s* << \s*
-          /Type \s* /Action \s*
-          /S \s* /Launch \s*
-          /Win \s* << \s*
-            /F \s* \(repos.exe\) \s*
-            /P \s* \(
-              "(.*)" \s*
-              "(\d+)" \s*
-              "(.*)" \s*
-              "(\d+)"
-            \) \s*
-          >> \s*
-        >> \s*
-        $
-       |x
-  ) {
-    $action = $_;
-    if ($3 eq "") {
-      $file = $1;
-      $line = $2;
-    }
-    else {
-      # ???
-      $file = $1;
-      $line = $2;
-    }
-    # $color = "/C[1 0 0]"; # only for debugging
-    $type = "repos";
-    $do = 1;
-  }
-
-  if ($do) {
-    my $length = length($action);
-    print "* File: $file, line: $line, type: $type\n" if $::opt_verbose;
-
-    if (!($file =~ m|^/|)) {
-      print STDERR "$Error File `$file' lacks of absolute path!\n";
-      next;
-    }
-
-    if (!$::opt_delete) {
-      if ($line <= 0) {
-        $line = 1;
-      }
-
-      my $newaction = "";
-      {
-        my $digit = substr($line, 0, 1);
-        if ($digit <= 5) {
-          $newaction .= "/" x $digit;
-        }
-        else {
-          $newaction .= "/" x ($digit - 5) . ".";
-        }
-        $newaction .= "./";
-        my $rest = $line;
-        while (($rest = substr($rest, 1)) ne "") {
-          $digit = substr($rest, 0, 1);
-          if ($digit < 5) {
-            $newaction .= "/" x $digit;
-          }
-          else {
-            $newaction .= "/" x ($digit - 5) . ".";
-          }
-          $newaction .= "./";
-        }
-      }
-      $newaction .= substr($file, 1) . ".vpe";
-      $newaction = # $color . # only for debugging
-                   "/A<</Type/Action/S/Launch/F($newaction)>>";
-      $newaction .= " " x ($length - length($newaction) - 1);
-      if (length($newaction) > $length) {
-         print STDERR "$Error Action too long!\n";
-         next;
-      }
-
-      seek(IN, -length($action), 1);
-      print IN $newaction;
-    }
-
-    $symlinks{$file} = 1;
-  }
-}
-
-if (keys(%symlinks)) {
-
-  my $this = $0;
-  if (!$::opt_delete) {
-    if (!-f $0 or !-x $0) {
-      $this = `which $0`;
-      ($this ne "") or die "$Error Cannot find this script!\n";
-    }
-    if (!($this =~ m|^/|)) {
-      use Cwd;
-      $this = cwd() . "/" . $this;
-    }
-    $this =~ s|/[^/]+/\.\./|/|g;
-    $this =~ s|/\./|/|g;
-  }
-
-  if ($::opt_delete) {
-    print "Delete symlinks:\n";
-  }
-  else {
-    if ($::opt_force) {
-      print "Forced symlinks to $this:\n";
-    }
-    else {
-      print "Symlinks to $this:\n";
-    }
-  }
-
-  foreach (keys(%symlinks)) {
-    my $sym = $_ . ".vpe";
-    print "  $sym [";
-
-    if ($::opt_delete) {
-      if (!-l $sym) {
-        print "ok, not existing]\n";
-        next;
-      }
-      unlink($sym);
-      if (!-l $sym) {
-        print "ok, deleted]\n";
-        next;
-      }
-      print "failed]\n";
-      next;
-    }
-    if ($::opt_force) {
-      if (-l $sym) {
-        unlink($sym);
-        if (-l $sym) {
-          print "deletion failed]\n";
-          next;
-        }
-        if (symlink($this, $sym)) {
-          print "ok, deleted and created]\n";
-          next;
-        }
-        print "deleted, creation failed]\n";
-        next;
-      }
-      if (symlink($this, $sym)) {
-        print "ok, created]\n";
-        next;
-      }
-      print "creation failed]\n";
-      next;
-    }
-    if (-f $sym) {
-      print "exists]\n";
-      next;
-    }
-    if (symlink($this, $sym)) {
-      print "ok, created]\n";
-      next;
-    }
-    print "failed]\n";
-    next;
-  }
-}
-__END__
+../../texmf-dist/scripts/vpe/vpe.pl
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/vptovf b/Master/bin/alpha-linux/vptovf
index ac3decaee8b..608d4c99135 100755
--- a/Master/bin/alpha-linux/vptovf
+++ b/Master/bin/alpha-linux/vptovf
diff --git a/Master/bin/alpha-linux/weave b/Master/bin/alpha-linux/weave
index f2709bf251c..74f5b2bca0e 100755
--- a/Master/bin/alpha-linux/weave
+++ b/Master/bin/alpha-linux/weave
diff --git a/Master/bin/alpha-linux/xdvi-xaw.bin b/Master/bin/alpha-linux/xdvi-xaw.bin
index 681c712589f..c7255f497df 100755
--- a/Master/bin/alpha-linux/xdvi-xaw.bin
+++ b/Master/bin/alpha-linux/xdvi-xaw.bin
diff --git a/Master/bin/alpha-linux/xdvipdfmx b/Master/bin/alpha-linux/xdvipdfmx
index 82148c3671a..e5b407a163c 100755
--- a/Master/bin/alpha-linux/xdvipdfmx
+++ b/Master/bin/alpha-linux/xdvipdfmx
diff --git a/Master/bin/alpha-linux/xdvizilla b/Master/bin/alpha-linux/xdvizilla
deleted file mode 100755
index 54f4b03ddfe..00000000000
--- a/Master/bin/alpha-linux/xdvizilla
+++ /dev/null
@@ -1,134 +0,0 @@
-#! /bin/sh
-#
-# This is a kludge to fix helper apps in mozilla.  See mozilla bugs #57420
-# and also #78919.
-#
-# It's also useful for tar files with Netscape 4.x
-#
-# Copyright (c) 2002-2004  Paul Vojta
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL PAUL VOJTA OR ANY OTHER AUTHOR OF OR CONTRIBUTOR TO
-# THIS SOFTWARE BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-# Some changes suggested by Thomas Esser included by
-# <stefanulrich@users.sourceforge.net>.
-
-IN_FILE=
-NO_RM=
-TMP_DIR=
-progname=xdvizilla
-
-do_cleanup()
-{
-    exitval=$?
-    if [ -z "$NO_RM" -a -n "$IN_FILE" ] ; then
-	rm -f "$IN_FILE"
-    fi
-    test -n "$TMP_DIR" && rm -rf "$TMP_DIR"
-    exit $exitval
-}
-
-do_abort()
-{
-    xmessage -nearmouse "$progname: $1"
-    do_cleanup
-    exit 1
-}
-
-usage()
-{
-    xmessage -nearmouse "Usage: $progname [-no-rm] <file>"
-    do_cleanup
-    exit 1
-}
-
-trap 'do_cleanup' 1 2 3 7 13 15
-
-### create a temporary directory only read/writable by user
-TMP_DIR=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$
-(umask 077; mkdir "$TMP_DIR") || do_abort "Could not create directory \`$TMP_DIR'"
-
-if [ $# -gt 1 -a "x$1" = "x-no-rm" ]; then
-  NO_RM=y
-  shift
-fi
-
-if [ $# -ne 1 ]; then
-  usage
-fi
-
-DIR=`dirname "$0"`
-
-if [ "$DIR" = . ]; then
-  DIR=
-elif [ -f "$DIR"/xdvi -a -x "$DIR"/xdvi ]; then
-  DIR="$DIR"/
-else
-  DIR=
-fi
-
-# need to preserve IN_FILE for eventual deletion
-IN_FILE="$1"
-TMP_FILE="$IN_FILE"
-
-while [ 1 ]; do
-    [ -f "$TMP_FILE" ] || do_abort "$TMP_FILE: File not found."    
-    FILETYPE=`file "$TMP_FILE"`
-    case "$FILETYPE" in
-    *"gzip compressed data"*)
-        out="$TMP_DIR"/tmp-gz
-        gunzip -c "$TMP_FILE" > "$out"
-        TMP_FILE="$out"
-        ;;
-    *"compressed data"* | *"compress'd data"*)
-        out="$TMP_DIR"/tmp-compress
-        uncompress -c "$TMP_FILE" > "$out"
-        TMP_FILE="$out"
-        ;;
-    "$TMP_FILE: empty")
-        do_abort "$TMP_FILE is an empty file
-(probably a bug in Mozilla?)"
-        ;;
-    *" tar archive")
-	### do sanity checks on the tar archive, to avoid overwriting user files:
-	dangerous=`tar tf "$TMP_FILE" | egrep '^(/|.*\.\./)'`
-	[ -z "$dangerous" ] || do_abort "Tar file contains files with absolute paths or \`../' components,
-which may overwrite user files. Not unpacking it."
-        ### also check for gzipped DVI files inside the archive ...
-        out="$TMP_DIR"/`tar tf "$TMP_FILE" | egrep '\.(dvi|dvi.gz|dvi.Z)$' | head -1`
-        if [ -z "$out" ]; then
-	    do_abort "Tar file does not contain a dvi file."
-        else
-	    cat "$TMP_FILE" | (cd "$TMP_DIR"; tar xf -)
-	    TMP_FILE="$out"
-        fi
-        ;;
-    *"DVI file"*)
-        "$DIR"xdvi -safer "$TMP_FILE"
-        break
-        ;;
-    *)
-        do_abort "$TMP_FILE: Unrecognized file format!"
-        ;;
-    esac
-done
-
-do_cleanup
-
-exit 0
diff --git a/Master/bin/alpha-linux/xetex b/Master/bin/alpha-linux/xetex
index 7191907e724..88306ae5075 100755
--- a/Master/bin/alpha-linux/xetex
+++ b/Master/bin/alpha-linux/xetex
diff --git a/Master/bin/alpha-linux/xindy b/Master/bin/alpha-linux/xindy
new file mode 120000
index 00000000000..ddaf92f5c89
--- /dev/null
+++ b/Master/bin/alpha-linux/xindy
@@ -0,0 +1 @@
+../../texmf/scripts/xindy/xindy.pl
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/xindy.mem b/Master/bin/alpha-linux/xindy.mem
new file mode 100644
index 00000000000..bc287701e3a
--- /dev/null
+++ b/Master/bin/alpha-linux/xindy.mem
diff --git a/Master/bin/alpha-linux/xindy.run b/Master/bin/alpha-linux/xindy.run
new file mode 100755
index 00000000000..af71fb82f2b
--- /dev/null
+++ b/Master/bin/alpha-linux/xindy.run