Fix breakage in i386-linux

git-svn-id: svn://tug.org/texlive/trunk@6974 c570f23f-e606-0410-a88d-b1316a301751
author: Martin Schröder <martin@oneiros.de> 2008-03-15 16:01:48 +0000
committer: Martin Schröder <martin@oneiros.de> 2008-03-15 16:01:48 +0000
commit: 6551b64647df0be3010eb5723b6e3a497d06b774 (patch)
tree: 500019f0140609634c0b0445273866f2b3c8435d /Master/bin
parent: 1e8fa10066d82d5e8fd7c96e1b58f978d8536b31 (diff)
272 files changed, 0 insertions, 32242 deletions
diff --git a/Master/bin/i386-linux/a2ping b/Master/bin/i386-linux/a2ping
deleted file mode 120000
index 5cbfe106996..00000000000
--- a/Master/bin/i386-linux/a2ping
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf/scripts/a2ping/a2ping.pl
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/afm2pl b/Master/bin/i386-linux/afm2pl
deleted file mode 100755
index 8b97b316805..00000000000
--- a/Master/bin/i386-linux/afm2pl
+++ /dev/null
diff --git a/Master/bin/i386-linux/afm2tfm b/Master/bin/i386-linux/afm2tfm
deleted file mode 100755
index bd62b6cb134..00000000000
--- a/Master/bin/i386-linux/afm2tfm
+++ /dev/null
diff --git a/Master/bin/i386-linux/aleph b/Master/bin/i386-linux/aleph
deleted file mode 100755
index c202a997145..00000000000
--- a/Master/bin/i386-linux/aleph
+++ /dev/null
diff --git a/Master/bin/i386-linux/allcm b/Master/bin/i386-linux/allcm
deleted file mode 100755
index 945c7c88457..00000000000
--- a/Master/bin/i386-linux/allcm
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-
-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+"$@"}'='"$@"'
-
-progname=`basename $0`
-tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$
-
-case "$progname" in
-  allec)
-    encoding=T1;;
-  *)
-    encoding=OT1;;
-esac
-
-case "$1" in
-  -r)
-    DVIPS=dvired
-    shift
-    ;;
-  *)
-    DVIPS=dvips
-    ;;
-esac
-
-body()
-{
-  cat <<-'eof'
-	\pagestyle{empty}
-	\parindent0in
-	\hfuzz=\maxdimen
-	\hbadness=10000
-	\textheight9.5in
-	\textwidth6.5in
-	\newcommand{\myformula}{\sum a_{b_{c_d}} = c}
-	\newcommand{\mytext}{text $\mathcal{\myformula}\mathrm{\myformula}
-	\mathbf{\myformula}\mathsf{\myformula}\mathtt{\myformula}
-	\mathnormal{\myformula}\mathit{\myformula}$}
-
-	\newcommand{\TestSizes}{{%
-	\tiny \mytext\scriptsize \mytext\footnotesize \mytext\small \mytext
-	\normalsize \mytext
-	\large \mytext\Large \mytext\LARGE \mytext\huge \mytext\Huge \mytext}}
-	\newcommand{\TestRM}{rm-family: {\rmfamily\TestSizes}\newline}
-	\newcommand{\TestSF}{sf-family: {\sffamily\TestSizes}\newline}
-	\newcommand{\TestTT}{tt-family: {\ttfamily\TestSizes}\newline}
-	\newcommand{\TestFamilies}{\TestRM\TestSF\TestTT\newline}
-	\newcommand{\TestMD}{md-series: {\mdseries\TestFamilies}}
-	\newcommand{\TestBF}{bf-series: {\bfseries\TestFamilies}}
-	\newcommand{\TestSeries}{\TestBF\TestMD\par}
-	\newcommand{\TestUP}{up-shape: {\upshape\TestSeries}\par}
-	\newcommand{\TestIT}{it-shape: {\itshape\TestSeries}\par}
-	\newcommand{\TestSL}{sl-shape: {\slshape\TestSeries}\par}
-	\newcommand{\TestSC}{sc-shape: {\scshape\TestSeries}\par}
-	\newcommand{\TestShapes}{\TestUP\TestIT\TestSL\TestSC}
-	\begin{document}
-	\TestShapes
-	\end{document}
-eof
-}
-
-head()
-{
-  echo '\documentclass['$1'pt]{article}'
-  echo '\usepackage['$encoding']{fontenc}'
-}
-
-# before we create the tmpdir, set trap for cleanup
-trap '
-  rm -rf $tmpdir
-  exit 1
-' 1 2 3 7 13 15
-
-(umask 077; mkdir "$tmpdir") || {
-  echo "$progname: failed to create temp directory." >&2
-  exit 1
-}
-
-cd $tmpdir || exit 1
-echo >&2
-echo "---------------------------------------------------------------------" >&2
-echo ">>>>>>>>>>>  Generating testfiles for 10pt, 11pt and 12pt. <<<<<<<<<<" >&2
-echo "---------------------------------------------------------------------" >&2
-head 10 > allcm10.tex
-head 11 > allcm11.tex
-head 12 > allcm12.tex
-body >> allcm10.tex
-body >> allcm11.tex
-body >> allcm12.tex
-
-echo >&2
-echo "---------------------------------------------------------------------" >&2
-echo ">>>>>>>>>>>  Calling latex...                              <<<<<<<<<<" >&2
-echo "---------------------------------------------------------------------" >&2
-latex allcm10 >/dev/null
-latex allcm11 >/dev/null
-latex allcm12 >/dev/null
-
-echo >&2
-echo "---------------------------------------------------------------------" >&2
-echo ">>>>>>>>>>>  Now, calling $DVIPS to make missing fonts...  <<<<<<<<<<" >&2
-echo "---------------------------------------------------------------------" >&2
-$DVIPS ${1+"$@"} -V -f allcm10 > /dev/null
-$DVIPS ${1+"$@"} -V -f allcm11 > /dev/null
-$DVIPS ${1+"$@"} -V -f allcm12 > /dev/null
-
-cd /
-rm -rf $tmpdir
diff --git a/Master/bin/i386-linux/allec b/Master/bin/i386-linux/allec
deleted file mode 120000
index 6d5b04d0d35..00000000000
--- a/Master/bin/i386-linux/allec
+++ /dev/null
@@ -1 +0,0 @@
-allcm
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/allneeded b/Master/bin/i386-linux/allneeded
deleted file mode 100755
index 15c62c84adb..00000000000
--- a/Master/bin/i386-linux/allneeded
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-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
-
-progname=`basename $0`
-dvired=false
-
-case $1 in
--r)	DVIPS="dvips -x707"
-	shift;;
-*)	DVIPS=dvips;;
-esac
-
-case $# in
-0)	echo "Usage: $progname [-r] files ..." >&2
-	exit ;;
-esac
-
-findopt=
-dvipsopt=
-
-for i
-do
-	if [ -f $i ] || [ -d $i ]; then
-		findopt="$findopt $i"
-	else
-		dvipsopt="$dvipsopt $i"
-	fi
-done
-
-find $findopt -name \*.dvi -type f -print |
-  while true; do
-	read i
-	test -z "$i" && exit
-	echo "processing file '$i' ..."
-	$DVIPS $dvipsopt -f "$i" >/dev/null
-	echo
-   done
diff --git a/Master/bin/i386-linux/amstex b/Master/bin/i386-linux/amstex
deleted file mode 120000
index f68cc91498e..00000000000
--- a/Master/bin/i386-linux/amstex
+++ /dev/null
@@ -1 +0,0 @@
-pdftex
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/bbox b/Master/bin/i386-linux/bbox
deleted file mode 100755
index ad5a55372c5..00000000000
--- a/Master/bin/i386-linux/bbox
+++ /dev/null
diff --git a/Master/bin/i386-linux/bg5+latex b/Master/bin/i386-linux/bg5+latex
deleted file mode 120000
index 1366a36e76c..00000000000
--- a/Master/bin/i386-linux/bg5+latex
+++ /dev/null
@@ -1 +0,0 @@
-gbklatex
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/bg5+pdflatex b/Master/bin/i386-linux/bg5+pdflatex
deleted file mode 120000
index 1e0ce565ca7..00000000000
--- a/Master/bin/i386-linux/bg5+pdflatex
+++ /dev/null
@@ -1 +0,0 @@
-gbkpdflatex
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/bg5conv b/Master/bin/i386-linux/bg5conv
deleted file mode 100755
index e03407182ee..00000000000
--- a/Master/bin/i386-linux/bg5conv
+++ /dev/null
diff --git a/Master/bin/i386-linux/bg5latex b/Master/bin/i386-linux/bg5latex
deleted file mode 100755
index 257a8446e21..00000000000
--- a/Master/bin/i386-linux/bg5latex
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-
-# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
-#
-# 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 in doc/COPYING; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-# MA 02110-1301 USA
-
-n=1
-argv=
-
-# get last argument
-while test 1 -lt $#; do
-  eval argv$n=\$1
-  argv="$argv \"\$argv$n\""
-  n=`expr $n + 1`
-  shift
-done
-
-# replace extension with .cjk or append .cjk if there is no extension
-tex=$1
-case $tex in
-""|*.cjk)
-  echo >&2 "Usage: $0 [options] latex-file"
-  exit 1;;
-*)
-  aux=`expr "X$tex" : 'X\(.*\)\.[^/]*$' \| "X$tex" : 'X\(.*\)'`.cjk;;
-esac
-
-bg5conv < "$tex" > "$aux" && eval latex "$argv" "\$aux"
-
-# EOF
diff --git a/Master/bin/i386-linux/bg5pdflatex b/Master/bin/i386-linux/bg5pdflatex
deleted file mode 100755
index 80adc376a93..00000000000
--- a/Master/bin/i386-linux/bg5pdflatex
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-
-# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
-#
-# 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 in doc/COPYING; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-# MA 02110-1301 USA
-
-n=1
-argv=
-
-# get last argument
-while test 1 -lt $#; do
-  eval argv$n=\$1
-  argv="$argv \"\$argv$n\""
-  n=`expr $n + 1`
-  shift
-done
-
-# replace extension with .cjk or append .cjk if there is no extension
-tex=$1
-case $tex in
-""|*.cjk)
-  echo >&2 "Usage: $0 [options] pdflatex-file"
-  exit 1;;
-*)
-  aux=`expr "X$tex" : 'X\(.*\)\.[^/]*$' \| "X$tex" : 'X\(.*\)'`.cjk;;
-esac
-
-bg5conv < "$tex" > "$aux" && eval pdflatex "$argv" "\$aux"
-
-# EOF
diff --git a/Master/bin/i386-linux/bibtex b/Master/bin/i386-linux/bibtex
deleted file mode 100755
index 5eb1e96ab61..00000000000
--- a/Master/bin/i386-linux/bibtex
+++ /dev/null
diff --git a/Master/bin/i386-linux/bibtex8 b/Master/bin/i386-linux/bibtex8
deleted file mode 100755
index 8fd13476bcb..00000000000
--- a/Master/bin/i386-linux/bibtex8
+++ /dev/null
diff --git a/Master/bin/i386-linux/cef5conv b/Master/bin/i386-linux/cef5conv
deleted file mode 100755
index cf583062739..00000000000
--- a/Master/bin/i386-linux/cef5conv
+++ /dev/null
diff --git a/Master/bin/i386-linux/cef5latex b/Master/bin/i386-linux/cef5latex
deleted file mode 100755
index 7eda1633766..00000000000
--- a/Master/bin/i386-linux/cef5latex
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-
-# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
-#
-# 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 in doc/COPYING; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-# MA 02110-1301 USA
-
-n=1
-argv=
-
-# get last argument
-while test 1 -lt $#; do
-  eval argv$n=\$1
-  argv="$argv \"\$argv$n\""
-  n=`expr $n + 1`
-  shift
-done
-
-# replace extension with .cjk or append .cjk if there is no extension
-tex=$1
-case $tex in
-""|*.cjk)
-  echo >&2 "Usage: $0 [options] latex-file"
-  exit 1;;
-*)
-  aux=`expr "X$tex" : 'X\(.*\)\.[^/]*$' \| "X$tex" : 'X\(.*\)'`.cjk;;
-esac
-
-cef5conv < "$tex" > "$aux" && eval latex "$argv" "\$aux"
-
-# EOF
diff --git a/Master/bin/i386-linux/cef5pdflatex b/Master/bin/i386-linux/cef5pdflatex
deleted file mode 100755
index 25fe066a53f..00000000000
--- a/Master/bin/i386-linux/cef5pdflatex
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-
-# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
-#
-# 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 in doc/COPYING; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-# MA 02110-1301 USA
-
-n=1
-argv=
-
-# get last argument
-while test 1 -lt $#; do
-  eval argv$n=\$1
-  argv="$argv \"\$argv$n\""
-  n=`expr $n + 1`
-  shift
-done
-
-# replace extension with .cjk or append .cjk if there is no extension
-tex=$1
-case $tex in
-""|*.cjk)
-  echo >&2 "Usage: $0 [options] pdflatex-file"
-  exit 1;;
-*)
-  aux=`expr "X$tex" : 'X\(.*\)\.[^/]*$' \| "X$tex" : 'X\(.*\)'`.cjk;;
-esac
-
-cef5conv < "$tex" > "$aux" && eval pdflatex "$argv" "\$aux"
-
-# EOF
diff --git a/Master/bin/i386-linux/cefconv b/Master/bin/i386-linux/cefconv
deleted file mode 100755
index 772ebf6af74..00000000000
--- a/Master/bin/i386-linux/cefconv
+++ /dev/null
diff --git a/Master/bin/i386-linux/ceflatex b/Master/bin/i386-linux/ceflatex
deleted file mode 100755
index d34244d9a5b..00000000000
--- a/Master/bin/i386-linux/ceflatex
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-
-# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
-#
-# 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 in doc/COPYING; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-# MA 02110-1301 USA
-
-n=1
-argv=
-
-# get last argument
-while test 1 -lt $#; do
-  eval argv$n=\$1
-  argv="$argv \"\$argv$n\""
-  n=`expr $n + 1`
-  shift
-done
-
-# replace extension with .cjk or append .cjk if there is no extension
-tex=$1
-case $tex in
-""|*.cjk)
-  echo >&2 "Usage: $0 [options] latex-file"
-  exit 1;;
-*)
-  aux=`expr "X$tex" : 'X\(.*\)\.[^/]*$' \| "X$tex" : 'X\(.*\)'`.cjk;;
-esac
-
-cefconv < "$tex" > "$aux" && eval latex "$argv" "\$aux"
-
-# EOF
diff --git a/Master/bin/i386-linux/cefpdflatex b/Master/bin/i386-linux/cefpdflatex
deleted file mode 100755
index 4c7309f2bf2..00000000000
--- a/Master/bin/i386-linux/cefpdflatex
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-
-# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
-#
-# 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 in doc/COPYING; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-# MA 02110-1301 USA
-
-n=1
-argv=
-
-# get last argument
-while test 1 -lt $#; do
-  eval argv$n=\$1
-  argv="$argv \"\$argv$n\""
-  n=`expr $n + 1`
-  shift
-done
-
-# replace extension with .cjk or append .cjk if there is no extension
-tex=$1
-case $tex in
-""|*.cjk)
-  echo >&2 "Usage: $0 [options] pdflatex-file"
-  exit 1;;
-*)
-  aux=`expr "X$tex" : 'X\(.*\)\.[^/]*$' \| "X$tex" : 'X\(.*\)'`.cjk;;
-esac
-
-cefconv < "$tex" > "$aux" && eval pdflatex "$argv" "\$aux"
-
-# EOF
diff --git a/Master/bin/i386-linux/cefsconv b/Master/bin/i386-linux/cefsconv
deleted file mode 100755
index c5be844f3d0..00000000000
--- a/Master/bin/i386-linux/cefsconv
+++ /dev/null
diff --git a/Master/bin/i386-linux/cefslatex b/Master/bin/i386-linux/cefslatex
deleted file mode 100755
index 619d08c7577..00000000000
--- a/Master/bin/i386-linux/cefslatex
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-
-# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
-#
-# 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 in doc/COPYING; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-# MA 02110-1301 USA
-
-n=1
-argv=
-
-# get last argument
-while test 1 -lt $#; do
-  eval argv$n=\$1
-  argv="$argv \"\$argv$n\""
-  n=`expr $n + 1`
-  shift
-done
-
-# replace extension with .cjk or append .cjk if there is no extension
-tex=$1
-case $tex in
-""|*.cjk)
-  echo >&2 "Usage: $0 [options] latex-file"
-  exit 1;;
-*)
-  aux=`expr "X$tex" : 'X\(.*\)\.[^/]*$' \| "X$tex" : 'X\(.*\)'`.cjk;;
-esac
-
-cefsconv < "$tex" > "$aux" && eval latex "$argv" "\$aux"
-
-# EOF
diff --git a/Master/bin/i386-linux/cefspdflatex b/Master/bin/i386-linux/cefspdflatex
deleted file mode 100755
index 02bf6598f71..00000000000
--- a/Master/bin/i386-linux/cefspdflatex
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-
-# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
-#
-# 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 in doc/COPYING; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-# MA 02110-1301 USA
-
-n=1
-argv=
-
-# get last argument
-while test 1 -lt $#; do
-  eval argv$n=\$1
-  argv="$argv \"\$argv$n\""
-  n=`expr $n + 1`
-  shift
-done
-
-# replace extension with .cjk or append .cjk if there is no extension
-tex=$1
-case $tex in
-""|*.cjk)
-  echo >&2 "Usage: $0 [options] latex-file"
-  exit 1;;
-*)
-  aux=`expr "X$tex" : 'X\(.*\)\.[^/]*$' \| "X$tex" : 'X\(.*\)'`.cjk;;
-esac
-
-cefsconv < "$tex" > "$aux" && eval pdflatex "$argv" "\$aux"
-
-# EOF
diff --git a/Master/bin/i386-linux/cfftot1 b/Master/bin/i386-linux/cfftot1
deleted file mode 100755
index 4860793aadd..00000000000
--- a/Master/bin/i386-linux/cfftot1
+++ /dev/null
diff --git a/Master/bin/i386-linux/cslatex b/Master/bin/i386-linux/cslatex
deleted file mode 120000
index f68cc91498e..00000000000
--- a/Master/bin/i386-linux/cslatex
+++ /dev/null
@@ -1 +0,0 @@
-pdftex
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/csplain b/Master/bin/i386-linux/csplain
deleted file mode 120000
index f68cc91498e..00000000000
--- a/Master/bin/i386-linux/csplain
+++ /dev/null
@@ -1 +0,0 @@
-pdftex
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/ctangle b/Master/bin/i386-linux/ctangle
deleted file mode 100755
index 272552ff8c7..00000000000
--- a/Master/bin/i386-linux/ctangle
+++ /dev/null
diff --git a/Master/bin/i386-linux/ctie b/Master/bin/i386-linux/ctie
deleted file mode 100755
index a8c860c4ba1..00000000000
--- a/Master/bin/i386-linux/ctie
+++ /dev/null
diff --git a/Master/bin/i386-linux/ctxtools b/Master/bin/i386-linux/ctxtools
deleted file mode 100755
index 84e47bbee3c..00000000000
--- a/Master/bin/i386-linux/ctxtools
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-texmfstart ctxtools.rb "$@"
diff --git a/Master/bin/i386-linux/cweave b/Master/bin/i386-linux/cweave
deleted file mode 100755
index 035d320aee8..00000000000
--- a/Master/bin/i386-linux/cweave
+++ /dev/null
diff --git a/Master/bin/i386-linux/detex b/Master/bin/i386-linux/detex
deleted file mode 100755
index 07c506bf3d8..00000000000
--- a/Master/bin/i386-linux/detex
+++ /dev/null
diff --git a/Master/bin/i386-linux/devnag b/Master/bin/i386-linux/devnag
deleted file mode 100755
index c5e5879b5ef..00000000000
--- a/Master/bin/i386-linux/devnag
+++ /dev/null
diff --git a/Master/bin/i386-linux/disdvi b/Master/bin/i386-linux/disdvi
deleted file mode 100755
index d0205d7f493..00000000000
--- a/Master/bin/i386-linux/disdvi
+++ /dev/null
diff --git a/Master/bin/i386-linux/dmp b/Master/bin/i386-linux/dmp
deleted file mode 100755
index 324b0aff109..00000000000
--- a/Master/bin/i386-linux/dmp
+++ /dev/null
diff --git a/Master/bin/i386-linux/dt2dv b/Master/bin/i386-linux/dt2dv
deleted file mode 100755
index c0e7ad493ab..00000000000
--- a/Master/bin/i386-linux/dt2dv
+++ /dev/null
diff --git a/Master/bin/i386-linux/dv2dt b/Master/bin/i386-linux/dv2dt
deleted file mode 100755
index 218be7089dc..00000000000
--- a/Master/bin/i386-linux/dv2dt
+++ /dev/null
diff --git a/Master/bin/i386-linux/dvi2fax b/Master/bin/i386-linux/dvi2fax
deleted file mode 100755
index fdfa83211eb..00000000000
--- a/Master/bin/i386-linux/dvi2fax
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-# options for dvips are passwd down
-
-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+"$@"}'='"$@"'
-
-progname=`basename "$0"`
-help()
-{
-  echo "Usage: $progname [-hi|-lo] file[.dvi] [options for dvips]"
-  echo "  -hi: use high fax resolution (204x196) (default)"
-  echo "  -lo: use low fax resolution (204x98)"
-  echo
-  echo "Example: $progname foo -l 2"
-}
-
-dvipsconf=dfaxhigh; gsdev=dfaxhigh
-case $1 in
-  -hi) gsdev=dfaxhigh; shift;;
-  -lo) gsdev=dfaxlow; shift;;
-esac
-
-case $# in
-  0) help >&2
-     exit 1
-     ;;
-esac
-
-NAME=`basename "$1" .dvi`
-dvips "$@" -P$dvipsconf -f |
-  gs -q -dSAFER -sDEVICE=$gsdev -sOutputFile="$NAME-%03d.fax" -sNOPAUSE -
diff --git a/Master/bin/i386-linux/dvi2tty b/Master/bin/i386-linux/dvi2tty
deleted file mode 100755
index fdc4a1991e8..00000000000
--- a/Master/bin/i386-linux/dvi2tty
+++ /dev/null
diff --git a/Master/bin/i386-linux/dvibook b/Master/bin/i386-linux/dvibook
deleted file mode 100755
index 20dc3050fff..00000000000
--- a/Master/bin/i386-linux/dvibook
+++ /dev/null
diff --git a/Master/bin/i386-linux/dviconcat b/Master/bin/i386-linux/dviconcat
deleted file mode 100755
index d036272eed3..00000000000
--- a/Master/bin/i386-linux/dviconcat
+++ /dev/null
diff --git a/Master/bin/i386-linux/dvicopy b/Master/bin/i386-linux/dvicopy
deleted file mode 100755
index d0b8c7d5431..00000000000
--- a/Master/bin/i386-linux/dvicopy
+++ /dev/null
diff --git a/Master/bin/i386-linux/dvidvi b/Master/bin/i386-linux/dvidvi
deleted file mode 100755
index 26324b9be02..00000000000
--- a/Master/bin/i386-linux/dvidvi
+++ /dev/null
diff --git a/Master/bin/i386-linux/dvihp b/Master/bin/i386-linux/dvihp
deleted file mode 100755
index 6b149517086..00000000000
--- a/Master/bin/i386-linux/dvihp
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/sh
-# $Id: dvihp,v 1.3 1996/12/03 19:53:56 karl Exp karl $
-# Run dvicopy, then dvilj[k].  kb@mail.tug.org, 1994.  Public domain.
-# Try to accept arguments a la dvips, from Thomas Esser.
-
-: ${DVILJ=dvilj4}       # the dvilj variant to run
-: ${SPOOL=lpr}          # used to print an LJ file
-: ${TMPDIR=${TEMP-${TMP-/tmp}}} # for the dvicopy output
-
-tmpdir="${TMPDIR}"/dvihp$$
-(umask 077; mkdir "$tmpdir") \
-  || { echo "cannot create directory \`$tmpdir'."; exit 1; }
-
-trap '
-  cd "${TMPDIR}"
-  test -d "$tmpdir" && { rm -f "$tmpdir"/*; rmdir "$tmpdir"; }
-  exit 0
-' 0 1 2 3 6 7 13 15
-
-rcs_revision='$Revision: 1.3 $'
-version=`set - $rcs_revision; echo $2`
-
-usage="Usage: `basename $0` [OPTIONS] [DVIFILE[.dvi]].
-  Translate the given DVIFILE to Hewlett-Packard PCL by calling dvicopy
-  and then \$DVILJ (dvilj4 by default).
-  In the absence of other options, pipe the PCL to \$SPOOL (lpr by default).
-  
-  Options are recognized from dvips where possible:
--A    print odd pages
--B    print even pages
--d #  set debug bits to # (see documentation)
--D #  set resolution to #
--f    run as filter
--l #  don't print pages after #
--m    manual feed
--n #  print # pages
--O #,#  set/change paper offset to #,# mm
--o s  output to s instead of spooling
--p #  don't print pages before #
--Ps   pass directly to lpr
--v    verbose operation
--x #  set magnification to #
-
-Other options are passed to the dvilj program.
-
-Email bug reports to tex-k@mail.tug.org."
-
-
-if test $# -eq 0; then
-  echo "`basename $0`: Missing argument(s)." >&2
-  echo "Try \``basename $0` --help' for more information." >&2
-  exit 0
-fi
-
-unset infile opt output
-output_opt=-e
-verbose=false
-
-while test $# -gt 0; do
-  case "$1" in
-    -help|--help) echo "$usage"; exit 0;;
-    -version|--version) 
-      echo "`basename $0` (Dviljk 2.6) $version"
-      echo "There is NO warranty.  This script is public domain."
-      exit 0;;
-    -A)  opt="$opt -D1";;                       # -A => -D1 (odd pages)
-    -B)  opt="$opt -D2";;                       # -B -> -D2 (even pages)
-    -d)  shift; opt="$opt --D$1";;              # -d => --D (debug)
-    -d*) opt="$opt `echo $1 | sed s/d/-D/`";;
-    -D)  shift; opt="$opt -R$1";;               # -D => -R (resolution)
-    -f)  infile=; output=-;;                    # -f (run as filter)
-    -l)  shift; opt="$opt -t$1";;               # -l => -t (ending page)
-    -l*) opt="$opt `echo $1 | sed s/l/t/`";;
-    -m)  opt="$opt -A";;                        # -m => -A (manual feed)
-    -n)  shift; opt="$opt -p$1";;               # -n => -p (page count)
-    -n*) opt="$opt `echo $1 | sed s/^-n/-p/`";;
-    -o)  if test $# -eq 1; then                 # -o (output file)
-           # No remaining args, output to foo.lj.
-           output=`basename $infile .dvi`.lj
-         else shift; output="$1"; fi;;
-    -o*) output="`echo $1 | sed 's/^-o//'`";;
-    -O)  shift; x=`echo $1 | sed 's/,.*//'`     # -O => -x, -y (page offsets)
-         y=`echo $1 | sed 's/.*,//'`;  opt="$opt -x$x -y$y";;
-    -O*) temp="`echo $1 | sed 's/^-O//'`"
-         x=`echo $temp | sed 's/,.*//'`
-         y=`echo $temp | sed 's/.*,//'`;
-         opt="$opt -x$x -y$y";;
-    -p)  shift; opt="$opt -f$1";;               # -p => -f (starting page)
-    -p*) opt="$opt `echo $1 | sed s/p/f/`";;
-    -P)  shift; output=; spool_opt="-P$1";;     # -Pprinter
-    -P*) output=; spool_opt="$1";;
-    -v)  verbose=true; opt="$opt -v";;
-    -x)  shift; opt="$opt -m$1";;               # -x => -m (magnification)
-    -x*) opt="$opt `echo $1 | sed s/x/m/`";;
-    --)  shift; infile="$1"; break;;            # -- => end of options
-    -*)  opt="$opt $1";;                        # pass other options through
-    *)   infile="$1";;
-  esac
-  shift
-done
-
-# Make sure the filenames are unique on MS-DOS
-vfless_dvi="$tmpdir"/dvi$$.vf
-
-# Expand VF references.
-# If $infile is null, this will read standard input.
-# dvilj can't read from a pipe, so always write to a file.
-$verbose && echo "Running dvicopy $infile >$vfless_dvi" >&2
-if dvicopy $infile >"$vfless_dvi"; then :; else
-  echo "$0: dvicopy $infile failed." >&2
-  exit 1
-fi
-$verbose && ls -l "$vfless_dvi" >&2
-
-if test -z "$output"; then
-  output=- # output to stdout
-  # Doing this pipe means the true exit status might get lost, but it
-  # seems worth it to avoid the temporary file. (Bad enough to have one.)
-  maybe_spool_cmd="| $SPOOL $spool_opt"
-else
-  maybe_spool_cmd=
-fi
-
-# Translate DVI to LJ.
-cmd="$DVILJ $opt $output_opt$output \"$vfless_dvi\" $maybe_spool_cmd"
-$verbose && echo "Running $cmd" >&2
-if eval $cmd; then :; else
-  echo "$0: $DVILJ failed." >&2
-  exit 2
-fi
diff --git a/Master/bin/i386-linux/dvilj b/Master/bin/i386-linux/dvilj
deleted file mode 100755
index c4fccf8c633..00000000000
--- a/Master/bin/i386-linux/dvilj
+++ /dev/null
diff --git a/Master/bin/i386-linux/dvilj2p b/Master/bin/i386-linux/dvilj2p
deleted file mode 100755
index e4bc70733e8..00000000000
--- a/Master/bin/i386-linux/dvilj2p
+++ /dev/null
diff --git a/Master/bin/i386-linux/dvilj4 b/Master/bin/i386-linux/dvilj4
deleted file mode 100755
index 58b79ab56ee..00000000000
--- a/Master/bin/i386-linux/dvilj4
+++ /dev/null
diff --git a/Master/bin/i386-linux/dvilj4l b/Master/bin/i386-linux/dvilj4l
deleted file mode 100755
index 2a90afda461..00000000000
--- a/Master/bin/i386-linux/dvilj4l
+++ /dev/null
diff --git a/Master/bin/i386-linux/dvilj6 b/Master/bin/i386-linux/dvilj6
deleted file mode 120000
index 576e6e449cd..00000000000
--- a/Master/bin/i386-linux/dvilj6
+++ /dev/null
@@ -1 +0,0 @@
-dvilj4
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/dvipdfm b/Master/bin/i386-linux/dvipdfm
deleted file mode 100755
index e1abaa114de..00000000000
--- a/Master/bin/i386-linux/dvipdfm
+++ /dev/null
diff --git a/Master/bin/i386-linux/dvipdfmx b/Master/bin/i386-linux/dvipdfmx
deleted file mode 100755
index c6e6f0e4f9d..00000000000
--- a/Master/bin/i386-linux/dvipdfmx
+++ /dev/null
diff --git a/Master/bin/i386-linux/dvipdft b/Master/bin/i386-linux/dvipdft
deleted file mode 100755
index db53bd2f5a0..00000000000
--- a/Master/bin/i386-linux/dvipdft
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/sh
-
-#
-# dvipdft, completely rewtitten by Thomas Esser for teTeX after an
-# original script by Mark A. Wicks
-#
-# Thomas Esser. Public Domain.
-#
-
-# This script makes a first (fast) run with dvipdfm, then calls gs on
-# the resulting pdf file to get the thumbnails and finally calls dvipdfm.
-
-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+"$@"}'='"$@"'
-
-progname=dvipdft
-version=1111942378 # seconds since `00:00:00 1970-01-01 UTC'
-                    # date '+%s' (with GNU date)
-
-help="Usage: $progname [options] dvifile
-       $progname --help
-       $progname --version"
-
-tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$
-
-quoteit()
-{
-  echo "x$1" | sed "s@.@@; s@'@'\\\\''@; s@^@'@; s@\$@'@"
-}
-
-# process args 1 to (n-1) and scan for a -o argument keep a properly
-# quoted backup of the options, so that they can be restored later
-unset s outfile
-while test $# -gt 1; do
-  case $1 in
-    -o) outfile=$2;;
-  esac
-  s="$s${s+ }"`quoteit "$1"`
-  shift
-done
-
-# check for last argument
-case $1 in
-  --help)
-    echo "$help"
-    exit 0
-    ;;
-  --version)
-    echo "$progname version $version by Thomas Esser"
-    exit 0
-    ;;
-  "")
-    echo "$help"
-    exit 1
-    ;;
-esac
-
-# args 1 to (n-1) are gone, last one must be the dvifile
-dvifile=$1
-
-# outfile comes from -o argument, else it is derived from the input file
-test -n "$outfile" \
-  || outfile=`echo "$dvifile" | sed 's@.*/@@; s@\.dvi$@@; s@$@.pdf@'`
-
-# outBase is part of the thumbname files just as dvipdfm expects them:
-outBase=`echo "$outfile" | sed 's@\.pdf$@@'`
-
-# restore args 1 to (n-1):
-eval set x "$s"; shift
-
-# Run dvipdfm with the fastest options for the first pass
-echo "$progname: running dvipdfm $@ -e -z0 $dvifile" >&2
-dvipdfm ${1+"$@"} -e -z0 "$dvifile" || {
-  echo "$progname: dvipdfm failed." >&2
-  exit 1
-}
-
-# before we create the tmpdir, set trap for cleanup
-trap '
-  rm -rf $tmpdir
-  exit 1
-' 1 2 3 7 13 15
-
-mkdir "$tmpdir" || {
-  echo "$progname: failed to create temp directory." >&2
-  exit 1
-}
-
-# if outBase contains a /, we might need to create a directory
-case $outBase in
-  */*)
-    fq=`echo "$tmpdir/$outBase" | sed 's@//@/@g; s@/[^/]*$@@'`
-    test -d "$fq" || mkdir -p "$fq" || {
-      echo "$progname: failed to create temp thumbnail directory." >&2
-      rm -rf $tmpdir
-      exit 1
-    }
-    ;;
-esac
-
-# run gs
-echo "$progname: running gs" >&2
-gs -r10 -dNOPAUSE -dBATCH -sDEVICE=png256 \
-   -sOutputFile="$tmpdir/$outBase.%d" "$outfile" || {
-  echo "$progname: gs failed." >&2
-  rm -rf $tmpdir
-  exit 1
-}
-
-# run dvipdfm with the users specified options for the last pass
-echo "$progname: running dvipdfm -dt $@ $dvifile" >&2
-TMP=$tmpdir dvipdfm -dt ${1+"$@"} "$dvifile" || {
-  echo "$progname: dvipdfm failed." >&2
-  rm -rf $tmpdir
-  exit 1
-}
-
-# nothing failed, so cleanup and report success to caller
-rm -rf $tmpdir
-exit 0
diff --git a/Master/bin/i386-linux/dvipng b/Master/bin/i386-linux/dvipng
deleted file mode 100755
index 75c435d4a38..00000000000
--- a/Master/bin/i386-linux/dvipng
+++ /dev/null
diff --git a/Master/bin/i386-linux/dvipos b/Master/bin/i386-linux/dvipos
deleted file mode 100755
index 1ef999091a4..00000000000
--- a/Master/bin/i386-linux/dvipos
+++ /dev/null
diff --git a/Master/bin/i386-linux/dvips b/Master/bin/i386-linux/dvips
deleted file mode 100755
index d44cad6005c..00000000000
--- a/Master/bin/i386-linux/dvips
+++ /dev/null
diff --git a/Master/bin/i386-linux/dvired b/Master/bin/i386-linux/dvired
deleted file mode 100755
index 4eb3586119d..00000000000
--- a/Master/bin/i386-linux/dvired
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-#==============================================================================
-# Version:      0.3
-# Module:       dvired
-# Purpose:      Translate dvi-file into postscript with reduced output size.
-#		Two logical pages will be put on onto each physical sheet of
-#		paper.
-# System:	Linux. UNIX(tm) systems may work as well :-)
-# Requires:	pstops (http://www.dcs.ed.ac.uk/home/ajcd/psutils/), dvips
-# Created:      19.11.1992
-# Last Change:  13.08.1999
-# Language:     sh
-# Author:       Thomas Esser
-# Address:      te@dbs.uni-hannover.de
-# Copyright:    (c) 1994, 1999 by Thomas Esser
-# Copying:      GNU GENERAL PUBLIC LICENSE
-#==============================================================================
-
-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
-
-help()
-{
-        cat <<eof
-
-Usage: dvired [options] file
-
-This programm behaves like dvips, execpt fot the fact that two logical
-pages will be put on onto each physical sheet of paper.
-
-For options see dvips(1). This program only interprets the options
--o, -P and -f. All other options will directly be passed to dvips.
-
-If your paper is not in A4 format, you need to adjust the dimensions
-in this program.
-
-Examples: (it is assumed that the PRINTER-variable is set)
-   dvired -Plw foo                 send output to printer lw
-   dvired -o foo.ps foo            send output to file foo.ps
-   dvired -pp4-7 foo               send 4 output-pages to printer
-   dvired foo -f | ghostview -     preview output with ghostview
-eof
-}
-
-case $# in
-0)      help ; exit 1 ; ;;
-esac
-
-# This will work for A4 paper.
-paper=a4 ;	pstopsopt='2:0(7.44mm,7.44mm)+1(7.44mm,-141.06mm)'
-
-# The following are *UNTESTED*. Please let me know whether they work
-# or not, if you can test them.
-#paper=a3 ;	pstopsopt='2:0(7.44mm,7.44mm)+1(7.44mm,-202.56mm)'
-#paper=letter ;	pstopsopt='2:0(7.44mm,7.44mm)+1(7.44mm,-132.26mm)'
-#paper=legal ;	pstopsopt='2:0(7.44mm,7.44mm)+1(7.44mm,-170.36mm)'
-#paper=ledger ;	pstopsopt='2:0(7.44mm,7.44mm)+1(7.44mm,-132.26mm)'
-#paper=tabloid ;	pstopsopt='2:0(7.44mm,7.44mm)+1(7.44mm,-208.46mm)'
-
-of=""
-lpr_opt=""
-
-case "$PRINTER" in
-"")	dvips_pre="" ;;
-*)	dvips_pre="-P$PRINTER" ;;
-esac
-
-dvips_pre="$dvips_pre -t $paper -t landscape"
-
-while [ ! -z "$1" ] ; do
-	case $1 in
-	-P)	of="" ;  dvips_pre="$dvips_pre -P$2" ; lpr_opt="-P$2"
-		shift ;;
-	-P*)	of="" ;  dvips_pre="$dvips_pre $1" ; lpr_opt="$1" ;;
-	-o)	of="$2"
-		shift ;;
-	-o*)	of="`echo $1| sed 's/..//'`" ;;
-	-f)	of="-" ;;
-	*)	opt="$opt $1"
-	esac
-	shift
-done
-
-case "$of" in
-"")	dvips -x707 $dvips_pre $opt -f | pstops -q $pstopsopt | lpr $lpr_opt
-	;;
-"-")	dvips -x707 $dvips_pre $opt -f | pstops -q $pstopsopt
-	;;
-*)	dvips -x707 $dvips_pre $opt -f | pstops -q $pstopsopt > "$of"
-	;;
-esac
diff --git a/Master/bin/i386-linux/dviselect b/Master/bin/i386-linux/dviselect
deleted file mode 100755
index 1394d447100..00000000000
--- a/Master/bin/i386-linux/dviselect
+++ /dev/null
diff --git a/Master/bin/i386-linux/dvitodvi b/Master/bin/i386-linux/dvitodvi
deleted file mode 100755
index c7abf24c497..00000000000
--- a/Master/bin/i386-linux/dvitodvi
+++ /dev/null
diff --git a/Master/bin/i386-linux/dvitomp b/Master/bin/i386-linux/dvitomp
deleted file mode 100755
index 1c01e08a7f8..00000000000
--- a/Master/bin/i386-linux/dvitomp
+++ /dev/null
diff --git a/Master/bin/i386-linux/dvitype b/Master/bin/i386-linux/dvitype
deleted file mode 100755
index 713223383ee..00000000000
--- a/Master/bin/i386-linux/dvitype
+++ /dev/null
diff --git a/Master/bin/i386-linux/e2pall b/Master/bin/i386-linux/e2pall
deleted file mode 120000
index 47465883225..00000000000
--- a/Master/bin/i386-linux/e2pall
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf/scripts/tetex/e2pall.pl
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/ebb b/Master/bin/i386-linux/ebb
deleted file mode 100755
index dc4a6c6538e..00000000000
--- a/Master/bin/i386-linux/ebb
+++ /dev/null
diff --git a/Master/bin/i386-linux/ebong b/Master/bin/i386-linux/ebong
deleted file mode 100755
index ef59012e3bc..00000000000
--- a/Master/bin/i386-linux/ebong
+++ /dev/null
@@ -1,390 +0,0 @@
-# look in newbong
-import sre
-A='A'
-B='B'
-S='S'
-s='s'
-F='F'
-X='X'
-
-NCLINE = 0 
-global NCWORD,CWORD
-
-
-
-AKSAR={
-        'k'   :[B,'k'],
-        'kh'  :[B,'kh'],
-        'g'   :[B,'g'],
-        'gh'  :[B,'gh'],
-        'ng'  :[B,'NG'],
-
-        'ch'  :[B,'c'],
-        '^ch' :[B,'ch'],
-        'j'   :[B,'j'],
-        'jh'  :[B,'jh'],
-        '^y'  :[B,'NJ'],
-        '_n'  :[B,'NJ'],
-
-        't'   :[B,'T'],
-        '^th' :[B,'Th'],
-        'd'   :[B,'D'],
-        'dh'  :[B,'Dh'],
-        '^n'  :[B,'N'],
-
-        '_t'  :[B,'t'],
-        'th' :[B,'th'],
-        '_d'  :[B,'d'],
-        '_dh' :[B,'dh'],
-        'n'   :[B,'n'],
-
-
-        'p'   :[B,'p'],
-        'ph'  :[B,'ph'],
-        'f'   :[B,'ph'],
-        'b'   :[B,'b'],
-        'bh'  :[B,'bh'],
-        'v'   :[B,'bh'],
-        'm'   :[B,'m'],
-        'M'   :[F,'M'],
-
-
-        '^j'  :[B,'J'],
-        'J'   :[B,'J'],
-        'r'   :[B,'r'],
-        'R'   :[F,'R'],
-        'l'   :[B,'l'],
-        'L'   :[F,'L'],    
-        'W'   :[F,'W'],
-        'V'   :[F,'W'], 
-        'h'   :[B,'H'],
-        'kk'  :[B,'kK'],
-        'kkm' :[B,'kK/N'],
-
-        'sh'  :[B,'sh'],
-        '^s'  :[B,'Sh'],
-        '^sh' :[B,'Sh'],
-        's'   :[B,'s'],
-
-        '^r'   :[B,'rh'],
-        '^rh'  :[B,'rhh'],
-        'y'    :[B,'y'],
-        'Y'    :[F,'Y'],
-        'JY'   :[F,'Y'],
-        '__t'  :[B,'t//'],
-        '^ng'  :[B,'NNG'],
-        ':h'   :[B,'h'],
-        '^'    :[F,'NN'],
-        '_'    :[F,':/'],
-
-
-
-        'A'    :[S,'A'],
-        'AA'   :[S,'Aa'],
-        'I'    :[S,'I'],
-        'II'   :[S,'II'],
-        'U'    :[S,'U'],
-        'UU'   :[S,'UU'],
-        'RI'   :[S,'RR'],
-        'E'    :[S,'E'],
-        'OI'   :[S,'OI'],
-        'O'    :[S,'O'],
-        'OU'   :[S,'OU'],
-
-
-        'a'    :[X,'o',1],
-        'aa'   :[s,'a',1],
-        'i'    :[s,'i',-1],
-        'ii'   :[s,'ii',1],
-        'u'    :[s,'u',1],
-        'uu'   :[s,'uu',1],
-        'RII'   :[s,'rR',1],
-        'e'    :[s,'e',-1],
-        'oi'   :[s,'oi',-2],
-        'oo'   :[s,'oo',11],
-        'o'    :[X,'o',1],
-        'ou'   :[s,'ou',12],
-
-        '.'    :[F,'.'],
-        '..'   :[F,'..'],
-        '...'  :[F,'...'],
-        '|'    :[F,'|'],
-
-
-        '~'    :[F,'~'],
-        '`'    :[F,'`'],
-        '!'    :[F,'!'],
-        '1'    :[F,'1'],
-        '2'    :[F,'2'],
-        'at'   :[F,'@'],
-        '#'    :[F,'#'],
-        '3'    :[F,'3'],
-        '$'    :[F,'$'],
-        '4'    :[F,'4'],
-        '%'    :[F,'%'],
-        '5'    :[F,'5'],
-        '6'    :[F,'6'],
-        '&'    :[F,'&'],
-        '7'    :[F,'7'],
-        '*'    :[F,'*'],
-        '8'    :[F,'8'],
-        '('    :[F,'('],
-        '9'    :[F,'9'],
-        ')'    :[F,')'],
-        '0'    :[F,'0'],
-        'dash' :[F,'-'],
-        '+'    :[F,'+'],
-        '='    :[F,'='],
-        '|'    :[F,'|'],
-        '{'    :[F,'{'],
-        '['    :[F,'['],
-        '}'    :[F,'}'],
-        ']'    :[F,']'],
-        ':'    :[F,':'],
-        ';'    :[F,';'],
-        '"'    :[F,'"'],
-        "'"    :[F,"'"],
-        '<'    :[F,'<'],
-        ','    :[F,','],
-        '>'    :[F,'>'],
-        '.'    :[F,'.'],
-        '?'    :[F,'?'],
-        '/'    :[F,'/']}
-        
-        
-        
-        
-        
-        
-        
-
-CATCODES = {'SS'  :[S,'','','',1],
-            'SB'  :[B,'','','',1],
-            'BS'  :[S,'','','',1],
-            'BB'  :[B,'','/','',1],
-            'BF'  :[F,'','','',1],
-            'Bs1' :[S,'','','',1],
-            'Bs-1':[S,'\*','','*',1],
-            'Bs-2':[S,'\*','','*{oi}',0],
-            'Bs11':[S,'\*','','*ea',0],
-            'Bs12':[S,'\*','','*eou',0],
-            'Fs1' :[S,'','','',1],
-            'Fs-1':[S,'\*','','*',1],
-            'Fs-2':[S,'\*','','*{oi}',0],
-            'Fs11':[S,'\*','','*ea',0],
-            'Fs12':[S,'\*','','*eou',0],
-            'FF'  :[F,'','','',1], 
-            'AX'  :[F,'','','',1]}
-
-
-def blocked(line):
-    #print '@ blocked', line , '->',
-    m = sre.findall('@[^@]+@',line)
-    outline = line
-    if not m :        
-        #print  outline
-        return(outline)
-    else:
-        for i in range(len(m)):
-            s=m[i][:-1].replace(' ','%X%')
-            outline = outline.replace(m[i],s,1)
-        #print outline
-        return(outline)
-
-def unblock(line):
-    #print '@unblock', line, '->',    
-    m = sre.findall('@[^\s]+',line)
-    outline = line
-    if not m :
-        #print outline
-        return(outline)
-    else:
-        for i in range(len(m)):
-            s=m[i].replace('@','').replace('%X%',' ')
-            outline = outline.replace(m[i],s)
-        #print outline
-        return(outline)
-
-
-def printamp(line):
-    #print '@unblock', line, '->',    
-    m = sre.findall('#AT',line)
-    outline = line
-    if not m :
-        #print outline
-        return(outline)
-    else:
-        for i in range(len(m)):
-            outline = outline.replace('#AT','@')
-        #print outline
-        return(outline)
-
-def  readsyll(syll):
-    syllparts=[]
-    start = 0; end = len(syll)
-    while syll[start : end]:
-	slice = syll[start : end]
-	#print slice
-	if AKSAR.has_key(slice):
-		syllparts.append(AKSAR[slice])
-		start = start + len(slice)
-		end = len(syll)
-	else :
-		end = end -1
-    return(syllparts)
-
-def fuse(list1,list2):
-    global CCATCODE
-    #print list1,list2
-    Type1 = list1[0]
-    Type2 = list2[0]
-    
-    if Type2 == s:
-       Type3 = str(list2[2])
-    elif Type2 == X:
-	Type1=A
-	Type3=''
-    else:
-	Type3 =''
-
-
-      
-     
-    Type = Type1+Type2+Type3
-
-    #print 'Type:', Type
-
-    try:
-        CATCODE = CATCODES[Type]
-        TARGET = CATCODE[0]
-        PREFIX = CATCODE[1]
-        MIDFIX = CATCODE[2]
-        POSTFIX = CATCODE[3]
-        FLAG = CATCODE[4]
-
-        #print 'TGT:', TARGET, PREFIX,MIDFIX,POSTFIX,FLAG
-        #print 'RAWC', AKSAR[list1[1]][1],AKSAR[list2[1]][1] 
-
-        c1=list1[1]
-        c2=list2[1]
-
-        if FLAG == 1 :
-            c = PREFIX + c1 + MIDFIX + POSTFIX + c2
-        else :
-            c = PREFIX + c1 + MIDFIX + POSTFIX
-
-        fused = [TARGET,c]
-        #print CATCODE
-        return(fused)
-    except KeyError:
-        print '\n ERROR AT LINE:', NCLINE, 'WORD:',NCWORD, '(',CWORD,')'
-        return(['ERROR','UNKNOWN CATCODE'])
-        
-    
-        
-    
-
-def fuseatoms(syll):
-    slist=readsyll(syll);
-    #print slist
-    lslist=len(slist);
-    l0=slist[0];
-    for i in range(1,lslist):
-        nextitem = slist[i]
-        l0=fuse(l0,nextitem)
-        
-    return(l0[1])
-
-def fuseword(wrd):
-    if wrd[0] == '@' :
-        return(wrd)
-    syllables = wrd.split('-')
-    w0=''
-    for eachsyll in syllables:
-        syll=eachsyll
-        thesyll = fuseatoms(syll)
-        w0 = w0 + thesyll
-    #print 'FUSED WORD',w0
-    return(w0)
-
-    
-def fuseline(line):
-    global NCWORD,CWORD
-    NCWORD = 0
-    #line = blocked(line)
-    words = line.split()
-    l0=''
-    for eachword in words:
-        NCWORD=NCWORD+1
-        word = eachword
-        CWORD=word
-        theword=fuseword(word)
-        #print 'XX',theword
-        l0=l0+' '+theword
-    #print 'FUSED LINE', l0    
-    return(l0)
-
-
-# The main program
-import sys
-OK=1
-finnam = sys.argv[1]
-foutnam = finnam.split('.')[0] + '.' + 'tex'
-
-fin  = file(finnam,'rt')
-fout = file(foutnam,'wt')
-
-textin = fin.readlines()
-nlines = len(textin)
-
-
-textout = []
-
-fin.close()
-
-for eachline in textin:
-                NCLINE = NCLINE+1
-                if eachline[0] == '#' :
-                    lineout = eachline[1:]
-                elif eachline[0] == '\\' :
-                    lineout = eachline
-                elif eachline == '\n':
-                    lineout = eachline
-                else :
-                    line1   = eachline.strip()
-                    line2   = blocked(line1)
-                    lineout = fuseline(line2) + '\n'
-                    lineout = lineout[1:]                    
-                    #print ':::', lineout
-                if lineout.find('UNKNOWN CATCODE') == -1 :
-                    lineout = unblock(lineout)
-                    #print ':::', lineout
-                    textout.append(printamp(lineout))
-                else :
-                    OK = 0
-                    fout.close()
-                   
-                  
-
-
-                        
-                
-             
-        
-        
-if OK == 1:        
-    fout.writelines(textout)
-    fout.close()
-    print 'done'
-else:
-    print 'Unknown CATCODE, Fix The errors and try again'
-
-    
-    
-    
-    
-        
-           
-        
-        
-                
diff --git a/Master/bin/i386-linux/eplain b/Master/bin/i386-linux/eplain
deleted file mode 120000
index f68cc91498e..00000000000
--- a/Master/bin/i386-linux/eplain
+++ /dev/null
@@ -1 +0,0 @@
-pdftex
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/epsffit b/Master/bin/i386-linux/epsffit
deleted file mode 100755
index 53e1f60b3bf..00000000000
--- a/Master/bin/i386-linux/epsffit
+++ /dev/null
diff --git a/Master/bin/i386-linux/epstopdf b/Master/bin/i386-linux/epstopdf
deleted file mode 120000
index 3287ed667d6..00000000000
--- a/Master/bin/i386-linux/epstopdf
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf/scripts/epstopdf/epstopdf.pl
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/etex b/Master/bin/i386-linux/etex
deleted file mode 120000
index f68cc91498e..00000000000
--- a/Master/bin/i386-linux/etex
+++ /dev/null
@@ -1 +0,0 @@
-pdftex
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/exatools b/Master/bin/i386-linux/exatools
deleted file mode 100755
index 50ff0f07e46..00000000000
--- a/Master/bin/i386-linux/exatools
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-texmfstart exatools.rb "$@"
diff --git a/Master/bin/i386-linux/extconv b/Master/bin/i386-linux/extconv
deleted file mode 100755
index d3e360c52e2..00000000000
--- a/Master/bin/i386-linux/extconv
+++ /dev/null
diff --git a/Master/bin/i386-linux/extractres b/Master/bin/i386-linux/extractres
deleted file mode 100755
index c54056461a2..00000000000
--- a/Master/bin/i386-linux/extractres
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/usr/bin/env perl
-# extractres: extract resources from PostScript file
-#
-# Copyright (C) Angus J. C. Duggan 1991-1995
-# See file LICENSE for details.
-
-$prog = ($0 =~ s=.*/==);
-
-%resources = ();		# list of resources included
-%merge = ();			# list of resources extracted this time
-%extn = ("font", ".pfa", "file", ".ps", "procset", ".ps", # resource extns
-	 "pattern", ".pat", "form", ".frm", "encoding", ".enc");
-%type = ("%%BeginFile:", "file", "%%BeginProcSet:", "procset",
-	 "%%BeginFont:", "font"); # resource types
-
-while (@ARGV) {
-   $_ = shift;
-   if (/^-m(erge)?$/) { $merge = 1; }
-   elsif (/^-/) {
-      print STDERR "Usage: $prog [-merge] [file]\n";
-      exit 1;
-   } else {
-      unshift(@ARGV, $_);
-      last;
-   }
-}
-
-if (defined($ENV{TMPDIR})) {	# set body file name
-   $body = "$ENV{TMPDIR}/body$$.ps";
-} else {
-   $body = "body$$.ps";
-}
-
-open(BODY, $body) && die "Temporary file $body already exists";
-open(BODY, ">$body") || die "Can't write file $body";
-
-sub filename {			# make filename for resource in @_
-   local($name);
-   foreach (@_) {		# sanitise name
-      s/[!()\$\#*&\\\|\`\'\"\~\{\}\[\]\<\>\?]//g;
-      $name .= $_;
-   }
-   $name =~ s@.*/@@;		# drop directories
-   die "Filename not found for resource ", join(" ", @_), "\n"
-      if $name =~ /^$/;
-   $name;
-}
-
-$output = STDOUT;		# start writing header out
-while (<>) {
-   if (/^%%BeginResource:/ || /^%%BeginFont:/ || /^%%BeginProcSet:/) {
-      local($comment, @res) = split(/\s+/); # look at resource type
-      local($type) = defined($type{$comment}) ? $type{$comment} : shift(@res);
-      local($name) = &filename(@res, $extn{$type}); # make file name
-      $saveout = $output;
-      if (!$resources{$name}) {
-	 print "%%IncludeResource: $type ", join(" ", @res), "\n";
-	 if (!open(RES, $name)) {
-	    open(RES, ">$name") || die "Can't write file $name";
-	    $resources{$name} = $name;
-	    $merge{$name} = $merge;
-	    $output = RES;
-	 } else {		# resource already exists
-	    close(RES);
-	    undef $output;
-	 }
-      } elsif ($merge{$name}) {
-	 open(RES, ">>$name") || die "Can't append to file $name";
-	 $output = RES;
-      } else {			# resource already included
-	 undef $output;
-      }
-   } elsif (/^%%EndResource/ || /^%%EndFont/ || /^%%EndProcSet/) {
-      if (defined $output) {
-	 print $output $_;
-	 close($output);
-      }
-      $output = $saveout;
-      next;
-   } elsif ((/^%%EndProlog/ || /^%%BeginSetup/ || /^%%Page:/)) {
-      $output = BODY;
-   }
-   print $output $_
-      if defined $output;
-}
-
-close(BODY);			# close body output file
-
-open(BODY, $body);		# reopen body for input
-while (<BODY>) {		# print it all
-   print $_;
-}
-close(BODY);
-
-unlink($body);			# dispose of body file
-
diff --git a/Master/bin/i386-linux/fixdlsrps b/Master/bin/i386-linux/fixdlsrps
deleted file mode 100755
index 2a1d85a654c..00000000000
--- a/Master/bin/i386-linux/fixdlsrps
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env perl
-# fixdlsrps: fix DviLaser/PS document to work with PSUtils
-#
-# Copyright (C) Angus J. C. Duggan 1991-1995
-# See file LICENSE for details.
-
-$nesting = 0;
-$page = 1;
-$infont = 0;
-
-@fonts = ();
-@body = ();
-$header = 1;
-
-while (<>) {
-   if (/^XP/) {
-      $infont++;
-      push(@fonts, $_);
-      $infont-- if /PXL.*RP/ || /DN?F.*RP/;
-   } elsif ($infont) {
-      push(@fonts, $_);
-      $infont-- if /PXL.*RP/ || /DN?F.*RP/;
-   } elsif ((/^%%EndSetup/ || /^%%Page:/) && $header) {
-      print @body;
-      @body = ("%%EndSetup\n");
-      $header = 0;
-   } elsif (/^%%EndProlog/ && !$nesting) {
-      push(@body,
-	   "\$DviLaser begin/GlobalMode{}bdef/LocalMode{}bdef/XP{}def/RP{}def",
-	   "/DoInitialScaling{72.0 Resolution div dup scale}bdef end\n", $_);
-   } elsif (/^%%BeginPageSetup/ && !$nesting) {
-      push(@body, "%%Page: $page $page\n", $_,
-	    "Resolution 72 div dup scale Magnification 1000 div dup scale\n",
-	    "/DocumentInitState where {\n",
-	    "/DocumentInitState [ matrix currentmatrix currentlinewidth",
-	    " currentlinecap currentlinejoin currentdash currentgray",
-	    " currentmiterlimit] cvx put}if\n");
-      $page++;
-   } elsif (/^%%BeginDocument:/ || /^%%BeginBinary:/ || /^%%BeginFile:/) {
-      push(@body, $_);
-      $nesting++;
-   } elsif (/^%%EndDocument/ || /^%%EndBinary/ || /^%%EndFile/) {
-      push(@body, $_);
-      $nesting--;
-   } elsif (!/^%%PageBoundingBox:/ && !/^%%Page:/) {
-      push(@body, $_);
-   }
-}
-
-print @fonts;
-print @body;
-
-exit 0;
-
diff --git a/Master/bin/i386-linux/fixfmps b/Master/bin/i386-linux/fixfmps
deleted file mode 100755
index 039ac8e5a3e..00000000000
--- a/Master/bin/i386-linux/fixfmps
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env perl
-# fixfmps: get conforming PostScript out of FrameMaker version 2 file
-# move all FMDEFINEFONTs to start of pages
-#
-# Copyright (C) Angus J. C. Duggan 1991-1995
-# See file LICENSE for details.
-
-%fonts=();
-
-while (<>) {
-   if (/^([0-9]+) [0-9]+ .* FMDEFINEFONT$/) {
-      $fonts{$1} = $_;
-   } elsif (/^[0-9.]+ [0-9.]+ [0-9]+ FMBEGINPAGE$/) {
-      print $_, join('',values(%fonts));
-   } elsif (m%(.*/PageSize \[paperwidth paperheight\]put )setpagedevice(.*)%) {
-      print "$1pop$2\n";
-   } else {
-      print $_;
-   }
-}
-
diff --git a/Master/bin/i386-linux/fixmacps b/Master/bin/i386-linux/fixmacps
deleted file mode 100755
index f4cfdb10a9e..00000000000
--- a/Master/bin/i386-linux/fixmacps
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/usr/bin/env perl
-# fixmacps: swap to sanitised appledict
-#
-# Copyright (C) Angus J. C. Duggan 1991-1995
-# See file LICENSE for details.
-
-$line = 0;			# keep line count
-$predir = `kpsewhich -progname=psutils md71_0.ps`;
-$dir=`basename $predir`;
-$prefix = "md";
-$default = "md71_0.ps";
-
-while ($_ = shift(@ARGV)) {
-   if (/^-d(ir)?$/)   { $dir = shift(@ARGV); }
-   elsif (/^-n(ame)?$/)   { $prefix = shift(@ARGV); }
-   else {
-      unshift(@ARGV, $_);
-      last;
-   }
-}
-
-%fonts = ();
-$nesting = 0;
-
-while (<>) {
-   if (/^%!/) {
-      if (! $line) {
-	 print;
-      }
-   } elsif (/^%%(Begin|Include)ProcSet: "?\(AppleDict md\)"? ([0-9]+) ([0-9]+)$/) {
-      local($inc, $mdv, $mdr) = ($1, $2, $3);
-      if (open(SANE, "<$dir/$prefix${mdv}_$mdr.ps") ||
-	  open(SANE, "<$dir/$default")) {
-	 $sane = <SANE>;
-	 local($snv, $snr) =
-	    $sane =~ /^%%BeginProcSet: \(AppleDict md\) ([0-9]+) ([0-9]+)$/;
-	 if ($mdv == $snv && $mdr == $snr) {
-	     if ( $inc eq "Include" ) {
-		 print STDERR "Inserting ProcSet \"(AppleDict md)\" $snv $snr\n";
-		 print $sane;
-		 while(<SANE>) {
-		     print;
-		 }
-		 close(SANE);
-	     }
-	     else {
-		 print STDERR "Substituting ProcSet \"(AppleDict md)\" $snv $snr\n";
-		 $ignore = 1;
-	     }
-	 } else {
-	    print STDERR "Unrecognised AppleDict version $mdv $mdr\n";
-	    print "%!\n" if !$line;
-	    print;
-	 }
-      } else {
-	 print STDERR "Can't find sanitised AppleDict\n";
-	 print "%!\n" if !$line;
-	 print;
-      }
-   } elsif (/^%%EndProcSet/) {
-      if ($ignore) {
-	 $ignore = 0;
-	 print "%!\n" if !$line;
-	 print $sane;
-	 while(<SANE>) {
-	    print;
-	 }
-	 close(SANE);
-      } else {
-	 print "%!\n" if !$line;
-	 print;
-      }
-   } elsif (/^%%Page:/ && $nesting == 0) {
-      print $_;
-      print values(%fonts);
-   } elsif (/^%%BeginDocument/ || /^%%BeginBinary/ || /^%%BeginFile/) {
-      print $_;
-      $nesting++;
-   } elsif (/^%%EndDocument/ || /^%%EndBinary/ || /^%%EndFile/) {
-      print $_;
-      $nesting--;
-   } else {
-      if (! $ignore) {
-	 if (/^\{\}mark .*rf$/) {
-	    $fonts{$_} = $_;
-	    print;
-	 } else {
-	    print "%!\n" if !$line;
-	    print;
-	 }
-      }
-   }
-   $line++;
-}
-
diff --git a/Master/bin/i386-linux/fixpsditps b/Master/bin/i386-linux/fixpsditps
deleted file mode 100755
index 2a1728a8204..00000000000
--- a/Master/bin/i386-linux/fixpsditps
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env perl
-# fixpsditps: fix psdit output for use in psutils
-#
-# Copyright (C) Angus J. C. Duggan 1991-1995
-# See file LICENSE for details.
-
-$nesting = 0;
-
-while (<>) {
-   if (/^\/p{pop showpage pagesave restore \/pagesave save def}def$/) {
-      print "/p{pop showpage pagesave restore}def\n";
-   } elsif (/^%%BeginDocument/ || /^%%BeginBinary/ || /^%%BeginFile/ ) {
-      print $_;
-      $nesting++;
-   } elsif (/^%%EndDocument/ || /^%%EndBinary/ || /^%%EndFile/) {
-      print $_;
-      $nesting--;
-   } elsif (/^%%Page:/ && $nesting == 0) {
-      print $_;
-      print "xi\n";
-   } elsif (! /^xi$/) {
-      print $_;
-   }
-}
-
diff --git a/Master/bin/i386-linux/fixpspps b/Master/bin/i386-linux/fixpspps
deleted file mode 100755
index 77bba66d6b7..00000000000
--- a/Master/bin/i386-linux/fixpspps
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env perl
-# mangle PostScript produced by PSPrint to make it almost conforming
-#
-# Copyright (C) Angus J. C. Duggan 1991-1995
-# See file LICENSE for details.
-
-$header = 1; $ignore = 0;
-$verbose = 0;
-@body = ();
-%fonts = (); $font = "";
-$inchar = 0; @char = ();
-
-while (<>) {
-   if (/^\@end$/) {
-      $ignore = 1;
-   } elsif (/^[0-9]+ \@bop0$/) {
-      $ignore = 0;
-      $header = 1;
-   } elsif ($header) {
-      if (/^\/([a-z.0-9]+) \@newfont$/) {
-	 if (! defined($fonts{$1})) {
-	    $fonts{$1} = 1;
-	    print;
-	 } elsif ($verbose) {
-	    print STDERR "$font already defined\n";
-	 }
-      } elsif (/^([a-z.0-9]+) sf$/) {
-	 $font = $1;
-	 print;
-      } elsif (/^\[</) {
-	 $inchar = 1;
-	 push (@char, $_);
-      } elsif ($inchar) {
-	 push (@char, $_);
-	 if (/.*\] ([0-9]+) dc$/) {
-	    if (! defined($fonts{$font,$1})) {
-	       $fonts{$font,$1} = 1;
-	       print (@char);
-	    } elsif ($verbose) {
-	       print STDERR "$font character $1 already defined\n";
-	    }
-	    $inchar = 0;
-	    @char = ();
-	 }
-      } elsif (/^([0-9]+) \@bop1$/) {
-	 $header = 0;
-	 push (@body, "%%Page: ? $1\n");
-	 push (@body, $_);
-      } else {
-	 print;
-      }
-   } elsif (! $ignore) {
-      push (@body, $_);
-   }
-}
-print (@body);
-print ("\@end\n");
-
diff --git a/Master/bin/i386-linux/fixscribeps b/Master/bin/i386-linux/fixscribeps
deleted file mode 100755
index bd4e9a0e3e0..00000000000
--- a/Master/bin/i386-linux/fixscribeps
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-# fixscribeps: get conforming PostScript out of Scribe
-#
-# Copyright (C) Angus J. C. Duggan 1991-1995
-# See file LICENSE for details.
-
-$inepsf = 0;
-$epsfn = 0;
-while (<>) {
-   if (/^([0-9]+ [0-9]+ [0-9]+ PB) (%!.*)/) {
-      print "$1\n%%BeginDocument: Scribe-EPSF $epsfn 0\n$2\n";
-      $inepsf++;
-   } elsif (/^ PE/ && $inepsf) {
-      print "%%EndDocument\n", $_;
-   } else {
-      print $_;
-   }
-}
-
diff --git a/Master/bin/i386-linux/fixtpps b/Master/bin/i386-linux/fixtpps
deleted file mode 100755
index 4239bb9dfc5..00000000000
--- a/Master/bin/i386-linux/fixtpps
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env perl
-# fixtpps: fix tpscript document to work with PSUtils
-#
-# Copyright (C) Angus J. C. Duggan 1991-1995
-# See file LICENSE for details.
-
-$nesting = 0;
-$header = 1;
-
-while (<>) {
-   if (/^%%Page:/ && $nesting == 0) {
-      print $_;
-      print "save home\n";
-      $header = 0;
-   } elsif (/^%%BeginDocument/ || /^%%BeginBinary/ || /^%%BeginFile/) {
-      print $_;
-      $nesting++;
-   } elsif (/^%%EndDocument/ || /^%%EndBinary/ || /^%%EndFile/) {
-      print $_;
-      $nesting--;
-   } elsif (/save home/) {
-      s/save home//;
-      print $_;
-   } elsif (!$header || (! /^save$/ && ! /^home$/)) {
-      print $_;
-   }
-}
-
diff --git a/Master/bin/i386-linux/fixwfwps b/Master/bin/i386-linux/fixwfwps
deleted file mode 100755
index 92d88443fe1..00000000000
--- a/Master/bin/i386-linux/fixwfwps
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env perl
-# fixwfwps: fix Word for windows PostScript for printing.
-#
-# Copyright (C) Angus J. C. Duggan 1991-1995
-# See file LICENSE for details.
-
-$nesting = 0;
-while (<>) {
-   tr/\000-\010\012-\014\016-\037//d;
-   foreach (grep($_ ne "", split("\015"))) {
-      s!/SVDoc\s+save\s+def!!g;
-      s!SVDoc\s+restore!!g;
-      if (/^(%!PS-Adobe-\d*\.\d*) EPSF-/ && !$nesting) {
-	 print "$1\n";
-	 $wfwepsf = 1;
-      } elsif (/^SS\s*$/ && $wfwepsf) {
-	 print "%%Page: $wfwepsf $wfwepsf\n";
-	 $wfwepsf++;
-	 print "$_\n";
-      } elsif (/^%MSEPS Preamble/) {
-	 print "%%BeginDocument: (Included EPSF)\n";
-	 print "$_\n";
-	 $nesting++;
-      } elsif (/^%MSEPS Trailer/) {
-	 $nesting--;
-	 print "$_\n";
-	 print "%%EndDocument\n";
-      } elsif (! /^%%BoundingBox/) {
-	 print "$_\n";
-      }
-   }
-}
-
diff --git a/Master/bin/i386-linux/fixwpps b/Master/bin/i386-linux/fixwpps
deleted file mode 100755
index 83a5fdfaf0b..00000000000
--- a/Master/bin/i386-linux/fixwpps
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env perl
-# fixwpps: get semi-conforming PostScript out of WordPerfect 5.0 file
-#
-# Copyright (C) Angus J. C. Duggan 1991-1995
-# See file LICENSE for details.
-
-$page = 1;
-$nesting = 0;
-
-while (<>) {
-   s/([^\/]_t)([0-9]+)/\1 \2/g;	# fix wp 5.0 bug
-   if (m!/_[be][dp]! || m!_bp \d+ \d+ roll!) {
-      print $_;
-   } elsif (/^(.*)(_bp.*)$/) {
-      print "$1\n" if $1 ne "";
-      print "%%Page: $page $page\n";
-      print "$2\n";
-      $page++;
-      $nesting++;
-   } elsif (/_ep$/) {
-      print $_;
-      $nesting--;
-   } elsif (/^(.*)(_ed.*)/) {
-      print "$1\n" if $1 ne "";
-      print "%%Trailer:\n";
-      print "$2\n";
-   } else {
-      print $_;
-   }
-}
-
diff --git a/Master/bin/i386-linux/fixwwps b/Master/bin/i386-linux/fixwwps
deleted file mode 100755
index bfd58c086da..00000000000
--- a/Master/bin/i386-linux/fixwwps
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env perl
-# fixwwps: get semi-conforming PostScript out of Windows Write file
-#
-# Copyright (C) Angus J. C. Duggan 1991-1995
-# See file LICENSE for details.
-
-$page = 1;
-
-while (<>) {
-   if (/^(%!.*) EPSF-\d.\d/) {
-      print $1, "\n";
-   } elsif (/^SS/) {
-      print "%%Page: $page $page\n";
-      print $_;
-      $page++;
-   } else {
-      print $_;
-   }
-}
-
diff --git a/Master/bin/i386-linux/fmtutil b/Master/bin/i386-linux/fmtutil
deleted file mode 100755
index 0cdb4347121..00000000000
--- a/Master/bin/i386-linux/fmtutil
+++ /dev/null
@@ -1,901 +0,0 @@
-#!/bin/sh
-
-###############################################################################
-# fmtutil: utility to maintain format files.
-#
-# Thomas Esser, public domain.
-#
-# Commands:
-# --all                      recreate all format files
-# --missing                  create all missing format files
-# --refresh                  recreate only existing format files
-# --byfmt formatname         (re)create format for `formatname'
-# --byhyphen hyphenfile      (re)create formats that depend on `hyphenfile'
-# --enablefmt formatname     enable formatname in config file
-# --disablefmt formatname    disable formatname in config file
-# --listcfg                  list (enabled and disabled) configurations,
-#                            filtered to available formats
-# --catcfg                   output the content of the config file
-# --showhyphen formatname    print name of hyphenfile for format `formatname'
-# --edit                     edit fmtutil.cnf file
-# --version                  show version info
-# --help                     show this message
-#
-# Options:
-#  --cnffile file             set configfile for fmtutil
-#  --fmtdir directory         set destination directory for format files
-#  --no-engine-subdir         don't use $engine subdirectory of the fmtdir
-###############################################################################
-
-###############################################################################
-# program history:
-#   further changes in texk/tetex/ChangeLog.
-#   2007-01-04  patch by JK to support $engine subdir (enabled by default)
-#   Fr Apr  8 19:15:05 CEST 2005 cleanup now has an argument for the return code
-#   Do Mar 02 10:42:31 CET 2006 add tmpdir to TEXFORMATS
-#   So Mär 27 18:52:06 CEST 2005 honor $TMPDIR, $TEMP and $TMP, not just $TMP
-#   Sa Jan 15 18:13:46 CET 2005 avoid multiple variable assignments in one statement
-#   Di Jan 11 11:42:36 CET 2005 fix --byhyphen with relative hyphenfile
-#   Fr Dez 31 16:51:29 CET 2004 option catcfg added (for being called by texconfig)
-#   Do Dez 30 21:53:27 CET 2004 rename variable verbose to verboseFlag
-#   Sa Dez 25 12:44:23 CET 2004 implementation adopted for teTeX-3.0 (tcfmgr)
-#   Do Okt 28 11:09:36 CEST 2004 added --refresh
-#   Fr Sep 17 19:25:28 CEST 2004 save $0 in a variable before calling a function
-#   Sun May  9 23:24:06 CEST 2004 changes for new web2c: format names
-#                                 are now *.fmt, nothing else, disable
-#                                 "plain" symlinks
-#   Thu May  6 14:16:19 CEST 2004: "mv ...</dev/null" to avoid interaction.
-#   Sun Mar 21 19:44:36 CET 2004: support aleph
-#   Thu Dec 25 22:11:53 CET 2003: add version string
-#   Thu Dec 25 12:56:14 CET 2003: new listcfg_loop lists only supported formats
-#   Sun Dec 21 10:25:37 CET 2003 "mktexfmt pdflatex" did not work (if called
-#                                as mktexfmt, an extention was mandatory)
-#   Mon Sep 15 13:07:31 CEST 2003 add tmpdir to TEXINPUTS
-#   Sun Aug  3 11:09:46 CEST 2003 special case for mptopdf
-#   Sun Apr 20 10:27:09 CEST 2003 allow " " as well as tab in config file
-#   Wed Feb 19 21:14:52 CET 2003   add eomega support
-#   Sat Feb 15 22:01:35 CET 2003   let mf-nowin work without mf
-#   Wed Dec 25 09:47:44 CET 2002   bugfix for localized pool files
-#   Fri Oct 25 02:29:06 CEST 2002: now more careful about find_hyphenfile()
-#   Tue Oct 22 22:46:48 CEST 2002: -jobname, oft extension
-#   Fri Oct  4 22:33:17 CEST 2002: add more cli stuff: enablefmt
-#                                  disablefmt listcfg
-#   Sun Jul  7 21:28:37 CEST 2002: look at log file for possible problems,
-#                                  and issue a warning
-#   Tue Jun  4 21:52:57 CEST 2002: trap / cleanup code from updmap
-#   Tue Jun  4 19:32:44 CEST 2002: be smarter about stdout / stderr
-#   Tue Apr  9 22:46:34 CEST 2002: pass -progname=mpost for metafun
-#   Tue Apr  2 00:37:39 CEST 2002: added mktexfmt functionality
-#   Tue Jun  5 14:45:57 CEST 2001: added support for mf / mpost
-###############################################################################
-
-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+"$@"}'='"$@"'
-
-progname=fmtutil
-argv0=$0
-version=1205513038 # seconds since `00:00:00 1970-01-01 UTC'
-                   # date '+%s' (with GNU date)
-
-cnf=fmtutil.cnf   # name of the config file
-export PATH
-
-###############################################################################
-# cleanup()
-#   clean up the temp area and exit with proper exit status
-###############################################################################
-cleanup()
-{
-  rc=$1
-  # for debugging, exit $rc here so $tmpdir with its logs sticks around.
-  $needsCleanup && test -n "$tmpdir" && test -d "$tmpdir" \
-    && { cd / && rm -rf "$tmpdir"; }
-  (exit $rc); exit $rc
-}   
-
-###############################################################################
-# setupTmpDir()
-#   set up a temp directory and a trap to remove it
-###############################################################################
-setupTmpDir()
-{
-  $needsCleanup && return
-
-  trap 'cleanup 1' 1 2 3 7 13 15
-  needsCleanup=true
-  (umask 077; mkdir "$tmpdir") \
-    || abort "could not create directory \`$tmpdir'"
-}
-
-###############################################################################
-# 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()
-{
-  file=$1; pat=$2; line=$3
-
-  if grep "$pat" "$file" >/dev/null; then
-    ed "$file" >/dev/null 2>&1 <<-eof
-	/$pat/
-	c
-	$line
-	.
-	w
-	q
-eof
-  else
-    echo "$line" >> $file
-  fi
-}
-
-###############################################################################
-# setmatch(match)
-#   setting the "match state" to true or false. Used to see if there was at
-#   least one match.
-###############################################################################
-setmatch()
-{
-  match=$1
-}
-
-###############################################################################
-# getmatch()
-#    return success if there was at least one match.
-###############################################################################
-getmatch()
-{
-  test "x$match" = xtrue
-}
-
-###############################################################################
-# initTexmfMain()
-#   get $MT_TEXMFMAIN from $TEXMFMAIN
-###############################################################################
-initTexmfMain()
-{
-  case $MT_TEXMFMAIN in
-    "") MT_TEXMFMAIN=`kpsewhich --var-value=TEXMFMAIN`;;
-  esac
-  export MT_TEXMFMAIN
-}
-
-###############################################################################
-# cache_vars()
-#   locate files / kpathsea variables and export variables to environment
-#    this speeds up future calls to e.g. mktexupd
-###############################################################################
-cache_vars()
-{
-  : ${MT_VARTEXFONTS=`kpsewhich --expand-var='$VARTEXFONTS' | sed 's%^!!%%'`}
-  : ${MT_MKTEXNAM=`kpsewhich --format='web2c files' mktexnam`}
-  : ${MT_MKTEXNAM_OPT=`kpsewhich --format='web2c files' mktexnam.opt`}
-  : ${MT_MKTEXDIR=`kpsewhich --format='web2c files' mktexdir`}
-  : ${MT_MKTEXDIR_OPT=`kpsewhich --format='web2c files' mktexdir.opt`}
-  : ${MT_MKTEXUPD=`kpsewhich --format='web2c files' mktexupd`}
-  : ${MT_MKTEX_CNF=`kpsewhich --format='web2c files' mktex.cnf`}
-  : ${MT_MKTEX_OPT=`kpsewhich --format='web2c files' mktex.opt`}
-  export MT_VARTEXFONTS MT_MKTEXNAM MT_MKTEXNAM_OPT MT_MKTEXDIR
-  export MT_MKTEXDIR_OPT MT_MKTEXUPD MT_MKTEX_CNF MT_MKTEX_OPT
-}
-
-###############################################################################
-# help()
-#   display help message and exit
-###############################################################################
-help()
-{
-  cat <<'eof'
-Usage: fmtutil [option] ... cmd [argument]
-
-Valid options:
-  --cnffile file
-  --fmtdir directory
-  --no-engine-subdir         don't use engine-specific subdir of the fmtdir
-  --quiet                    (not implemented, just for compatibility)
-  --test                     (not implemented, just for compatibility)
-  --dolinks                  (not implemented, just for compatibility)
-  --force                    (not implemented, just for compatibility)
-
-Valid commands:
-  --all                      recreate all format files
-  --missing                  create all missing format files
-  --refresh                  recreate only existing format files
-  --byfmt formatname         (re)create format for `formatname'
-  --byhyphen hyphenfile      (re)create formats that depend on `hyphenfile'
-  --enablefmt formatname     enable formatname in config file
-  --disablefmt formatname    disable formatname in config file
-  --listcfg                  list (enabled and disabled) configurations,
-                             filtered to available formats
-  --catcfg                   output the content of the config file
-  --showhyphen formatname    print name of hyphenfile for format `formatname'
-  --edit                     edit fmtutil.cnf file
-  --version                  show version info
-  --help                     show this message
-eof
-  cleanup 0
-}
-
-version()
-{
-  cat <<eof
-$progname version $version.
-eof
-  cleanup 0
-}
-
-###############################################################################
-# abort(errmsg)
-#   print `errmsg' to stderr and exit with error code 1
-###############################################################################
-abort()
-{
-  echo "$progname: $1." >&2
-  cleanup 1
-}
-
-###############################################################################
-# verboseMsg(msg)
-#   print `msg' to stderr is $verbose is true
-###############################################################################
-verboseMsg() {
-  $verboseFlag && verbose echo ${1+"$@"}
-}
-
-###############################################################################
-# byebye()
-#   report any failures and exit the program
-###############################################################################
-byebye()
-{
-  if $has_errors; then
-    {
-      cat <<eof
-
-###############################################################################
-$progname: Error! Not all formats have been built successfully.
-Visit the log files in directory
-  $destdir
-for details.
-###############################################################################
-
-This is a summary of all \`failed' messages and warnings:
-$log_failure_msg
-eof
-    } >&2
-    cleanup 1
-  else
-    cleanup 0
-  fi
-}
-
-###############################################################################
-# init_log_failure()
-#   reset the list of failure messages
-###############################################################################
-init_log_failure()
-{
-  log_failure_msg=
-  has_errors=false
-}
-
-###############################################################################
-# log_failure(errmsg)
-#   report and save failure message `errmsg'
-###############################################################################
-log_failure()
-{
-  echo "Error: $@" >&2
-  if test -z "$log_failure_msg"; then
-    log_failure_msg="$@"
-  else
-    OLDIFS=$IFS; IFS=
-    log_failure_msg="$log_failure_msg
-$@"
-    IFS=$OLDIFS
-  fi
-  has_errors=true
-}
-
-###############################################################################
-# verbose (cmd)
-#   execute cmd. Redirect output depending on $mktexfmtMode.
-###############################################################################
-verbose()
-{
-  $mktexfmtMode && ${1+"$@"} >&2 || ${1+"$@"}
-}
-
-###############################################################################
-# mktexdir(args)
-#   call mktexdir script, disable all features (to prevent sticky directories)
-###############################################################################
-mktexdir()
-{      
-  initTexmfMain
-  MT_FEATURES=none "$MT_TEXMFMAIN/web2c/mktexdir" "$@" >&2
-}
-
-###############################################################################
-# tcfmgr(args)
-#   call tcfmgr script
-###############################################################################
-tcfmgr()
-{
-  initTexmfMain
-  "$MT_TEXMFMAIN/texconfig/tcfmgr" "$@"
-}
-
-###############################################################################
-# mktexupd(args)
-#   call mktexupd script
-###############################################################################
-mktexupd()
-{
-  initTexmfMain
-  "$MT_TEXMFMAIN/web2c/mktexupd" "$@"
-}
-
-###############################################################################
-# main()
-#   parse commandline arguments, initialize variables,
-#   switch into temp. direcrory, execute desired command
-###############################################################################
-main()
-{
-  destdir=     # global variable: where do we put the format files?
-  cnf_file=    # global variable: full name of the config file
-  cmd=         # desired action from command line
-  needsCleanup=false
-  need_find_hyphenfile=false
-  cfgparam=
-  cfgmaint=
-  tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$
-  verboseFlag=true
-
-  # mktexfmtMode: if called as mktexfmt, set to true. Will echo the
-  # first generated filename after successful generation to stdout then
-  # (and nothing else), since kpathsea can only deal with one.
-  mktexfmtMode=false
-  case $argv0 in
-    mktexfmt|*/mktexfmt)
-      mktexfmtMode=true
-      fullfmt=$1; shift
-      case $fullfmt in
-        *.fmt|*.mem|*.base)
-           set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"}; shift
-           ;;
-        *.*)
-           abort "unknown format type: $fullfmt"
-           ;;
-        "")
-           help
-           ;;
-        *)
-           set x --byfmt $fullfmt; shift
-           ;;
-      esac
-      ;;
-  esac
-
-  use_engine_dir=true # whether to use web2c/$engine subdirs
-  while
-    case $1 in
-      --cnffile)
-          shift; cnf_file=$1; cfgparam=1;;
-      --cnffile=*)
-          cnf_file=`echo "$1" | sed 's/--cnffile=//'`; cfgparam=1; shift ;;
-      --fmtdir)
-          shift; destdir=$1;;
-      --fmtdir=*)
-          destdir=`echo "$1" | sed 's/--fmtdir=//'`; shift ;;
-      --no-engine-subdir)
-          use_engine_dir=false;;
-      --all|-a)
-          cmd=all;;
-      --edit|-e)
-          cmd=edit; cfgmaint=1;;
-      --missing|-m)
-          cmd=missing;;
-      --refresh|-r)
-          cmd=refresh;;
-      --byfmt|-f)
-          shift; cmd=byfmt; arg=$1;;
-      --byfmt=*)
-          cmd=byfmt; arg=`echo "$1" | sed 's/--byfmt=//'`; shift ;;
-      --byhyphen|-h)
-          shift; cmd=byhyphen; arg=$1;;
-      --byhyphen=*)
-          cmd=byhyphen; arg=`echo "$1" | sed 's/--byhyphen=//'`; shift ;;
-      --showhyphen|-s)
-          shift; cmd=showhyphen; arg=$1;;
-      --showhyphen=*)
-          cmd=showhyphen; arg=`echo "$1" | sed 's/--showhyphen=//'`; shift ;;
-      --help|-help)
-          cmd=help;;
-      --version)
-          cmd=version;;
-      --enablefmt)
-          shift; cmd=enablefmt; arg=$1; cfgmaint=1;;
-      --enablefmt=*)
-          cmd=enablefmt; arg=`echo "$1" | sed 's/--enablefmt=//'`; cfgmaint=1; shift;;
-      --disablefmt)
-          shift; cmd=disablefmt; arg=$1; cfgmaint=1;;
-      --disablefmt=*)
-          cmd=disablefmt; arg=`echo "$1" | sed 's/--disablefmt=//'`; cfgmaint=1; shift;;
-      --catcfg)
-          cmd=catcfg;;
-      --listcfg)
-          cmd=listcfg;;
-      --quiet|-q)
-          verboseFlag=false;;
-      --test|--dolinks|--force)
-          ;;
-      "") break;;
-      *) abort "$progname: unknown option \`$1'. Try $progname --help for help";;
-    esac
-  do test $# -gt 0 && shift; done
-
-  case "$cmd" in
-    help|"") help;;
-    version) version;;
-  esac
-
-  if test -n "$cfgparam"; then
-    test -f "$cnf_file" || abort "config file \`$cnf_file' not found"
-  fi
-
-  if test -n "$cfgmaint"; then
-    if test -z "$cfgparam"; then
-      setupTmpDir
-      co=`tcfmgr --tmp $tmpdir --cmd co --file $cnf`
-      test $? = 0 || cleanup 1
-      set x $co; shift
-      id=$1; cnf_file=$3; orig=$4
-      verboseMsg "$progname: initial config file is \`$orig'"
-    fi
-  else
-    if test -z "$cfgparam"; then
-      cnf_file=`tcfmgr --cmd find --file $cnf`
-      test -f "$cnf_file" || abort "config file \`$cnf' not found"
-    fi
-  fi
-
-  # showhyphen and edit do not need any temp. directory, so do it here:
-  case "$cmd" in
-    showhyphen)
-      show_hyphen_file "$arg"
-      cleanup $?
-      ;;
-    edit)
-      ${VISUAL-${EDITOR-vi}} $cnf_file
-      ;;
-    enablefmt|disablefmt)
-      $cmd $arg
-      ;;
-    catcfg)
-      grep -v '^ *#' "$cnf_file" | sed 's@^ *@@; s@ *$@@' | grep . | sort
-      cleanup $?
-      ;;
-    listcfg)
-      listcfg_loop
-      cleanup $?
-      ;;
-  esac
-
-  if test -n "$cfgmaint"; then
-    if test -z "$cfgparam"; then
-      ci=`tcfmgr --tmp $tmpdir --cmd ci --id $id`
-      if test $? = 0; then
-        if test -n "$ci"; then
-          verboseMsg "$progname: configuration file updated: \`$ci'"
-        else
-          verboseMsg "$progname: configuration file unchanged."
-        fi
-      else
-        abort "failed to update configuration file."
-      fi
-    fi
-    cleanup $?
-  fi
-
-  # set up destdir:
-  if test -z "$destdir"; then
-    : ${MT_TEXMFVAR=`kpsewhich -var-value=TEXMFVAR`}
-    destdir=$MT_TEXMFVAR/web2c
-  fi
-  test -d "$destdir" || mktexdir "$destdir" >/dev/null 2>&1
-  test -d "$destdir" || abort "format directory \`$destdir' does not exist"
-  test -w "$destdir" || abort "format directory \`$destdir' is not writable"
-
-  thisdir=`pwd`
-
-  : ${KPSE_DOT=$thisdir}
-  export KPSE_DOT
-
-  # due to KPSE_DOT, we don't search the current directory, so include
-  # it explicitly for formats that \write and later on \read
-  TEXINPUTS="$tmpdir:$TEXINPUTS"; export TEXINPUTS
-  # for formats that load other formats (e.g., jadetex loads latex.fmt), 
-  # add the current directory to TEXFORMATS, too.  Currently unnecessary
-  # for MFBASES and MPMEMS.
-  TEXFORMATS="$tmpdir:$TEXFORMATS"; export TEXFORMATS
-
-  setupTmpDir
-  cd "$tmpdir" || cleanup 1
-
-  # make local paths absolute:
-  case "$destdir" in
-    /*) ;;
-    *)  destdir="$thisdir/$destdir";;
-  esac
-  case "$cnf_file" in
-    /*) ;;
-    *)  cnf_file="$thisdir/$cnf_file";;
-  esac
-
-  cache_vars
-  init_log_failure
-  # execute the desired command:
-  case "$cmd" in 
-    all)
-      recreate_all;;
-    missing)
-      create_missing;;
-    refresh)
-      recreate_existing;;
-    byfmt)
-      recreate_by_fmt "$arg";;
-    byhyphen)
-      recreate_by_hyphenfile "$arg";;
-  esac
-
-  byebye
-}
-
-###############################################################################
-# parse_line(config_line) sets global variables:
-#   format:  name of the format, e.g. pdflatex
-#   engine:  name of the TeX engine, e.g. tex, etex, pdftex
-#   texargs: flags for initex and name of the ini file (e.g. -mltex frlatex.ini)
-#   fmtfile: name of the format file (without directory, but with extension)
-#
-#   Support for building internationalized formats sets:
-#     pool: base name of pool file (to support translated pool files)
-#     tcx: translation file used when creating the format
-#
-#   Example (for fmtutil.cnf):
-#     mex-pl tex mexconf.tex nls=tex-pl,il2-pl mex.ini
-#
-#   The nls parameter (pool,tcx) can only be specified as the first argument
-#   inside the 4th field in fmtutil.cnf.
-#
-# exit code: returns error code if the ini file is not installed
-###############################################################################
-parse_line()
-{
-  case $1 in
-    '#!') disabled=true; shift;;
-    *) disabled=false;;
-  esac
-  format=$1
-  engine=$2
-  hyphenation=$3
-  shift; shift; shift
-
-  # handle nls support: pool + tcx
-  pool=; tcx=
-  case $1 in
-    nls=*)
-      pool=`echo $1 | sed 's@nls=@@; s@,.*@@'`
-      tcx=`echo $1 | sed 's@nls=[^,]*@@; s@^,@@'`
-      shift      # nls stuff is not handled by the engine directly,
-                 # so we shift this away
-      ;;
-  esac
-
-  texargs="$@"
-
-  eval lastarg=\$$#
-  inifile=`echo $lastarg | sed 's%^\*%%'`
-
-  case "$engine" in
-    mpost)  fmtfile="$format.mem";  kpsefmt=mpost; texengine=metapost;;
-    mf|mfw|mf-nowin) fmtfile="$format.base"; kpsefmt=mf; texengine=metafont;;
-    *)      fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
-  esac
-
-  # See if we can find $inifile for return code:
-  kpsewhich -progname=$format -format=$kpsefmt $inifile >/dev/null 2>&1
-}
-
-###############################################################################
-# find_hyphenfile(format, hyphenation) searches for hyphenation along
-#                                      searchpath of format
-# exit code: returns error is file is not found
-###############################################################################
-find_hyphenfile()
-{
-  format="$1"; hyphenation="$2"
-  case $hyphenation in
-    -) ;;
-    *) kpsewhich -progname="$format" -format=tex "$hyphenation";;
-  esac
-}
-
-###############################################################################
-# find_info_for_name(format) 
-#   Look up the config line for format `format' and call parse_line to set
-#   global variables.
-###############################################################################
-find_info_for_name()
-{
-  format="$1"
-
-  # set x `awk '$1 == format {print; exit}' format="$format" "$cnf_file"`; shift
-  set x `egrep "^$format( |	)" "$cnf_file" | sed q`; shift
-  test $# = 0 && abort "no info for format \`$format'"
-  parse_line "$@"
-}
-
-###############################################################################
-# run_initex()
-#   Calls initex. Assumes that global variables are set by parse_line.
-###############################################################################
-run_initex()
-{
-
-  # install a pool file and set tcx flag if requested in lang= option:
-  rm -f *.pool
-  poolfile=
-  tcxflag=
-  test -n "$pool" \
-    && poolfile=`(kpsewhich -progname=$engine $pool.pool) 2>/dev/null`
-  if test -n "$poolfile" && test -f "$poolfile"; then
-    verboseMsg "$progname: attempting to create localized format using pool=$pool and tcx=$tcx."
-    cp "$poolfile" $engine.pool
-    test -n "$tcx" && tcxflag=-translate-file=$tcx
-    localpool=true
-  else
-    localpool=false
-  fi
-
-  jobswitch="-jobname=$format"
-  case "$format" in
-    metafun) prgswitch=-progname=mpost;;
-    mptopdf|cont-??) prgswitch=-progname=context;;
-    *)       prgswitch=-progname=$format;;
-  esac
-
-  rm -f $fmtfile
-
-  # Check for infinite recursion before running the iniTeX:
-  case :$mktexfmt_loop: in
-  *:"$format":*)
-    abort "Infinite recursion detected, giving up!" ;;
-  esac
-  mktexfmt_loop=$mktexfmt_loop:$format
-  export mktexfmt_loop
-
-  verboseMsg "$progname: running \`$engine -ini  $tcxflag $jobswitch $prgswitch $texargs' ..."
-
-  # run in a subshell to get a local effect of TEXPOOL manipulation:
-  (
-    # If necessary, set TEXPOOL. Use absolute path, because of KPSE_DOT.
-    $localpool && { TEXPOOL="`pwd`:$TEXPOOL"; export TEXPOOL; }
-    verbose $engine -ini $tcxflag $jobswitch $prgswitch $texargs
-  ) </dev/null
-
-  if test $use_engine_dir; then
-    fulldestdir="$destdir/$texengine"
-  else
-    fulldestdir="$destdir"
-  fi
-  mkdir -p $fulldestdir
-  if test -f $fmtfile; then
-    grep '^! ' $format.log >/dev/null 2>&1 &&
-      log_failure "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' possibly failed."
-
-    # We don't want user-interaction for the following "mv" commands:
-    mv "$format.log" "$fulldestdir/$format.log" </dev/null
-    if mv "$fmtfile" "$fulldestdir/$fmtfile" </dev/null; then
-      verboseMsg "$progname: $fulldestdir/$fmtfile installed."
-      #
-      $mktexfmtMode && $mktexfmtFirst \
-      && echo "$fulldestdir/$fmtfile" && mktexfmtFirst=false
-      #
-      mktexupd "$fulldestdir" "$fmtfile"
-    fi
-  else
-    log_failure "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' failed"
-  fi
-}
-
-###############################################################################
-# recreate_loop()
-#   for each line in config file: check match-condition and recreate format
-#   if there is a match
-###############################################################################
-recreate_loop()
-{
-  OIFS=$IFS
-  IFS='
-'
-  set `echo x; sed '/^#/d; /^[ 	]*$/d' "$cnf_file"`; shift
-  IFS=$OIFS
-  for line
-  do
-    parse_line $line || continue
-    check_match || continue
-    run_initex
-  done
-}
-
-###############################################################################
-# listcfg_loop()
-#   prints all format definitions in config files (enabled and disabled ones)
-#   for supported formats (i.e. for those which have an existing ini file)
-###############################################################################
-listcfg_loop()
-{
-  OIFS=$IFS
-  IFS='
-'
-  set `echo x; sed '/^#$/d; /^#[^!]/d; /^[ 	]*$/d' "$cnf_file"`; shift
-  IFS=$OIFS
-  for line
-  do
-    parse_line $line && echo "$line"
-  done
-}
-
-###############################################################################
-# check_match()
-#   recreate all formats
-###############################################################################
-check_match()
-{
-  $need_find_hyphenfile && \
-    this_hyphenfile=`find_hyphenfile "$format" "$hyphenation"`
-
-  eval $match_cmd && setmatch true
-}
-
-###############################################################################
-# recreate_by_fmt(fmtname)
-#   recreate all versions of fmtname
-###############################################################################
-recreate_by_fmt()
-{
-  fmtname=$1
-  match_cmd="test x\$format = x$fmtname"
-  recreate_loop
-}
-
-###############################################################################
-# create_missing()
-#   create all missing format files
-###############################################################################
-create_missing()
-{
-  # match_cmd='test ! -f $destdir/$fmtfile'
-  match_cmd='test ! -f "`kpsewhich -engine=$texengine -progname=$format $fmtfile`"'
-  recreate_loop
-}
-
-###############################################################################
-# recreate_existing()
-#   recreate only existing format files
-###############################################################################
-recreate_existing()
-{
-  match_cmd='test -f "`kpsewhich -engine=$texengine -progname=$format $fmtfile`"'
-  recreate_loop
-}
-
-###############################################################################
-# recreate_all()
-#   recreate all formats
-###############################################################################
-recreate_all()
-{
-  match_cmd=true
-  recreate_loop
-}
-
-###############################################################################
-# recreate_by_hyphenfile(hyphenfile)
-#   recreate all formats that depend on hyphenfile
-###############################################################################
-recreate_by_hyphenfile()
-{
-  hyphenfile=$1
-
-  case $hyphenfile in
-    /*)
-      :
-      ;;
-    ./*)
-      hyphenfile="$KPSE_DOT/"`echo "$hyphenfile" | sed 's@..@@'`
-      ;;
-    *)
-      hyphenfile="$KPSE_DOT/$hyphenfile"
-      ;;
-  esac
-  need_find_hyphenfile=true
-  match_cmd="test x\$this_hyphenfile = x$hyphenfile"
-
-  # No match before the loop:
-  setmatch false
-
-  recreate_loop
-
-  # Now check if there was at least one match:
-  getmatch || abort "no format depends on \`$hyphenfile'"
-}
-
-
-###############################################################################
-# show_hyphen_file(format)
-#   prints full name of the hyphenfile for format
-#
-# exit code: returns error code if the ini file is not installed or if
-#            the hyphen file cannot be found
-###############################################################################
-show_hyphen_file()
-{
-  fmtname=$1
-
-  find_info_for_name "$fmtname" || abort "no info for format \`$fmtname'"
-  if test "x$hyphenation" = x-; then
-    echo -
-    cleanup 0
-  fi
-  find_hyphenfile "$format" "$hyphenation" \
-    || abort "hyphenfile \`$hyphenation' not found"
-}
-
-###############################################################################
-# disablefmt(format)
-#   disables format in configuration file
-###############################################################################
-disablefmt()
-{
-  grep "^$1[ 	]" $cnf_file >/dev/null || { (exit 0); return 0; }
-
-  ed $cnf_file >/dev/null 2>&1 <<-eof
-	g/^$1[ 	]/s/^/#! /
-	w
-	q
-eof
-  (exit 0); return 0
-}
-
-###############################################################################
-#  enablefmt(format)
-#    enables format in configuration file
-###############################################################################
-enablefmt()
-{
-  grep "^#![ 	]*$1[ 	]" $cnf_file >/dev/null || { (exit 0); return 0; }
-  ed $cnf_file >/dev/null 2>&1 <<-eof
-	g/^#![ 	]*$1[ 	]/s/..[ 	]*//
-	w
-	q
-eof
-  (exit 0); return 0
-}
-
-main ${1+"$@"}
-cleanup 0
diff --git a/Master/bin/i386-linux/fmtutil-sys b/Master/bin/i386-linux/fmtutil-sys
deleted file mode 100755
index bfb52f94e1f..00000000000
--- a/Master/bin/i386-linux/fmtutil-sys
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# fmtutil-sys: Thomas Esser, public domain.
-
-# wrapper script for fmtutil with TEXMFVAR and TEXMFCONFIG set to
-#   TEXMFSYSVAR / TEXMFSYSCONFIG
-
-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+"$@"}'='"$@"'
-export PATH
-
-v=`kpsewhich -var-value TEXMFSYSVAR`
-c=`kpsewhich -var-value TEXMFSYSCONFIG`
-
-TEXMFVAR="$v"
-TEXMFCONFIG="$c"
-export TEXMFVAR TEXMFCONFIG
-
-exec fmtutil ${1+"$@"}
diff --git a/Master/bin/i386-linux/fontinst b/Master/bin/i386-linux/fontinst
deleted file mode 100755
index 7d1271517ad..00000000000
--- a/Master/bin/i386-linux/fontinst
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-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+"$@"}'='"$@"'
-
-tex -progname=fontinst \&tex ${1+"$@"}
diff --git a/Master/bin/i386-linux/gbklatex b/Master/bin/i386-linux/gbklatex
deleted file mode 100755
index f799f7b6e63..00000000000
--- a/Master/bin/i386-linux/gbklatex
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-
-# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
-#
-# 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 in doc/COPYING; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-# MA 02110-1301 USA
-
-n=1
-argv=
-
-# get last argument
-while test 1 -lt $#; do
-  eval argv$n=\$1
-  argv="$argv \"\$argv$n\""
-  n=`expr $n + 1`
-  shift
-done
-
-# replace extension with .cjk or append .cjk if there is no extension
-tex=$1
-case $tex in
-""|*.cjk)
-  echo >&2 "Usage: $0 [options] latex-file"
-  exit 1;;
-*)
-  aux=`expr "X$tex" : 'X\(.*\)\.[^/]*$' \| "X$tex" : 'X\(.*\)'`.cjk;;
-esac
-
-extconv < "$tex" > "$aux" && eval latex "$argv" "\$aux"
-
-# EOF
diff --git a/Master/bin/i386-linux/gbkpdflatex b/Master/bin/i386-linux/gbkpdflatex
deleted file mode 100755
index 6dd3ee3de9e..00000000000
--- a/Master/bin/i386-linux/gbkpdflatex
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-
-# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
-#
-# 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 in doc/COPYING; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-# MA 02110-1301 USA
-
-n=1
-argv=
-
-# get last argument
-while test 1 -lt $#; do
-  eval argv$n=\$1
-  argv="$argv \"\$argv$n\""
-  n=`expr $n + 1`
-  shift
-done
-
-# replace extension with .cjk or append .cjk if there is no extension
-tex=$1
-case $tex in
-""|*.cjk)
-  echo >&2 "Usage: $0 [options] pdflatex-file"
-  exit 1;;
-*)
-  aux=`expr "X$tex" : 'X\(.*\)\.[^/]*$' \| "X$tex" : 'X\(.*\)'`.cjk;;
-esac
-
-extconv < "$tex" > "$aux" && eval pdflatex "$argv" "\$aux"
-
-# EOF
diff --git a/Master/bin/i386-linux/getafm b/Master/bin/i386-linux/getafm
deleted file mode 100755
index 1c6cd21cf77..00000000000
--- a/Master/bin/i386-linux/getafm
+++ /dev/null
@@ -1,358 +0,0 @@
-#!/bin/sh
-
-if [ $# -ne 1 ]; then
-  echo "usage: $0 font-name | gsnd - >font-name.afm" >&2
-  exit 1
-fi
-
-cat << EOF
-%!
-% produce .afm for $1
-% (c) 1993 by Robert Joop <rj@rainbow.in-berlin.de>
-% inspired by two other versions of this theme which are
-%	getafm 1.00 (c) AJCD
-% and getafm.ps by an unknown author,
-%	modified by J. Daniel Smith <dsmith@mailhost.aa.cad.slb.com>
-
-% Metrics dictionary code added by AJCD, 7/6/93
-
-/getafmdict 100 dict dup begin
-
-  /buf 256 string def
-  /buf2 16 string def
-
-  /prany	% dict dictname printname -> dict
-  {
-    2 index 2 index cvn known
-    {
-      print % printname
-      ( ) print
-      1 index exch cvn get =
-    }
-    {
-      (Comment /FontInfo contains no /) print
-      2 copy eq
-      {
-        = % printname
-	pop % dictname
-      }
-      {
-	exch
-	print % dictname
-	(, therefore no ) print
-	= % printname
-      }
-      ifelse
-    }
-    ifelse
-  }
-  bind def
-
-  /printfontname
-  {
-    (FontName)dup prany
-  }
-  bind def
-
-  /printfontinfo
-  {
-    dup /FontInfo known
-    {
-      dup /FontInfo get
-	(FullName)dup prany
-	(FamilyName)dup prany
-	(Weight)dup prany
-	(ItalicAngle)dup prany
-	(isFixedPitch)(IsFixedPitch) prany
-	(UnderlinePosition)dup prany
-	(UnderlineThickness)dup prany
-	(Version)(version) prany
-	(Notice)dup prany
-      pop
-    }
-    {
-      (Comment Font lacks a /FontInfo!)=
-    }
-    ifelse
-  }
-  bind def
-
-  /prbbox % llx lly urx ury -> -
-  {
-    4 1 roll 3 1 roll exch % swap top 4 elements
-    4 { ( ) print buf cvs print } repeat
-  }
-  bind def
-
-  /getbbox % fontdict chardict character -> fontdict chardict llx lly urx ury
-  {
-    gsave
-      2 index setfont 0 0 moveto
-      false charpath flattenpath pathbbox
-    grestore
-  }
-  bind def
-
-  /printmiscinfo
-  {
-    dup /FontBBox known
-    {
-      (FontBBox) print
-      dup /FontBBox get aload pop prbbox ()=
-    }
-    {
-      (Comment missing required /FontBBox)=
-      quit
-    }
-    ifelse
-    2 copy exch get
-      dup /H known
-      1 index /x known and
-      1 index /d known and
-      1 index /p known and
-      dup /looksRoman exch def
-      {
-	(CapHeight ) print
-	(H) getbbox
-	ceiling cvi = pop pop pop
-	(XHeight ) print
-	(x) getbbox
-	ceiling cvi = pop pop pop
-	(Ascender ) print
-	(d) getbbox
-	ceiling cvi = pop pop pop
-	(Descender ) print
-	(p) getbbox
-	pop pop floor cvi = pop
-      }
-      {
-	(Comment font doesn't contain H, x, d and p; therefore no CapHeight, XHeight, Ascender and Descender)=
-      }
-      ifelse
-    pop
-    dup /Encoding get
-      [
-	[ (ISOLatin1Encoding) /ISOLatin1Encoding ]
-	[ (AdobeStandardEncoding) /StandardEncoding ]
-      ]
-      {
-	aload pop dup where
-	{
-	  exch get 2 index eq
-	  {
-	    (EncodingScheme ) print
-	    buf cvs =
-	  }
-	  {
-	    pop
-	  }
-	  ifelse
-	}
-	{
-	  pop pop
-	}
-	ifelse
-      }
-      forall
-    pop
-  }
-  bind def
-
-  /printcharmetric
-  {
-    % chardictname fontdict charnamedict encoding charindex charname
-
-    4 index dup length dict dup begin exch
-      {
-	1 index /FID ne
-	2 index /UniqueID ne
-	and
-	{
-	  1 index /Encoding eq { 256 array copy } if
-	  def
-	}
-	{ pop pop }
-	ifelse
-      }
-      forall
-    end
-    dup /Encoding get 32 3 index put
-    /f2 exch definefont
-    setfont
-
-    (C ) print
-    1 index buf cvs print
-
-    ( ; WX ) print
-% Metrics entries are:
-%       1 number:               which is the character width
-%       an array of 2 numbers:  which are the left sidebearing and width
-%       an array of 4 numbers:  x & y left sidebearing, width and height
-    dup 5 index         % /charname fontdict
-    dup /Metrics known {
-       /Metrics get exch 2 copy known {
-          get dup type /arraytype eq {
-             dup length 2 eq
-             {1 get} {2 get} ifelse
-          } if
-          round cvi buf cvs print
-       } {
-          pop pop ( ) stringwidth pop round cvi buf cvs print
-       } ifelse
-    } {
-       pop pop ( ) stringwidth pop round cvi buf cvs print
-    } ifelse
-
-    ( ; N ) print
-    dup buf cvs print
-
-    ( ; B) print
-    gsave
-      newpath 0 0 moveto
-      ( ) true charpath flattenpath pathbbox
-    grestore
-    2 { ceiling cvi 4 1 roll } repeat
-    2 { floor cvi 4 1 roll } repeat
-    prbbox
-
-    looksRoman
-    {
-      [
-	[ /f [ /i /f /l ] ]
-	[ /ff [ /i /l ] ]
-      ]
-      {
-	aload pop 1 index 3 index eq
-	{
-	  { 
-	    1 index buf cvs
-	    length
-	    1 index buf2 cvs dup length
-	    2 index add
-	    buf
-	    4 2 roll putinterval
-	    buf 0
-	    3 -1 roll getinterval
-	    dup cvn
-	    7 index
-	    exch known
-	    {
-	      exch
-	      ( ; L ) print
-	      buf2 cvs print
-	      ( ) print
-	      print
-	    }
-	    {
-	      pop pop
-	    }
-	    ifelse
-	  }
-	  forall
-	  pop 
-	}
-	{
-	  pop pop
-	}
-	ifelse
-      }
-      forall
-    }
-    if
-    pop
-
-    ( ;)=
-  }
-  bind def
-
-  /printcharmetrics
-  {
-    (StartCharMetrics ) print
-    2 copy exch get length 1 sub buf cvs =
-
-    256 dict dup begin
-      1 index /Encoding get
-      { null def }
-      forall
-    end
-    % chardictname fontdict charnamedict
-    1 index /Encoding get
-    0 1 255
-    {
-      % encoding index
-      2 copy get
-      dup /.notdef eq { pop } { printcharmetric } ifelse
-      pop % index
-    } for
-
-    -1
-    3 index 5 index get
-    {
-      pop
-      dup /.notdef eq
-      { pop }
-      {
-	% chardictname fontdict charnamedict encoding charindex charname
-	dup 4 index exch known
-	{ pop }
-	{ printcharmetric }
-	ifelse
-      }
-      ifelse
-    }
-    forall
-    % charnamedict encoding index
-    pop pop pop
-
-    (EndCharMetrics)=
-  }
-  bind def
-
-  /printfontmetrics
-  {
-    (StartFontMetrics 3.0)=
-    (Comment Produced by getafm 3.0 (which is by rj@rainbow.in-berlin.de))=
-
-    printfontname
-    printfontinfo
-    printmiscinfo
-    printcharmetrics
-
-    (EndFontMetrics)=
-  }
-  bind def
-
-end def
-
-/getafm
-{
-  getafmdict begin
-    save exch
-      findfont 1000 scalefont 
-
-      null
-      [ /CharDefs /CharData /CharProcs /CharStrings ]
-      {
-	2 index 1 index known { exch } if
-	pop
-      }
-      forall
-      dup null eq
-      {
-	(can't find dictionary with character data!)=
-	quit
-      }
-      if
-      exch % dictname fontdict
-
-      printfontmetrics
-
-      pop pop
-    restore
-  end
-}
-bind def
-
-/$1 getafm
-
-EOF
diff --git a/Master/bin/i386-linux/getnonfreefonts b/Master/bin/i386-linux/getnonfreefonts
deleted file mode 120000
index 26aadc46261..00000000000
--- a/Master/bin/i386-linux/getnonfreefonts
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf/scripts/texlive/getnonfreefonts.pl
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/getnonfreefonts-sys b/Master/bin/i386-linux/getnonfreefonts-sys
deleted file mode 100755
index b3fbf603329..00000000000
--- a/Master/bin/i386-linux/getnonfreefonts-sys
+++ /dev/null
@@ -1 +0,0 @@
-link ../../texmf/scripts/texlive/getnonfreefonts.pl
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/gftodvi b/Master/bin/i386-linux/gftodvi
deleted file mode 100755
index 75acd5cf6ee..00000000000
--- a/Master/bin/i386-linux/gftodvi
+++ /dev/null
diff --git a/Master/bin/i386-linux/gftopk b/Master/bin/i386-linux/gftopk
deleted file mode 100755
index 0c9b47c1771..00000000000
--- a/Master/bin/i386-linux/gftopk
+++ /dev/null
diff --git a/Master/bin/i386-linux/gftype b/Master/bin/i386-linux/gftype
deleted file mode 100755
index bab87e9189b..00000000000
--- a/Master/bin/i386-linux/gftype
+++ /dev/null
diff --git a/Master/bin/i386-linux/giftopng b/Master/bin/i386-linux/giftopng
deleted file mode 100755
index e218c61fe6b..00000000000
--- a/Master/bin/i386-linux/giftopng
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-X=`kpsewhich $1`
-Y=`basename $X .gif`.png
-convert $X $Y
diff --git a/Master/bin/i386-linux/gsftopk b/Master/bin/i386-linux/gsftopk
deleted file mode 100755
index f07ad03ff45..00000000000
--- a/Master/bin/i386-linux/gsftopk
+++ /dev/null
diff --git a/Master/bin/i386-linux/hbf2gf b/Master/bin/i386-linux/hbf2gf
deleted file mode 100755
index 0446b73fda4..00000000000
--- a/Master/bin/i386-linux/hbf2gf
+++ /dev/null
diff --git a/Master/bin/i386-linux/ht b/Master/bin/i386-linux/ht
deleted file mode 100755
index 0498e529af7..00000000000
--- a/Master/bin/i386-linux/ht
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-        $1 $2
-        $1 $2
-        $1 $2
-        tex4ht $2
-        t4ht $2  $3
-
diff --git a/Master/bin/i386-linux/htcontext b/Master/bin/i386-linux/htcontext
deleted file mode 100755
index 9e01fa97f66..00000000000
--- a/Master/bin/i386-linux/htcontext
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/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 
-
-
-
diff --git a/Master/bin/i386-linux/htlatex b/Master/bin/i386-linux/htlatex
deleted file mode 100755
index ebab47dbaa6..00000000000
--- a/Master/bin/i386-linux/htlatex
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/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 
-
-
-
diff --git a/Master/bin/i386-linux/htmex b/Master/bin/i386-linux/htmex
deleted file mode 100755
index 485a7594468..00000000000
--- a/Master/bin/i386-linux/htmex
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/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 
-
-
-
diff --git a/Master/bin/i386-linux/httex b/Master/bin/i386-linux/httex
deleted file mode 100755
index 4c184897d13..00000000000
--- a/Master/bin/i386-linux/httex
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/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 
-
-
-
diff --git a/Master/bin/i386-linux/httexi b/Master/bin/i386-linux/httexi
deleted file mode 100755
index 26427698991..00000000000
--- a/Master/bin/i386-linux/httexi
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/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 ?
-
-
-
diff --git a/Master/bin/i386-linux/includeres b/Master/bin/i386-linux/includeres
deleted file mode 100755
index 4547357cd93..00000000000
--- a/Master/bin/i386-linux/includeres
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env perl
-# includeres: include resources in PostScript file
-#
-# Copyright (C) Angus J. C. Duggan 1991-1995
-# See file LICENSE for details.
-
-$prog = ($0 =~ s=.*/==);
-
-%extn = ("font", ".pfa", "file", ".ps", "procset", ".ps", # resource extns
-	 "pattern", ".pat", "form", ".frm", "encoding", ".enc");
-%type = ("%%BeginFile:", "file", "%%BeginProcSet:", "procset",
-	 "%%BeginFont:", "font"); # resource types
-
-sub filename {			# make filename for resource in @_
-   local($name);
-   foreach (@_) {		# sanitise name
-      s/[!()\$\#*&\\\|\`\'\"\~\{\}\[\]\<\>\?]//g;
-      $name .= $_;
-   }
-   $name =~ s@.*/@@;		# drop directories
-   die "Filename not found for resource ", join(" ", @_), "\n"
-      if $name =~ /^$/;
-   $name;
-}
-
-while (<>) {
-   if (/^%%IncludeResource:/ || /^%%IncludeFont:/ || /^%%IncludeProcSet:/) {
-      local($comment, @res) = split(/\s+/);
-      local($type) = defined($type{$comment}) ? $type{$comment} : shift(@res);
-      local($name) = &filename(@res);
-      local($inc) = ""; # system include directory
-      if (open(RES, $name) || open(RES, "$name$extn{$type}") ||
-	  open(RES, "$inc/$name") || open(RES, "$inc/$name$extn{$type}")) {
-	 while (<RES>) {
-	    print $_;
-	 }
-	 close(RES);
-      } else {
-	 print "%%IncludeResource: ", join(" ", $type, @res), "\n";
-	 print STDERR "Resource $name not found\n";
-      }
-   } else {
-      print $_;
-   }
-}
-
diff --git a/Master/bin/i386-linux/info b/Master/bin/i386-linux/info
deleted file mode 100755
index 881679f49d7..00000000000
--- a/Master/bin/i386-linux/info
+++ /dev/null
diff --git a/Master/bin/i386-linux/infokey b/Master/bin/i386-linux/infokey
deleted file mode 100755
index 625dbb8197f..00000000000
--- a/Master/bin/i386-linux/infokey
+++ /dev/null
diff --git a/Master/bin/i386-linux/install-info b/Master/bin/i386-linux/install-info
deleted file mode 100755
index 2b7bf54ee61..00000000000
--- a/Master/bin/i386-linux/install-info
+++ /dev/null
diff --git a/Master/bin/i386-linux/jadetex b/Master/bin/i386-linux/jadetex
deleted file mode 120000
index f68cc91498e..00000000000
--- a/Master/bin/i386-linux/jadetex
+++ /dev/null
@@ -1 +0,0 @@
-pdftex
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/kpseaccess b/Master/bin/i386-linux/kpseaccess
deleted file mode 100755
index 5741fb87a74..00000000000
--- a/Master/bin/i386-linux/kpseaccess
+++ /dev/null
diff --git a/Master/bin/i386-linux/kpsepath b/Master/bin/i386-linux/kpsepath
deleted file mode 120000
index 30de0e13853..00000000000
--- a/Master/bin/i386-linux/kpsepath
+++ /dev/null
@@ -1 +0,0 @@
-kpsetool
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/kpsereadlink b/Master/bin/i386-linux/kpsereadlink
deleted file mode 100755
index 49169a7a22c..00000000000
--- a/Master/bin/i386-linux/kpsereadlink
+++ /dev/null
diff --git a/Master/bin/i386-linux/kpsestat b/Master/bin/i386-linux/kpsestat
deleted file mode 100755
index 342439bc3eb..00000000000
--- a/Master/bin/i386-linux/kpsestat
+++ /dev/null
diff --git a/Master/bin/i386-linux/kpsetool b/Master/bin/i386-linux/kpsetool
deleted file mode 100755
index 463097fd4a9..00000000000
--- a/Master/bin/i386-linux/kpsetool
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-
-# kpsetool. Script to make teTeX-style kpsetool, kpsexpand and kpsepath
-# available. Web2C's kpsewhich offers a superset of the functionality.
-# For compatibilty with old versions of teTeX, this script provides the
-# old command line interface of kpsetool, kpsexpand and kpsepath. All the
-# real work is done inside Web2C's kpsewhich.
-# Thomas Esser <te@dbs.uni-hannover.de>, Mar 1997, public domain.
-
-export PATH
-
-usage="
-Usage: kpsexpand [options] string
-Usage: kpsetool -w [options] pathtype filename
-Usage: kpsepath  [options] pathtype
-
-Valid options are the following:
-  -n progname  : pretend to be progname to kpathsea
-  -m mode      : set Metafont mode
-  -w           : locate files (similar to kpsewhich)
-  -p           : act like kpsepath
-  -v           : act like kpsexpand
-
-Valid pathtypes are:
-  gf            : generic font bitmap
-  pk            : packed bitmap font
-  base          : Metafont memory dump
-  bib           : BibTeX bibliography source
-  bst           : BibTeX style files
-  cnf           : Kpathsea runtime configuration files
-  fmt           : TeX memory dump
-  mem           : MetaPost memory dump
-  mf            : Metafont source
-  mfpool        : Metafont program strings
-  mp            : MetaPost source
-  mppool        : MetaPost program strings
-  mpsupport     : MetaPost support files
-  pict          : Other kinds of figures
-  tex           : TeX source
-  texpool       : TeX program strings
-  tfm           : TeX font metrics
-  vf            : virtual font
-  dvips_config  : dvips config files
-  dvips_header  : dvips header files
-  troff_font    : troff fonts
-"
-
-action=kpsexpand
-case $0 in
-  */kpsewhich) action=kpsewhich;;
-  */kpsepath)  action=kpsepath;;
-esac
-
-progname=`echo $0 | sed 's@.*/@@'`
-flags=''
-
-while true; do
-  case x"$1" in
-    x-n)
-      if test $# = 1; then
-        echo "$progname: missing argument for -n."
-        echo "$usage"; exit 1
-      else
-        flags="$flags -progname=$2"; shift; shift
-      fi;;
-    x-m)
-      if test $# = 1; then
-        echo "$progname: missing argument for -m."
-        echo "$usage"; exit 1
-      else
-        flags="$flags -mode=$2"; shift; shift
-      fi;;
-    x-w) action=kpsewhich; shift;; 
-    x-p) action=kpsepath; shift;;
-    x-v) action=kpsexpand; shift;;
-    *) break;;
-  esac
-done
-
-case "$action" in
-  kpsewhich|kpsepath)
-    case "$1" in
-      gf)		format='gf';;
-      pk)		format='pk';;
-      base)		format='.base';;
-      bib)		format='.bib';;
-      bst)		format='.bst';;
-      cnf)		format='.cnf';;
-      fmt)		format='.fmt';;
-      mem)		format='.mem';;
-      mf)		format='.mf';;
-      mfpool)		format='.pool';;
-      mp)		format='.mp';;
-      mppool)		format='.pool';;
-      mpsupport)	format='MetaPost support';;
-      pict)		format='.eps';;
-      tex)		format='.tex';;
-      texpool)		format='.pool';;
-      tfm)		format='.tfm';;
-      vf)		format='.vf';;
-      dvips_config)	format='dvips config';;
-      dvips_header)	format='.pro';;
-      troff_font)	format='Troff fonts';;
-      *)		echo "$progname: $1: unknown format"; echo "$usage"; exit 1;;
-    esac
-    shift;;
-esac
-
-case "$action" in
-  kpsewhich)
-    test $# = 1 || { echo "$progname: missing filename"; echo "$usage"; exit 1; }
-    kpsewhich $flags -format="$format" "$1";;
-  kpsepath)
-    kpsewhich $flags -show-path="$format";;
-  kpsexpand)
-    test $# = 1 || { echo "$progname: missing string"; echo "$usage"; exit 1; }
-    kpsewhich $flags -expand-var="$1";;
-esac
diff --git a/Master/bin/i386-linux/kpsewhere b/Master/bin/i386-linux/kpsewhere
deleted file mode 100755
index 51088ee80d6..00000000000
--- a/Master/bin/i386-linux/kpsewhere
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-#
-# Thomas Esser, Hans Fredrik Nordhaug, 2003, 2004.
-# Public domain.
-#
-# kpsewhere is an extension to kpsewhich (as where is for which in tcsh).
-# The intention is to provide a way to check for conflicts/shadowed
-# files.
-#
-# Original version by Hans Fredrik Nordhaug <hans.fredrik@nordhaug.no>
-#
-# Bugs / limitations:
-#   conflicts/shadowed files whithin each texmf tree are not found.
-#
-
-
-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
-
-help='Usage: kpsewhere [OPTION]... [FILENAME]...
-  Expanding kpsewhich to iterate over each texmf tree listed in $TEXMF
-  separately.
-
-  See kpsewhich for help on options. 
-
-  --help        show this help'
-
-options=
-while 
-  case $1 in
-     -h|-help|--help)
-             echo "$help" >&2
-             exit 0;;
-     -*)     options="${options} '${1}'";;
-      *)     break;;
-  esac
-do shift; done
-
-case $# in
-  0)
-    echo "$help" >&2
-    exit 1
-    ;;
-esac
-
-IFS=':'
-for file
-do
-    for path in `kpsewhich --expand-path='$TEXMF'`
-    do
-        eval TEXMF=\$path kpsewhich $options \"\$file\"
-    done
-done
-exit 0
diff --git a/Master/bin/i386-linux/kpsewhich b/Master/bin/i386-linux/kpsewhich
deleted file mode 100755
index 1b43783f1e4..00000000000
--- a/Master/bin/i386-linux/kpsewhich
+++ /dev/null
diff --git a/Master/bin/i386-linux/kpsexpand b/Master/bin/i386-linux/kpsexpand
deleted file mode 120000
index 30de0e13853..00000000000
--- a/Master/bin/i386-linux/kpsexpand
+++ /dev/null
@@ -1 +0,0 @@
-kpsetool
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/lacheck b/Master/bin/i386-linux/lacheck
deleted file mode 100755
index 6903787749a..00000000000
--- a/Master/bin/i386-linux/lacheck
+++ /dev/null
diff --git a/Master/bin/i386-linux/lambda b/Master/bin/i386-linux/lambda
deleted file mode 120000
index de9fd6e773d..00000000000
--- a/Master/bin/i386-linux/lambda
+++ /dev/null
@@ -1 +0,0 @@
-omega
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/lamed b/Master/bin/i386-linux/lamed
deleted file mode 120000
index b02b132b9c1..00000000000
--- a/Master/bin/i386-linux/lamed
+++ /dev/null
@@ -1 +0,0 @@
-aleph
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/latex b/Master/bin/i386-linux/latex
deleted file mode 120000
index f68cc91498e..00000000000
--- a/Master/bin/i386-linux/latex
+++ /dev/null
@@ -1 +0,0 @@
-pdftex
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/luatex b/Master/bin/i386-linux/luatex
deleted file mode 100755
index 1333f5f94ed..00000000000
--- a/Master/bin/i386-linux/luatex
+++ /dev/null
diff --git a/Master/bin/i386-linux/luatools b/Master/bin/i386-linux/luatools
deleted file mode 100755
index cb3ec1add4a..00000000000
--- a/Master/bin/i386-linux/luatools
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-texmfstart luatools.lua "$@"
diff --git a/Master/bin/i386-linux/mag b/Master/bin/i386-linux/mag
deleted file mode 100755
index 95807d9059e..00000000000
--- a/Master/bin/i386-linux/mag
+++ /dev/null
diff --git a/Master/bin/i386-linux/makeglossaries b/Master/bin/i386-linux/makeglossaries
deleted file mode 120000
index 526413aa3ea..00000000000
--- a/Master/bin/i386-linux/makeglossaries
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/scripts/glossaries/makeglossaries
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/makeindex b/Master/bin/i386-linux/makeindex
deleted file mode 100755
index 08ddad1422f..00000000000
--- a/Master/bin/i386-linux/makeindex
+++ /dev/null
diff --git a/Master/bin/i386-linux/makeinfo b/Master/bin/i386-linux/makeinfo
deleted file mode 100755
index 50b296ef8eb..00000000000
--- a/Master/bin/i386-linux/makeinfo
+++ /dev/null
diff --git a/Master/bin/i386-linux/makempx b/Master/bin/i386-linux/makempx
deleted file mode 100755
index 7f5144ac7f9..00000000000
--- a/Master/bin/i386-linux/makempx
+++ /dev/null
diff --git a/Master/bin/i386-linux/makempy b/Master/bin/i386-linux/makempy
deleted file mode 100755
index 4bf7a1af230..00000000000
--- a/Master/bin/i386-linux/makempy
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-texmfstart makempy.pl "$@"
diff --git a/Master/bin/i386-linux/mex b/Master/bin/i386-linux/mex
deleted file mode 120000
index f68cc91498e..00000000000
--- a/Master/bin/i386-linux/mex
+++ /dev/null
@@ -1 +0,0 @@
-pdftex
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/mf b/Master/bin/i386-linux/mf
deleted file mode 100755
index b1f551dd110..00000000000
--- a/Master/bin/i386-linux/mf
+++ /dev/null
diff --git a/Master/bin/i386-linux/mf-nowin b/Master/bin/i386-linux/mf-nowin
deleted file mode 100755
index 45ff5ce3e3d..00000000000
--- a/Master/bin/i386-linux/mf-nowin
+++ /dev/null
diff --git a/Master/bin/i386-linux/mft b/Master/bin/i386-linux/mft
deleted file mode 100755
index a679ff2e36b..00000000000
--- a/Master/bin/i386-linux/mft
+++ /dev/null
diff --git a/Master/bin/i386-linux/mk4ht b/Master/bin/i386-linux/mk4ht
deleted file mode 100755
index 2bd1f7e2038..00000000000
--- a/Master/bin/i386-linux/mk4ht
+++ /dev/null
@@ -1,346 +0,0 @@
-#!/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 );
-}
-
diff --git a/Master/bin/i386-linux/mkindex b/Master/bin/i386-linux/mkindex
deleted file mode 100755
index 565f805695d..00000000000
--- a/Master/bin/i386-linux/mkindex
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-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
-
-progname=`basename $0`
-case $# in
-  0) 
-    echo "usage: `basename $0` file[.idx] ..." 1>&2
-    exit 1
-    ;;
-esac
-
-gind=gind.ist
-gglo=gglo.ist
-
-# remember starting directory
-dir=`pwd`
-
-# loop over all files
-for i
-do
-  destdir=`echo $i | sed 's/^[^\/]*$/./; s/\/[^\/]*$//'`
-  test -d "$destdir"||continue
-  cd "$destdir"
-  FILENAME=`basename $i .idx`
-  test -f "$FILENAME".idx \
-    && makeindex -s $gind "$FILENAME"
-  test -f "$FILENAME".glo \
-    && makeindex -s $gglo -o "$FILENAME".gls "$FILENAME".glo
-  cd "$dir"
-done
diff --git a/Master/bin/i386-linux/mkjobtexmf b/Master/bin/i386-linux/mkjobtexmf
deleted file mode 100755
index 27f94a5a375..00000000000
--- a/Master/bin/i386-linux/mkjobtexmf
+++ /dev/null
@@ -1,799 +0,0 @@
-#!/usr/bin/env perl
-#
-# ToDos/unsolved problems:
-# * collision of symbol links
-# * texmf.cnf (path settings, variables)
-# * aliases
-# * binaries, libraries
-#
-use strict;
-$^W=1;
-
-my $prj = 'mkjobtexmf';
-my $version = '0.5';
-my $date = '2007/09/06';
-my $author = 'Heiko Oberdiek';
-my $copyright = "Copyright 2007 $author";
-
-my $cmd_tex        = 'pdflatex';
-my $cmd_kpsewhich  = 'kpsewhich';
-my $cmd_texhash    = 'texhash';
-my $cmd_strace     = 'strace';
-my $ext_tex        = '.tex';
-my $ext_recorder   = '.fls';
-my $ext_strace     = '.strace';
-my $ext_mkjobtexmf = '.mjt';
-my $jobname = '';
-my $texname = '';
-my $destdir = '';
-my @args = ();
-my @texopt = ();
-my $verbose = 0;
-my $output = 0;
-my $strace = 0;
-my $copy = 0;
-my $flat = 0;
-my $needs_texhash = 0;
-my @texmf;
-my %files;
-my %links;
-my %flat_ignore = (
-    'ls-R' => '',
-    'aliases' => '',
-);
-
-my $title = "\U$prj\E $date v$version, $copyright\n";
-
-print $title;
-
-sub die_error ($) {
-    my $msg = shift;
-    die "!!! Error: $msg!\n";
-}
-
-sub warning ($) {
-    my $msg = shift;
-    print "!!! Warning: $msg!\n";
-}
-
-sub verbose (@) {
-    my @msg = @_;
-    print "* @msg\n" if $verbose;
-}
-
-sub value ($) {
-    my $value = $_[0];
-    "[$value]";
-}
-
-sub die_usage {
-    my $msg = $_[0];
-    pod2usage(
-        -exitstatus => 2,
-        -msg        => "\n==> $msg!\n");
-}
-
-use Getopt::Long;
-use Pod::Usage;
-
-my $man = 0;
-my $help = 0;
-
-GetOptions(
-    'jobname=s'       => \$jobname,
-    'texname=s'       => \$texname,
-    'texopt=s'        => \@texopt,
-    'destdir=s'       => \$destdir,
-    'cmd-tex=s'       => \$cmd_tex,
-    'cmd-kpsewhich=s' => \$cmd_kpsewhich,
-    'cmd-texhash=s'   => \$cmd_texhash,
-    'strace'          => \$strace,
-    'copy'            => \$copy,
-    'flat'            => \$flat,
-    'verbose'         => \$verbose,
-    'output'          => \$output,
-    'help|?'          => \$help,
-    'man'             => \$man,
-) or die_usage('Unknown option');
-pod2usage(1) if $help;
-pod2usage(-exitstatus => 0, -verbose => 2) if $man;
-
-if (@ARGV > 0) {
-    $strace = 1;
-    $texname = '';
-    my @args = @ARGV;
-}
-$jobname or die_usage('Missing jobname');
-$texname = "$jobname$ext_tex" unless $texname;
-$destdir = "$jobname$ext_mkjobtexmf" unless $destdir;
-
-verbose "jobname: " . value $jobname;
-verbose "texname: " . value $texname if $texname;
-verbose "command: " . value "@args" if @args;
-verbose "destdir: " . value $destdir;
-
-if (!$copy) {
-    my $symlink_exists = eval { symlink('', ''); 1 };
-    if ($symlink_exists) {
-        verbose "symbolic linking: supported";
-    }
-    else {
-        $copy = 1;
-        verbose "symbolic linking: unsupported";
-    }
-}
-my $umask = umask;
-if (defined($umask)) {
-    verbose "umask: " . sprintf("%04o", $umask);
-}
-else {
-    $umask = 0;
-    verbose "umask: unsupported";
-}
-
-if ($copy) {
-    use File::Copy;
-}
-if ($flat) {
-    use File::Basename;
-}
-
-sub check_child_error () {
-    if ($? != 0) {
-        if ($? == -1) {
-            die_error "Failed to execute: $!";
-        }
-        elsif ($? & 127) {
-            die_error sprintf "Child died with signal %d, %s coredump",
-                      ($? & 127), ($? & 128) ? 'with' : 'without';
-        }
-        else {
-            die_error sprintf "Child exited with value %d", $? >> 8;
-        }
-    }
-    verbose "child exit: ok";
-}
-
-sub run_generic (@) {
-    my @args = @_;
-    my $cmd = $_[0];
-    verbose "exec: " . value "@args";
-    print '>' x 79, "\n";
-    system $cmd @args;
-    print '<' x 79, "\n";
-    check_child_error;
-}
-
-sub run_tex {
-    if ($strace) {
-        my @run_args;
-        if (@args) {
-            @run_args = @args;
-        }
-        else {
-            @run_args = (
-                $cmd_tex,
-                '-interaction=nonstopmode',
-                @texopt,
-                $texname
-            );
-        }
-        run_generic(
-            $cmd_strace,
-            '-f',
-            '-e',
-            'trace=open,access', # trace=file
-            '-o',
-            "$jobname$ext_strace",
-            @run_args
-        )
-    }
-    else {
-        run_generic(
-            $cmd_tex,
-            '-recorder',
-            "-jobname=$jobname",
-            '-interaction=nonstopmode',
-            @texopt,
-            $texname
-        );
-    }
-}
-
-sub run_texhash {
-    return if $flat;
-    if ($needs_texhash) {
-        run_generic(
-            $cmd_texhash,
-            "$destdir/texmf"
-        );
-    }
-    else {
-        verbose("texhash run skipped, no files added");
-    }
-}
-
-use Cwd 'abs_path', 'getcwd';
-
-sub get_texmf_trees () {
-    return if $flat;
-    my $cmdline = "$cmd_kpsewhich -expand-path='\$TEXMF'";
-    verbose "exec: " . value($cmdline);
-    my $str = `$cmdline`;
-    check_child_error;
-    chomp $str;
-    @texmf = split ':', $str;
-    my %texmf;
-    foreach my $texmf (@texmf) {
-        $texmf{$texmf} = '';
-        $texmf{abs_path($texmf)} = '';
-    }
-    @texmf = sort keys %texmf;
-    if ($verbose) {
-        if (@texmf) {
-            map { verbose 'texmf: ' . value($_) } @texmf;
-        }
-        else {
-            verbose 'texmf: none';
-        }
-    }
-}
-
-sub analyze_recorder {
-    my $pwd = getcwd;
-    verbose "pwd: " . value($pwd);
-
-    my $file_rec = $jobname . ($strace ? $ext_strace : $ext_recorder);
-    verbose 'File with recorded file names: ' . value($file_rec);
-    open(IN, '<', $file_rec)
-            or die_error "Cannot open `$file_rec'";
-    if ($strace) {
-        while (<IN>) {
-            chomp;
-            next if /\)\s+= -\d/; # -1 ENOENT, ...
-            next if /\WO_DIRECTORY\W/; # skip directories
-            my $type = 'INPUT';
-            if ($output) {
-                $type = 'OUTPUT' if /\WO_WRONLY\W/;
-            }
-            else {
-                next if /\WO_WRONLY\W/;
-            }
-            /^\d+\s+\w+\(\"([^"]+)\",/ or warning "Unknown entry `$_'";
-            my $file = $1;
-            $files{$file} = '';
-        }
-    }
-    else {
-        while (<IN>) {
-            chomp;
-            next if /^PWD /;
-            next if not $output and /^OUTPUT /;
-            /^(INPUT|OUTPUT) (.*)$/ or warning "Unknown entry `$_'";
-            my $type = $1;
-            my $file = $2;
-            $files{$file} = '';
-        }
-    }
-    close(IN);
-}
-
-sub map_files {
-    if ($flat) {
-        map_files_flat();
-    }
-    else {
-        map_files_texmf();
-    }
-}
-
-sub map_files_flat {
-    my %abs_files;
-    my %names;
-    my %clashes;
-
-    foreach my $file (keys %files) {
-        $abs_files{abs_path($file)} = '';
-    }
-
-    foreach my $file (keys %abs_files) {
-        my $name = basename($file);
-        next if exists $flat_ignore{$name};
-        if (defined($names{$name})) {
-            push @{$names{$name}}, $file;
-            $clashes{$name} = '';
-        }
-        else {
-            my @a = ($file);
-            $names{$name} = \@a;
-        }
-    }
-
-    foreach my $name (sort keys %clashes) {
-        print "* file name clash for " . value($name) . "\n";
-        my @a = @{$names{$name}};
-        foreach my $file (@a) {
-            print "  " . value($file) . "\n";
-        }
-    }
-
-    foreach my $name (sort keys %names) {
-        my $file = @{$names{$name}}[0];
-        my $clash = $clashes{$name} ? ' (clash)' : '';
-        verbose value($name) . ' => ' . value($file) . $clash;
-        $links{$name} = $file;
-    }
-}
-
-sub map_files_texmf {
-    my @failed;
-
-    foreach my $file (sort keys %files) {
-        verbose "file: " . value($file);
-
-        my $abs_file = abs_path($file);
-
-        my $found = '';
-        foreach (@texmf) {
-            my $texmf = "$_/";
-            my $len = length($texmf);
-            my $str = substr $file, 0, $len;
-            if ($texmf eq $str) {
-                $found = 'texmf/' . substr $file, $len;
-                if ($found =~ /(^|\/)\.\.\//) {
-                    $found = '';
-                }
-            }
-            last if $found;
-            my $str = substr $abs_file, 0, $len;
-            if ($texmf eq $str) {
-                $found = 'texmf/' . substr $abs_file, $len;
-                last;
-            }
-        }
-        if (not($found)) {
-            if ($file =~ /(^|\/)\.\.\// or $file =~ /^\//) {
-                push @failed, $file;
-            }
-            else {
-                $found = $file;
-            }
-        }
-        if ($found) {
-            $links{$found} = abs_path($file);
-        }
-    }
-
-    if ($verbose) {
-        foreach (sort keys %links) {
-            verbose value($_) . ' => ' . value($links{$_});
-        }
-    }
-
-    foreach (@failed) {
-        print "!!! Failed: " . value($_) . "\n";
-    }
-}
-
-sub make_dirs ($) {
-    my $path = shift;
-    my @elems = split /\/+/, $path;
-    if (@elems <= 1) {
-        return;
-    }
-    pop @elems;
-    my $dir = '';
-    foreach my $elem (@elems) {
-        $dir .= '/' if $dir;
-        $dir .= $elem;
-        next if -d $dir;
-        verbose 'mkdir: ' . value($dir);
-        mkdir $dir or die_error "Cannot make directory `$dir'";
-    }
-}
-
-sub make_links {
-
-    foreach my $key (sort keys %links) {
-        my $source = $links{$key};
-        my $dest = "$destdir/$key";
-        make_dirs $dest;
-        if (-e $dest) {
-            my $type = '';
-            if (-l $dest) {
-                $type .= 'link';
-            }
-            elsif (-f $dest) {
-                $type = 'file';
-            }
-            elsif (-d $dest) {
-                $type = 'directory';
-            }
-            elsif (-b $dest) {
-                $type = 'block device';
-            }
-            elsif (-c $dest) {
-                $type = 'character device';
-            }
-            elsif (-p $dest) {
-                $type = 'pipe';
-            }
-            elsif (-S $dest) {
-                $type = 'socket';
-            }
-            elsif (-t $dest) {
-                $type = 'tty';
-            }
-            $type = " ($type)" if $type;
-            verbose "destination$type exists: " . value($dest);
-            next;
-        }
-        $needs_texhash = 1;
-        do_link_copy($source, $dest);
-    }
-}
-
-sub do_link_copy {
-    my $source = shift;
-    my $dest = shift;
-    my $success = 0;
-
-    if ($copy) {
-        if (copy($source, $dest) == 1) {
-            $success = 1;
-            my ($source_mode, $source_atime, $source_mtime)
-                    = (stat($source))[2, 8, 9];
-            my ($dest_mode, $dest_atime, $dest_mtime)
-                    = (stat($dest))[2, 8, 9];
-            # preserve executable permissions if necessary
-            my $new_dest_mode = $dest_mode
-                                | (($source_mode & 0111) & ~$umask);
-            if ($new_dest_mode != $dest_mode) {
-                if (chmod($new_dest_mode, $dest) < 1) {
-                    print "!!! Setting executive mode failed: "
-                          . value($dest) . "\n";
-                }
-            }
-            # preserve file times
-            if ($source_atime != $dest_atime
-                    || $source_mtime != $dest_mtime) {
-                if (utime($source_atime, $source_mtime, $dest) < 1) {
-                    print "!!! Setting file times failed: "
-                          . value($dest) . "\n";
-                }
-            }
-        }
-    }
-    else {
-        if (symlink($source, $dest) == 1) {
-            $success = 1;
-        }
-    }
-    if ($success == 0) {
-        my $method = $copy ? 'Copying' : 'Symbolic linking';
-        print "!!! $method failed:\n    "
-              . value($dest) . ' => ' . value($source) . "\n";
-    }
-}
-
-run_tex;
-get_texmf_trees;
-analyze_recorder;
-map_files;
-make_links;
-run_texhash;
-
-1;
-
-__DATA__
-
-=head1 NAME
-
-mkjobtexmf -- Generate a texmf tree for a particular job
-
-=head1 SYNOPSIS
-
-The progam B<mkjobtexmf> runs a program and tries to
-find the used file names. Two methods are available,
-option C<-recorder> of TeX (Web2C) or the program B<strace>.
-
-Then it generates a directory with a texmf tree. It checks
-the found files and tries sort them in this texmf tree.
-
-It can be used for archiving purposes or to speed up
-following TeX runs.
-
-    mkjobtexmf [options]
-
-This runs TeX that can be configured by options.
-Both methods for getting the used file names are available.
-
-    mkjobtexmf [options] -- <cmd> [args]
-
-The latter form runs program I<cmd> with arguments I<args>
-instead of TeX. As method only program B<strace> is available.
-
-Options:
-
-    --jobname <name>       Name of the job (mandatory).
-                              Usually this is the TeX file
-                              without extension
-    --texname <file>       Input file for TeX. Default is the
-                              job name with extension '.tex'
-    --texopt <option>      Option for TeX run
-    --destdir <directory>  Destination directory,
-                              default is `<jobname>.mjt'
-    --output               Add also output files
-    --strace               Use strace instead of TeX's
-                              option -recorder
-    --copy                 Copy files instead of creating
-                              symbol links
-    --flat                 Junk paths, do not make directories
-                              inside the destination directory
-    --cmd-tex <cmd>        Command for the TeX compiler
-    --cmd-kpsewhich <cmd>  Command for kpsewhich
-    --cmd-texhash <cmd>    Command for texhash
-    --cmd-strace <cmd>     Command for strace
-    --verbose              Verbose output
-    --help                 Brief help message
-    --man                  Full documentation
-
-=head1 DESCRIPTION
-
-=head2 Running the program
-
-First B<mkjobtexmf> runs a program, usually TeX. The TeX compiler
-is configured by option B<--cmd-tex>. Option B<--texname> can
-be used, if the file name extension differs from F<.tex>:
-
-    mkjobtexmf --jobname foo --texname foo.ltx
-
-Even more complicate cases are possible:
-
-    mkjobtexmf --jobname foo --texname '\def\abc{...}\input{foo}'
-
-If another program than TeX should be used (dvips, ...),
-then this program can be given after C<-->:
-
-    mkjobtexmf --jobname foo -- dvips foo
-
-=head2 File recording
-
-Two methods are available to get the used file names:
-
-=over
-
-=item Recorder of TeX
-
-Some TeX distributions (e.g. Web2C) support the option B<-recorder>
-for its TeX compilers. Then the TeX compiler generates a file with
-extension F<.fls> that records the used input and output files.
-
-=item Program strace
-
-This program traces system calls and signals. It is used here
-to log the used files.
-
-=back
-
-=head2 Analyze and link/copy found files
-
-The result directory F<I<jobname>.mjt> is generated. Inside the
-result TEXMF tree is created. Each found file is compared against
-a list of paths of TEXMF trees. If a match is found, the file is
-linked/copied into the TEXMF tree. The list of paths is generated by
-program B<kpsewhich>.
-
-If the file cannot be mapped to a TEXMF tree and the file is
-a relative file name, then it is directly linked/copied into the
-result directory F<I<jobname>.mjt>. Absolute file names
-are not supported and neither paths with links to parent directories.
-
-Symbolic links are created by default. The files are copied
-if option --copy is given or symbolic linking is not available.
-
-=head1 OPTIONS
-
-=over
-
-=item B<--jobname>=I<jobname>
-
-It is the name of the job. `<jobname>.tex' serves as default for
-the TeX file and <jobname> is used for naming various directories
-and files. See section L</FILES>.
-
-=item B<--texname>=I<name>
-
-The name of the TeX input file, if it differs from <jobname>.tex.
-
-=item B<--texopt>=I<opt>
-
-Additional option for the TeX compiler, examples are --ini or
---shell-escape. This option can be given more than once.
-
-=item B<--destdir>=I<directory>
-
-Specifies the name of the destination directory where the result
-is collected. As default a directory is generated in the current
-directory with the job name and extension `.mjt'.
-
-=item B<--output>
-
-Also add output files.
-
-=item B<--strace>
-
-Use method with program B<strace>, see L<"DESCRIPTION">.
-
-=item B<--copy>
-
-Files are copied instead of creating symbolic links.
-
-=item B<--flat>
-
-Files are linked or copied without path elements.
-The destination directory will contain a flat list of
-files or links without directory.
-
-The files `ls-R' and `aliases' are ignored.
-
-=item B<--cmd-tex>=I<cmd>
-
-Command for the TeX compiler. Default is pdflatex.
-
-=item B<--cmd-kpsewhich>=I<cmd>
-
-Command for kpsewhich.
-
-=item B<--cmd-texhash>=I<cmd>
-
-Command for updating the file name database of the generated
-texmf tree. Default is texmf.
-
-=item B<--cmd-strace>=I<cmd>
-
-Command for strace.
-
-=item B<--verbose>
-
-Verbose messages.
-
-=item B<--help>
-
-Display help screen.
-
-=back
-
-=head1 EXAMPLES
-
-TeX file F<test.tex> using TeX's recorder method:
-
-    mkjobtexmf --jobname test
-
-TeX file F<test.tex> using LaTeX:
-
-    mkjobtexmf --jobname test --cmd-tex latex
-
-Format generation:
-
-    mkjobtexmf --jobname test --texopt -ini --texname pdflatex.ini
-
-Example, how the new texmf tree (Linux/bash) can be used:
-
-    TEXMF=!!test.mjt/texmf pdflatex test
-
-Example for generating a zip archive (Linux/bash):
-
-    (cd test.mjt && zip -9r ../test .)
-
-Example for generating a tar archive:
-
-    tar cjhvf test.tar.bz2 -C test.mjt .
-
-=head1 UNSOLVED ISSUES, CAVEATS, TODOS
-
-=over
-
-=item Experimental software
-
-Options, defaults, how the program works might change in
-future versions.
-
-=item F<texmf.cnf>
-
-Currently the method with B<strace> records this files.
-TeX's recorder does not. Useful are F<texmf.cnf> files for
-variable settings. Because we have just one TEXMF tree,
-the path sections should probably rewritten.
-
-=item Settings in environment variables
-
-They are not stored at all.
-
-=item Collisions
-
-The program uses one destination directory and at most
-one TEXMF tree for the result. However, the source files
-can come from different directories and TEXMF trees.
-Therefore name collisions are possible.
-
-The program follows the strategy not to delete files
-in the destination directory. That allows to collect files
-from differnt runs. Thus collisions are resolved
-in the manner that the first entry that is made in
-the destination directory wins.
-
-=item Configuration file
-
-It would save the user from retyping the same options again and again.
-
-=item Uncomplete recording
-
-Bugs in TeX's file recording might result in incomplete
-file recording (e.g. pdfTeX 1.40.3 does not record .pfb and
-.pk files).
-
-=item ...
-
-=back
-
-=head1 FILES
-
-=over
-
-=item F<E<lt>jobnameE<gt>.mjt/>
-
-Directory where the resulting texmf tree and symbol links
-are stored. It can be changed by option --destdir.
-
-=item F<E<lt>jobnameE<gt>.fls>
-
-Name of TeX's recorder file.
-
-=item F<E<lt>jobnameE<gt>.strace>
-
-Log file where the result of B<strace> is stored.
-
-=back
-
-=head1 AUTHOR
-
-Heiko Oberdiek, email: oberdiek at uni-freiburg.de
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright 2007 by Heiko Oberdiek.
-
-This library is free software; you may redistribute it and/or
-modify it under the same terms as Perl itself
-(Perl Artistic License/GNU General Public License, version 2).
-
-=head1 HISTORY
-
-=over
-
-=item 2007/04/16 v0.1
-
-* First experimental version.
-
-=item 2007/05/09 v0.2
-
-* Typo in option name fixed.
-
-=item 2007/09/03 v0.3
-
-* New options: --copy, --flat, --destdir
-
-=item 2007/09/04 v0.4
-
-* Bug fix in map_files_texmf.
-
-=item 2007/09/06 v0.5
-
-* Support for `configure' added.
-  (Thanks to Norbert Preining for writing a first version of
-  the configure stuff.)
-
-=back
-
-=cut
diff --git a/Master/bin/i386-linux/mkocp b/Master/bin/i386-linux/mkocp
deleted file mode 100755
index 41ffead8bf1..00000000000
--- a/Master/bin/i386-linux/mkocp
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# Initial definition.  Will leave the .ocp file in the local directory.
-(
-otp2ocp `basename "$1" .ocp` || exit 1
-) 1>&2 </dev/null
-echo `basename "$1" .ocp`.ocp
diff --git a/Master/bin/i386-linux/mkofm b/Master/bin/i386-linux/mkofm
deleted file mode 100755
index ef820171f08..00000000000
--- a/Master/bin/i386-linux/mkofm
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-# Initial definition.  For the moment only makes .tfm files.
-mktextfm $*
diff --git a/Master/bin/i386-linux/mktexfmt b/Master/bin/i386-linux/mktexfmt
deleted file mode 120000
index 817cc8aaa1b..00000000000
--- a/Master/bin/i386-linux/mktexfmt
+++ /dev/null
@@ -1 +0,0 @@
-fmtutil
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/mktexlsr b/Master/bin/i386-linux/mktexlsr
deleted file mode 100755
index 9f729e4d495..00000000000
--- a/Master/bin/i386-linux/mktexlsr
+++ /dev/null
@@ -1,163 +0,0 @@
-#!/bin/sh
-# original mktexlsr -- create or rebuild ls-R.
-# 
-# (If you change or delete the word `original' on the previous line,
-# installation won't write this script over yours.)
-#
-# Suitable for calling from cron, as in:
-# 0 * * * * cd /your/texmf/root && /usr/local/bin/mktexlsr
-# unless the scripts live in a different directory than the 'kpseaccess',
-# 'kpsestat', 'kpsereadlink', and 'kpsewhich' binaries.
-# 
-# Originally written as `texhash' by Thomas Esser
-# <te@dbs.uni-hannover.de>, Okt., 1994.
-# Public domain.
-
-version='$Id: mktexlsr,v 1.46 2005/06/21 14:32:26 olaf Exp $'
-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.
-
-Rebuild all necessary ls-R filename databases completely. If one or
-more arguments DIRS are given, these are used as texmf directories to
-build ls-R for. Else all directories in the search path for ls-R files
-(\$TEXMFDBS) are used."
-
-# MS-DOS and MS-Windows define $COMSPEC or $ComSpec and use `;' to separate
-# directories in path lists whereas Unix uses `:'.  Make an exception for
-# Cygwin, which pretends to be UNIX.
-# Create a variable that holds the right character to be used by the scripts.
-DOSISH=no
-case `uname -s` in
-  CYGWIN*|Cygwin*|cygwin*) ;;
-  *) if test -n "$COMSPEC" || test -n "$ComSpec"; then DOSISH=yes; fi
-esac
-if test "$DOSISH" = "no"; then SEP=':'; else SEP=';';fi
-
-# Add the location of the script to the PATH if necessary.  This must
-# be done before kpsewhich can be called, and thus cannot be put into
-# mktex.opt.
-dirname=`echo $0 | sed 's%/*[^/][^/]*$%%'`
-case $dirname in
-  "") # Do nothing
-      ;;
-  /* | [A-z]:/*) # Absolute name
-      PATH="$dirname$SEP$PATH"
-      export PATH ;;
-   *)  # Relative name
-      PATH="`pwd`/$dirname$SEP$PATH"
-      export PATH ;;
-esac
-
-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
-  shift
-fi
-
-# mktexupd and mktexlsr make sure they're coordinated via this.  A copy
-# is found mktex.opt.
-ls_R_magic='% ls-R -- filename database for kpathsea; do not change this line.'
-# The old string, which should continue to work.
-old_ls_R_magic='% ls-R -- maintained by MakeTeXls-R; do not change this line.'
-
-trap 'cd / ; test -z "$db_dir_tmp" || rm -rf "$db_dir_tmp"; exit' 0 1 2 3 7 13 15
-
-# Get list of directories from $TEXMFDBS; eliminate duplicates.
-test $# = 0 && {
-  OIFS=$IFS
-  IFS='
-'
-  set x `kpsewhich --show-path=ls-R | tr : '
-' | sort | uniq`; shift
-  IFS=$OIFS
-}
-
-for TEXMFLS_R in "$@"; do
-  # Prepend cwd if the directory was relative.
-  case "$TEXMFLS_R" in
-  "") continue ;;  # Strictly speaking, it is an error if this case is taken.
-  /* | [A-z]:/*) ;;
-  *)  TEXMFLS_R="`pwd`/$TEXMFLS_R"
-  esac
-  # Allow for ls-R and ls-r to exist.  But create ls-R if we're working
-  # from scratch.
-  if test -f "$TEXMFLS_R/ls-R"; then
-    db_file="$TEXMFLS_R/ls-R"
-  elif test -f "$TEXMFLS_R/ls-r"; then
-    db_file="$TEXMFLS_R/ls-r"
-  else
-    db_file="$TEXMFLS_R/ls-R"
-  fi
-  # Follow a possible symlink to get the right filesystem. 
-  # The '|| true' construct prevents an sh -e aborting.
-  db_readlink=`kpsereadlink "$TEXMFLS_R/ls-R" 2>/dev/null` || true
-  case "$db_readlink" in
-  "") ;;
-  /* | [A-z]:/*) db_file="$db_readlink" ;;
-  *)  db_file="$TEXMFLS_R/$db_readlink"
-  esac
-  db_dir=`echo "$db_file" | sed 's%/[^/][^/]*$%%'` # can't rely on dirname
-
-  test -d "$db_dir" || continue
-  test -w "$db_dir" || { echo "$progname: $db_dir: directory not writable. Skipping..." >&2; continue; }
-
-  if test ! -f "$db_file"; then
-    cp /dev/null "$db_file"
-    # Use same permissions as parent directory, minus x,s, or t bits.
-    chmod `kpsestat -xst "$db_dir"` "$db_file"
-  elif test -s "$db_file" \
-       && test "x`sed '1s/
-$//;1q' \"$db_file\"`" != "x$ls_R_magic" \
-       && test "x`sed '1s/
-$//;1q' \"$db_file\"`" != "x$old_ls_R_magic"; then
-    echo "$progname: $db_file lacks magic string. Skipping..." >&2
-    continue
-  fi
-
-  # Skip if we cannot write the file:
-  kpseaccess -w "$db_file" || { echo "$progname: $db_file: no write permission. Skipping..." >&2; continue; }
-
-  db_dir_tmp="$db_dir/lsR$$.tmp"
-  (umask 077 && mkdir "$db_dir_tmp" ) \
-    || { echo "$progname: could not create directory '$db_dir_tmp'. Skipping..." >&2; continue; }
-  db_file_tmp="$db_dir_tmp/lsR$$.tmp"
-  rm -f "$db_file_tmp"
-
-  $verbose && echo "$progname: Updating $db_file... " >&2
-  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.
-  # 
-  echo "./:" >>"$db_file_tmp"
-  (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' \
-   >>"$db_file_tmp"
-
-  # To be really safe, a loop.
-  until PERMS=`kpsestat = "$db_file"`; do sleep 1; done
-  chmod $PERMS "$db_file_tmp"
-  rm -f "$db_file"
-  mv "$db_file_tmp" "$db_file"
-  rm -rf "$db_dir_tmp"
-done
-$verbose && echo "$progname: Done." >&2
-exit 0
diff --git a/Master/bin/i386-linux/mktexmf b/Master/bin/i386-linux/mktexmf
deleted file mode 100755
index 32bb85ec3d8..00000000000
--- a/Master/bin/i386-linux/mktexmf
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/bin/sh
-# original mktexmf -- make a new MF file, because one wasn't found.
-# 
-# (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.
-# Public domain.
-
-version='$Id: mktexmf,v 1.27 2005/01/25 17:39:21 olaf Exp $'
-progname=`echo $0 | sed 's%.*/%%'`
-usage="Usage: $progname FONT.
-
-Makes the Metafont source file for FONT, if possible. For example,
-\`ecr12' or \`cmr11'."
-
-# Common code for all scripts.
-: ${MT_TEXMFMAIN=`kpsewhich --expand-path='$TEXMFMAIN'`}
-: ${MT_MKTEX_OPT=`kpsewhich --format='web2c files' mktex.opt`}
-test -n "$MT_MKTEX_OPT" || MT_MKTEX_OPT="$MT_TEXMFMAIN/web2c/mktex.opt"
-if test ! -f "$MT_MKTEX_OPT"; then
-  echo "$progname: Cannot find mktex.opt; check your installation." >&2
-  exit 1
-fi
-
-. "$MT_MKTEX_OPT"
-
-(
-# See comments in mktexpk.
-name="`echo $1 | sed 's%.*/%%; s%\.mf$%%'`"
-rootname=`echo "$name" | sed 's/[0-9]*$//'`
-pointsize=`echo "$name" | sed "s/^$rootname//"`
-
-sauterroot=`kpsewhich b-$rootname.mf 2>/dev/null`
-if test -n "$sauterroot"; then
-  rootfile=$sauterroot
-  rootname=b-$rootname
-else
-  case $rootname in
-    # csso12[0-5][0-9] from CJK package; unsupported by mktexmf
-    csso12[0-5][0-9])
-       rootfile=;;
-    cs*|lcsss*|icscsc*|icstt*|ilcsss*)
-       rootfile=`kpsewhich cscode.mf`;;
-    wn[bcdfirstuv]*|rx[bcdfiorstuvx][bcfhilmostx]|l[abcdhl][bcdfiorstuvx]*)
-       lhprefix=`echo "$name" | sed 's/^\(..\).*/\1/'`
-       rootfile=`kpsewhich ${lhprefix}codes.mf 2>/dev/null`;;
-    *)
-       rootfile=`kpsewhich $rootname.mf 2>/dev/null`;;
-  esac
-fi
-{ test -z "$rootfile" || test ! -f "$rootfile"; } && exit 1
-
-#if test -z "$MT_MFNAME"; then
-OIFS=$IFS; IFS=$SEP
-set x `"$MT_MKTEXNAM" $name`; shift
-IFS=$OIFS
-MT_MFNAME="$3"
-#fi
-
-destdir=`echo "$MT_MFNAME" | sed 's%/[^/][^/]*$%%'`
-test -d "$destdir" || "$MT_MKTEXDIR" "$destdir" || exit 1
-cd "$destdir" || exit 1
-
-case "$pointsize" in
-  "") echo "$progname: no pointsize."; exit 1;;
-  11) realsize=10.95;;      # \magstephalf
-  14) realsize=14.4;;  # \magstep2
-  17) realsize=17.28;; # \magstep3
-  20) realsize=20.74;; # \magstep4
-  25) realsize=24.88;; # \magstep5
-  30) realsize=29.86;; # \magstep6
-  36) realsize=35.83;; # \magstep7
-        # The new convention is to have three or four letters for the
-        # font name and four digits for the pointsize. The number is
-        # pointsize * 100. We effectively divide by 100 by ignoring the
-        # last two digits.
-  ????|?????) realsize=`echo "$pointsize" | sed 's/\(..\)$/.\1/'`;;
-  *) realsize="$pointsize";;
-esac
-
-mfname="$name.mf"
-if test -r "$mfname"; then
-  echo "$progname: $destdir/$mfname already exists."
-  echo "$destdir/$mfname" >$STDOUT
-  "$MT_MKTEXUPD" "$destdir" "$mfname"
-  exit 0
-fi
-
-case "$name" in
-  ec*|tc*)
-    cat > "mf$$.tmp" <<END
-if unknown exbase: input exbase fi;
-gensize:=$realsize;
-generate $rootname;
-END
-    ;;
-  dc*)
-    cat > "mf$$.tmp" <<END
-if unknown dxbase: input dxbase fi;
-gensize:=$realsize;
-generate $rootname;
-END
-    ;;
-  cs*|lcsss*|icscsc*|icstt*|ilcsss*)
-    cat > "mf$$.tmp" <<END
-input cscode
-use_driver;
-END
-    ;;
-  wn[bcdfirstuv]*|rx[bcdfiorstuvx][bcfhilmostx]*|l[abcdhl][bcdfiorstuvx]*)
-    cat > "mf$$.tmp" <<END
-input fikparm;
-END
-    ;;
-  g[lmorst][bijmtwx][cilnoru]*)
-    # A small superset of the names of the cbgreek fonts.
-    cat > "mf$$.tmp" <<END
-% generated by mktexmf
-input cbgreek;
-END
-    ;;
-  *)
-    cat > "mf$$.tmp" <<END
-design_size := $realsize;
-input $rootname;
-END
-    ;;
-esac
-
-chmod `kpsestat -xst,go-w .` "mf$$.tmp"
-rm -f "$mfname"
-mv "mf$$.tmp" "$mfname"
-
-echo "$destdir/$mfname" >$STDOUT
-echo "$progname: $destdir/$mfname: successfully generated." >&2
-"$MT_MKTEXUPD" "$destdir" "$mfname"
-exit 0
-) 1>&2 </dev/null
diff --git a/Master/bin/i386-linux/mktexpk b/Master/bin/i386-linux/mktexpk
deleted file mode 100755
index 4a16e0d3477..00000000000
--- a/Master/bin/i386-linux/mktexpk
+++ /dev/null
@@ -1,264 +0,0 @@
-#!/bin/sh
-# original mktexpk -- make a new PK font, because one wasn't found.
-# 
-# (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.
-# Public domain.
-
-version='$Id: mktexpk,v 1.34 2005/06/21 10:49:10 olaf Exp $'
-progname=`echo $0 | sed 's%.*/%%'`
-usage="Usage: $progname [OPTIONS] NAME [REDIRECT],
-  Create a PK font.
-
---dpi DPI           use resolution DPI.
---bdpi BDPI         use base resolution BDPI.
---mag MAG           use magnificiation MAG.
---mfmode MODE       use MODE as the METAFONT mode.
---destdir DESTDIR   write fonts in DESTDIR.
-
-Try to create a PK file for NAME at resolution DPI, with an assumed
-device base resolution of BDPI, and a Metafont \`mag' of MAG. Use MODE
-for the METAFONT mode.  Use DESTDIR for the root of where to install
-into, either the absolute directory name to use (if it starts with a
-/) or relative to the default DESTDIR (if not). REDIRECT, if supplied,
-is a string of the form '>&n', where n is the number of the file
-descriptor which is to receive, instead of stdout, the name of the
-newly created pk file."
-
-# Handle non-positional options, except for --version/--help
-while test $# -gt 0; do
-  case "$1" in
-    --destdir) shift; DEST="$1"; shift ;;
-    --destdir=*) DEST=`echo "$1" | sed 's/--destdir=//'`; shift ;;
-    --dpi) shift; DPI="$1"; shift ;;
-    --dpi=*) DPI=`echo "$1" | sed 's/--dpi=//'`; shift ;;
-    --bdpi) shift; BDPI="$1"; shift ;;
-    --bdpi=*) BDPI=`echo "$1" | sed 's/--bdpi=//'`; shift ;;
-    --mfmode) shift; test "x$1" != "x/" && MODE="$1"; shift ;;
-    --mfmode=*) test "x$1" != "x--mfmode/" \
-                && MODE=`echo "$1" | sed 's/--mfmode=//'`; shift ;;
-    --mag) shift; MAG="$1"; shift;;
-    --mag=*) MAG=`echo "$1" | sed '/s--mag=//'`; shift;;
-    --version|-version) break ;;
-    --help|-help) break ;;
-    *) break ;;
-  esac
-done
-
-if test "x$2" != x; then
-  tail="`echo \"x$2\" | sed 's/^x>&//' | grep '^[0-9]*$'`"
-  if test -z "$tail"; then
-    echo "$progname: argument '$2' ignored - bad file number" >&2
-  elif test "$tail" != 1; then
-      eval 'exec 1>&$tail'
-  fi
-fi
-
-mt_max_args=2
-
-# Common code for all scripts.
-: ${MT_TEXMFMAIN=`kpsewhich --expand-path='$TEXMFMAIN'`}
-: ${MT_MKTEX_OPT=`kpsewhich --format='web2c files' mktex.opt`}
-test -n "$MT_MKTEX_OPT" || MT_MKTEX_OPT="$MT_TEXMFMAIN/web2c/mktex.opt"
-if test ! -f "$MT_MKTEX_OPT"; then
-  echo "$progname: Cannot find mktex.opt; check your installation." >&2
-  exit 1
-fi
-
-. "$MT_MKTEX_OPT"
-
-# Where do potential driver files belong?
-case "$MT_FEATURES" in
-  *nomfdrivers*)
-     : ${MT_MFDESTDIR=`pwd`}
-     export MT_MFDESTDIR;;
-esac
-
-# Since we want to pass the generated filename and only that filename
-# back to the caller on standard output, we do some redirections so
-# regular echo's will end up on stderr, and do an echo >$STDOUT at the end.
-# Then the contents of $STDOUT will be echoed to stdout by a trap.
-
-# start of redirection stdout -> stderr, stdin <- /dev/null
-(
-
-NAME=$1
-
-if kpsewhich $NAME.mf >/dev/null 2>&1 || mktexmf $NAME >/dev/null 2>&1; then
-  # determine the progname of metafont to use; prefer mf-nowin.
-  if (mf-nowin --version) >/dev/null 2>&1; then
-    MF="mf-nowin -progname=mf"
-  else
-    MF=mf
-  fi
-
-  # Check that $BDPI and $MODE are consistent; if not, ignore the mode and
-  # hope we can correctly guess it from bdpi.  (People like to specify the
-  # resolution on the command line, not the mode so much.)
-  if test -n "$MODE"; then
-    mf_bdpi=`$MF \
-'\mode:='$MODE';mode_setup;message"BDPI= "&decimal round pixels_per_inch;end.'\
-             </dev/null \
-             | awk '/DPI=/ {print $2}'`
-    if test "x$mf_bdpi" != x$BDPI; then
-      echo "$progname: Mismatched mode $MODE and resolution $BDPI; ignoring mode." >&2
-      MODE=
-    fi
-  fi
-
-  # If an explicit mode is not supplied, try to guess. You can get a
-  # list of extant modes from ftp://ftp.tug.org/tex/modes.mf.
-  if test -z "$MODE" || test "x$MODE" = xdefault; then
-    case "$BDPI" in
-      85) MODE=sun;;
-     100) MODE=nextscrn;;
-     180) MODE=toshiba;;
-     300) MODE=cx;;
-     360) MODE=epstylus;;
-     400) MODE=nexthi;;
-     600) MODE=ljfour;;
-     720) MODE=epscszz;;
-    1200) MODE=ultre;;
-    1270) MODE=linoone;;
-    8000) MODE=dpdfezzz;;
-       *) echo "$progname: Can't guess mode for $BDPI dpi devices." >&2
-          echo "$progname: Use a config file or option to specify the mode; see:" >&2
-          echo "$progname: http://tug.org/texinfohtml/kpathsea.html#Unable-to-generate-fonts" >&2
-          exit 1
-    esac
-  fi
-
-  # Run Metafont. Always use plain Metafont, since reading cmbase.mf
-  # does not noticeably slow things down.
-  cmd="$MF \mode:=$MODE; mag:=$MAG; nonstopmode; input $NAME"
-else
-  MODE=modeless
-  # ps_to_pk is set in mktex.opt
-  case $ps_to_pk in
-    gsftopk)
-      if $ps_to_pk -t "$NAME"; then
-        cmd="$ps_to_pk $NAME $DPI"
-      fi;;
-    ps2pk)
-      # grep for the font in $PSMAPFILE.  These are base font names, such as
-      # rpplr (the original) or pplr0 (an interim step) or pplr8r (current).
-      : ${PSMAPFILE=`kpsewhich --format=map psfonts.map ps2pk.map`}
-      pattern="^$NAME"'([ 	]|$)' 
-      psline=`egrep "$pattern" $PSMAPFILE | tail -1`
-      if test -n "$psline"; then
-        set x `echo "$psline" | sed 's%[<["]%%g'`
-        shift; shift; shift;
-        encoding=; psname=; slant=; extend=
-        while test ! -z "$1"; do
-          case "$1" in
-            *.enc)       encoding="-e $1";;
-            *.pf[ab])    psname="$1";;
-            *SlantFont)  slant="-S $lastopt";;
-            *ExtendFont) extend="-E $lastopt";;
-          esac
-          lastopt="$1"
-          shift
-        done
-        # Guessing the name of the type1 font file as fallback:
-        ANAME=`echo $NAME | sed 's/8r$/8a/'`
-        for i in $NAME.pfa $NAME.pfb $ANAME.pfa $ANAME.pfb; do
-          if kpsewhich $i >/dev/null 2>&1; then
-            psname=$i
-            break
-          fi
-        done
-
-        if [ -n "$psname" ]; then
-          cmd="ps2pk -v -X$DPI -R$BDPI $slant $extend $encoding $psname $NAME.${DPI}pk"
-        else
-          if gsftopk -t "$NAME"; then
-            echo "$progname: cannot find $NAME.pfa or $NAME.pfb. Trying gsftopk." >&2
-            cmd="gsftopk $NAME $DPI"
-          fi
-        fi
-      fi;;
-  esac
-
-  # unsupported by $ps_to_pk, try other conversions:
-  if test -z "$cmd"; then
-    if (ttf2pk -t -q $NAME) >/dev/null 2>&1; then
-      cmd="ttf2pk -q $NAME $DPI"
-    elif (hbf2gf -t -q $NAME) >/dev/null 2>&1; then
-      cmd="hbf2gf -q -p $NAME $DPI"
-    else
-      echo "$progname: don't know how to create bitmap font for $NAME." >&2
-      exit 1
-    fi
-  fi
-fi
-
-OIFS=$IFS; IFS=$SEP
-set x `"$MT_MKTEXNAM" $NAME $DPI $MODE $DEST`; shift
-IFS=$OIFS
-
-PKDEST="$1"
-PKDESTDIR=`echo "$PKDEST" | sed 's%/[^/][^/]*$%%'` # can't rely on dirname
-PKNAME=`basename "$PKDEST"`
-GFNAME=$NAME.${DPI}gf
-
-if test -r "$PKDESTDIR/$PKNAME"; then
-  echo "$progname: $PKDESTDIR/$PKNAME already exists." >&2
-  echo "$PKDESTDIR/$PKNAME" >$STDOUT
-  "$MT_MKTEXUPD" "$PKDESTDIR" $PKNAME
-  exit 0
-fi
-
-"$MT_MKTEXDIR" "$PKDESTDIR"
-if test ! -d "$PKDESTDIR"; then
-  echo "$progname: mktexdir $PKDESTDIR failed." >&2
-  exit 1
-fi
-
-echo "$progname: Running $cmd"
-$cmd </dev/null || {
-  # Don't abort if only "Strange path", "bad pos" or "angle(0,0)"
-  # errors occurr.
-  grep '^!' $NAME.log | sort >$$.errs 2>/dev/null
-  grep '^! Strange path' $$.errs >$$.strange 2>/dev/null
-  grep '^! bad pos.' $$.errs >$$.badpos 2>/dev/null
-  grep '^! angle(0,0) is taken as zero.' $$.errs >$$.angle 2>/dev/null
-  cat $$.badpos $$.strange $$.angle | sort > $$.errs_accept
-  if cmp $$.errs $$.errs_accept >/dev/null 2>&1; then
-    test -s $$.strange >/dev/null 2>&1 \
-      && echo "$progname: warning: \`$cmd' caused strange path errors." >&2
-    test -s $$.badpos >/dev/null 2>&1 \
-      && echo "$progname: warning: \`$cmd' caused bad pos errors." >&2
-    test -s $$.angle >/dev/null 2>&1 \
-      && echo "$progname: warning: \`$cmd' caused angle(0,0) errors." >&2
-  else
-    echo "$progname: \`$cmd' failed." >&2
-    test -s $NAME.log && mv -f $NAME.log "$KPSE_DOT"
-    exit 1;
-  fi
-}
-
-test -r $GFNAME && { gftopk ./$GFNAME $PKNAME || exit 1; }
-test ! -f $PKNAME && test -f $NAME.${DPI}pk && mv $NAME.${DPI}pk $PKNAME
-if test ! -s $PKNAME; then
-  echo "$progname: \`$cmd' failed to make $PKNAME." >&2
-  exit 1
-fi
-
-# Install the PK file carefully, since others may be working simultaneously.
-# 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
-chmod `kpsestat -xst,go-w .` pk$$.tmp
-test -r $PKNAME || mv pk$$.tmp $PKNAME || exit 1
-
-# Update ls-R if necessary.
-"$MT_MKTEXUPD" "$PKDESTDIR" $PKNAME
-
-# If this line (or an equivalent) is not present, dvipsk/xdvik/dviljk
-# will think mktexpk failed.  Any other output to stdout will also lose.
-echo "$PKDESTDIR/$PKNAME" >$STDOUT
-echo "$progname: $PKDESTDIR/$PKNAME: successfully generated." >&2
-) 1>&2 </dev/null
diff --git a/Master/bin/i386-linux/mktextfm b/Master/bin/i386-linux/mktextfm
deleted file mode 100755
index a423d0309b0..00000000000
--- a/Master/bin/i386-linux/mktextfm
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/bin/sh
-# original mktextfm -- make a new TFM file, because one wasn't found.
-# 
-# (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.
-# Public domain.
-
-version='$Id: mktextfm,v 1.27 2004/07/03 19:25:15 olaf Exp $'
-progname=`echo $0 | sed 's%.*/%%'`
-usage="Usage: $progname [--destdir DESTDIR] FONT.
-
-Makes a TFM file for FONT, if possible. Use DESTDIR for the root of where
-to install into, either the absolute directory name to use (if it starts
-with a /) or relative to the default DESTDIR (if not)."
-
-# Handle non-positional options, except for --version/--help
-while test $# -gt 0; do
-  case "$1" in
-    --destdir) shift; DEST="$1"; shift ;;
-    --destdir=*) DEST=`echo "$1" | sed 's/--destdir=//'`; shift ;;
-    --version|-version) break ;;
-    --help|-help) break ;;
-    *) break ;;
-  esac
-done
-
-# Common code for all scripts.
-: ${MT_TEXMFMAIN=`kpsewhich --expand-path='$TEXMFMAIN'`}
-: ${MT_MKTEX_OPT=`kpsewhich --format='web2c files' mktex.opt`}
-test -n "$MT_MKTEX_OPT" || MT_MKTEX_OPT="$MT_TEXMFMAIN/web2c/mktex.opt"
-if test ! -f "$MT_MKTEX_OPT"; then
-  echo "$progname: Cannot find mktex.opt; check your installation." >&2
-  exit 1
-fi
-
-. "$MT_MKTEX_OPT"
-
-# Where do potential mf driver files go?
-case "$MT_FEATURES" in
-  *nomfdrivers*)
-     : ${MT_MFDESTDIR=`pwd`}
-     export MT_MFDESTDIR;;
-esac
-
-# start of redirection stdout -> stderr, stdin <- /dev/null
-(
-
-NAME=`basename "$1" .tfm`
-MAG=1
-#DEST="$2"
-DPI=$BDPI
-
-OIFS=$IFS; IFS=$SEP
-set x `"$MT_MKTEXNAM" $NAME $DPI $MODE $DEST`; shift
-IFS=$OIFS
-
-PKDEST="$1"
-TFMDEST="$2"
-PKDESTDIR=`echo "$PKDEST" | sed 's%/[^/][^/]*$%%'` # can't rely on dirname
-TFMDESTDIR=`echo "$TFMDEST" | sed 's%/[^/][^/]*$%%'`
-PKNAME=`basename "$PKDEST"`
-TFMNAME=$NAME.tfm
-GFNAME=$NAME.$DPI'gf'
-
-if test -r "$TFMDESTDIR/$TFMNAME"; then
-  echo "$progname: $TFMDESTDIR/$TFMNAME already exists." >&2
-  echo "$TFMDESTDIR/$TFMNAME" >$STDOUT
-  "$MT_MKTEXUPD" "$TFMDESTDIR" $TFMNAME
-  exit
-fi
-
-# Try to create the destdir first. Do not create fonts, if this fails.
-"$MT_MKTEXDIR" "$TFMDESTDIR"
-if test ! -d "$TFMDESTDIR"; then
-  echo "$progname: mktexdir $TFMDESTDIR failed."
-  exit 1
-fi
-
-# Check if this font is supported by hbf2gf else use metafont.
-if (hbf2gf -q -t $NAME) >/dev/null 2>&1; then
-  cmd="hbf2gf -g $NAME $DPI"
-else
-  # determine the progname of metafont to use; prefer mf-nowin.
-  if (mf-nowin --version) >/dev/null 2>&1; then
-    MF="mf-nowin -progname=mf"
-  else
-    MF=mf
-  fi
-
-  cmd="$MF \mode:=$MODE; mag:=$MAG; nonstopmode; input $NAME"
-fi
-
-echo "$progname: Running $cmd"
-$cmd </dev/null || {
-  # Don't abort if only "Strange path", "bad pos" or "angle(0,0)"
-  # errors occurr.
-  grep '^!' $NAME.log | sort >$$.errs 2>/dev/null
-  grep '^! Strange path' $$.errs >$$.strange 2>/dev/null
-  grep '^! bad pos.' $$.errs >$$.badpos 2>/dev/null
-  grep '^! angle(0,0) is taken as zero.' $$.errs >$$.angle 2>/dev/null
-  cat $$.badpos $$.strange $$.angle | sort > $$.errs_accept
-  if cmp $$.errs $$.errs_accept >/dev/null 2>&1; then
-    test -s $$.strange >/dev/null 2>&1 \
-      && echo "$progname: warning: \`$cmd' caused strange path errors." >&2
-    test -s $$.badpos >/dev/null 2>&1 \
-      && echo "$progname: warning: \`$cmd' caused bad pos errors." >&2
-    test -s $$.angle >/dev/null 2>&1 \
-      && echo "$progname: warning: \`$cmd' caused angle(0,0) errors." >&2
-  else
-    echo "$progname: \`$cmd' failed." >&2
-    test -s $NAME.log && mv -f $NAME.log "$KPSE_DOT"
-    exit 1;
-  fi
-}
-
-# hbf2gf just produces a .pl file:
-test -r ./$NAME.pl && pltotf ./$NAME.pl $TFMNAME
-test -r $TFMNAME || { echo "$progname: \`$cmd' failed to make $TFMNAME."; exit 1; }
-
-# Install the TFM file carefully, since others may be working simultaneously.
-# Use cp when mv fails, since DOS will fail mv for deeply-nested directories.
-mv $TFMNAME "$TFMDESTDIR/tfm$$.tmp" 2>/dev/null \
-  || cp $TFMNAME "$TFMDESTDIR/tfm$$.tmp" || exit 1
-cd "$TFMDESTDIR" || exit 1
-chmod `kpsestat -xst,go-w .` tfm$$.tmp
-test -r $TFMNAME || mv tfm$$.tmp $TFMNAME || exit 1
-
-# OK, success with the TFM.
-"$MT_MKTEXUPD" "$TFMDESTDIR" $TFMNAME
-echo "$TFMDESTDIR/$TFMNAME" >$STDOUT
-echo "$progname: $TFMDESTDIR/$TFMNAME: successfully generated." >&2
-
-# Since we probably made a GF(->PK) file, too, may as well install it if
-# it's needed.
-cd $TEMPDIR
-if test -r $GFNAME && test ! -f "$PKDESTDIR/$PKNAME"; then
-  gftopk ./$GFNAME $PKNAME || exit 1
-  "$MT_MKTEXDIR" "$PKDESTDIR"
-  mv $PKNAME "$PKDESTDIR/pk$$.tmp" 2>/dev/null \
-    || cp $PKNAME "$PKDESTDIR/pk$$.tmp" || exit 1
-  cd "$PKDESTDIR" || exit 1
-  if test -f $PKNAME; then
-    rm -f pk$$.tmp
-  else
-    chmod `kpsestat -xst,go-w .` pk$$.tmp
-    mv pk$$.tmp $PKNAME
-    "$MT_MKTEXUPD" "$PKDESTDIR" $PKNAME
-  fi
-fi
-) 1>&2 </dev/null
diff --git a/Master/bin/i386-linux/mllatex b/Master/bin/i386-linux/mllatex
deleted file mode 120000
index f68cc91498e..00000000000
--- a/Master/bin/i386-linux/mllatex
+++ /dev/null
@@ -1 +0,0 @@
-pdftex
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/mltex b/Master/bin/i386-linux/mltex
deleted file mode 120000
index f68cc91498e..00000000000
--- a/Master/bin/i386-linux/mltex
+++ /dev/null
@@ -1 +0,0 @@
-pdftex
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/mmafm b/Master/bin/i386-linux/mmafm
deleted file mode 100755
index d42697b8d4d..00000000000
--- a/Master/bin/i386-linux/mmafm
+++ /dev/null
diff --git a/Master/bin/i386-linux/mmpfb b/Master/bin/i386-linux/mmpfb
deleted file mode 100755
index 4bfd23cd894..00000000000
--- a/Master/bin/i386-linux/mmpfb
+++ /dev/null
diff --git a/Master/bin/i386-linux/mpost b/Master/bin/i386-linux/mpost
deleted file mode 100755
index 54fcbca8042..00000000000
--- a/Master/bin/i386-linux/mpost
+++ /dev/null
diff --git a/Master/bin/i386-linux/mpstools b/Master/bin/i386-linux/mpstools
deleted file mode 100755
index b4c8f634548..00000000000
--- a/Master/bin/i386-linux/mpstools
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-texmfstart mpstools.rb "$@"
diff --git a/Master/bin/i386-linux/mpto b/Master/bin/i386-linux/mpto
deleted file mode 100755
index df3f1d4c0c4..00000000000
--- a/Master/bin/i386-linux/mpto
+++ /dev/null
diff --git a/Master/bin/i386-linux/mptopdf b/Master/bin/i386-linux/mptopdf
deleted file mode 100755
index 980a3123d1a..00000000000
--- a/Master/bin/i386-linux/mptopdf
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-texmfstart mptopdf.pl "$@"
diff --git a/Master/bin/i386-linux/mtxtools b/Master/bin/i386-linux/mtxtools
deleted file mode 100755
index 2922e0b4674..00000000000
--- a/Master/bin/i386-linux/mtxtools
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-texmfstart mtxtools.rb "$@"
diff --git a/Master/bin/i386-linux/musixflx b/Master/bin/i386-linux/musixflx
deleted file mode 100755
index 8c22ec5b8b7..00000000000
--- a/Master/bin/i386-linux/musixflx
+++ /dev/null
diff --git a/Master/bin/i386-linux/newer b/Master/bin/i386-linux/newer
deleted file mode 100755
index da7065662ab..00000000000
--- a/Master/bin/i386-linux/newer
+++ /dev/null
diff --git a/Master/bin/i386-linux/odvicopy b/Master/bin/i386-linux/odvicopy
deleted file mode 100755
index 2bd48dbf1c3..00000000000
--- a/Master/bin/i386-linux/odvicopy
+++ /dev/null
diff --git a/Master/bin/i386-linux/odvips b/Master/bin/i386-linux/odvips
deleted file mode 120000
index 2e853c89507..00000000000
--- a/Master/bin/i386-linux/odvips
+++ /dev/null
@@ -1 +0,0 @@
-dvips
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/odvitype b/Master/bin/i386-linux/odvitype
deleted file mode 100755
index 17cf4bdc5c5..00000000000
--- a/Master/bin/i386-linux/odvitype
+++ /dev/null
diff --git a/Master/bin/i386-linux/ofm2opl b/Master/bin/i386-linux/ofm2opl
deleted file mode 120000
index b1299fc008c..00000000000
--- a/Master/bin/i386-linux/ofm2opl
+++ /dev/null
@@ -1 +0,0 @@
-omfonts
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/omega b/Master/bin/i386-linux/omega
deleted file mode 100755
index bf95807cb5d..00000000000
--- a/Master/bin/i386-linux/omega
+++ /dev/null
diff --git a/Master/bin/i386-linux/omfonts b/Master/bin/i386-linux/omfonts
deleted file mode 100755
index 57428ae1a26..00000000000
--- a/Master/bin/i386-linux/omfonts
+++ /dev/null
diff --git a/Master/bin/i386-linux/opl2ofm b/Master/bin/i386-linux/opl2ofm
deleted file mode 120000
index b1299fc008c..00000000000
--- a/Master/bin/i386-linux/opl2ofm
+++ /dev/null
@@ -1 +0,0 @@
-omfonts
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/otangle b/Master/bin/i386-linux/otangle
deleted file mode 100755
index c9dfbd4bd94..00000000000
--- a/Master/bin/i386-linux/otangle
+++ /dev/null
diff --git a/Master/bin/i386-linux/otfinfo b/Master/bin/i386-linux/otfinfo
deleted file mode 100755
index c4a0cec525e..00000000000
--- a/Master/bin/i386-linux/otfinfo
+++ /dev/null
diff --git a/Master/bin/i386-linux/otftotfm b/Master/bin/i386-linux/otftotfm
deleted file mode 100755
index caceca71b5c..00000000000
--- a/Master/bin/i386-linux/otftotfm
+++ /dev/null
diff --git a/Master/bin/i386-linux/otp2ocp b/Master/bin/i386-linux/otp2ocp
deleted file mode 100755
index 7cd5926fa98..00000000000
--- a/Master/bin/i386-linux/otp2ocp
+++ /dev/null
diff --git a/Master/bin/i386-linux/outocp b/Master/bin/i386-linux/outocp
deleted file mode 100755
index 3a16db5868e..00000000000
--- a/Master/bin/i386-linux/outocp
+++ /dev/null
diff --git a/Master/bin/i386-linux/ovf2ovp b/Master/bin/i386-linux/ovf2ovp
deleted file mode 120000
index b1299fc008c..00000000000
--- a/Master/bin/i386-linux/ovf2ovp
+++ /dev/null
@@ -1 +0,0 @@
-omfonts
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/ovp2ovf b/Master/bin/i386-linux/ovp2ovf
deleted file mode 120000
index b1299fc008c..00000000000
--- a/Master/bin/i386-linux/ovp2ovf
+++ /dev/null
@@ -1 +0,0 @@
-omfonts
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/oxdvi b/Master/bin/i386-linux/oxdvi
deleted file mode 120000
index cf7065c02ca..00000000000
--- a/Master/bin/i386-linux/oxdvi
+++ /dev/null
@@ -1 +0,0 @@
-xdvi
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/patgen b/Master/bin/i386-linux/patgen
deleted file mode 100755
index 65bef0d22fd..00000000000
--- a/Master/bin/i386-linux/patgen
+++ /dev/null
diff --git a/Master/bin/i386-linux/pdfclose b/Master/bin/i386-linux/pdfclose
deleted file mode 100755
index f62a351e19b..00000000000
--- a/Master/bin/i386-linux/pdfclose
+++ /dev/null
diff --git a/Master/bin/i386-linux/pdfcrop b/Master/bin/i386-linux/pdfcrop
deleted file mode 120000
index 0e7f657875b..00000000000
--- a/Master/bin/i386-linux/pdfcrop
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf/scripts/pdfcrop/pdfcrop.pl
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/pdfcslatex b/Master/bin/i386-linux/pdfcslatex
deleted file mode 120000
index f68cc91498e..00000000000
--- a/Master/bin/i386-linux/pdfcslatex
+++ /dev/null
@@ -1 +0,0 @@
-pdftex
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/pdfcsplain b/Master/bin/i386-linux/pdfcsplain
deleted file mode 120000
index f68cc91498e..00000000000
--- a/Master/bin/i386-linux/pdfcsplain
+++ /dev/null
@@ -1 +0,0 @@
-pdftex
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/pdfetex b/Master/bin/i386-linux/pdfetex
deleted file mode 120000
index f68cc91498e..00000000000
--- a/Master/bin/i386-linux/pdfetex
+++ /dev/null
@@ -1 +0,0 @@
-pdftex
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/pdfjadetex b/Master/bin/i386-linux/pdfjadetex
deleted file mode 120000
index f68cc91498e..00000000000
--- a/Master/bin/i386-linux/pdfjadetex
+++ /dev/null
@@ -1 +0,0 @@
-pdftex
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/pdflatex b/Master/bin/i386-linux/pdflatex
deleted file mode 120000
index f68cc91498e..00000000000
--- a/Master/bin/i386-linux/pdflatex
+++ /dev/null
@@ -1 +0,0 @@
-pdftex
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/pdfmex b/Master/bin/i386-linux/pdfmex
deleted file mode 120000
index f68cc91498e..00000000000
--- a/Master/bin/i386-linux/pdfmex
+++ /dev/null
@@ -1 +0,0 @@
-pdftex
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/pdfopen b/Master/bin/i386-linux/pdfopen
deleted file mode 100755
index b64f56cf45c..00000000000
--- a/Master/bin/i386-linux/pdfopen
+++ /dev/null
diff --git a/Master/bin/i386-linux/pdftex b/Master/bin/i386-linux/pdftex
deleted file mode 100755
index a5252ec4834..00000000000
--- a/Master/bin/i386-linux/pdftex
+++ /dev/null
diff --git a/Master/bin/i386-linux/pdfthumb b/Master/bin/i386-linux/pdfthumb
deleted file mode 120000
index cfb7d400fa8..00000000000
--- a/Master/bin/i386-linux/pdfthumb
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/scripts/ppower4/pdfthumb.texlua
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/pdftools b/Master/bin/i386-linux/pdftools
deleted file mode 100755
index 92ee803a868..00000000000
--- a/Master/bin/i386-linux/pdftools
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-texmfstart pdftools.rb "$@"
diff --git a/Master/bin/i386-linux/pdftosrc b/Master/bin/i386-linux/pdftosrc
deleted file mode 100755
index b21ddafbfe7..00000000000
--- a/Master/bin/i386-linux/pdftosrc
+++ /dev/null
diff --git a/Master/bin/i386-linux/pdfxmltex b/Master/bin/i386-linux/pdfxmltex
deleted file mode 120000
index f68cc91498e..00000000000
--- a/Master/bin/i386-linux/pdfxmltex
+++ /dev/null
@@ -1 +0,0 @@
-pdftex
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/perltex b/Master/bin/i386-linux/perltex
deleted file mode 120000
index d135aa6f8e4..00000000000
--- a/Master/bin/i386-linux/perltex
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/scripts/perltex/perltex.pl
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/pfb2pfa b/Master/bin/i386-linux/pfb2pfa
deleted file mode 100755
index 00d15b9655b..00000000000
--- a/Master/bin/i386-linux/pfb2pfa
+++ /dev/null
diff --git a/Master/bin/i386-linux/physe b/Master/bin/i386-linux/physe
deleted file mode 120000
index f68cc91498e..00000000000
--- a/Master/bin/i386-linux/physe
+++ /dev/null
@@ -1 +0,0 @@
-pdftex
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/phyzzx b/Master/bin/i386-linux/phyzzx
deleted file mode 120000
index f68cc91498e..00000000000
--- a/Master/bin/i386-linux/phyzzx
+++ /dev/null
@@ -1 +0,0 @@
-pdftex
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/pk2bm b/Master/bin/i386-linux/pk2bm
deleted file mode 100755
index 173a896eb8a..00000000000
--- a/Master/bin/i386-linux/pk2bm
+++ /dev/null
diff --git a/Master/bin/i386-linux/pkfix b/Master/bin/i386-linux/pkfix
deleted file mode 120000
index 7d1c767c21f..00000000000
--- a/Master/bin/i386-linux/pkfix
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf/scripts/pkfix/pkfix.pl
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/pktogf b/Master/bin/i386-linux/pktogf
deleted file mode 100755
index 2df1a010cee..00000000000
--- a/Master/bin/i386-linux/pktogf
+++ /dev/null
diff --git a/Master/bin/i386-linux/pktype b/Master/bin/i386-linux/pktype
deleted file mode 100755
index b9de2f60cf6..00000000000
--- a/Master/bin/i386-linux/pktype
+++ /dev/null
diff --git a/Master/bin/i386-linux/pltotf b/Master/bin/i386-linux/pltotf
deleted file mode 100755
index 1b1e58d77f8..00000000000
--- a/Master/bin/i386-linux/pltotf
+++ /dev/null
diff --git a/Master/bin/i386-linux/pooltype b/Master/bin/i386-linux/pooltype
deleted file mode 100755
index b0fa2a13c9b..00000000000
--- a/Master/bin/i386-linux/pooltype
+++ /dev/null
diff --git a/Master/bin/i386-linux/ppower4 b/Master/bin/i386-linux/ppower4
deleted file mode 120000
index a407a5af300..00000000000
--- a/Master/bin/i386-linux/ppower4
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/scripts/ppower4/ppower4.texlua
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/ps2eps b/Master/bin/i386-linux/ps2eps
deleted file mode 120000
index 81d5f53cfde..00000000000
--- a/Master/bin/i386-linux/ps2eps
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf/scripts/ps2eps/ps2eps.pl
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/ps2frag b/Master/bin/i386-linux/ps2frag
deleted file mode 100755
index b8e673be087..00000000000
--- a/Master/bin/i386-linux/ps2frag
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-tty -s && {
-  echo
-  echo "Warning: the ps2frag script is not needed with this version of psfrag."
-  echo "Please read the manpage ps2frag(1) and the documentation of the"
-  echo "psfrag package."
-  echo
-} >&2
-
-exit 0
diff --git a/Master/bin/i386-linux/ps2pk b/Master/bin/i386-linux/ps2pk
deleted file mode 100755
index fdc3f5e9dae..00000000000
--- a/Master/bin/i386-linux/ps2pk
+++ /dev/null
diff --git a/Master/bin/i386-linux/ps4pdf b/Master/bin/i386-linux/ps4pdf
deleted file mode 100755
index cbdcb022926..00000000000
--- a/Master/bin/i386-linux/ps4pdf
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/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
-
diff --git a/Master/bin/i386-linux/psbook b/Master/bin/i386-linux/psbook
deleted file mode 100755
index 2af2a521333..00000000000
--- a/Master/bin/i386-linux/psbook
+++ /dev/null
diff --git a/Master/bin/i386-linux/pslatex b/Master/bin/i386-linux/pslatex
deleted file mode 100755
index 4badef0ec12..00000000000
--- a/Master/bin/i386-linux/pslatex
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# Copyright 1994 David Carlisle
-# This file may be redistributed and/or modified under the terms of the
-# LaTeX Project Public License distributed from CTAN archives in directory
-# macros/latex/base/lppl.txt; either version 1 of the License, or (at
-# your option) any later version.
-
-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+"$@"}'='"$@"'
-
-# we want to be able to use options to latex:
-while :; do
-  case $1 in
-    -*)
-      latexoptions="$latexoptions \"$1\""
-      shift;;
-    *)
-      break;;
-  esac
-done
-
-echo
-echo "*************************************"
-echo "* Using LaTeX, with pslatex package *"
-echo "*************************************"
-echo
-
-# messing around with \PSLATEXTMP is for AUCTeX which calls
-# documents via latex \nonstopmode \input{file}
-
-latex $latexoptions \
-    "\AtBeginDocument{\RequirePackage{pslatex}}"\
-    "\def\PSLATEXTMP{\futurelet\PSLATEXTMP\PSLATEXTMPB}"\
-    "\def\PSLATEXTMPB{\ifx\PSLATEXTMP\nonstopmode\else\input\fi}"\
-    "\PSLATEXTMP" ${1+"$@"}
diff --git a/Master/bin/i386-linux/psmerge b/Master/bin/i386-linux/psmerge
deleted file mode 100755
index 9500bcdf7e6..00000000000
--- a/Master/bin/i386-linux/psmerge
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/env perl
-# psmerge: merge PostScript files produced by same application and setup
-# usage: psmerge [-oout.ps] [-thorough] file1.ps file2.ps ...
-#
-# Copyright (C) Angus J. C. Duggan 1991-1995
-# See file LICENSE for details.
-
-$prog = ($0 =~ s=.*/==);
-
-while ($ARGV[0] =~ /^-/) {
-   $_ = shift;
-   if (/^-o(.+)/) {
-      if (!close(STDOUT) || !open(STDOUT, ">$1")) {
-	 print STDERR "$prog: can't open $1 for output\n";
-	 exit 1;
-      }
-   } elsif (/^-t(horough)?$/) {
-      $thorough = 1;
-   } else {
-      print STDERR "Usage: $prog [-oout] [-thorough] file...\n";
-      exit 1;
-   }
-}
-
-$page = 0;
-$first = 1;
-$nesting = 0;
-
-@header = ();
-$header = 1;
-
-@trailer = ();
-$trailer = 0;
-
-@pages = ();
-@body = ();
-
-@resources = ();
-$inresource = 0;
-
-while (<>) {
-   if (/^%%BeginFont:/ || /^%%BeginResource:/ || /^%%BeginProcSet:/) {
-      $inresource = 1;
-      push(@resources, $_);
-   } elsif ($inresource) {
-      push(@resources, $_);
-      $inresource = 0 if /^%%EndFont/ || /^%%EndResource/ || /^%%EndProcSet/;
-   } elsif (/^%%Page:/ && $nesting == 0) {
-      $header = $trailer = 0;
-      push(@pages, join("", @body)) if @body;
-      $page++;
-      @body = ("%%Page: ($page) $page\n");
-   } elsif (/^%%Trailer/ && $nesting == 0) {
-      push(@trailer, $_);
-      push(@pages, join("", @body)) if @body;
-      @body = ();
-      $trailer = 1;
-      $header = 0;
-   } elsif ($header) {
-      push(@trailer, $_);
-      push(@pages, join("", @body)) if @body;
-      @body = ();
-      $trailer = 1;
-      $header = 0;
-   } elsif ($trailer) {
-      if (/^%!/ || /%%EOF/) {
-	 $trailer = $first = 0;
-      } elsif ($first) {
-	 push(@trailer, $_);
-      }
-   } elsif (/^%%BeginDocument/ || /^%%BeginBinary/ || /^%%BeginFile/) {
-      push(@body, $_);
-      $nesting++;
-   } elsif (/^%%EndDocument/ || /^%%EndBinary/ || /^%%EndFile/) {
-      push(@body, $_);
-      $nesting--;
-   } else {
-      print $_ if $print;
-   }
-}
-
-print @trailer;
-
-exit 0;
-
diff --git a/Master/bin/i386-linux/psnup b/Master/bin/i386-linux/psnup
deleted file mode 100755
index 06dba777819..00000000000
--- a/Master/bin/i386-linux/psnup
+++ /dev/null
diff --git a/Master/bin/i386-linux/psresize b/Master/bin/i386-linux/psresize
deleted file mode 100755
index e6dd6f8bf32..00000000000
--- a/Master/bin/i386-linux/psresize
+++ /dev/null
diff --git a/Master/bin/i386-linux/psselect b/Master/bin/i386-linux/psselect
deleted file mode 100755
index 9915eafb701..00000000000
--- a/Master/bin/i386-linux/psselect
+++ /dev/null
diff --git a/Master/bin/i386-linux/pstopdf b/Master/bin/i386-linux/pstopdf
deleted file mode 100755
index 5b38ed426cb..00000000000
--- a/Master/bin/i386-linux/pstopdf
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-texmfstart pstopdf.rb "$@"
diff --git a/Master/bin/i386-linux/pstops b/Master/bin/i386-linux/pstops
deleted file mode 100755
index 03131eeae44..00000000000
--- a/Master/bin/i386-linux/pstops
+++ /dev/null
diff --git a/Master/bin/i386-linux/rlxtools b/Master/bin/i386-linux/rlxtools
deleted file mode 100755
index 41cea40fc09..00000000000
--- a/Master/bin/i386-linux/rlxtools
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-texmfstart rlxtools.rb "$@"
diff --git a/Master/bin/i386-linux/rubibtex b/Master/bin/i386-linux/rubibtex
deleted file mode 100755
index 373e6e1194d..00000000000
--- a/Master/bin/i386-linux/rubibtex
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/bin/sh
-
-# rubibtex, based on the original version contained in the t2 bundle.
-# Thomas Esser, Public Domain.
-
-progname=rubibtex
-tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$
-job=$1
-backup="$tmpdir/orig.aux"
-
-case $job in
-  "")
-    echo "usage: $progname file" >&2
-    exit 1
-esac
-
-if test ! -f "$job.aux"; then
-  echo "$progname: file \`$job.aux' does not exist." >&2
-  exit 1
-fi
-
-trap '
-  rm -rf "$tmpdir"
-  exit 1
-' 1 2 3 7 13 15
-(umask 077; mkdir "$tmpdir") \
-  || { echo "$progname: could not create directory \`$tmpdir'" >&2; exit 1; }
-
-cat <"$job.aux" >"$backup" || {
-  echo "$progname: could not create backup of file \`$job.aux' as \`$backup'." >&2
-  rm -rf "$tmpdir"
-  exit 1
-}
-
-sed '
-  /^\\citation/ {
-    s/\\IeC {\\CYRA }/�/g
-    s/\\IeC {\\CYRB }/�/g
-    s/\\IeC {\\CYRV }/�/g
-    s/\\IeC {\\CYRG }/�/g
-    s/\\IeC {\\CYRD }/�/g
-    s/\\IeC {\\CYRE }/�/g
-    s/\\IeC {\\CYRYO }/�/g
-    s/\\IeC {\\CYRZH }/�/g
-    s/\\IeC {\\CYRZ }/�/g
-    s/\\IeC {\\CYRI }/�/g
-    s/\\IeC {\\CYRISHRT }/�/g
-    s/\\IeC {\\CYRK }/�/g
-    s/\\IeC {\\CYRL }/�/g
-    s/\\IeC {\\CYRM }/�/g
-    s/\\IeC {\\CYRN }/�/g
-    s/\\IeC {\\CYRO }/�/g
-    s/\\IeC {\\CYRP }/�/g
-    s/\\IeC {\\CYRR }/�/g
-    s/\\IeC {\\CYRS }/�/g
-    s/\\IeC {\\CYRT }/�/g
-    s/\\IeC {\\CYRU }/�/g
-    s/\\IeC {\\CYRF }/�/g
-    s/\\IeC {\\CYRH }/�/g
-    s/\\IeC {\\CYRC }/�/g
-    s/\\IeC {\\CYRCH }/�/g
-    s/\\IeC {\\CYRSH }/�/g
-    s/\\IeC {\\CYRSHCH }/�/g
-    s/\\IeC {\\CYRHRDSN }/�/g
-    s/\\IeC {\\CYRERY }/�/g
-    s/\\IeC {\\CYRSFTSN }/�/g
-    s/\\IeC {\\CYREREV }/�/g
-    s/\\IeC {\\CYRYU }/�/g
-    s/\\IeC {\\CYRYA }/�/g
-    s/\\IeC {\\cyra }/�/g
-    s/\\IeC {\\cyrb }/�/g
-    s/\\IeC {\\cyrv }/�/g
-    s/\\IeC {\\cyrg }/�/g
-    s/\\IeC {\\cyrd }/�/g
-    s/\\IeC {\\cyre }/�/g
-    s/\\IeC {\\cyryo }/�/g
-    s/\\IeC {\\cyrzh }/�/g
-    s/\\IeC {\\cyrz }/�/g
-    s/\\IeC {\\cyri }/�/g
-    s/\\IeC {\\cyrishrt }/�/g
-    s/\\IeC {\\cyrk }/�/g
-    s/\\IeC {\\cyrl }/�/g
-    s/\\IeC {\\cyrm }/�/g
-    s/\\IeC {\\cyrn }/�/g
-    s/\\IeC {\\cyro }/�/g
-    s/\\IeC {\\cyrp }/�/g
-    s/\\IeC {\\cyrr }/�/g
-    s/\\IeC {\\cyrs }/�/g
-    s/\\IeC {\\cyrt }/�/g
-    s/\\IeC {\\cyru }/�/g
-    s/\\IeC {\\cyrf }/�/g
-    s/\\IeC {\\cyrh }/�/g
-    s/\\IeC {\\cyrc }/�/g
-    s/\\IeC {\\cyrch }/�/g
-    s/\\IeC {\\cyrsh }/�/g
-    s/\\IeC {\\cyrshch }/�/g
-    s/\\IeC {\\cyrhrdsn }/�/g
-    s/\\IeC {\\cyrery }/�/g
-    s/\\IeC {\\cyrsftsn }/�/g
-    s/\\IeC {\\cyrerev }/�/g
-    s/\\IeC {\\cyryu }/�/g
-    s/\\IeC {\\cyrya }/�/g
-  }
-' <"$backup" >"$job.aux"
-
-bibtex "$job"
-
-cat "$backup" > "$job.aux"
-rm -rf "$tmpdir"
-exit 0
diff --git a/Master/bin/i386-linux/rumakeindex b/Master/bin/i386-linux/rumakeindex
deleted file mode 100755
index b7b0c072729..00000000000
--- a/Master/bin/i386-linux/rumakeindex
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-BASE=`basename "$1" .idx`
-IDX=$BASE.idx
-IND=$BASE.ind
-ILG=$BASE.ilg
-
-sed '
-/^\\indexentry{/ {
-s/\\IeC {\\CYRA }/�/g
-s/\\IeC {\\cyra }/�/g
-s/\\IeC {\\CYRB }/�/g
-s/\\IeC {\\cyrb }/�/g
-s/\\IeC {\\CYRV }/�/g
-s/\\IeC {\\cyrv }/�/g
-s/\\IeC {\\CYRG }/�/g
-s/\\IeC {\\cyrg }/�/g
-s/\\IeC {\\CYRD }/�/g
-s/\\IeC {\\cyrd }/�/g
-s/\\IeC {\\CYRE }/�/g
-s/\\IeC {\\cyre }/�/g
-s/\\IeC {\\CYRYO }/�/g
-s/\\IeC {\\cyryo }/�/g
-s/\\IeC {\\CYRZH }/�/g
-s/\\IeC {\\cyrzh }/�/g
-s/\\IeC {\\CYRZ }/�/g
-s/\\IeC {\\cyrz }/�/g
-s/\\IeC {\\CYRI }/�/g
-s/\\IeC {\\cyri }/�/g
-s/\\IeC {\\CYRISHRT }/�/g
-s/\\IeC {\\cyrishrt }/�/g
-s/\\IeC {\\CYRK }/�/g
-s/\\IeC {\\cyrk }/�/g
-s/\\IeC {\\CYRL }/�/g
-s/\\IeC {\\cyrl }/�/g
-s/\\IeC {\\CYRM }/�/g
-s/\\IeC {\\cyrm }/�/g
-s/\\IeC {\\CYRN }/�/g
-s/\\IeC {\\cyrn }/�/g
-s/\\IeC {\\CYRO }/�/g
-s/\\IeC {\\cyro }/�/g
-s/\\IeC {\\CYRP }/�/g
-s/\\IeC {\\cyrp }/�/g
-s/\\IeC {\\CYRR }/�/g
-s/\\IeC {\\cyrr }/�/g
-s/\\IeC {\\CYRS }/�/g
-s/\\IeC {\\cyrs }/�/g
-s/\\IeC {\\CYRT }/�/g
-s/\\IeC {\\cyrt }/�/g
-s/\\IeC {\\CYRU }/�/g
-s/\\IeC {\\cyru }/�/g
-s/\\IeC {\\CYRF }/�/g
-s/\\IeC {\\cyrf }/�/g
-s/\\IeC {\\CYRH }/�/g
-s/\\IeC {\\cyrh }/�/g
-s/\\IeC {\\CYRC }/�/g
-s/\\IeC {\\cyrc }/�/g
-s/\\IeC {\\CYRCH }/�/g
-s/\\IeC {\\cyrch }/�/g
-s/\\IeC {\\CYRSH }/�/g
-s/\\IeC {\\cyrsh }/�/g
-s/\\IeC {\\CYRSHCH }/�/g
-s/\\IeC {\\cyrshch }/�/g
-s/\\IeC {\\CYRHRDSN }/�/g
-s/\\IeC {\\cyrhrdsn }/�/g
-s/\\IeC {\\CYRERY }/�/g
-s/\\IeC {\\cyrery }/�/g
-s/\\IeC {\\CYRSFTSN }/�/g
-s/\\IeC {\\cyrsftsn }/�/g
-s/\\IeC {\\CYREREV }/�/g
-s/\\IeC {\\cyrerev }/�/g
-s/\\IeC {\\CYRYU }/�/g
-s/\\IeC {\\cyryu }/�/g
-s/\\IeC {\\CYRYA }/�/g
-s/\\IeC {\\cyrya }/�/g
-}' $IDX | makeindex -t $ILG | tr '������������������������������������������������������������������' \
-  '�����������ų�����������������������������������������������������' > $IND
diff --git a/Master/bin/i386-linux/runtools b/Master/bin/i386-linux/runtools
deleted file mode 100755
index ff9a333791b..00000000000
--- a/Master/bin/i386-linux/runtools
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-texmfstart runtools.rb "$@"
diff --git a/Master/bin/i386-linux/showchar b/Master/bin/i386-linux/showchar
deleted file mode 100755
index e685e99ae8c..00000000000
--- a/Master/bin/i386-linux/showchar
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-# showchar: show character with information
-# usage:
-#       showchar Font-Name Char-Name | lpr -Pprinter
-
-if [ $# != 2 ]; then
-        echo "Usage: `basename $0` Font-Name Char-Name" >&2
-        exit 1
-fi
-
-cat <<EOF
-%!
-% Get character metrics and bounding box for $1
-/ns 30 string def
-/fname /$1 def
-/cname /$2 def
-/fn fname findfont 1000 scalefont def
-/thin 0.7 def
-/reduction 2.0 def
-
-/sn { ns cvs show } def
-/sc { (\()show exch sn (,)show sn (\))show } def
-
-/Times-Roman findfont 10 scalefont setfont
-
-72 242 translate % one inch in, 3 1/2 inch up
-newpath 0 0 moveto
-gsave   % print character name
-   0 468 rmoveto
-   ($2 from font $1 displayed on `date` by `basename $0` 1.00 (C) AJCD 1991)
-   show 
-grestore
-
-gsave
-   thin setlinewidth  % cross hairs
-   -9 0 rmoveto 18 0 rlineto
-   -9 -9 rmoveto 0 18 rlineto
-   stroke  % position info
-   -9 -9 moveto ((0,0)) stringwidth pop neg 0 rmoveto
-   ((0,0)) show
-grestore
-
-% create encoding with a single character at all positions
-/MyEncoding 256 array def
-
-0 1 255 { % fill out with notdefs
-   MyEncoding exch cname put
-} for
-
-fn dup length dict begin
-  {1 index /FID ne {def} {pop pop} ifelse} forall
-  /Encoding MyEncoding def
-  currentdict
-end /newfont exch definefont
-/fn exch def
-/en MyEncoding def
-
-gsave  % draw character (enlarged)
-  .75 setgray
-  fn 1 reduction div scalefont setfont
-  (\000) show
-grestore
-
-% show character info
-fn /Metrics known {
-   dup fn /Metrics get exch get 
-   dup type /arraytype eq {
-      dup length 2 eq
-      {1 get 0} {dup 2 get exch 3 get} ifelse
-   } {
-      round 0
-   } ifelse
-} {
-   gsave
-      fn setfont (\000) stringwidth round exch round exch
-   grestore
-} ifelse
-gsave   % show width
-   thin setlinewidth
-   2 copy
-   reduction div exch reduction div exch rlineto
-   gsave
-      1 1 rmoveto sc
-   grestore
-   -4 -3 rlineto 0 6 rmoveto 4 -3 rlineto
-   stroke
-grestore
-
-gsave
-   gsave  % get bounding box
-      fn setfont
-      (\000) true charpath flattenpath pathbbox
-   grestore
-   thin setlinewidth
-   3 index reduction div  % put coords on top of stack
-   3 index reduction div
-   3 index reduction div
-   3 index reduction div
-   3 index 3 index moveto
-   gsave  % llx lly
-      0 -9 rmoveto 7 index 7 index sc
-   grestore
-   1 index 3 index lineto
-   gsave  % urx lly
-      0 -9 rmoveto 5 index 7 index sc
-   grestore
-   1 index 1 index lineto
-   gsave  % urx ury
-      0 9 rmoveto 5 index 5 index sc
-   grestore
-   3 index 1 index lineto
-   gsave  % llx ury
-      0 9 rmoveto 7 index 5 index sc
-   grestore
-   closepath stroke
-grestore
-showpage
-EOF
diff --git a/Master/bin/i386-linux/simpdftex b/Master/bin/i386-linux/simpdftex
deleted file mode 100755
index 86f8ec0e623..00000000000
--- a/Master/bin/i386-linux/simpdftex
+++ /dev/null
@@ -1,570 +0,0 @@
-#!/bin/sh
-
-# Created by Gerben Wierda, May 2001
-# Rewritten by Gerben Wierda, January 2002
-
-# Modified by Joachim Kock, May 2003 
-
-# COPYRIGHT Gerben Wierda 2001--2004
-# This file is free software. You are free to use this file in any way you like
-# However, if you change it you should note in this file that you did and who
-# you are, you also need to change the version string if you do. That way
-# I will not get support questions for software that is not entirely mine.
-
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-# EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# $Id: altpdftex,v 2.18 2004/11/15 20:36:11 gerben Exp $
-
-# This script assumes that there is a config.pdf somewhere that sets
-# the bitmap mode to something large but realistic (real mode) so that
-# unavailable pfb fonts will be included as bitmaps.
-
-# Version 1.0:	added the string above for identification purposes
-# Version 1.0a:	Cosmetic change: do not display dir of argv[0] all the time
-#		Added calledas variable to hold command basename
-# Version 1.1:	Use calledas instead of $0 which means the sed command
-#		for determining format below also works when there is no dir
-#		(run from dir where altpdftex resides, not very likely...)
-# Version 1.2:	Force the use of tex binaries from the same directory as
-#		this script
-# Version 1.3:  Added --echo-version option, placed argument check after
-#		switch, inside while to prevent subscript out of range error
-#		Added --tex-path to override directory where this script
-#		resides. Added --gs-path to override a new default gs
-#		directory /usr/local/bin. Also, force gs directory at the
-#		start of the path to repair for broken installations of
-#		TeX, gs and such
-# Version 1.4:	Moved path changes to just before calling gs so that only
-#		ps2pdf is affected
-# Version 1.5:	Removed some path-related redundancy from GS calling
-# Version 1.5a:	Missing ${extradviopts} from echo
-#		Added version to --help output
-#		Added wolfram.map
-# Version 1.6:	Fixed bug: --dviopts did not work because it did set
-#		the wrong variable
-#		Changed dviopts to dvipsopts (better name)
-# Version 1.7:	Added --distiller and --distiller-filter option
-#		Changed --gs-path to --distiller-path
-#		Changed distiller semantics
-#		Fixed bug --tex-path flag needed trailing '/'
-#		Some extra quoting to be more robust for whitespace
-#		in names, also internally
-# Version 1.8:	Added pstill and u-psbuild info to help
-# Version 1.9:	Removed textrace bbold font (textrace is broken)
-# Version 1.10:	Added amstex support
-#		Simplified different format support
-# Version 1.11:	Do not source ~/.{t}cshrc, use the environment 'as is'
-#		Version 1.11 says it is version 1.10!
-# Version 1.12: Added textrace bold font (textrace 0.48 is ok)
-# Version 1.13:	Changed success message at the end
-#		Echo version on by default
-#		Debug option
-# Version 1.13b:Date report on version was very out of date, removed
-
-# Version 2.0:	Rewritten in /bin/sh because (t)csh does not handle signals
-#		very well...
-#		This version works, but you need to send the SIGTERM to
-#		the process group (the negative PID) to get it to work
-# Version 2.1:	Small bug fixes
-# Version 2.2:	Fixed bug where argument without extension was interpreted
-#		as dvi file.
-#		Removed dependencies on smart sh versions
-# Version 2.3:	Removed map file knowledge (needs to be outside this script)
-#		beyond the standard map files
-# Version 2.4:	Added support for omega and lambda (use odvips)
-# Version 2.5:	Changed maxpk and maxpfb implementation to recent updmap
-# Version 2.6:	Use ps2pdf13 as the default distiller
-# Version 2.7:	Changed help
-# Version 2.8:	Checked into CVS.
-#		Added handling of outdir for TeX
-# Version 2.9:	Added auto-outdir flag
-# Version 2.10:	Changed --outdir behaviour to mimick TEXMFOUTPUT,
-#		removed --auto-outdir
-# Version 2.11:	Fixed typo
-# Version 2.12:	RCS changes, from now on, the version number is the RCS number
-#		These notes here will become a ChangeLog.
-# 2003/05/20	Joachim's modification: write first to a pdf file in tmp, 
-#		and only upon completion copy the file to its final
-#		destination.  This is done in order to minimise the time where
-#		the pdf file in current directory is in an unstable state,
-#		because a PDF viewer might be tracking the file, and 
-#		if it finds the pdf file in an intermediate state it will
-#		display a blank page until the new version is ready.
-# 2003/05/21	Joachim's modification used /bin/cp. Gerben made it truly
-#		atomic by using /bin/cp in combination with /bin/mv
-# 2003/11/23	Added supportfor passing flasg to tex at the request of
-#		Dick Koch.
-# 2004/09/05	Bugfix: make it work better with directories with whitespace
-#		in their name
-# 2004/11/15	New calling mode: simpdftex format foo.tex
-#		e.g.:
-#			simpdftex latex foo.tex
-#		In the future, the old modes (altpdflatex and friends) through
-#		symlinks will disappear from my distribution, though they will
-#		still work.
-
-# 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
-
-version='$Revision: 2.18 $'
-calledas=`basename "$0"`
-if [ "${calledas}" = "simpdftex" ]
-then
-	argwithoutlead=`echo -n "$1"|sed 's/^--//'`
-	if [ "$1" != "" -a "$1" = "${argwithoutlead}" ]
-	then
-		formatname="$1"
-		shift
-		calledas="altpdf${formatname}"
-	fi
-fi
-argvbackup="$*"
-
-# 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
-maxpfbdvipsopts="-Poutline"
-opt_dvipsopts=""
-
-# Defaults:
-# altpdftex --default is the default setting, it also works
-# when there is no config.pdf file
-extradvipsoptions=""
-dvipsoptions="$maxpfbdvipsopts"
-outputpostfix=".maxpfb"
-simplename="yes"
-keeppsfile="no"
-echoversion="yes"
-texpath=`dirname "$0"`
-# Default distiller is ps2pdf from /usr/local/bin in no filter mode
-# as the direct call to a filtering gs does not work yet for some reason
-#distillerpath=""
-#distillerprog="/usr/local/bin/gs -dCompatibility=1.3 -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=- -c save pop"
-#distillerfilter="yes"
-distillerpath="/usr/local/bin"
-distillerprog="ps2pdf13"
-distillerfilter="no"
-unset outdir
-debug="no"
-
-usage()
-{
-	cat <<_eof_help
-This is simpdftex, $version
-
-Usage: simpdftex formatname
-	[--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
-
-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.
-
-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.
-
-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,
-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).
-
-Arguments:
-	tex-or-dvi-file
-		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
-	--help
-		Display this message and exit
-	--no-echo-version
-		Do not echo location and version of this script. Does not exit
-		so can be used tochange info to the output of a real run
-	--debug
-		Add some debug output
-	--extendedname
-		Depending on the mode, adds intermediary extensions to the
-		output filename. If the mode is --pdf, .pdfmode is added. If
-		the mode is --maxpk, ,maxpk is added and if the mode is
-		--maxpfb, .maxpfb is added. Example:
-			tex-or-dvi-file-basename.maxpfb.pdf
-	--maxpk
-		Use Metafont bitmaps (pk files) when possible. Only real
-		PostScript fonts (like Times Roman) are included as
-		PostScript fonts. All other fonts are included as bitmaps
-		for the default printer resolution. This options produces
-		optimal results for the chosen printer.
-		For file contents (not name) equivalent to:
-		--dvipsopts "-Ppk"
-	--maxpfb
-		Use PostScript pfb files whenever possible. This produces
-		optimal results for the screen.
-		For file contents (not name) equivalent to:
-		--dvipsopts "-Poutline"
-		If any font is included as TeX pk bitmap, it is rendered
-		at the default resolution.
-	--pdf
-		Select .pdfmode extension for the output file name if
-		--extendedname has been set. Use printer definition
-		config.pdf. For file contents (not name) equivalent to
-		--dvipsopts "-Ppdf"
-		Note that the default config.pdf assumes resolution 8000
-		for bitmaps and bitmap generation fails at this resolution
-		because there exists no known mode for that resolution.
-	--default
-		Select no extension for the output file name, even if
-		--extendedfilename has been set. Use standard printer
-		definition config.ps. For file contents (not name) equivalent
-		to:
-		--dvipsopts "" --noextendedname
-	--dvipsopts
-		Give arbitrary arguments to dvips, e.g.
-		--dvipsopts "-M"
-		Sets extension for --extendedfilename to .custom. --dvipsopts
-		overrides other flags that set dvipsopts.
-	--extratexopts
-		Give extra arbitrary arguments to tex, e.g.
-		--extratexopts "--interaction=nonstopmode"
-		Sets extra options for the tex command that is used.
-	--extradvipsopts
-		Give extra arbitrary arguments to dvips, e.g.
-		--extradvipsopts "-M"
-		Sets extra options for dvips and does not set extension
-		or override other options. Options will be added to the end
-		of the options for dvips
-	--keep-psfile
-		After running dvips, copy the ps file over to the directory
-		where the tex file is, possibly overwriting a ps file
-		that is there. Use with caution, a ps file could be input
-		as well.
-	--tex-path
-		Give path of TeX binaries, use directory of this script
-		otherwise
-	--distiller prog
-		Use a distiller different from ps2pdf which is the default.
-		Argument must be an executable or executable script that
-		gets called iwth two arguments: input file (PS) and output
-		file (PDF). E.g.:
-		--distiller=/usr/local/alternate/bin/ps2pdf
-		--distiller=pstill
-		Using this flag sets the distiller filter mode to off
-	--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
-	--distiller-path
-		Give path needed by the distiller binary. This path is added
-		to the begin of you PATH environment before the distiller is
-		run. The reason is that for instance ps2pdf uses the path to
-		find gs and sets the path to something with /sw/bin at the
-		beginning.  Thus, installing gs from fink would make
-		/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.
-	--outdir dir
-		Write files here *if* our current directory is unwritable. This
-		mimicks the TEXMFOUTPUT environment variable of TeX, but
-		differently. The current dir becomes the value of --outdir and
-		the directory where the old current dir is added to TEXINPUTS.
-		This is more robust for reading and locating files.
-		You can also set TEXMFOUTPUT instead, but with a disadvantage:
-		you will be running TeXin the current dir. And you will not be
-		able to read files in the outdir unless you also adapt
-		TEXINPUTS.
-
-	The defaults for the distiller are
-		Path addition: "${distillerpath}"
-		Filter mode: "${distillerfilter}"
-		Program: "${distillerprog}"
-
-	Later flags override settings of earlier flags.
-_eof_help
-}
-
-while test $# -gt 0
-do
-	case $1 in
-	--help)
-		usage
-		exit 0;;
-	--dvipsopts)
-		shift
-		outputpostfix=".custom"
-		dvipsoptions="$1"
-		;;
-	--extradvipsopts)
-		shift
-		extradvipsoptions="$1"
-		;;
-	--extratexopts)
-		shift
-		extratexoptions="$1"
-		;;
-	--tex-path)
-		shift
-		texpath="$1"
-		;;
-	--pdf)
-		outputpostfix=".pdfmode"
-		dvipsoptions="-P pdf"
-		;;
-	--default)
-		outputpostfix=""
-		dvipsoptions=""
-		# Use the default print option in config.ps
-		;;
-	--maxpk)
-		outputpostfix=".maxpk"
-		dvipsoptions="$maxpkdvipsopts"
-		;;
-	--maxpfb)
-		outputpostfix=".maxpbfb"
-		dvipsoptions="$maxpfbdvipsopts"
-		;;
-	--extendedname)
-		simplename="no"
-		;;
-	--keep-psfile)
-		keeppsfile="yes"
-		;;
-	--debug)
-		debug="yes"
-		;;
-	--distiller-path)
-		shift
-		distillerpath="$1"
-		;;
-	--distiller)
-		shift
-		distillerprog="$1"
-		distillerfilter="no"
-		;;
-	--outdir)
-		shift
-		export TEXINPUTS=`pwd`:`kpsewhich --expand-var '$TEXINPUTS'`
-		export TEXMFOUTPUT="$1"
-		outdir="$1/"
-		outdirset="yes"
-		cd "$1"
-		;;
-	--distiller-filter)
-		shift
-		distillerprog="$1"
-		distillerfilter="yes"
-		;;
-	--no-echo-version)
-		echoversion="no"
-		;;
-	--*)
-		echo "Unknown option $1"
-		exit 1;;
-	"")
-		;;
-	*)
-		break;;
-	esac
-	shift
-done
-
-if [ "${echoversion}" = "yes" -a "${debug}" = "no" ]
-then
-	echo "### This is $0, Version ${version}"
-fi
-
-if [ "${debug}" = "yes" ]
-then
-	echo "##### This is $0, Version ${version}"
-	echo "##### Arguments: ${argvbackup}"
-fi
-
-cleanup()
-{
-	if [ "${tmpdir}" != "" -a "${debug}" = "no" ]
-	then
-		rm -rf "${tmpdir}"
-	fi
-}
-
-terminated()
-{
-	cleanup
-	exit 1;
-}
-
-trap 'terminated' 15
-
-main()
-{
-	if [ "${file}" = "" ]
-	then
-		echo "simpdftex Empty argument: tex-or-dvi-file-name"
-		exit 1
-	fi
-
-	# Argument handling
-
-	if [ "${simplename}" = "yes" ]
-	then
-		outputpostfix=""
-	fi
-
-	startwithdvi="no"
-	basename=`basename "${file}"`
-	nosuffixbasename=`echo -n ${basename}|sed 's/\.[^.]*$//'`
-	nodvisuffixbasename=`echo -n ${basename}|sed 's/\.[dD][vV][iI]$//'`
-	if [ "${nodvisuffixbasename}" = "${nosuffixbasename}" -a \
-		"${basename}" != "${nosuffixbasename}" ]
-	then
-		startwithdvi="yes"
-	fi
-
-	kpsefilename=`kpsewhich "${file}"`
-	slashdirname=`dirname "${kpsefilename}"`/
-
-	if [ ! -w "." ]
-	then
-		if [ "${TEXMFOUTPUT}" != "" ]
-		then
-			outdir="${TEXMFOUTPUT}/"
-			outdirset="yes"
-			if [ "${autoinput}" = "yes" ]
-			then
-				export TEXINPUTS=${TEXMFOUTPUT}:`kpsewhich --expand-var '$TEXINPUTS'`
-
-			fi
-		else
-			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//'`
-	if [ "${texprogram}" = "omega" -o "${texprogram}" = "lambda" ]
-	then
-		dvips="odvips"
-	else
-		dvips="dvips"
-	fi
-
-	# Handle temp dir (cleanup is called on signal)
-	tmpext=$$-`/bin/date +"%s"`
-	tmpdir="/tmp/altpdf${texprogram}.${tmpext}"
-	# Force removal of possible existing tmpdir
-	cleanup
-	# Make new version
-	mkdir "${tmpdir}"
-
-	if [ "${startwithdvi}" = "yes" ]
-	then
-		dvifile="${file}"
-	else
-		texfile="${file}"
-		dvifile="${outdir}${nosuffixbasename}.dvi"
-	fi
-
-	psfile="${tmpdir}/${nosuffixbasename}${outputpostfix}.ps"
-	savedpsfile="${outdir}${nosuffixbasename}.ps"
-	pdffile="${tmpdir}/${nosuffixbasename}${outputpostfix}.pdf"
-	savedpdffile="${outdir}${nosuffixbasename}${outputpostfix}.pdf"
-
-	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:"
-		env | sed 's/^/##### /g'
-	fi
-
-	if [ "${startwithdvi}" = "yes" ]; then
-		echo "### Skipping ${texprogram} ${texfile} [dvi->pdf only]"
-	else
-		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})"
-	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
-
-	echo "### Copying/moving pdf file ${pdffile} to ${savedpdffile}"
-	/bin/cp "${pdffile}" "${savedpdffile}.${tmpext}" || \
-		echo "### FAILED to copy ${pdffile} (${status})"
-	/bin/rm -f "${savedpdffile}"
-	/bin/mv "${savedpdffile}.${tmpext}" "${savedpdffile}" || \
-		echo "### FAILED to rename ${savedpdffile}.${tmpext} (${status})"
-
-	if [ "${startwithdvi}" = "yes" ]; then
-		if [ "${keeppsfile}" = "yes" ]; then
-			echo "### Succesfully generated ${savedpdffile} and ${savedpsfile}"
-		else
-			echo "### Succesfully generated ${savedpdffile}"
-		fi
-	else
-		if [ "${keeppsfile}" = "yes" ]; then
-			echo "### Succesfully generated ${dvifile}, ${savedpdffile} and ${savedpsfile}"
-		else
-			echo "### Succesfully generated ${dvifile} and ${savedpdffile}"
-		fi
-	fi
-
-	cleanup
-}
-
-for file in "$@"
-do
-	main
-done
diff --git a/Master/bin/i386-linux/sjisconv b/Master/bin/i386-linux/sjisconv
deleted file mode 100755
index 2547889c666..00000000000
--- a/Master/bin/i386-linux/sjisconv
+++ /dev/null
diff --git a/Master/bin/i386-linux/sjislatex b/Master/bin/i386-linux/sjislatex
deleted file mode 100755
index 68c554e6d71..00000000000
--- a/Master/bin/i386-linux/sjislatex
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-
-# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
-#
-# 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 in doc/COPYING; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-# MA 02110-1301 USA
-
-n=1
-argv=
-
-# get last argument
-while test 1 -lt $#; do
-  eval argv$n=\$1
-  argv="$argv \"\$argv$n\""
-  n=`expr $n + 1`
-  shift
-done
-
-# replace extension with .cjk or append .cjk if there is no extension
-tex=$1
-case $tex in
-""|*.cjk)
-  echo >&2 "Usage: $0 [options] latex-file"
-  exit 1;;
-*)
-  aux=`expr "X$tex" : 'X\(.*\)\.[^/]*$' \| "X$tex" : 'X\(.*\)'`.cjk;;
-esac
-
-sjisconv < "$tex" > "$aux" && eval latex "$argv" "\$aux"
-
-# EOF
diff --git a/Master/bin/i386-linux/sjispdflatex b/Master/bin/i386-linux/sjispdflatex
deleted file mode 100755
index e8d070e9dc6..00000000000
--- a/Master/bin/i386-linux/sjispdflatex
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-
-# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
-#
-# 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 in doc/COPYING; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-# MA 02110-1301 USA
-
-n=1
-argv=
-
-# get last argument
-while test 1 -lt $#; do
-  eval argv$n=\$1
-  argv="$argv \"\$argv$n\""
-  n=`expr $n + 1`
-  shift
-done
-
-# replace extension with .cjk or append .cjk if there is no extension
-tex=$1
-case $tex in
-""|*.cjk)
-  echo >&2 "Usage: $0 [options] latex-file"
-  exit 1;;
-*)
-  aux=`expr "X$tex" : 'X\(.*\)\.[^/]*$' \| "X$tex" : 'X\(.*\)'`.cjk;;
-esac
-
-sjisconv < "$tex" > "$aux" && eval pdflatex "$argv" "\$aux"
-
-# EOF
diff --git a/Master/bin/i386-linux/t1ascii b/Master/bin/i386-linux/t1ascii
deleted file mode 100755
index 997ce172c42..00000000000
--- a/Master/bin/i386-linux/t1ascii
+++ /dev/null
diff --git a/Master/bin/i386-linux/t1asm b/Master/bin/i386-linux/t1asm
deleted file mode 100755
index 857b6be36a5..00000000000
--- a/Master/bin/i386-linux/t1asm
+++ /dev/null
diff --git a/Master/bin/i386-linux/t1binary b/Master/bin/i386-linux/t1binary
deleted file mode 100755
index 45a4e3e7aa3..00000000000
--- a/Master/bin/i386-linux/t1binary
+++ /dev/null
diff --git a/Master/bin/i386-linux/t1disasm b/Master/bin/i386-linux/t1disasm
deleted file mode 100755
index 2756629bb8c..00000000000
--- a/Master/bin/i386-linux/t1disasm
+++ /dev/null
diff --git a/Master/bin/i386-linux/t1dotlessj b/Master/bin/i386-linux/t1dotlessj
deleted file mode 100755
index aae1ec83c1c..00000000000
--- a/Master/bin/i386-linux/t1dotlessj
+++ /dev/null
diff --git a/Master/bin/i386-linux/t1lint b/Master/bin/i386-linux/t1lint
deleted file mode 100755
index 89016ac0f6c..00000000000
--- a/Master/bin/i386-linux/t1lint
+++ /dev/null
diff --git a/Master/bin/i386-linux/t1mac b/Master/bin/i386-linux/t1mac
deleted file mode 100755
index 1e84fa77447..00000000000
--- a/Master/bin/i386-linux/t1mac
+++ /dev/null
diff --git a/Master/bin/i386-linux/t1reencode b/Master/bin/i386-linux/t1reencode
deleted file mode 100755
index 7394b1dfd50..00000000000
--- a/Master/bin/i386-linux/t1reencode
+++ /dev/null
diff --git a/Master/bin/i386-linux/t1testpage b/Master/bin/i386-linux/t1testpage
deleted file mode 100755
index 394bfa68e13..00000000000
--- a/Master/bin/i386-linux/t1testpage
+++ /dev/null
diff --git a/Master/bin/i386-linux/t1unmac b/Master/bin/i386-linux/t1unmac
deleted file mode 100755
index 056833e3d48..00000000000
--- a/Master/bin/i386-linux/t1unmac
+++ /dev/null
diff --git a/Master/bin/i386-linux/t4ht b/Master/bin/i386-linux/t4ht
deleted file mode 100755
index 106ad502ff5..00000000000
--- a/Master/bin/i386-linux/t4ht
+++ /dev/null
diff --git a/Master/bin/i386-linux/tangle b/Master/bin/i386-linux/tangle
deleted file mode 100755
index dd20680937d..00000000000
--- a/Master/bin/i386-linux/tangle
+++ /dev/null
diff --git a/Master/bin/i386-linux/tcdialog b/Master/bin/i386-linux/tcdialog
deleted file mode 100755
index 81c272f44f4..00000000000
--- a/Master/bin/i386-linux/tcdialog
+++ /dev/null
diff --git a/Master/bin/i386-linux/tex b/Master/bin/i386-linux/tex
deleted file mode 100755
index fc01473b9b3..00000000000
--- a/Master/bin/i386-linux/tex
+++ /dev/null
diff --git a/Master/bin/i386-linux/tex4ht b/Master/bin/i386-linux/tex4ht
deleted file mode 100755
index ffb479d73f6..00000000000
--- a/Master/bin/i386-linux/tex4ht
+++ /dev/null
diff --git a/Master/bin/i386-linux/texconfig b/Master/bin/i386-linux/texconfig
deleted file mode 100755
index 037b6dcf3a1..00000000000
--- a/Master/bin/i386-linux/texconfig
+++ /dev/null
@@ -1,1439 +0,0 @@
-#!/bin/sh
-
-# TeXConfig version 3.0
-# Thomas Esser, te@dbs.uni-hannover.de. Public domain.
-
-# invoke the right shell:
-
-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
-
-export PATH
-
-# hack around a bug in zsh:
-test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
-
-# initializations...
-progname=texconfig
-
-# the version string
-version=1203187848 # seconds since `00:00:00 1970-01-01 UTC'
-                   # date '+%s' (with GNU date)
-
-envVars="
-  AFMFONTS BIBINPUTS BSTINPUTS CMAPFONTS CWEBINPUTS ENCFONTS GFFONTS
-  GLYPHFONTS INDEXSTYLE LIGFONTS MFBASES MFINPUTS MFPOOL MFTINPUTS
-  MISCFONTS MPINPUTS MPMEMS MPPOOL MPSUPPORT OCPINPUTS OFMFONTS
-  OPENTYPEFONTS OPLFONTS OTPINPUTS OVFFONTS OVPFONTS PDFTEXCONFIG PKFONTS
-  PSHEADERS SFDFONTS T1FONTS T1INPUTS T42FONTS TEXBIB TEXCONFIG TEXDOCS
-  TEXFONTMAPS TEXFONTS TEXFORMATS TEXINDEXSTYLE TEXINPUTS TEXMFCNF
-  TEXMFDBS TEXMFINI TEXMFSCRIPTS TEXPICTS TEXPKS TEXPOOL TEXPSHEADERS
-  TEXSOURCES TFMFONTS TRFONTS TTFONTS VFFONTS WEB2C WEBINPUTS
-"
-tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/tctmp.$$
-needsCleanup=false
-lastUpdatedFile=
-
-# 
-###############################################################################
-# setupFMT(void) - find a suitable version of fmt / adjust
-#
-setupFMT()
-{
-  case $FMT in
-    "") 
-      FMT=fmt
-      test ! -x /bin/fmt && test ! -f /usr/bin/fmt &&
-        { test -x /bin/adjust || test -x /usr/bin/adjust; } && FMT=adjust
-      ;;
-    *)
-      return
-      ;;
-  esac
-}
-
-###############################################################################
-# myFmt(args) - run $FMT
-#
-myFmt()
-{
-  setupFMT
-  $FMT ${1+"$@"}
-}
-
-###############################################################################
-# echoShowVariable(args ...)
-#   show environment variables which names are as args and their values
-#
-echoShowVariable()
-{
-  for esv
-  do
-    var=$esv
-    eval val=\"\${$var+=}\${$var- is unset}\"
-    echo "$var$val"
-  done | grep -v 'is unset$'
-}
-
-###############################################################################
-# echoShowKpseVariable(args ...)
-#   show kpathsea variables which names are as args and their values
-#
-echoShowKpseVariable()
-{
-  for eskv
-  do
-    var=$eskv
-    val=`kpsewhich -var-value="$eskv"`
-    echo "$var=$val"
-  done
-}
-
-###############################################################################
-# echoLocateBinary(args ...) - show where programs actually exist
-#
-echoLocateBinary()
-{
-  for elb
-  do
-    elbLoc=`checkForBinary "$elb"`
-    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 files actually exist
-#
-echoLocateCfgfile()
-{
-  for elc
-  do
-    case $elc in
-      texmf.cnf) elcLoc=`kpsewhich $elc`;;
-      *) elcLoc=`tcfmgr --cmd find --file "$elc"`;;
-    esac
-    case $elcLoc in
-      "") echo "$elc: not found";;
-      *)  echo "$elcLoc";;
-    esac
-  done
-}
-
-###############################################################################
-# checkForBinary(prog) - echo full path of prog
-#
-checkForBinary()
-{
-  cfbBinary=$1
-
-  OLDIFS=$IFS
-  IFS=:
-  set x `echo "$PATH" | sed 's/^:/.:/; s/:$/:./; s/::/:.:/g'`; shift
-  found=false
-  for pathElem
-  do
-    case $pathElem in
-      "") continue;;
-      *) test -f "$pathElem/$cfbBinary" && { echo "$pathElem/$cfbBinary"; found=true; break; }
-    esac
-  done
-  IFS=$OLDIFS
-  case $found in
-    true) (exit 0); return 0;;
-    false) (exit 1); return 1;;
-  esac
-}
-
-###############################################################################
-# cleanup() - clean up the temp area and exit with proper exit status
-#
-cleanup()
-{
-  rc=$1
-  $needsCleanup && test -n "$tmpdir" && test -d "$tmpdir" \
-    && { cd / && rm -rf "$tmpdir"; }
-  (exit $rc); exit $rc
-}
-
-###############################################################################
-# setupTmpDir() - set up a temp directory and a trap to remove it
-#
-setupTmpDir()
-{
-  case $needsCleanup in
-    true) return;;
-  esac
-
-  trap 'cleanup 1' 1 2 3 7 13 15
-  needsCleanup=true
-  (umask 077; mkdir "$tmpdir") \
-    || abort "could not create directory \`$tmpdir'"
-}
-
-###############################################################################
-# setupTexmfmain() - get value for MT_TEXMFMAIN (with caching)
-#
-setupTexmfmain()
-{
-  case $MT_TEXMFMAIN in
-    "") MT_TEXMFMAIN=`kpsewhich -var-value=TEXMFMAIN`;;
-    *) return;;
-  esac
-}
-
-###############################################################################
-# setupTexmfmain() - get value for MT_TEXMFDIST (with caching)
-#
-setupTexmfdist()
-{
-  case $MT_TEXMFDIST in
-    "") MT_TEXMFDIST=`kpsewhich -var-value=TEXMFDIST`;;
-    *) return;;
-  esac
-}
-
-###############################################################################
-# setupTexmfvar() - get value for MT_TEXMFVAR (with caching)
-#
-setupTexmfvar()
-{
-  case $MT_TEXMVAR in
-    "") MT_TEXMVAR=`kpsewhich -var-value=TEXMFVAR`;;
-    *) return;;
-  esac
-}
-
-###############################################################################
-# setupSystexmf() - get value for MT_SYSTEXMF (with caching)
-#
-setupSystexmf()
-{
-  case $MT_SYSTEXMF in
-    "") MT_SYSTEXMF=`kpsewhich -var-value=SYSTEXMF`;;
-    *) return;;
-  esac
-}
-
-###############################################################################
-# abort(errmsg)
-#   print `errmsg' to stderr and exit with error code 1
-#
-abort()
-{
-  echo "$progname: $1." >&2
-  cleanup 1
-}
-
-###############################################################################
-# mktexdir(args)
-#   call mktexdir script, disable all features (to prevent sticky directories)
-#
-mktexdir()
-{
-  setupTexmfmain
-  MT_FEATURES=none "$MT_TEXMFMAIN/web2c/mktexdir" "$@" >&2
-}
-
-###############################################################################
-# tcfmgr(args) - call tcfmgr script
-#
-tcfmgr()
-{
-  setupTexmfmain
-  "$MT_TEXMFMAIN/texconfig/tcfmgr" "$@"
-}
-
-###############################################################################
-# mktexupd(args) - call mktexupd script
-#
-mktexupd()
-{
-  setupTexmfmain
-  "$MT_TEXMFMAIN/web2c/mktexupd" "$@"
-}
-
-###############################################################################
-# getRelDir(file)
-#   matches file against SYSTEXMF. Returns relative directory of file within
-#   a texmf tree in variable relPart.
-#
-getRelDir()
-{
-  file=$1
-  relPart=
-
-  setupSystexmf
-  OLDIFS=$IFS
-  IFS='
-'
-  set x `echo "$MT_SYSTEXMF" | tr : '
-'`; shift
-  IFS=$OLDIFS
-
-  # now loop over all components of SYSTEXMF
-  for dir
-  do
-    test -n "$dir" || continue
-    case "$file" in
-      $dir/*)
-        relPart=`echo "$file" | sed "s%$dir/*%%"`
-        break
-        ;;
-    esac
-  done
-
-  # now check for success / failure
-  case $relPart in
-    ""|$file)
-      # empty or full filename -> getRelDir failed!
-      (exit 1); return 1
-      ;;
-    *)
-      # relPart should just have the "dirname" part:
-      relPart=`echo "$relPart" | sed 's%/*[^/]*$%%'`
-      (exit 0); return 0
-      ;;
-  esac
-}
-
-###############################################################################
-# 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
-
-  if grep "$configReplacePat" "$configReplaceFile" >/dev/null; then
-    ed "$configReplaceFile" >/dev/null 2>&1 <<-eof
-	/$configReplacePat/c
-	$configReplaceLine
-	.
-	w
-	q
-eof
-  else
-    echo "$configReplaceLine" >> $configReplaceFile
-  fi
-}
-
-###############################################################################
-# fmgrConfigReplace (file regex value)
-#   replaces line matching regex by value in file
-#
-fmgrConfigReplace()
-{
-  fmgrConfigReplaceChanged=false
-
-  moreArgs=""
-  while
-    case $1 in
-      --*) moreArgs="$moreArgs $1 $2";;
-      *) break;;
-    esac
-  do shift; shift; done
-  fmgrConfigReplaceFile=$1
-  fmgrConfigReplaceRegex=$2
-  fmgrConfigReplaceValue=$3
-
-  setupTmpDir
-  co=`tcfmgr $moreArgs --tmp $tmpdir --cmd co --file $fmgrConfigReplaceFile`
-  if test $? != 0; then
-    echo "$progname: fmgrConfigReplace co failed for \`$fmgrConfigReplaceFile'" >&2
-    (exit 1); return 1
-  fi
-  set x $co; shift
-  fmgrConfigReplaceID=$1; fmgrConfigReplaceCfgFile=$3; fmgrConfigReplaceOrigFile=$4
-  configReplace "$fmgrConfigReplaceCfgFile" "$fmgrConfigReplaceRegex" "$fmgrConfigReplaceValue"
-  ci=`tcfmgr --tmp $tmpdir --cmd ci --id "$fmgrConfigReplaceID"`
-  if test $? != 0; then
-    echo "$progname: fmgrConfigReplace ci failed for \`$fmgrConfigReplaceFile'" >&2
-    (exit 1); return 1
-  fi
-  case $ci in
-    "") :;;
-    $lastUpdatedFile)
-      fmgrConfigReplaceChanged=true;;
-    *) echo "$progname: updated configuration saved as file \`$ci'" >&2
-       fmgrConfigReplaceChanged=true
-       lastUpdatedFile=$ci;;
-  esac
-  (exit 0); return 0
-}
-
-###############################################################################
-# setupDvipsPaper(paper)
-#   rearranges config.ps to make paper the first paper definition
-#
-setupDvipsPaper()
-{
-  setupDvipsPaperChanged=false
-  setupDvipsPaperFile=config.ps
-  setupDvipsPaperDftPaper=$1
-
-  setupTmpDir
-  co=`tcfmgr --tmp $tmpdir --cmd co --file $setupDvipsPaperFile`
-  if test $? != 0; then
-    echo "$progname: setupDvipsPaper co failed for \`$setupDvipsPaperFile'" >&2
-    (exit 1); return 1
-  fi
-  set x $co; shift
-  setupDvipsPaperID=$1; setupDvipsPaperCfgFile=$3; setupDvipsPaperOrigFile=$4
-
-  ed "$setupDvipsPaperCfgFile" > /dev/null 2>&1 <<-eof
-	/@ /ka
-	\$a
-	@ 
-	.
-	/@ $setupDvipsPaperDftPaper /;/@ /-1m'a-1
-	\$d
-	w
-	q
-eof
-
-  ci=`tcfmgr --tmp $tmpdir --cmd ci --id "$setupDvipsPaperID"`
-  if test $? != 0; then
-    echo "$progname: setupDvipsPaper ci failed for \`$setupDvipsPaperFile'" >&2
-    (exit 1); return 1
-  fi
-  case $ci in
-    "") :;;
-    $lastUpdatedFile)
-      setupDvipsPaperChanged=true;;
-    *) echo "$progname: updated configuration saved as file \`$ci'" >&2
-       setupDvipsPaperChanged=true
-       lastUpdatedFile=$ci;;
-  esac
-  (exit 0); return 0
-}
-
-###############################################################################
-# setupModesMfFile(void) - find modes.mf file (with caching)
-#
-setupModesMfFile()
-{
-  case $modesMfFile in
-    "")
-      modesMfFile=`tcfmgr --cmd find --file modes.mf`
-      ;;
-    *)
-      return
-      ;;
-  esac
-}
-
-###############################################################################
-# locateConfigPsFile(void) - find config.ps file (with caching)
-#
-locateConfigPsFile()
-{
-  case $configPsFile in
-    "")
-      configPsFile=`tcfmgr --cmd find --file config.ps`
-      ;;
-    *)
-      return
-      ;;
-  esac
-}
-
-###############################################################################
-# listMfModes(file) - list modes from modes.mf file
-#
-listMfModes()
-{
-  grep mode_def "$modesMfFile" |
-  sed -e "s/mode_def //" \
-      -e "s/ .*%[^ ]* / '/" \
-      -e "s/\$/' /" |
-  egrep -v "^(help|%)" | sort
-}
-
-###############################################################################
-# listDvipsPapers(void) - list paper definitions from config.ps
-#
-listDvipsPapers()
-{
-  grep '@ ' $configPsFile | sed "s/..//;s/ / '/;s/\$/' /"
-}
-
-###############################################################################
-# doGenerate(file args) - synthesize configuration FILE, passing ARGS
-# 
-doGenerate()
-{
-  if test -z "$1" || test "x$1" = xhelp; then
-    echo "Usage: $progname generate fmtutil [ARG]...
-       $progname generate language [ARG]...
-       $progname generate updmap [ARG]...
-
-Generate the given configuration file, by invoking the generate-FILE
-scripts found in texmf/scripts.  Any additional arguments, such as
--dest=/loc/ation, are passed to the script.  For more details, run
-$progname generate TYPE --help."
-    return
-  fi
-  file=$1; shift
-  script=`kpsewhich --format=texmfscripts generate-$file.pl`
-  test -n "$script" || abort "could not find script generate-$file.pl"
-  echo "$0: running $script..."
-  $script "$@"
-  echo "$0: $script done."  
-}
-
-###############################################################################
-# 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()
-{
-  getResMode=$1
-  (
-    cd $tmpdir
-    cat >mftmp.mf <<-'eof'
-	let myexit = primitive_end_;
-	mode_setup;
-	string xdpi;
-	xdpi := decimal round pixels_per_inch;
-	message "XDPI = " & xdpi;
-	string ydpi;
-	ydpi := decimal round (pixels_per_inch * aspect_ratio);
-	message "YDPI = " & ydpi;
-	fontmaking := 0;
-	myexit;
-eof
-    mf '\mode='"$getResMode"';  \input ./mftmp' </dev/null \
-     | awk '$1 == "XDPI" || $1 == "YDPI" { print $3 }'
-  )
-}
-
-###############################################################################
-# checkElemInList(elem, list)
-#   check if element exists in list
-###############################################################################
-checkElemInList()
-{
-  checkElemInListElem=$1; shift
-  checkElemInListFound=false
-  for checkElemInListIter
-  do
-    case "x$checkElemInListElem" in
-      x$checkElemInListIter)
-        checkElemInListFound=true
-        break
-        ;;
-    esac
-  done
-  case $checkElemInListFound in
-    true) (exit 0); return 0;;
-  esac
-  (exit 1); return 1
-}
-
-
-# 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="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               (edit fmtutil.cnf)
-       $progname generate [FILE]       (synthesize configuration FILE)
-       $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 generate
-       $progname hyphen
-       $progname mode
-       $progname paper
-       $progname pdftex
-       $progname xdvi
-
-See http://tug.org/texlive/ for other documentation, etc.
-Report bugs to <tex-k@tug.org>."
-
-  case $1 in
-    # texconfig conf
-    conf|confall)
-      setupTexmfmain
-      setupTexmfdist
-      echo '=========================== version information =========================='
-      showDistVersionInfo
-      echo
-      echo '==================== binaries found by searching $PATH ==================='
-      echo "PATH=$PATH"
-      echoLocateBinary kpsewhich updmap fmtutil texconfig tex pdftex mktexpk dvips dvipdfm
-      echo
-      echo '=========================== active config files =========================='
-      echoLocateCfgfile texmf.cnf updmap.cfg fmtutil.cnf config.ps mktex.cnf XDvi pdftexconfig.tex config | sort -k 2
-      echo
-      echo '============================= font map files ============================='
-      for m in psfonts.map pdftex.map ps2pk.map dvipdfm.map; do
-        echo "$m: `kpsewhich $m`"
-      done
-      echo
-      echo '=========================== kpathsea variables ==========================='
-      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) ===='
-      echoShowVariable $envVars
-      ;;
-
-    # texconfig dvipdfm
-    dvipdfm)
-      help="Usage: $progname dvipdfm paper PAPER
-
-Valid PAPER settings:
-  letter legal ledger tabloid a4 a3"
-      case $2 in
-        # texconfig dvipdfm paper
-        paper-list)
-          for p in letter legal ledger tabloid a4 a3; do echo $p; done
-          ;;
-        paper)
-          case $3 in
-            letter|legal|ledger|tabloid|a4|a3)
-              fmgrConfigReplace config '^p' "p $3";;
-            "") echo "$help" >&2; rc=1;;
-            *)
-             echo "$progname: unknown PAPER \`$3' given as argument for \`$progname dvipdfm paper'" >&2
-             echo "$progname: try \`$progname dvipdfm paper' for help" >&2
-             rc=1 ;;
-          esac ;;
-        # texconfig dvipdfm ""
-        "")
-          echo "$help" >&2; rc=1 ;;
-        # texconfig dvipdfm <unknown>
-        *)
-          echo "$progname: unknown option \`$2' given as argument for \`$progname dvipdfm'" >&2
-          echo "$progname: try \`$progname dvipdfm' for help" >&2
-          rc=1
-          ;;
-      esac
-      ;;
-
-    # texconfig dvipdfmx
-    dvipdfmx)
-      help="Usage: $progname dvipdfmx paper PAPER
-
-Valid PAPER settings:
-  letter legal ledger tabloid a4 a3"
-      case $2 in
-        # texconfig dvipdfmx paper
-        paper-list)
-          for p in letter legal ledger tabloid a4 a3; do echo $p; done
-          ;;
-        paper)
-          case $3 in
-            letter|legal|ledger|tabloid|a4|a3)
-              fmgrConfigReplace dvipdfmx.cfg '^p' "p $3";;
-            "") echo "$help" >&2; rc=1;;
-            *)
-             echo "$progname: unknown PAPER \`$3' given as argument for \`$progname dvipdfmx paper'" >&2
-             echo "$progname: try \`$progname dvipdfmx paper' for help" >&2
-             rc=1 ;;
-          esac ;;
-        # texconfig dvipdfmx ""
-        "")
-          echo "$help" >&2; rc=1 ;;
-        # texconfig dvipdfmx <unknown>
-        *)
-          echo "$progname: unknown option \`$2' given as argument for \`$progname dvipdfmx'" >&2
-          echo "$progname: try \`$progname dvipdfmx' for help" >&2
-          rc=1
-          ;;
-      esac
-      ;;
-
-    # texconfig dvips
-    dvips)
-      shift
-      help="Usage: $progname dvips add PRINTER
-       $progname dvips del PRINTER
-       $progname dvips paper PAPER
-       $progname dvips [-P PRINTER] mode MODE
-       $progname dvips [-P PRINTER] offset OFFSET
-       $progname dvips [-P PRINTER] printcmd CMD"
-      case $1 in
-        -P)
-          case $2 in
-            "")
-              echo "$progname: missing arg for parameter -P" >&2
-              rc=1; (exit $rc); return $rc
-              ;;
-            *)
-              otherPrinter=true
-              otherPrinterName=$2
-              otherPrinterFile=`kpsewhich -format='dvips config' "config.$otherPrinterName"`
-              case $otherPrinterFile in
-                "")
-                  echo "$progname: configuration file \`config.$otherPrinterName' for printer \`$otherPrinterName' not found" >&2
-                  rc=1; (exit $rc); return $rc
-                  ;;
-                *) shift; shift;;
-              esac
-              ;;
-          esac
-          ;;
-        *)
-          otherPrinter=false
-          ;;
-      esac
-      case $otherPrinter in
-        true)
-          tcBatchDvipsPrinter=$otherPrinterName
-          moreFmgrArgs="--reldir dvips/config --infile $otherPrinterFile"
-          ;;
-        *)
-          tcBatchDvipsPrinter=ps
-          ;;
-      esac
-      case $1 in
-        add)
-          case $2 in
-            "")
-              echo "Usage: $progname dvips add PRINTER" >&2
-              rc=1
-              ;;
-            *)
-              printerName=$2
-              pFile=`kpsewhich -format='dvips config' "config.$printerName"`
-              case $pFile in
-                "")
-                  setupTmpDir
-                  tcfRet=`tcfmgr --emptyinfile --reldir dvips/config --cmd co --tmp $tmpdir --file "config.$printerName"`
-                  if test $? != 0; then
-                    echo "$progname: failed to add new configuration file \`config.$printerName'" >&2
-                    rc=1
-                  else
-                    set x $tcfRet; shift
-                    tcBatchDvipsAddID=$1; tcBatchDvipsAddFile=$3
-                    echo "% file config.$printerName; added by texconfig" > "$tcBatchDvipsAddFile"
-                    tcfRet=`tcfmgr --tmp $tmpdir --id "$tcBatchDvipsAddID" --cmd ci`
-                    if test $? != 0; then
-                      echo "$progname: failed to add new configuration file \`config.$printerName'" >&2
-                      rc=1
-                    else
-                      echo "$progname: file $tcfRet added" >&2
-                    fi
-                  fi
-                  ;;
-                *)
-                  echo "$progname: configuration file for printer \`$printerName' already exists (\`$pFile')" >&2
-                  rc=1
-                  ;;
-              esac
-              ;;
-          esac
-          ;;
-        del)
-          case $2 in
-            "")
-              echo "Usage: $progname dvips del PRINTER" >&2
-              rc=1
-              ;;
-            *)
-              printerName=$2
-              pFile=`kpsewhich -format='dvips config' "config.$printerName"`
-              case $pFile in
-                "")
-                  echo "$progname: configuration file for printer \`$printerName' (config.$printerName) not found" >&2
-                  rc=1
-                  ;;
-                *)
-                  if rm "$pFile"; then
-                    echo "$progname: file \`$pFile' removed" >&2
-                  else
-                    echo "$progname: failed to remove file \`$pFile'" >&2
-                    rc=1
-                  fi
-                  ;;
-              esac
-              ;;  
-          esac
-          ;;
-        paper-list)
-          locateConfigPsFile
-          listDvipsPapers
-          ;;
-        paper)
-          case $2 in
-            "")
-              echo "Usage: $progname dvips paper PAPER" >&2
-              echo >&2; echo "Valid PAPER settings:" >&2
-              locateConfigPsFile
-              listDvipsPapers | sed 's@ .*@@; s@^@  @' | myFmt
-              rc=1
-              ;;
-            *)
-              tcBatchDvipsPaper=$2
-              locateConfigPsFile
-              case "$configPsFile" in
-                "")
-                  echo "$progname: file config.ps not found" >&2; rc=1
-                  ;;
-                *)
-                  if grep "@ $tcBatchDvipsPaper " $configPsFile >/dev/null 2>&1; then
-                    setupDvipsPaper "$tcBatchDvipsPaper"
-                  else
-                    echo "$progname: paper \`$tcBatchDvipsPaper' not found in file \`$configPsFile'" >&2; rc=1
-                  fi
-                  ;;
-              esac
-              ;;
-          esac
-          ;;
-        mode)
-          case $2 in
-            "")
-              echo "Usage: $progname dvips mode MODE
-
-Valid MODE settings:"
-              setupModesMfFile
-              listMfModes | sed 's@ .*@@; s@^@  @' | myFmt
-              rc=1
-              ;;
-            *)
-              tcBatchDvipsMode=$2
-              setupTmpDir
-              setupModesMfFile
-              if checkElemInList "$tcBatchDvipsMode" `listMfModes | sed 's@ .*@@'`; then
-                set x `getRes "$tcBatchDvipsMode"`; shift
-                resX=$1; resY=$2
-                fmgrConfigReplace $moreFmgrArgs config.$tcBatchDvipsPrinter '^M' "M $tcBatchDvipsMode"
-                fmgrConfigReplace $moreFmgrArgs config.$tcBatchDvipsPrinter '^D' "D $resX"
-                fmgrConfigReplace $moreFmgrArgs config.$tcBatchDvipsPrinter '^X' "X $resX"
-                fmgrConfigReplace $moreFmgrArgs config.$tcBatchDvipsPrinter '^Y' "Y $resY"
-              else
-                echo "$progname: unknown MODE \`$tcBatchDvipsMode' given as argument for \`$progname dvips mode'" >&2
-                echo "$progname: try \`$progname dvips mode' for help" >&2
-                rc=1
-              fi
-              ;;
-          esac
-          ;;
-        offset)
-          offset=$2
-          case $offset in
-            "")
-              echo "Usage: $progname dvips offset OFFSET"
-              rc=1
-              ;;
-            *)
-              fmgrConfigReplace $moreFmgrArgs config.$tcBatchDvipsPrinter '^O' "O $offset"
-          esac
-          ;;
-        printcmd)
-          printcmd=$2
-          case $printcmd in
-            "")
-              echo "Usage: $progname dvips printcmd CMD"
-              rc=1
-              ;;
-            -)
-              fmgrConfigReplace $moreFmgrArgs config.$tcBatchDvipsPrinter '^o' o
-              ;;
-            *)
-              fmgrConfigReplace $moreFmgrArgs config.$tcBatchDvipsPrinter '^o' "o |$printcmd"
-              ;;
-          esac
-          ;;
-        "")
-          echo "$help" >&2; rc=1
-          ;;
-        *)
-          echo "$progname: unknown option \`$1' given as argument for \`$progname dvips'" >&2
-          echo "$progname: try \`$progname dvips' for help" >&2
-          rc=1
-          ;;
-      esac
-      ;;
-
-    faq)
-      setupTexmfmain
-      if test -f $MT_TEXMFMAIN/doc/tetex/teTeX-FAQ; then
-        <$MT_TEXMFMAIN/doc/tetex/teTeX-FAQ eval ${PAGER-more}
-      else
-        echo "$progname: faq not found (usually in \$TEXMFMAIN/doc/tetex/teTeX-FAQ)" >&2
-        rc=1
-      fi
-      ;;
-
-    findprog)
-      shift
-      ELB_PATH_ONLY=1 echoLocateBinary "$@"
-      ;;
-
-    # handle "texconfig font"
-    font)
-      help="Usage: $progname font vardir DIR
-       $progname font ro
-       $progname font rw
-
-The vardir option changes the VARTEXFONTS variable in the texmf.cnf file.
-
-The rw option makes the VARTEXFONTS directory (and subtrees pk, tfm,
-source) world writable and sets the features appendonlydir:varfonts
-in mktex.cnf.
-
-The ro option makes the VARTEXFONTS directory (and subtrees pk, tfm,
-source) writable for the owner only and sets the feature texmfvar in
-mktex.cnf.
-
-For more information about these \`features', consult the teTeX manual
-(e.g. by running \`texdoc TETEXDOC')."
-
-      case $2 in
-        vardir)
-          case $3 in
-            "")
-              echo "$help" >&2
-              rc=1
-              ;;
-            *)
-              tcBatchFontVardir=$3
-              tfc=`kpsewhich texmf.cnf`
-              if test -n "$tfc"; then
-                if test -w "$tfc"; then
-                  configReplace "$tfc" '^VARTEXFONTS' "VARTEXFONTS  = $tcBatchFontVardir"
-                else
-                  echo "$progname: setting up vardir failed. Reason: no permission to write file \`$tfc'" >&2
-                  rc=1
-                fi
-              else
-                echo "$progname: setting up vardir failed. Reason: failed to find file texmf.cnf" >&2
-                rc=1
-              fi
-              ;;
-          esac
-          ;;
-        rw)
-          MT_VARTEXFONTS=`kpsewhich -var-value VARTEXFONTS`
-          if test -z "$MT_VARTEXFONTS"; then
-            echo "$progname: failed to set \`font rw'; reason: could not determine VARTEXFONTS variable." >&2; rc=1
-            return
-          fi
-          test -d "$MT_VARTEXFONTS" || mktexdir "$MT_VARTEXFONTS"
-          if test ! -d "$MT_VARTEXFONTS"; then
-            echo "$progname: failed to set \`font rw'; reason: directory \`$MT_VARTEXFONTS' does not exist." >&2; rc=1
-            return
-          fi
-          chmod 1777 "$MT_VARTEXFONTS" || {
-            echo "$progname: failed to modify permissions in \`$MT_VARTEXFONTS'." >&2; rc=1
-            return;
-          }
-          (
-            cd "$MT_VARTEXFONTS" || exit
-            echo "$progname: modifying permissions in \`$MT_VARTEXFONTS' ..." >&2
-            for d in pk tfm source; do
-              test -d "$d" && find $d -type d -exec chmod 1777 '{}' \;
-            done
-            echo "$progname: all permissions set." >&2
-          )
-          setupTmpDir
-          fmgrConfigReplace mktex.cnf '^: ..MT_FEATURES=' ": \${MT_FEATURES=appendonlydir:varfonts}"
-          ;;
-        ro)
-          MT_VARTEXFONTS=`kpsewhich -var-value VARTEXFONTS`
-          if test -z "$MT_VARTEXFONTS"; then
-            echo "$progname: failed to set \`font ro'; reason: could not determine VARTEXFONTS variable." >&2; rc=1
-            return
-          fi
-          test -d "$MT_VARTEXFONTS" || mktexdir "$MT_VARTEXFONTS"
-          if test ! -d "$MT_VARTEXFONTS"; then
-            echo "$progname: failed to set \`font ro'; reason: directory \`$MT_VARTEXFONTS' does not exist." >&2; rc=1
-            return
-          fi
-          chmod 755 "$MT_VARTEXFONTS" || {
-            echo "$progname: failed to modify permissions in \`$MT_VARTEXFONTS'." >&2; rc=1
-            return;
-          }
-          (
-            cd "$MT_VARTEXFONTS" || exit
-            echo "$progname: modifying permissions in \`$MT_VARTEXFONTS' ..." >&2
-            for d in pk tfm source; do
-              test -d "$d" && find "$d" -type d -exec chmod 755 '{}' \;
-            done
-            echo "$progname: all permissions set." >&2
-          )
-          setupTmpDir
-          fmgrConfigReplace mktex.cnf '^: ..MT_FEATURES=' ": \${MT_FEATURES=texmfvar}"
-          ;;
-        "") echo "$help" >&2; rc=1;;
-        *) echo "$progname: unknown option \`$2' given as argument for \`$progname font'" >&2
-           echo "$progname: try \`$progname font' for help" >&2
-           rc=1
-           ;;
-      esac
-      ;;
-
-    formats)
-      setupTmpDir
-      echo "$progname: analyzing old configuration..." >&2
-      fmtutil --catcfg > $tmpdir/pre
-      fmtutil --edit
-      echo "$progname: analyzing new configuration..." >&2
-      fmtutil --catcfg > $tmpdir/post
-
-      if cmp $tmpdir/pre $tmpdir/post >/dev/null 2>&1; then
-        echo "$progname: no new/updated formats available ..." >&2
-      else
-      echo "$progname: updating formats ..." >&2
-        comm -13 $tmpdir/pre $tmpdir/post > $tmpdir/addOrChange
-        for i in `awk '{print $1}' $tmpdir/addOrChange`; do
-          fmtutil --byfmt "$i" || rc=1
-        done
-        texlinks --multiplatform || rc=1
-      fi
-      ;;
-
-    generate)
-      shift  # omit the `generate'
-      doGenerate "$@"
-      ;;
-
-    help|--help|-h)
-      echo "$help"
-      ;;
-
-    # "hyphen FORMAT"
-    hyphen)
-      tcBatchHyphenFormat=$2
-      formatsForHyphen=`getFormatsForHyphen`
-      formatsForHyphenFmt=`echo "$formatsForHyphen" | myFmt | sed 's@^@  @'`
-      help="Usage: $progname hyphen FORMAT
-
-Valid FORMATs are:
-$formatsForHyphenFmt"
-      case $tcBatchHyphenFormat in
-        "")
-          echo "$help" >&2; rc=1
-          ;;
-        *)
-          if checkElemInList "$tcBatchHyphenFormat" $formatsForHyphen; then
-
-            tcBatchHyphenFile=`fmtutil --showhyphen "$tcBatchHyphenFormat"`
-            case $tcBatchHyphenFile in
-              "")
-                echo "$progname: could not find hyphen setup file for format \`$tcBatchHyphenFormat'" >&2
-                rc=1
-                return
-                ;;
-            esac
-
-            getRelDir "$tcBatchHyphenFile"
-            case $relPart in
-              "")
-                # edit tcBatchHyphenFile directly
-                tcBatchHFID=
-                setupTmpDir
-                tcBatchHFEdit=$tcBatchHyphenFile
-                tcBatchHFOrig=$tmpdir/hforig
-                cp "$tcBatchHyphenFile" "$tcBatchHFOrig"
-                ;;
-              *)
-                # use tcfmgr
-                tcBatchHyphenFileBasename=`echo "$tcBatchHyphenFile" | sed 's@.*/@@'`
-                setupTmpDir
-                co=`tcfmgr --tmp $tmpdir --cmd co --file "$tcBatchHyphenFileBasename" --reldir "$relPart" --infile "$tcBatchHyphenFile"`
-                if test $? != 0; then
-                  echo "$progname: failed to check out file \`$tcBatchHyphenFile'" >&2
-                  rc=1
-                  return 1
-                else
-                  set x $co; shift
-                  tcBatchHFID=$1; tcBatchHFEdit=$3; tcBatchHFOrig=$4
-                fi
-                ;;
-            esac
-            ${VISUAL-${EDITOR-vi}} "$tcBatchHFEdit"
-            if cmp "$tcBatchHFEdit" "$tcBatchHFOrig" >/dev/null 2>&1; then
-              echo "$progname: configuration unchanged." >&2
-            else
-              case $tcBatchHFID in
-                "")
-                  tcBatchHFOut=$tcBatchHFEdit
-                  echo "$progname: updated configuration saved as file \`$tcBatchHFOut'" >&2
-                  lastUpdatedFile=$ci
-                  ;;
-                *)
-                  ci=`tcfmgr --tmp $tmpdir --cmd ci --id "$tcBatchHFID"`
-                  if test $? != 0; then
-                    echo "$progname: failed to check in file \`$tcBatchHyphenFileBasename'" >&2
-                    rc=1
-                    return
-                  else
-                    tcBatchHFOut=$ci
-                    echo "$progname: updated configuration saved as file \`$tcBatchHFOut'" >&2
-                    lastUpdatedFile=$ci
-                  fi
-                  ;;
-              esac
-              fmtutil --byhyphen "$tcBatchHFOut"
-            fi
-          else
-            echo "$progname: invalid format \`$tcBatchHyphenFormat' specified as argument for \`$progname hyphen'" >&2
-            echo "$progname: for getting help, try \`$progname hyphen'" >&2
-            rc=1
-          fi
-          ;;
-      esac
-      ;;
-
-    hyphen-list)
-      getFormatsForHyphen
-      ;;
-
-    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 \
-             && texlinks --multiplatform \
-             && $updmap; then
-            :
-          else
-            rc=1
-          fi
-          ;;
-        *)
-          shift 1
-          for i in "$@"; do
-            $fmtutil --byfmt "$i" || rc=1
-          done
-          ;;
-      esac
-      ;;
-
-    mode-list)
-      setupModesMfFile
-      listMfModes
-      ;;
-
-    mode)
-      case $2 in
-        "")
-          echo "Usage: $progname mode MODE
-
-Valid MODE settings:"
-          setupModesMfFile
-          listMfModes | sed 's@ .*@@; s@^@  @' | myFmt
-          rc=1
-          ;;
-        *)
-          tcBatchMode=$2
-          setupModesMfFile
-          if checkElemInList $tcBatchMode `listMfModes | sed 's@ .*@@'`; then
-
-            # modify mktex.cnf
-            setupTmpDir
-            fmgrConfigReplace mktex.cnf '^: ..MODE=' ": \${MODE=$tcBatchMode}"
-            set x `getRes "$tcBatchMode"`; shift
-            tcBatchRes=$1
-            fmgrConfigReplace mktex.cnf '^: ..BDPI=' ": \${BDPI=$tcBatchRes}"
-
-            if checkForBinary dvips >/dev/null && tcfmgr --cmd find --file config.ps >/dev/null 2>&1; then
-              tcBatch dvips mode "$tcBatchMode"
-            fi
-            if checkForBinary pdftex >/dev/null && tcfmgr --cmd find --file pdftexconfig.tex >/dev/null 2>&1; then
-              tcBatch pdftex mode "$tcBatchMode"
-            fi
-          else
-            echo "$progname: unknown mode \`$tcBatchMode' specified as argument for \`$progname mode'" >&2; rc=1
-          fi
-          ;;
-      esac
-      ;;
-
-    paper)
-      help="Usage: $progname paper PAPER
-
-Valid PAPER settings:
-  letter a4"
-
-      p=$2; pXdvi=$2; pDvips=$2
-      case $2 in
-        letter)
-          pXdvi=us;;
-        a4)
-          pXdvi=a4;;
-        "") echo "$help" >&2; rc=1; return;;
-        *)
-          echo "$progname: unknown PAPER \`$2' given as argument for \`$progname paper'" >&2
-          echo "$progname: try \`$progname paper' for help" >&2
-          rc=1
-          return;;
-      esac
-      if checkForBinary dvips >/dev/null && tcfmgr --cmd find --file config.ps >/dev/null 2>&1; then
-        tcBatch dvips paper $pDvips
-      fi
-      if checkForBinary dvipdfm >/dev/null && tcfmgr --cmd find --file config >/dev/null 2>&1; then
-        tcBatch dvipdfm paper $p
-      fi
-      if checkForBinary dvipdfmx >/dev/null && tcfmgr --cmd find --file dvipdfmx.cfg >/dev/null 2>&1; then
-        tcBatch dvipdfmx paper $p
-      fi
-      if checkForBinary xdvi >/dev/null && tcfmgr --cmd find --file XDvi >/dev/null 2>&1; then
-        tcBatch xdvi paper $pXdvi
-      fi
-      if checkForBinary pdftex >/dev/null && tcfmgr --cmd find --file pdftexconfig.tex >/dev/null 2>&1; then
-        tcBatch pdftex paper $p
-      fi
-      ;;
-
-    pdftex)
-      help="Usage: $progname pdftex paper PAPER
-
-Valid PAPER settings:
-  a4 letter"
-      case $2 in
-
-        mode)
-          case $3 in
-            "")
-              echo "Usage: $progname pdftex mode MODE"
-              rc=1
-              ;;
-            *)
-              tcBatchPdftexMode=$3
-              setupTmpDir
-              setupModesMfFile
-              if checkElemInList "$tcBatchPdftexMode" `listMfModes | sed 's@ .*@@'`; then
-                set x `getRes "$tcBatchPdftexMode"`; shift
-                fmgrConfigReplace pdftexconfig.tex 'pdfpkresolution' "\\pdfpkresolution=$1"
-                if $fmgrConfigReplaceChanged; then
-                  fmtutil --refresh
-                fi
-              else
-                echo "$progname: unknown MODE \`$tcBatchPdftexMode' given as argument for \`$progname pdftex mode'" >&2
-                rc=1
-              fi
-              ;;
-          esac
-          ;;
-
-        paper)
-          case $3 in
-            letter)
-              w="8.5 true in"; h="11 true in"
-              setupTmpDir
-              fmgrConfigReplace pdftexconfig.tex pdfpagewidth '\pdfpagewidth='"$w"
-              wChanged=$fmgrConfigReplaceChanged
-              fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$h"
-              if $wChanged || $fmgrConfigReplaceChanged; then
-                fmtutil --refresh
-              fi
-              ;;
-            a4)
-              w="210 true mm"; h="297 true mm"
-              fmgrConfigReplace pdftexconfig.tex pdfpagewidth '\pdfpagewidth='"$w"
-              wChanged=$fmgrConfigReplaceChanged
-              fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$h"
-              if $wChanged || $fmgrConfigReplaceChanged; then
-                fmtutil --refresh
-              fi
-              ;;
-            "") echo "$help" >&2; rc=1;;
-            *)
-             echo "$progname: unknown PAPER \`$3' given as argument for \`$progname pdftex paper'" >&2
-             echo "$progname: try \`$progname pdftex paper' for help" >&2
-             rc=1 ;;
-          esac ;;
-        "")
-          echo "$help" >&2; rc=1;;
-        *)
-          echo "$progname: unknown option \`$2' given as argument for \`$progname pdftex'" >&2
-          echo "$progname: try \`$progname pdftex' for help" >&2
-          rc=1
-          ;;
-      esac
-      ;;
-
-    rehash)
-      mktexlsr
-      ;;
-    
-    # 
-    version|--version)
-      echo "$progname version $version"
-      setupTexmfmain
-      setupTexmfdist
-      showDistVersionInfo
-      (exit 0); exit 0;;
-
-    # handle "xdvi paper PAPER"
-    xdvi)
-      tcBatchXdviPapers='us           "8.5x11"
-usr          "11x8.5"
-legal        "8.5x14"
-foolscap     "13.5x17.0"
-a1           "59.4x84.0cm"
-a2           "42.0x59.4cm"
-a3           "29.7x42.0cm"
-a4           "21.0x29.7cm"
-a5           "14.85x21.0cm"
-a6           "10.5x14.85cm"
-a7           "7.42x10.5cm"
-a1r          "84.0x59.4cm"
-a2r          "59.4x42.0cm"
-a3r          "42.0x29.7cm"
-a4r          "29.7x21.0cm"
-a5r          "21.0x14.85cm"
-a6r          "14.85x10.5cm"
-a7r          "10.5x7.42cm"
-b1           "70.6x100.0cm"
-b2           "50.0x70.6cm"
-b3           "35.3x50.0cm"
-b4           "25.0x35.3cm"
-b5           "17.6x25.0cm"
-b6           "13.5x17.6cm"
-b7           "8.8x13.5cm"
-b1r          "100.0x70.6cm"
-b2r          "70.6x50.0cm"
-b3r          "50.0x35.3cm"
-b4r          "35.3x25.0cm"
-b5r          "25.0x17.6cm"
-b6r          "17.6x13.5cm"
-b7r          "13.5x8.8cm"
-c1           "64.8x91.6cm"
-c2           "45.8x64.8cm"
-c3           "32.4x45.8cm"
-c4           "22.9x32.4cm"
-c5           "16.2x22.9cm"
-c6           "11.46x16.2cm"
-c7           "8.1x11.46cm"
-c1r          "91.6x64.8cm"
-c2r          "64.8x45.8cm"
-c3r          "45.8x32.4cm"
-c4r          "32.4x22.9cm"
-c5r          "22.9x16.2cm"
-c6r          "16.2x11.46cm"
-c7r          "11.46x8.1cm"'
-      help="Usage: $progname xdvi paper PAPER
-
-Valid PAPER settings:
-  a1 a1r a2 a2r a3 a3r a4 a4r a5 a5r a6 a6r a7 a7r
-  b1 b1r b2 b2r b3 b3r b4 b4r b5 b5r b6 b6r b7 b7r
-  c1 c1r c2 c2r c3 c3r c4 c4r c5 c5r c6 c6r c7 c7r
-  foolscap legal us usr"
-      case $2 in
-        paper-list)
-          echo "$tcBatchXdviPapers"
-          ;;
-        paper)
-          case $3 in
-            a1|a1r|a2|a2r|a3|a3r|a4|a4r|a5|a5r|a6|a6r|a7|a7r|b1|b1r|b2|b2r|b3|b3r|b4|b4r|b5|b5r|b6|b6r|b7|b7r|c1|c1r|c2|c2r|c3|c3r|c4|c4r|c5|c5r|c6|c6r|c7|c7r|foolscap|legal|us|usr)
-              fmgrConfigReplace XDvi paper: "*paper: $3"
-              ;;
-            "") echo "$help" >&2; rc=1;;
-            *)
-             echo "$progname: unknown PAPER \`$3' given as argument for \`$progname xdvi paper'" >&2
-             echo "$progname: try \`$progname xdvi paper' for help" >&2
-             rc=1 ;;
-          esac ;;
-        "")
-          echo "$help" >&2; rc=1;;
-        *)
-          echo "$progname: unknown option \`$2' given as argument for \`$progname xdvi'" >&2
-          echo "$progname: try \`$progname xdvi' for help" >&2
-          rc=1
-          ;;
-      esac
-      ;;
-    *)
-      echo "$progname: unknown option \`$1' given as argument for \`$progname'" >&2
-      echo "$progname: try \`$progname help' for help" >&2
-      rc=1
-  esac
-}
-
-###############################################################################
-# tcInteractive(void)
-#   handle interactive mode
-###############################################################################
-tcInteractive()
-{
-  texconfig-dialog
-}
-
-###############################################################################
-# main()
-###############################################################################
-rc=0
-case $# in
-  0) tcInteractive;;
-  *) tcBatch "$@";;
-esac
-
-cleanup $rc
diff --git a/Master/bin/i386-linux/texconfig-dialog b/Master/bin/i386-linux/texconfig-dialog
deleted file mode 100755
index 76e1f51eea6..00000000000
--- a/Master/bin/i386-linux/texconfig-dialog
+++ /dev/null
@@ -1,495 +0,0 @@
-#!/bin/sh
-
-# TeX-Config version 3.0
-# Thomas Esser, te@dbs.uni-hannover.de. Public domain.
-
-# invoke the right shell:
-
-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
-
-export PATH
-
-# hack around a bug in zsh:
-test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
-
-# the version string
-version=1112981053 # seconds since `00:00:00 1970-01-01 UTC'
-                   # date '+%s' (with GNU date)
-
-: ${PAGER=more}
-progname=texconfig-dialog
-tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/tcdtmp.$$
-log=$tmpdir/log
-tmpmenu=$tmpdir/tmpmenu
-needsCleanup=false
-
-###############################################################################
-# cleanup()
-#   clean up the temp area and exit with proper exit status
-###############################################################################
-cleanup()
-{
-  rc=$1
-  $needsCleanup && test -n "$tmpdir" && test -d "$tmpdir" \
-    && { cd / && rm -rf "$tmpdir"; }
-  termCtl reset
-  (exit $rc); exit $rc
-}
-
-###############################################################################
-# setupTmpDir()
-#   set up a temp directory and a trap to remove it
-###############################################################################
-setupTmpDir()
-{
-  case $needsCleanup in
-    true) return;;
-  esac
-
-  trap 'cleanup 1' 1 2 3 7 13 15
-  needsCleanup=true
-  (umask 077; mkdir "$tmpdir") \
-    || abort "could not create directory \`$tmpdir'"
-}
-
-###############################################################################
-# abort(errmsg)
-#   print `errmsg' to stderr and exit with error code 1
-###############################################################################
-abort()
-{
-  echo "$progname: $1." >&2
-  cleanup 1
-}
-
-logexec()
-{
-  (echo; echo ">>> Executing \`$@' <<<") >> $log
-  "$@" 2>&1 | tee -a $log
-}
-
-###############################################################################
-# runDialog(args, ...)
-#   execute the right dialog program with the right default parameters
-###############################################################################
-runDialog()
-{
-  termCtl clear
-  if test -n "$DIALOG_PROG"; then
-    $DIALOG_PROG --title "TeX setup utility" ${1+"$@"}
-    runDialogRc=$?
-  else
-    TERM=$DIALOG_TERM TERMINFO=$DIALOG_TERMINFO \
-      tcdialog --title "TeX setup utility" ${1+"$@"}
-    runDialogRc=$?
-  fi
-  termCtl clear
-  (exit $runDialogRc)
-  return $runDialogRc
-}
-
-###############################################################################
-# findDialog(void)
-#   Some systems have their own dialog. Use it then and do not use
-#   faked TERM and TERMINFO variables when calling that dialog.
-###############################################################################
-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
-  case $DIALOG_PROG in
-    "") 
-      : ${DIALOG_TERMINFO=$TEXMFMAIN/texconfig}
-      : ${DIALOG_TERM=generic}
-  esac
-}
-
-###############################################################################
-# mktexdir(args)
-#   call mktexdir script, disable all features (to prevent sticky directories)
-###############################################################################
-mktexdir()
-{
-  MT_FEATURES=none "$TEXMFMAIN/web2c/mktexdir" "$@" >&2
-}
-
-###############################################################################
-# termCtl(arg)
-#   some convenience utilities for terminal control
-###############################################################################
-termCtl()
-{
-  case $1 in
-    clear)
-      test -n "$NO_CLEAR" && return
-      tty >/dev/null 2>&1 && clear
-      ;;
-    reset)
-      test -n "$NO_CLEAR" && return
-      reset 2>/dev/null
-      stty sane 2>/dev/null
-      reset 2>/dev/null
-      termCtl clear
-      ;;
-    readln)
-      echo
-      echo "press return to continue..."
-      read a
-      ;;
-  esac
-}
-
-###############################################################################
-# menuMain(void)
-#   the main menu
-###############################################################################
-menuMain()
-{
-  cat <<-'eof'
-	The interactive texconfig utility will be started now. Make sure
-	your screen has at least 24 rows and 80 columns. If texconfig
-	crashes now, you can still set up your teTeX system using the
-	batch mode of texconfig.  Try 'texconfig help' to get a list
-	of options.
-
-	The interactive mode works best with a real vt100 terminal or
-	inside an xterm window.
-eof
-  termCtl readln
-
-  while :; do
-    logMessage='view logfile'
-
-    runDialog \
-      --menu "
-Hint: all output of external commands (e.g. tex) is logged into
-a file. You can look at this file using "LOG". If cursor keys make
-trouble, you may have more luck with +/- and TAB.
-" \
-      23 80 14 \
-      EXIT      'exit' \
-      PAPER     'default paper: A4 or letter (us)' \
-      MODE      'default metafont mode and resolution' \
-      REHASH    'rebuild filename databases' \
-      FORMATS   'edit format definitions' \
-      HYPHENATION   'customize hyphenation' \
-      DVIPS     'dvips configuration' \
-      FAQ       'view frequently asked questions + answers' \
-      CONF      'show configuration' \
-      LOG       "$logMessage" \
-      2>"$tmpmenu" || break
-    
-    case `cat "$tmpmenu"` in
-      EXIT)
-        break
-        ;;
-      PAPER)
-        menuPaper
-        ;;
-      MODE)
-        menuMode
-        ;;
-      REHASH)
-        logexec texconfig rehash
-        termCtl readln
-        ;;
-      FORMATS)
-        texconfig formats
-        termCtl readln
-        ;;
-      HYPHENATION)
-        menuHyphenation
-        ;;
-      DVIPS)
-        menuDvips
-        ;;
-      FAQ)
-        texconfig faq
-        termCtl readln
-        ;;
-      CONF)
-        logexec texconfig conf
-        termCtl readln
-        ;;
-      LOG)
-        <"$log" eval $PAGER
-        termCtl readln
-        ;;
-    esac
-  done
-}
-
-menuGetMode()
-{
-  # we need eval to get the command line right... :-(
-  eval \
-    runDialog \
-      --menu \""
-Chosse a mode to be used when metafont generates font bitmaps. The resolution is the most important point, but there might
-be differences between modes of the same resolution. See the comments in the file modes.mf for more details.
-\"" \
-      23 80 14 \
-      `texconfig mode-list` 2>"$tmpmenu"
-}
-
-menuMode()
-{
-  menuGetMode
-  mode=`cat "$tmpmenu"`
-
-  if test -n "$mode"; then
-    logexec texconfig mode "$mode"
-    termCtl readln
-  fi
-}
-
-menuDvips()
-{
-  menuDvipsDest=ps
-
-  while :; do
-    case $menuDvipsDest in
-      ps)
-        menuDvipsPrinterOpt=
-        menuDvipsMsg="
-dvips GLOBAL section. Define the most common default settings (config.ps).
-To define settings for a specific printer, first ADD a printer definition,
-then CHANGE it.
-"
-        ;;
-      *)
-        menuDvipsPrinterOpt="-P $menuDvipsDest"
-        menuDvipsMsg="
-dvips settings for printer $menuDvipsDest (config.$menuDvipsDest). Define
-local settings for this printer. To switch back to global settings mode,
-select GLOBAL.
-"
-        ;;
-    esac
-
-    runDialog \
-      --menu "$menuDvipsMsg
-You can use dvips for non PostScript printers, if you can setup your
-printing system to convert PostScript to a format that your printer can
-handle. Maybe, you can use GhostScript to do the conversion (if your
-printer is supported)." \
-      23 80 9 \
-      RETURN	'back to the main menu' \
-      DEST      'define default destination of the generated Postscript' \
-      MODE      'change metafont mode/resolution' \
-      OFFSET    'shift output by some offset' \
-      PAPER     'define the default paper' \
-      GLOBAL	'change global settings (config.ps)' \
-      CHANGE	'change printer settings (config.$PRINTER)' \
-      ADD	'add a printer configuration' \
-      DEL	'remove a printer configuration' \
-        2>"$tmpmenu" || break
-
-    menuDvipsAns=`cat "$tmpmenu"`
-    case $menuDvipsAns in
-      RETURN)
-        break
-        ;;
-      DEST)
-        runDialog --inputbox "Enter the command to print.
-
-In general, you need a command like 'lpr' or 'lpr -Pfoo'.
-
-NOTE: If you just press return, printing will be disabled and the output saved to a file by default.
-" 23 80 2>"$tmpmenu"
-        if test $? = 0; then
-          menuDvipsAns=`cat "$tmpmenu"`
-          case $menuDvipsAns in
-            "")
-              menuDvipsPrintOpt=-
-              ;;
-            *)
-              menuDvipsPrintOpt=$menuDvipsAns
-              ;;
-          esac
-          logexec texconfig dvips $menuDvipsPrinterOpt printcmd "$menuDvipsPrintOpt"
-          termCtl readln
-        fi
-        ;;
-      MODE)
-        menuGetMode
-        mode=`cat "$tmpmenu"`
-  
-        if test -n "$mode"; then
-          logexec texconfig dvips $menuDvipsPrinterOpt mode "$mode"
-          termCtl readln
-        fi
-        ;;
-      OFFSET)
-        runDialog --inputbox "Enter a dimension pair (a rightwards offset and a downwards
-offset), e.g. 2mm,-0.5in (right 2mm and up .5in):" 23 80 2>"$tmpmenu"; menuDvipsAns=`cat "$tmpmenu"`
-        case $menuDvipsAns in
-          "") : ;;
-          *)
-            logexec texconfig dvips $menuDvipsPrinterOpt offset "$menuDvipsAns"
-            termCtl readln
-            ;;
-        esac
-        ;;
-      PAPER)
-        eval runDialog \
-          --menu \'\\n\\nChoose the default papersize definition for dvips.\\n\\n\' \
-          23 80 8 `texconfig dvips paper-list` \
-          2>"$tmpmenu"
-        paper=`cat "$tmpmenu"`
-        if test -n "$paper"; then
-          logexec texconfig dvips paper "$paper"
-          termCtl readln
-        fi
-        ;;
-      GLOBAL)
-        menuDvipsDest=ps
-        ;;
-      CHANGE)
-        runDialog --inputbox "Printer name (for future settings of DEST / MODE / OFFSET)" 23 80 2>"$tmpmenu"
-        menuDvipsAns=`cat $tmpmenu`
-        case $menuDvipsAns in
-          "") : ;;
-          *)  menuDvipsDest=$menuDvipsAns;;
-        esac
-        ;;
-      ADD)
-        runDialog --inputbox "Printer name (for printer to add)" 23 80 2>"$tmpmenu"
-        menuDvipsAns=`cat $tmpmenu`
-        case $menuDvipsAns in
-          "") : ;;
-          *)
-            logexec texconfig dvips add $menuDvipsAns
-            termCtl readln
-            ;;
-        esac
-        ;;
-      DEL)
-        runDialog --inputbox "Printer name (for printer to delete)" 23 80 2>"$tmpmenu"
-        menuDvipsAns=`cat $tmpmenu`
-        case $menuDvipsAns in
-          "") : ;;
-          *)
-	    logexec texconfig dvips del $menuDvipsAns
-            termCtl readln
-            ;;
-        esac
-        ;;
-    esac
-  done
-}
-
-menuPaper()
-{
-  runDialog \
-    --menu "
-Select your default paper format.
-" \
-    23 80 14 \
-    RETURN 'return to the main menu' \
-    A4	'ISO A4 (210x297mm)' \
-    LETTER 'US (8.5x11in)' 2>"$tmpmenu"
-
-  p=`cat "$tmpmenu"`
-  case $p in
-    A4)
-      logexec texconfig paper a4
-      termCtl readln
-      ;;
-    LETTER)
-      logexec texconfig paper letter
-      termCtl readln
-      ;;
-  esac
-}
-
-menuHyphenation()
-{
-  runDialog \
-    --menu "
-Choose format to set up hyphenation for.
-" \
-    23 80 14 \
-    `texconfig hyphen-list | sed 's@\(.*\)@\1 \1@'`  2>"$tmpmenu"
-  p=`cat "$tmpmenu"`
-  case $p in
-    "")
-      return
-      ;;
-    *)
-      texconfig hyphen "$p"
-      termCtl readln
-  esac
-}
-
-# main()
-
-case $1 in
-  help|--help)
-    cat <<-eof
-	Usage: $progname [--help|--version]
-eof
-    exit 0
-    ;;
-  --version)
-    cat <<-eof
-	$progname version $version.
-eof
-    exit 0
-    ;;
-esac
-
-
-: ${TEXMFCONFIG=`kpsewhich -var-value=TEXMFCONFIG`}
-: ${TEXMFVAR=`kpsewhich -var-value=TEXMFVAR`}
-: ${TEXMFMAIN=`kpsewhich -var-value=TEXMFMAIN`}
-export TEXMFCONFIG TEXMFVAR TEXMFMAIN
-
-setupTmpDir
-echo "$progname: started `date`" > $log
-findDialog
-
-test -d "$TEXMFCONFIG" \
-  || mktexdir "$TEXMFCONFIG" >/dev/null 2>&1 \
-  || echo "$progname: directory \`$TEXMFCONFIG' (from TEXMFCONFIG variable) does not exist and cannot be created" >&2
-
-canWriteConfig=false
-if test -d "$TEXMFCONFIG"; then
-  if test -w "$TEXMFCONFIG"; then
-    canWriteConfig=true
-  else
-    echo "$progname: directory \`$TEXMFCONFIG' (from TEXMFCONFIG variable) is not writable."
-    echo "$progname: configuration data cannot be changed." >&2
-  fi
-fi
-
-test -d "$TEXMFVAR" \
-  || mktexdir "$TEXMFVAR" >/dev/null 2>&1 \
-  || echo "$progname: directory \`$TEXMFVAR' (from TEXMFVAR variable) does not exist and cannot be created" >&2
-
-canWriteVardata=false
-if test -d "$TEXMFVAR"; then
-  if test -w "$TEXMFVAR"; then
-    canWriteVardata=true
-  else
-    echo "$progname: directory \`$TEXMFVAR' (from TEXMFVAR variable) is not writable."
-    echo "$progname: cached variable runtime data files cannot be written." >&2
-  fi
-fi
-
-menuMain
-cleanup 0
diff --git a/Master/bin/i386-linux/texconfig-sys b/Master/bin/i386-linux/texconfig-sys
deleted file mode 100755
index a67854789c4..00000000000
--- a/Master/bin/i386-linux/texconfig-sys
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-# $Id$
-
-# texconfig-sys: Thomas Esser, public domain.
-
-# wrapper script for texconfig with TEXMFVAR and TEXMFCONFIG set to
-#   TEXMFSYSVAR / TEXMFSYSCONFIG
-
-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
-
-export PATH
-
-# hack around a bug in zsh:
-test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
-
-v=`kpsewhich -var-value TEXMFSYSVAR`
-c=`kpsewhich -var-value TEXMFSYSCONFIG`
-
-TEXMFVAR="$v"
-TEXMFCONFIG="$c"
-texconfig_sys=1
-export TEXMFVAR TEXMFCONFIG
-
-exec texconfig ${1+"$@"}
diff --git a/Master/bin/i386-linux/texcount b/Master/bin/i386-linux/texcount
deleted file mode 120000
index dedfa7d2c3e..00000000000
--- a/Master/bin/i386-linux/texcount
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/scripts/texcount/TeXcount.pl
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/texdoc b/Master/bin/i386-linux/texdoc
deleted file mode 100755
index f66b3c855de..00000000000
--- a/Master/bin/i386-linux/texdoc
+++ /dev/null
@@ -1,206 +0,0 @@
-#!/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
diff --git a/Master/bin/i386-linux/texdoctk b/Master/bin/i386-linux/texdoctk
deleted file mode 120000
index 56729104154..00000000000
--- a/Master/bin/i386-linux/texdoctk
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf/scripts/tetex/texdoctk.pl
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/texexec b/Master/bin/i386-linux/texexec
deleted file mode 100755
index 2158172906a..00000000000
--- a/Master/bin/i386-linux/texexec
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-texmfstart texexec.rb "$@"
diff --git a/Master/bin/i386-linux/texfont b/Master/bin/i386-linux/texfont
deleted file mode 100755
index a91f786e3f8..00000000000
--- a/Master/bin/i386-linux/texfont
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-texmfstart texfont.pl "$@"
diff --git a/Master/bin/i386-linux/texhash b/Master/bin/i386-linux/texhash
deleted file mode 120000
index fe296c273bb..00000000000
--- a/Master/bin/i386-linux/texhash
+++ /dev/null
@@ -1 +0,0 @@
-mktexlsr
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/texi2dvi b/Master/bin/i386-linux/texi2dvi
deleted file mode 100755
index 18f6f59322b..00000000000
--- a/Master/bin/i386-linux/texi2dvi
+++ /dev/null
@@ -1,836 +0,0 @@
-#! /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 $
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
-# 2002, 2003, 2004, 2005 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.
-#
-# 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, 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.
-#
-# Original author: Noah Friedman.
-#
-# Please send bug reports, etc. to bug-texinfo@gnu.org.
-# If possible, please send a copy of the output of the script called with
-# the `--debug' option when making a bug report.
-
-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
-
-# This string is expanded by rcs automatically when this file is checked out.
-rcs_revision='$Revision: 1.42 $'
-rcs_version=`set - $rcs_revision; echo $2`
-program=`echo $0 | sed -e 's!.*/!!'`
-version="texi2dvi (GNU Texinfo 4.8) $rcs_version
-
-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."
-
-usage="Usage: $program [OPTION]... FILE...
-
-Run each Texinfo or LaTeX 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).
-
-Makeinfo is used to perform Texinfo macro expansion before running TeX
-when needed.
-
-Operation modes:
-  -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
-  -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
-
-The values of the BIBTEX, LATEX (or PDFLATEX), MAKEINDEX, MAKEINFO,
-TEX (or PDFTEX), TEXINDEX, and THUMBPDF environment variables are used
-to run those commands, if they are set.  Any CMD strings are added
-after @setfilename for Texinfo input, in the first line for LaTeX input.
-
-Email bug reports to <bug-texinfo@gnu.org>,
-general questions and discussion to <help-texinfo@gnu.org>.
-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='\'
-expand=         # t for expansion via makeinfo
-miincludes=     # makeinfo include path
-oformat=dvi
-oname=          # --output
-quiet=          # by default let the tools' message be displayed
-recode=false
-set_language=
-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
-
-orig_pwd=`pwd`
-
-# 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
-  path_sep=";"
-else
-  path_sep=":"
-fi
-
-# Pacify verbose cds.
-CDPATH=${ZSH_VERSION+.}$path_sep
-
-# In case someone crazy insists on using grep -E.
-: ${EGREP=egrep}
-
-# return true if program $1 is somewhere in PATH, else false.
-#
-findprog ()
-{
-  foundprog=false
-
-  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      
-    fi
-  done
-  IFS=$saveIFS
-  $foundprog
-}
-
-# Report some information.
-report ()
-{
-  for i in "$@"
-  do
-    echo >&2 "$0: $i"
-  done
-}
-
-# Report some verbose information.
-verbose ()
-{
-  $verb >&2 "$0: $@"
-}
-
-# Report an error and exit with failure.
-fatal ()
-{
-  s=$1
-  shift
-  report "$@"
-  exit $s
-}
-
-# Save TEXINPUTS so we can construct a new TEXINPUTS path for each file.
-# Likewise for bibtex and makeindex.
-tex_envvars="BIBINPUTS BSTINPUTS INDEXSTYLE TEXINPUTS"
-for var in $tex_envvars; do
-  eval ${var}_orig=\$$var
-  export $var
-done
-
-
-# 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
-# Solaris set - turns off set -x (but keeps set -e).
-# Use ${1+"$@"} rather than "$@" because Digital Unix and Ultrix 4.3
-# still expand "$@" to a single argument (the empty string) rather
-# than nothing at all.
-arg_sep="$$--$$"
-set dummy ${1+"$@"} "$arg_sep"; shift
-
-# 
-# Parse command line arguments.
-while test x"$1" != x"$arg_sep"; do
-
-  # Handle --option=value by splitting apart and putting back on argv.
-  case "$1" in
-    --*=*)
-      opt=`echo "$1" | sed -e 's/=.*//'`
-      val=`echo "$1" | sed -e 's/[^=]*=//'`
-      shift
-      set dummy "$opt" "$val" ${1+"$@"}; shift
-      ;;
-  esac
-
-  # This recognizes --quark as --quiet.  So what.
-  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;;
-    -I | --I*)
-      shift
-      miincludes="$miincludes -I $1"
-      txincludes="$txincludes$1$path_sep"
-      ;;
-    -l | --l*) shift; set_language=$1;;
-    -o | --o*)
-      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\\
-"`echo "$1" | sed 's/\\\\/\\\\\\\\/g'`;;
-    -v | --vers*) echo "$version"; exit 0;;
-    -V | --verb*) verb=echo;;
-    --) # What remains are not options.
-      shift
-      while test x"$1" != x"$arg_sep"; do
-        set dummy ${1+"$@"} "$1"; shift
-        shift
-      done
-      break;;
-    -*)
-      fatal 1 "Unknown or ambiguous option \`$1'." \
-              "Try \`--help' for more information."
-      ;;
-    *) set dummy ${1+"$@"} "$1"; shift;;
-   esac
-   shift
-done
-# Pop the token
-shift
-
-# Interpret remaining command line args as filenames.
-case $# in
- 0)
-  fatal 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."
-  fi
-  ;;
-esac
-
-
-# We can't do much without tex.
-#
-if findprog ${TEX:-tex}; then :; else cat <<EOM
-You don't have a working TeX binary (${TEX:-tex}) installed anywhere in
-your PATH, and texi2dvi cannot proceed without one.  If you want to use
-this script, you'll need to install TeX (if you don't have it) or change
-your PATH or TEX environment variable (if you do).  See the --help
-output for more details.
-
-For information about obtaining TeX, please see http://www.tug.org.  If
-you happen to be using Debian, you can get it with this command:
-  apt-get install tetex-bin
-EOM
-  exit 1
-fi
-
-
-# We want to use etex (or pdftex) if they are available, and the user
-# didn't explicitly specify.  We don't check for elatex and pdfelatex
-# because (as of 2003), the LaTeX team has asked that new distributions
-# use etex by default anyway.
-#
-# End up with the TEX and PDFTEX variables set to what we are going to use.
-if test -z "$TEX"; then
-  if findprog etex; then TEX=etex; else TEX=tex; fi
-fi
-#
-if test -z "$PDFTEX"; then
-  if findprog pdfetex; then PDFTEX=pdfetex; else PDFTEX=pdftex; fi
-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)
-# 2 standard error
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 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
-  exec 5>/dev/null
-else
-  exec 5>&1
-fi
-
-# Enable tracing
-if test "$debug" = t; then
-  exec 6>&1
-  set -x
-else
-  exec 6>/dev/null
-fi
-
-# 
-# TeXify files.
-
-for command_line_filename in ${1+"$@"}; do
-  verbose "Processing $command_line_filename ..."
-
-  # 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.
-  echo "$command_line_filename" | $EGREP '^(/|[A-z]:/)' >&6 \
-  || command_line_filename="./$command_line_filename"
-
-  # See if the file exists.  If it doesn't we're in trouble since, even
-  # 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
-  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"`
-  # 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
-
-  # 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
-
-  # 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
-  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
-  fi
-
-  # 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
-
-  # 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
-
-  # 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
-  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
-
-
-  # 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
-
-  # 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
-done
-
-verbose "done."
-exit 0 # exit successfully, not however we ended the loop.
diff --git a/Master/bin/i386-linux/texi2html b/Master/bin/i386-linux/texi2html
deleted file mode 100755
index eea8b0fbe50..00000000000
--- a/Master/bin/i386-linux/texi2html
+++ /dev/null
@@ -1,17536 +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 = '/home/fmorel/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 ('/home/fmorel/Build/source/inst' ne '@' . 'datadir@')
-{
-    $pkgdatadir = eval '"/home/fmorel/Build/source/inst/texi2html"';
-    $datadir = eval '"/home/fmorel/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/i386-linux/texi2pdf b/Master/bin/i386-linux/texi2pdf
deleted file mode 100755
index 492128325db..00000000000
--- a/Master/bin/i386-linux/texi2pdf
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-# $Id: texi2pdf,v 1.1 2004/07/11 01:02:35 karl Exp $
-# Written by Thomas Esser.  Public domain.
-# Execute texi2dvi --pdf.
-
-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+"$@"}'='"$@"'
-
-texi2dvi --pdf ${1+"$@"}
diff --git a/Master/bin/i386-linux/texindex b/Master/bin/i386-linux/texindex
deleted file mode 100755
index 06fdbedb7ca..00000000000
--- a/Master/bin/i386-linux/texindex
+++ /dev/null
diff --git a/Master/bin/i386-linux/texlinks b/Master/bin/i386-linux/texlinks
deleted file mode 100755
index bfe1b75db16..00000000000
--- a/Master/bin/i386-linux/texlinks
+++ /dev/null
@@ -1,322 +0,0 @@
-#!/bin/sh
-
-# Thomas Esser, 1999, 2002, 2003. public domain.
-
-# texlinks: script to maintain symlinks from format to engine. Interprets
-# the lines given in fmtutil.cnf.
-
-# History:
-#   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
-#       honor $TMPDIR, $TEMP and $TMP, not just $TMP
-#   Mon May 10 20:52:48 CEST 2004
-#       kpseaccess instead of access
-#   Thu Dec 25 22:11:53 CET 2003, te:
-#       add version string
-#   Tue Apr  9 22:46:34 CEST 2002, te:
-#       do not create symlinks for cont-??, metafun and mptopdf
-
-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
-
-# hack around a bug in zsh:
-test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
-
-cnf=fmtutil.cnf   # name of the config file
-version=1192147136 # seconds since `00:00:00 1970-01-01 UTC'
-                   # date '+%s' (with GNU date)
-progname=texlinks
-
-usage='Usage: texlinks [OPTION]... [DIRECTORY]...
-
-Create symbolic links format -> engine according to fmtutil setup.
-
-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)
-  -s, --silent         silently skip existing scripts / binaries
-                        (default: issue warning)
-  -u, --unlink	       remove symlinks created by texlinks
-
-The DIRECTORY arguments are an optional list of directories in which to
-operate.  If no directories are specified the list of directories
-depends on the --multiplatform option.
-
-Report bugs to tex-k@tug.org.'
-
-###############################################################################
-# abort(errmsg)
-#   print `errmsg' to stderr and exit with error code 1
-###############################################################################
-abort() { errmsg "texlinks: $1."; cleanup 1; }
-
-# error message to stderr:
-errmsg() { echo "$@" >&2; }
-
-# give message to stderr only if "verbose" mode is on:
-verbose_echo() { $verbose && errmsg "$@"; }
-
-# in verbose mode: show command that is executed:
-verbose_do() { verbose_echo "$@"; "$@"; }
-
-###############################################################################
-# cleanup()
-#   clean up the temp area and exit with proper exit status
-###############################################################################
-cleanup()
-{
-  rc=$1
-  $needsCleanup && test -n "$tmpdir" && test -d "$tmpdir" \
-    && { rm -f "$tmpdir"/*; cd /; rmdir "$tmpdir"; }
-  exit $rc
-}
-
-###############################################################################
-# setupTmpDir()
-#   set up a temp directory and a trap to remove it
-###############################################################################
-setupTmpDir()
-{
-  $needsCleanup && return
-
-  trap 'cleanup 1' 1 2 3 7 13 15
-  needsCleanup=true
-  (umask 077; mkdir "$tmpdir") \
-    || abort "could not create directory \`$tmpdir'"
-}
-
-
-# search a binary along $PATH:
-check_for_binary()
-{
-  testbin=$1
-  set x `echo "$PATH" | sed 's/^:/.:/; s/:$/:./; s/::/:.:/g; s/:/ /g'`; shift
-  for i
-  do
-    if [ -x "$i/$testbin" ]; then
-      echo "$i/$testbin"
-      return 0
-    fi
-  done
-  return 1
-}
-
-
-###############################################################################
-# install_link(dest src)
-#   create a symlink like ln -s dest src, but make sure that src is not
-#   an existing binary
-###############################################################################
-install_link()
-{
-  # make symlink    src -> dest
-  dest=$1; src=$2
-
-  case $src in
-    */mf)
-      if test "$dest" = mf-nowin; then
-        if test -f $selfautoloc/mfw; then
-          dest=mfw  # name for windows-enabled mf, once upon a time
-          verbose_echo "both mfw and mf-nowin exists, $src linked to $dest"
-        fi
-        if test -f $selfautoloc/mf && test -f $selfautoloc/mf-nowin; then
-          # have both mf and mf-nowin binaries.  no link.
-          verbose_echo "skipped metafont symlink $src -> $dest (special case)"
-          return
-        fi
-      fi
-      ;;
-  esac
-
-  case $src in
-    */cont-??|*/metafun|*/mptopdf)
-      verbose_echo "skipped ConTeXtish symlink $src -> $dest (special case)"
-      ;;
-    *)
-      test "x$src" != "x`(ls -ld $src | awk '{print $NF}') 2>/dev/null`" &&
-        verbose_do rm -f "$src"
-  
-      if test -f "$src"; then
-        case $silent in
-          true)
-            ;;
-          *)
-            errmsg "install_link $src -> $dest failed: file already exists."
-            ;;
-        esac
-      else
-        verbose_do ln -s "$dest" "$src"
-      fi
-      ;;
-   esac
-}
-
-###############################################################################
-# search_symlinkdir()
-#   look if $PATH has only symlinks to the real binaries and find that
-#   directory. Also check if this directory is writable.
-###############################################################################
-search_symlinkdir()
-{
-  kpsewhich=`check_for_binary kpsewhich`
-  test -z "$kpsewhich" && return 1
-  symlinkdir=`echo $kpsewhich | sed 's@/*kpsewhich$@@'`
-  kpseaccess -w "$symlinkdir" || return 1
-  touch "$symlinkdir/tl$$"
-  if test -f "$selfautoloc/tl$$"; then
-    rm -f "$symlinkdir/tl$$"
-    return 1
-  else
-    rm -f "$symlinkdir/tl$$"
-    return 0
-  fi
-}
-
-###############################################################################
-# upd_symlinkdir()
-#   if $PATH has only symlinks to the real binaries, update that directory
-#   that holds the symlinks
-###############################################################################
-upd_symlinkdir()
-{
-  search_symlinkdir || return 0
-  for i in `sed 's@ .*@@' cnf_file_ln.$$`; do
-    install_link "$selfautoloc/$i" "$symlinkdir/$i"
-  done
-}
-
-###############################################################################
-# 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
-###############################################################################
-main()
-{
-  cnf_file=    # global variable: full name of the config file
-  dirs=
-  needsCleanup=false
-
-  multiplatform=false
-  verbose=false
-  unlink=false
-  silent=false
-  thisdir=`pwd`
-  : ${KPSE_DOT=$thisdir}; export KPSE_DOT
-  selfautoloc=`kpsewhich --expand-var='$SELFAUTOLOC'`
-  while 
-    case $1 in
-      --h*|-h)
-          echo "$usage"; exit 0;;
-      --version)
-          echo "$progname version $version."; exit 0;;
-      --cnffile|-f)
-          shift; cnf_file=$1;;
-      --v*|-v) verbose=true;;
-      --s*|-s) silent=true;;
-      --m*|-m) multiplatform=true;;
-      --u*|-u) unlink=true;;
-      -*) errmsg "fmtutil: unknown option \`$1' ignored.";;
-      *)  break;;
-    esac
-  do test $# -gt 0 && shift; done
-  dirs="$*"
-
-  # if no cnf_file from command-line, look it up with kpsewhich:
-  test -z "$cnf_file" && cnf_file=`kpsewhich --format='web2c files' $cnf`
-  test -f "$cnf_file" || abort "config file \`$cnf' not found"
-
-
-  tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/texlinks.$$
-  setupTmpDir
-  cd "$tmpdir" || cleanup 1
-
-  sed '/^[ 	]*#/d; /^[ 	]*$/d' $cnf_file \
-    | awk '{print $1, $2}' > cnf_file_ln.$$
-
-  if test -z "$dirs"; then
-    if test $multiplatform = true; then
-      case $selfautoloc in
-        */bin) dirs=$selfautoloc;;
-        *)     parent=`kpsewhich --expand-var='$SELFAUTODIR'`
-               dirs=`find $parent -type f -name kpsewhich -print \
-                       | sed 's@/kpsewhich$@@'`;;
-      esac
-    else
-      dirs=$selfautoloc
-    fi
-  fi
-  
-  for d in $dirs; do
-    kpseaccess -w $d \
-      || { errmsg "$d: no write permissions. Skipping..."; continue; }
-    # cnf_file_ln.$$ has lines with "format engine" pairs
-    set x `cat cnf_file_ln.$$`; shift
-    while test $# != 0; do
-      fmt=$1; engine=$2; shift; shift
-
-      # Some broken shells destroy the positional arguments when calling a
-      # shellfunction. Therefore, we save and restore them "by hand" in the
-      # main_args_while variable.
-      main_args_while="$@"
-
-      test "x$fmt" = "x$engine" && continue
-      if test -f "$d/$engine"; then
-        case $unlink in
-        true)
-          rm_link "$d/$fmt";;
-        *)
-          install_link "$engine" "$d/$fmt";;
-        esac
-      else
-        verbose_echo "skipped $d/$engine, engine does not exist"
-      fi
-
-      # restore positional arguments:
-      set x $main_args_while; shift
-
-    done
-  done
-  upd_symlinkdir
-}
-
-main ${1+"$@"}
-
-# set successful return code
-cleanup 0
diff --git a/Master/bin/i386-linux/texlua b/Master/bin/i386-linux/texlua
deleted file mode 120000
index 8d727021583..00000000000
--- a/Master/bin/i386-linux/texlua
+++ /dev/null
@@ -1 +0,0 @@
-luatex
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/texmfstart b/Master/bin/i386-linux/texmfstart
deleted file mode 100755
index 4d1e2976145..00000000000
--- a/Master/bin/i386-linux/texmfstart
+++ /dev/null
@@ -1,2580 +0,0 @@
-#!/usr/bin/env ruby
-
-# program   : texmfstart
-# copyright : PRAGMA Advanced Document Engineering
-# version   : 1.9.0 - 2003/2006
-# author    : Hans Hagen
-#
-# project   : ConTeXt / eXaMpLe
-# info      : j.hagen@xs4all.nl
-# www       : www.pragma-pod.com / www.pragma-ade.com
-
-# no special requirements, i.e. no exa modules/classes used
-
-# texmfstart [switches] filename [optional arguments]
-#
-# ruby2exe texmfstart --help -> avoids stub test
-#
-# Of couse I can make this into a nice class, which i'll undoubtely will
-# do when I feel the need. In that case it will be part of a bigger game.
-
-# turning this into a service would be nice, so some day ...
-
-# --locate        => provides location
-# --exec          => exec instead of system
-# --iftouched=a,b => only if timestamp a<>b
-# --ifchanged=a,b => only if checksum changed
-#
-# file: path: bin:
-
-# texmfstart --exec bin:scite *.tex
-
-# we don't depend on other libs
-
-$: << File.expand_path(File.dirname($0)) ; $: << File.join($:.last,'lib') ; $:.uniq!
-
-require "rbconfig"
-require "md5"
-
-# kpse_merge_done: require 'base/kpseremote'
-# kpse_merge_done: require 'base/kpsedirect'
-# kpse_merge_done: require 'base/kpsefast'
-# kpse_merge_done: require 'base/merge'
-
-# kpse_merge_start
-
-# kpse_merge_file: 'C:/data/develop/context/ruby/base/kpseremote.rb'
-
-# kpse_merge_done: require 'base/kpsefast'
-
-case ENV['KPSEMETHOD']
-    when /soap/o then # kpse_merge_done: require 'base/kpse/soap'
-    when /drb/o  then # kpse_merge_done: require 'base/kpse/drb'
-    else              # kpse_merge_done: require 'base/kpse/drb'
-end
-
-class KpseRemote
-
-    @@port   = ENV['KPSEPORT']   || 7000
-    @@method = ENV['KPSEMETHOD'] || 'drb'
-
-    def KpseRemote::available?
-        @@method && @@port
-    end
-
-    def KpseRemote::start_server(port=nil)
-        kpse = KpseServer.new(port || @@port)
-        kpse.start
-    end
-
-    def KpseRemote::start_client(port=nil) # keeps object in server
-        kpseclient = KpseClient.new(port || @@port)
-        kpseclient.start
-        kpse = kpseclient.object
-        tree = kpse.choose(KpseUtil::identify, KpseUtil::environment)
-        [kpse, tree]
-    end
-
-    def KpseRemote::fetch(port=nil) # no need for defining methods but slower, send whole object
-        kpseclient = KpseClient.new(port || @@port)
-        kpseclient.start
-        kpseclient.object.fetch(KpseUtil::identify, KpseUtil::environment) rescue nil
-    end
-
-    def initialize(port=nil)
-        if KpseRemote::available? then
-            begin
-                @kpse, @tree = KpseRemote::start_client(port)
-            rescue
-                @kpse, @tree = nil, nil
-            end
-        else
-            @kpse, @tree = nil, nil
-        end
-    end
-
-    def progname=(value)
-        @kpse.set(@tree,'progname',value)
-    end
-    def format=(value)
-        @kpse.set(@tree,'format',value)
-    end
-    def engine=(value)
-        @kpse.set(@tree,'engine',value)
-    end
-
-    def progname
-        @kpse.get(@tree,'progname')
-    end
-    def format
-        @kpse.get(@tree,'format')
-    end
-    def engine
-        @kpse.get(@tree,'engine')
-    end
-
-    def load
-        @kpse.load(KpseUtil::identify, KpseUtil::environment)
-    end
-    def okay?
-        @kpse && @tree
-    end
-    def set(key,value)
-        @kpse.set(@tree,key,value)
-    end
-    def load_cnf
-        @kpse.load_cnf(@tree)
-    end
-    def load_lsr
-        @kpse.load_lsr(@tree)
-    end
-    def expand_variables
-        @kpse.expand_variables(@tree)
-    end
-    def expand_braces(str)
-        clean_name(@kpse.expand_braces(@tree,str))
-    end
-    def expand_path(str)
-        clean_name(@kpse.expand_path(@tree,str))
-    end
-    def expand_var(str)
-        clean_name(@kpse.expand_var(@tree,str))
-    end
-    def show_path(str)
-        clean_name(@kpse.show_path(@tree,str))
-    end
-    def var_value(str)
-        clean_name(@kpse.var_value(@tree,str))
-    end
-    def find_file(filename)
-        clean_name(@kpse.find_file(@tree,filename))
-    end
-    def find_files(filename,first=false)
-        # dodo: each filename
-        @kpse.find_files(@tree,filename,first)
-    end
-
-    private
-
-    def clean_name(str)
-        str.gsub(/\\/,'/')
-    end
-
-end
-
-
-# kpse_merge_file: 'C:/data/develop/context/ruby/base/kpsefast.rb'
-
-# module    : base/kpsefast
-# copyright : PRAGMA Advanced Document Engineering
-# version   : 2005
-# author    : Hans Hagen
-#
-# project   : ConTeXt / eXaMpLe
-# concept   : Hans Hagen
-# info      : j.hagen@xs4all.nl
-
-# todo: multiple cnf files
-#
-
-class String
-
-    def split_path
-        if self =~ /\;/o || self =~ /^[a-z]\:/io then
-            self.split(";")
-        else
-            self.split(":")
-        end
-    end
-
-end
-
-class Array
-
-    def join_path
-        self.join(File::PATH_SEPARATOR)
-    end
-
-end
-
-class File
-
-    def File.locate_file(path,name)
-        begin
-            files = Dir.entries(path)
-            if files.include?(name) then
-                fullname = File.join(path,name)
-                return fullname if FileTest.file?(fullname)
-            end
-            files.each do |p|
-                fullname = File.join(path,p)
-                if p != '.' and p != '..' and FileTest.directory?(fullname) and result = locate_file(fullname,name) then
-                    return result
-                end
-            end
-        rescue
-            # bad path
-        end
-        return nil
-    end
-
-    def File.glob_file(pattern)
-        return Dir.glob(pattern).first
-    end
-
-end
-
-module KpseUtil
-
-    # to be adapted, see loading cnf file
-
-    @@texmftrees = ['texmf-local','texmf.local','../..','texmf'] # '../..' is for gwtex
-    @@texmfcnf   = 'texmf.cnf'
-
-    def KpseUtil::identify
-        # we mainly need to identify the local tex stuff and wse assume that
-        # the texmfcnf variable is set; otherwise we need to expand the
-        # TEXMF variable and that takes time since it may involve more
-        ownpath = File.expand_path($0)
-        if ownpath.gsub!(/texmf.*?$/o, '') then
-            ENV['SELFAUTOPARENT'] = ownpath
-        else
-            ENV['SELFAUTOPARENT'] = '.' # fall back
-            # may be too tricky:
-            #
-            # (ENV['PATH'] ||'').split_path.each do |p|
-                # if p.gsub!(/texmf.*?$/o, '') then
-                    # ENV['SELFAUTOPARENT'] = p
-                    # break
-                # end
-            # end
-        end
-        filenames = Array.new
-        if ENV['TEXMFCNF'] && ! ENV['TEXMFCNF'].empty? then
-            ENV['TEXMFCNF'].to_s.split_path.each do |path|
-                filenames << File.join(path,@@texmfcnf)
-            end
-        elsif ENV['SELFAUTOPARENT'] == '.' then
-            filenames << File.join('.',@@texmfcnf)
-        else
-            @@texmftrees.each do |tree|
-                filenames << File.join(ENV['SELFAUTOPARENT'],tree,'web2c',@@texmfcnf)
-            end
-        end
-        loop do
-            busy = false
-            filenames.collect! do |f|
-                f.gsub(/\$([a-zA-Z0-9\_\-]+)/o) do
-                    if (! ENV[$1]) || (ENV[$1] == $1) then
-                        "$#{$1}"
-                    else
-                        busy = true
-                        ENV[$1]
-                    end
-                end
-            end
-            break unless busy
-        end
-        filenames.delete_if do |f|
-            ! FileTest.file?(f)
-        end
-        return filenames
-    end
-
-    def KpseUtil::environment
-        Hash.new.merge(ENV)
-    end
-
-end
-
-class KpseFast
-
-    # formats are an incredible inconsistent mess
-
-    @@suffixes  = Hash.new
-    @@formats   = Hash.new
-    @@suffixmap = Hash.new
-
-    @@texmfcnf  = 'texmf.cnf'
-
-    @@suffixes['gf']                       = ['.<resolution>gf'] # todo
-    @@suffixes['pk']                       = ['.<resolution>pk'] # todo
-    @@suffixes['tfm']                      = ['.tfm']
-    @@suffixes['afm']                      = ['.afm']
-    @@suffixes['base']                     = ['.base']
-    @@suffixes['bib']                      = ['.bib']
-    @@suffixes['bst']                      = ['.bst']
-    @@suffixes['cnf']                      = ['.cnf']
-    @@suffixes['ls-R']                     = ['ls-R', 'ls-r']
-    @@suffixes['fmt']                      = ['.fmt', '.efmt', '.efm', '.ofmt', '.ofm', '.oft', '.eofmt', '.eoft', '.eof', '.pfmt', '.pfm', '.epfmt', '.epf', '.xpfmt', '.xpf', '.afmt', '.afm']
-    @@suffixes['map']                      = ['.map']
-    @@suffixes['mem']                      = ['.mem']
-    @@suffixes['mf']                       = ['.mf']
-    @@suffixes['mfpool']                   = ['.pool']
-    @@suffixes['mft']                      = ['.mft']
-    @@suffixes['mp']                       = ['.mp']
-    @@suffixes['mppool']                   = ['.pool']
-    @@suffixes['ocp']                      = ['.ocp']
-    @@suffixes['ofm']                      = ['.ofm', '.tfm']
-    @@suffixes['opl']                      = ['.opl']
-    @@suffixes['otp']                      = ['.otp']
-    @@suffixes['ovf']                      = ['.ovf']
-    @@suffixes['ovp']                      = ['.ovp']
-    @@suffixes['graphic/figure']           = ['.eps', '.epsi']
-    @@suffixes['tex']                      = ['.tex']
-    @@suffixes['texpool']                  = ['.pool']
-    @@suffixes['PostScript header']        = ['.pro']
-    @@suffixes['type1 fonts']              = ['.pfa', '.pfb']
-    @@suffixes['vf']                       = ['.vf']
-    @@suffixes['ist']                      = ['.ist']
-    @@suffixes['truetype fonts']           = ['.ttf', '.ttc']
-    @@suffixes['web']                      = ['.web', '.ch']
-    @@suffixes['cweb']                     = ['.w', '.web', '.ch']
-    @@suffixes['enc files']                = ['.enc']
-    @@suffixes['cmap files']               = ['.cmap']
-    @@suffixes['subfont definition files'] = ['.sfd']
-    @@suffixes['lig files']                = ['.lig']
-    @@suffixes['bitmap font']              = []
-    @@suffixes['MetaPost support']         = []
-    @@suffixes['TeX system documentation'] = []
-    @@suffixes['TeX system sources']       = []
-    @@suffixes['Troff fonts']              = []
-    @@suffixes['dvips config']             = []
-    @@suffixes['type42 fonts']             = []
-    @@suffixes['web2c files']              = []
-    @@suffixes['other text files']         = []
-    @@suffixes['other binary files']       = []
-    @@suffixes['misc fonts']               = []
-    @@suffixes['opentype fonts']           = []
-    @@suffixes['pdftex config']            = []
-    @@suffixes['texmfscripts']             = []
-
-    # replacements
-
-    @@suffixes['fmt']                      = ['.fmt']
-    @@suffixes['type1 fonts']              = ['.pfa', '.pfb', '.pfm']
-    @@suffixes['tex']                      = ['.tex', '.xml']
-    @@suffixes['texmfscripts']             = ['rb','lua','py','pl']
-
-    @@suffixes.keys.each do |k| @@suffixes[k].each do |s| @@suffixmap[s] = k end end
-
-    # TTF2TFMINPUTS
-    # MISCFONTS
-    # TEXCONFIG
-    # DVIPDFMINPUTS
-    # OTFFONTS
-
-    @@formats['gf']                       = ''
-    @@formats['pk']                       = ''
-    @@formats['tfm']                      = 'TFMFONTS'
-    @@formats['afm']                      = 'AFMFONTS'
-    @@formats['base']                     = 'MFBASES'
-    @@formats['bib']                      = ''
-    @@formats['bst']                      = ''
-    @@formats['cnf']                      = ''
-    @@formats['ls-R']                     = ''
-    @@formats['fmt']                      = 'TEXFORMATS'
-    @@formats['map']                      = 'TEXFONTMAPS'
-    @@formats['mem']                      = 'MPMEMS'
-    @@formats['mf']                       = 'MFINPUTS'
-    @@formats['mfpool']                   = 'MFPOOL'
-    @@formats['mft']                      = ''
-    @@formats['mp']                       = 'MPINPUTS'
-    @@formats['mppool']                   = 'MPPOOL'
-    @@formats['ocp']                      = 'OCPINPUTS'
-    @@formats['ofm']                      = 'OFMFONTS'
-    @@formats['opl']                      = 'OPLFONTS'
-    @@formats['otp']                      = 'OTPINPUTS'
-    @@formats['ovf']                      = 'OVFFONTS'
-    @@formats['ovp']                      = 'OVPFONTS'
-    @@formats['graphic/figure']           = ''
-    @@formats['tex']                      = 'TEXINPUTS'
-    @@formats['texpool']                  = 'TEXPOOL'
-    @@formats['PostScript header']        = 'TEXPSHEADERS'
-    @@formats['type1 fonts']              = 'T1FONTS'
-    @@formats['vf']                       = 'VFFONTS'
-    @@formats['ist']                      = ''
-    @@formats['truetype fonts']           = 'TTFONTS'
-    @@formats['web']                      = ''
-    @@formats['cweb']                     = ''
-    @@formats['enc files']                = 'ENCFONTS'
-    @@formats['cmap files']               = 'CMAPFONTS'
-    @@formats['subfont definition files'] = 'SFDFONTS'
-    @@formats['lig files']                = 'LIGFONTS'
-    @@formats['bitmap font']              = ''
-    @@formats['MetaPost support']         = ''
-    @@formats['TeX system documentation'] = ''
-    @@formats['TeX system sources']       = ''
-    @@formats['Troff fonts']              = ''
-    @@formats['dvips config']             = ''
-    @@formats['type42 fonts']             = 'T42FONTS'
-    @@formats['web2c files']              = 'WEB2C'
-    @@formats['other text files']         = ''
-    @@formats['other binary files']       = ''
-    @@formats['misc fonts']               = ''
-    @@formats['opentype fonts']           = 'OPENTYPEFONTS'
-    @@formats['pdftex config']            = 'PDFTEXCONFIG'
-    @@formats['texmfscripts']             = 'TEXMFSCRIPTS'
-
-    attr_accessor :progname, :engine, :format, :rootpath, :treepath,
-        :verbose, :remember, :scandisk, :diskcache, :renewcache
-
-    @@cacheversion = '1'
-
-    def initialize
-        @rootpath    = ''
-        @treepath    = ''
-        @progname    = 'kpsewhich'
-        @engine      = 'pdftex'
-        @variables   = Hash.new
-        @expansions  = Hash.new
-        @files       = Hash.new
-        @found       = Hash.new
-        @kpsevars    = Hash.new
-        @lsrfiles    = Array.new
-        @cnffiles    = Array.new
-        @verbose     = true
-        @remember    = true
-        @scandisk    = true
-        @diskcache   = true
-        @renewcache  = false
-        @isolate     = false
-
-        @diskcache   = false
-        @cachepath   = nil
-        @cachefile   = 'tmftools.log'
-
-        @environment = ENV
-    end
-
-    def set(key,value)
-        case key
-            when 'progname' then @progname = value
-            when 'engine'   then @engine   = value
-            when 'format'   then @format   = value
-        end
-    end
-
-    def push_environment(env)
-        @environment = env
-    end
-
-    # {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
-    #
-    # $SELFAUTOLOC    : /usr/tex/bin/platform
-    # $SELFAUTODIR    : /usr/tex/bin
-    # $SELFAUTOPARENT : /usr/tex
-    #
-    # since we live in scriptpath we need a slightly different method
-
-    def load_cnf(filenames=nil)
-        unless filenames then
-            ownpath = File.expand_path($0)
-            if ownpath.gsub!(/texmf.*?$/o, '') then
-                @environment['SELFAUTOPARENT'] = ownpath
-            else
-                @environment['SELFAUTOPARENT'] = '.'
-            end
-            unless @treepath.empty? then
-                unless @rootpath.empty? then
-                    @treepath = @treepath.split(',').collect do |p| File.join(@rootpath,p) end.join(',')
-                end
-                @environment['TEXMF'] = @treepath
-                # only the first one
-                @environment['TEXMFCNF'] = File.join(@treepath.split(',').first,'texmf/web2c')
-            end
-            unless @rootpath.empty? then
-                @environment['TEXMFCNF'] = File.join(@rootpath,'texmf/web2c')
-                @environment['SELFAUTOPARENT'] = @rootpath
-                @isolate = true
-            end
-            filenames = Array.new
-            if @environment['TEXMFCNF'] and not @environment['TEXMFCNF'].empty? then
-                @environment['TEXMFCNF'].to_s.split_path.each do |path|
-                    filenames << File.join(path,@@texmfcnf)
-                end
-            elsif @environment['SELFAUTOPARENT'] == '.' then
-                filenames << File.join('.',@@texmfcnf)
-            else
-                ['texmf-local','texmf'].each do |tree|
-                    filenames << File.join(@environment['SELFAUTOPARENT'],tree,'web2c',@@texmfcnf)
-                end
-            end
-        end
-        # <root>/texmf/web2c/texmf.cnf
-        filenames = _expanded_path_(filenames)
-        @rootpath = filenames.first
-        3.times do
-            @rootpath = File.dirname(@rootpath)
-        end
-        filenames.collect! do |f|
-            f.gsub("\\", '/')
-        end
-        filenames.each do |fname|
-            if FileTest.file?(fname) and f = File.open(fname) then
-                @cnffiles << fname
-                while line = f.gets do
-                    loop do
-                        # concatenate lines ending with \
-                        break unless line.sub!(/\\\s*$/o) do
-                            f.gets || ''
-                        end
-                    end
-                    case line
-                        when /^[\%\#]/o then
-                            # comment
-                        when /^\s*(.*?)\s*\=\s*(.*?)\s*$/o then
-                            key, value = $1, $2
-                            unless @variables.key?(key) then
-                                value.sub!(/\%.*$/,'')
-                                value.sub!(/\~/, "$HOME")
-                                @variables[key] = value
-                            end
-                            @kpsevars[key] = true
-                    end
-                end
-                f.close
-            end
-        end
-    end
-
-    def load_lsr
-        @lsrfiles = []
-        simplified_list(expansion('TEXMF')).each do |p|
-            ['ls-R','ls-r'].each do |f|
-                filename = File.join(p,f)
-                if FileTest.file?(filename) then
-                    @lsrfiles << [filename,File.size(filename)]
-                    break
-                end
-            end
-        end
-        @files = Hash.new
-        if @diskcache then
-            ['HOME','TEMP','TMP','TMPDIR'].each do |key|
-                if @environment[key] then
-                    if FileTest.directory?(@environment[key]) then
-                        @cachepath = @environment[key]
-                        @cachefile = [@rootpath.gsub(/[^A-Z0-9]/io, '-').gsub(/\-+/,'-'),File.basename(@cachefile)].join('-')
-                        break
-                    end
-                end
-            end
-            if @cachepath and not @renewcache and FileTest.file?(File.join(@cachepath,@cachefile)) then
-                begin
-                    if f = File.open(File.join(@cachepath,@cachefile)) then
-                        cacheversion = Marshal.load(f)
-                        if cacheversion == @@cacheversion then
-                            lsrfiles = Marshal.load(f)
-                            if lsrfiles == @lsrfiles then
-                                @files = Marshal.load(f)
-                            end
-                        end
-                        f.close
-                    end
-                rescue
-                   @files = Hash.new
-               end
-            end
-        end
-        return if @files.size > 0
-        @lsrfiles.each do |filedata|
-            filename, filesize = filedata
-            filepath = File.dirname(filename)
-            begin
-                path = '.'
-                data = IO.readlines(filename)
-                if data[0].chomp =~ /% ls\-R \-\- filename database for kpathsea\; do not change this line\./io then
-                    data.each do |line|
-                        case line
-                            when /^[a-zA-Z0-9]/o then
-                                line.chomp!
-                                if @files[line] then
-                                    @files[line] << path
-                                else
-                                    @files[line] = [path]
-                                end
-                            when /^\.\/(.*?)\:$/o then
-                                path = File.join(filepath,$1)
-                        end
-                    end
-                end
-            rescue
-                # sorry
-            end
-        end
-        if @diskcache and @cachepath and f = File.open(File.join(@cachepath,@cachefile),'wb') then
-            f << Marshal.dump(@@cacheversion)
-            f << Marshal.dump(@lsrfiles)
-            f << Marshal.dump(@files)
-            f.close
-        end
-    end
-
-    def expand_variables
-        @expansions = Hash.new
-        if @isolate then
-            @variables['TEXMFCNF'] = @environment['TEXMFCNF'].dup
-            @variables['SELFAUTOPARENT'] = @environment['SELFAUTOPARENT'].dup
-        else
-            @environment.keys.each do |e|
-                if e =~ /^([a-zA-Z]+)\_(.*)\s*$/o then
-                    @expansions["#{$1}.#{$2}"] = (@environment[e] ||'').dup
-                else
-                    @expansions[e] = (@environment[e] ||'').dup
-                end
-            end
-        end
-        @variables.keys.each do |k|
-            @expansions[k] = @variables[k].dup unless @expansions[k]
-        end
-        loop do
-            busy = false
-            @expansions.keys.each do |k|
-                @expansions[k].gsub!(/\$([a-zA-Z0-9\_\-]*)/o) do
-                    busy = true
-                    @expansions[$1] || ''
-                end
-                @expansions[k].gsub!(/\$\{([a-zA-Z0-9\_\-]*)\}/o) do
-                    busy = true
-                    @expansions[$1] || ''
-                end
-            end
-            break unless busy
-        end
-        @expansions.keys.each do |k|
-            @expansions[k] = @expansions[k].gsub("\\", '/')
-        end
-    end
-
-    def variable(name='')
-        (name and not name.empty? and @variables[name.sub('$','')]) or  ''
-    end
-
-    def expansion(name='')
-        (name and not name.empty? and @expansions[name.sub('$','')]) or ''
-    end
-
-    def variable?(name='')
-        name and not name.empty? and @variables.key?(name.sub('$',''))
-    end
-
-    def expansion?(name='')
-        name and not name.empty? and @expansions.key?(name.sub('$',''))
-    end
-
-    def simplified_list(str)
-        lst = str.gsub(/^\{/o,'').gsub(/\}$/o,'').split(",")
-        lst.collect do |l|
-            l.sub(/^[\!]*/,'').sub(/[\/\\]*$/o,'')
-        end
-    end
-
-    def original_variable(variable)
-        if variable?("#{@progname}.#{variable}") then
-            variable("#{@progname}.#{variable}")
-        elsif variable?(variable) then
-            variable(variable)
-        else
-            ''
-        end
-    end
-
-    def expanded_variable(variable)
-        if expansion?("#{variable}.#{@progname}") then
-            expansion("#{variable}.#{@progname}")
-        elsif expansion?(variable) then
-            expansion(variable)
-        else
-            ''
-        end
-    end
-
-    def original_path(filename='')
-        _expanded_path_(original_variable(var_of_format_or_suffix(filename)).split(";"))
-    end
-
-    def expanded_path(filename='')
-        _expanded_path_(expanded_variable(var_of_format_or_suffix(filename)).split(";"))
-    end
-
-    def _expanded_path_(pathlist)
-        i, n = 0, 0
-        pathlist.collect! do |mainpath|
-            mainpath.gsub(/([\{\}])/o) do
-                if $1 == "{" then
-                    i += 1 ; n = i if i > n ; "<#{i}>"
-                else
-                    i -= 1 ; "</#{i+1}>"
-                end
-            end
-        end
-        n.times do |i|
-            loop do
-                more = false
-                newlist = []
-                pathlist.each do |path|
-                    unless path.sub!(/^(.*?)<(#{n-i})>(.*?)<\/\2>(.*?)$/) do
-                        pre, mid, post = $1, $3, $4
-                        mid.gsub!(/\,$/,',.')
-                        mid.split(',').each do |m|
-                            more = true
-                            if m == '.' then
-                                newlist << "#{pre}#{post}"
-                            else
-                                newlist << "#{pre}#{m}#{post}"
-                            end
-                        end
-                    end then
-                        newlist << path
-                    end
-                end
-                if more then
-                    pathlist = [newlist].flatten # copy -)
-                else
-                    break
-                end
-            end
-        end
-        pathlist = pathlist.uniq.collect do |path|
-            p = path
-            # p.gsub(/^\/+/o) do '' end
-            # p.gsub!(/(.)\/\/(.)/o) do "#{$1}/#{$2}" end
-            # p.gsub!(/\/\/+$/o) do '//' end
-            p.gsub!(/\/\/+/o) do '//' end
-            p
-        end
-        pathlist
-    end
-
-    # todo: ignore case
-
-    def var_of_format(str)
-        @@formats[str] || ''
-    end
-
-    def var_of_suffix(str) # includes .
-        if @@suffixmap.key?(str) then @@formats[@@suffixmap[str]] else '' end
-    end
-
-    def var_of_format_or_suffix(str)
-        if @@formats.key?(str) then
-            @@formats[str]
-        elsif @@suffixmap.key?(File.extname(str)) then # extname includes .
-            @@formats[@@suffixmap[File.extname(str)]]  # extname includes .
-        else
-            ''
-        end
-    end
-
-end
-
-class KpseFast
-
-    # test things
-
-    def list_variables(kpseonly=true)
-        @variables.keys.sort.each do |k|
-            if kpseonly then
-                puts("#{k} = #{@variables[k]}") if @kpsevars[k]
-            else
-                puts("#{if @kpsevars[k] then 'K' else 'E' end} #{k} = #{@variables[k]}")
-            end
-        end
-    end
-
-    def list_expansions(kpseonly=true)
-        @expansions.keys.sort.each do |k|
-            if kpseonly then
-                puts("#{k} = #{@expansions[k]}") if @kpsevars[k]
-            else
-                puts("#{if @kpsevars[k] then 'K' else 'E' end} #{k} = #{@expansions[k]}")
-            end
-        end
-    end
-
-    def list_lsr
-        puts("files = #{@files.size}")
-    end
-
-    def set_test_patterns
-        @variables["KPSE_TEST_PATTERN_A"] = "foo/{1,2}/bar//"
-        @variables["KPSE_TEST_PATTERN_B"] = "!!x{A,B{1,2}}y"
-        @variables["KPSE_TEST_PATTERN_C"] = "x{A,B//{1,2}}y"
-        @variables["KPSE_TEST_PATTERN_D"] = "x{A,B//{1,2,}}//y"
-    end
-
-    def show_test_patterns
-        ['A','B','D'].each do |i|
-            puts ""
-            puts @variables ["KPSE_TEST_PATTERN_#{i}"]
-            puts ""
-            puts expand_path("KPSE_TEST_PATTERN_#{i}").split_path
-            puts ""
-        end
-    end
-
-end
-
-class KpseFast
-
-    # kpse stuff
-
-    def expand_braces(str) # output variable and brace expansion of STRING.
-        _expanded_path_(original_variable(str).split_path).join_path
-    end
-
-    def expand_path(str)   # output complete path expansion of STRING.
-        _expanded_path_(expanded_variable(str).split_path).join_path
-    end
-
-    def expand_var(str)    # output variable expansion of STRING.
-        expanded_variable(str)
-    end
-
-    def show_path(str)     # output search path for file type NAME
-        expanded_path(str).join_path
-    end
-
-    def var_value(str)     # output the value of variable $STRING.
-        original_variable(str)
-    end
-
-end
-
-class KpseFast
-
-    def _is_cnf_?(filename)
-        filename == File.basename((@cnffiles.first rescue @@texmfcnf) || @@texmfcnf)
-    end
-
-    def find_file(filename)
-        if _is_cnf_?(filename) then
-            @cnffiles.first rescue ''
-        else
-            [find_files(filename,true)].flatten.first || ''
-        end
-    end
-
-    def find_files(filename,first=false)
-        if _is_cnf_?(filename) then
-            result = @cnffiles.dup
-        else
-            if @remember then
-                # stamp = "#{filename}--#{@format}--#{@engine}--#{@progname}"
-                stamp = "#{filename}--#{@engine}--#{@progname}"
-                return @found[stamp] if @found.key?(stamp)
-            end
-            pathlist = expanded_path(filename)
-            result = []
-            filelist = if @files.key?(filename) then @files[filename].uniq else nil end
-            done = false
-            if pathlist.size == 0 then
-                if FileTest.file?(filename) then
-                    done = true
-                    result << '.'
-                end
-            else
-                pathlist.each do |path|
-                    doscan = if path =~ /^\!\!/o then false else true end
-                    recurse = if path =~ /\/\/$/o then true else false end
-                    pathname = path.dup
-                    pathname.gsub!(/^\!+/o, '')
-                    done = false
-                    if not done and filelist then
-                        # checking for exact match
-                        if filelist.include?(pathname) then
-                            result << pathname
-                            done = true
-                        end
-                        if not done and recurse then
-                            # checking for fuzzy //
-                            pathname.gsub!(/\/+$/o, '/.*')
-                            # pathname.gsub!(/\/\//o,'/[\/]*/')
-                            pathname.gsub!(/\/\//o,'/.*?/')
-                            re = /^#{pathname}/
-                            filelist.each do |f|
-                                if re =~ f then
-                                    result << f # duplicates will be filtered later
-                                    done = true
-                                end
-                                break if done
-                            end
-                        end
-                    end
-                    if not done and doscan then
-                        # checking for path itself
-                        pname = pathname.sub(/\.\*$/,'')
-                        if not pname =~ /\*/o and FileTest.file?(File.join(pname,filename)) then
-                            result << pname
-                            done = true
-                        end
-                    end
-                    break if done and first
-                end
-            end
-            if not done and @scandisk then
-                pathlist.each do |path|
-                    pathname = path.dup
-                    unless pathname.gsub!(/^\!+/o, '') then # !! prevents scan
-                        recurse = pathname.gsub!(/\/+$/o, '')
-                        complex = pathname.gsub!(/\/\//o,'/*/')
-                        if recurse then
-                            if complex then
-                                if ok = File.glob_file("#{pathname}/**/#{filename}") then
-                                    result << File.dirname(ok)
-                                    done = true
-                                end
-                            elsif ok = File.locate_file(pathname,filename) then
-                                result << File.dirname(ok)
-                                done = true
-                            end
-                        elsif complex then
-                            if ok = File.glob_file("#{pathname}/#{filename}") then
-                                result << File.dirname(ok)
-                                done = true
-                            end
-                        elsif FileTest.file?(File.join(pathname,filename)) then
-                            result << pathname
-                            done = true
-                        end
-                        break if done and first
-                    end
-                end
-            end
-            result = result.uniq.collect do |pathname|
-                File.join(pathname,filename)
-            end
-            @found[stamp] = result if @remember
-        end
-        return result # redundant
-    end
-
-end
-
-class KpseFast
-
-    class FileData
-        attr_accessor :tag, :name, :size, :date
-        def initialize(tag=0,name=nil,size=nil,date=nil)
-            @tag, @name, @size, @date = tag, name, size, date
-        end
-        def FileData.sizes(a)
-            a.collect do |aa|
-                aa.size
-            end
-        end
-        def report
-            case @tag
-                when 1 then "deleted  | #{@size.to_s.rjust(8)} | #{@date.strftime('%m/%d/%Y %I:%M')} | #{@name}"
-                when 2 then "present  | #{@size.to_s.rjust(8)} | #{@date.strftime('%m/%d/%Y %I:%M')} | #{@name}"
-                when 3 then "obsolete | #{' '*8} | #{' '*16} | #{@name}"
-            end
-        end
-    end
-
-    def analyze_files(filter='',strict=false,sort='',delete=false)
-        puts("command line     = #{ARGV.join(' ')}")
-        puts("number of files  = #{@files.size}")
-        puts("filter pattern   = #{filter}")
-        puts("loaded cnf files = #{@cnffiles.join(' ')}")
-        puts('')
-        if filter.gsub!(/^not:/,'') then
-            def the_same(filter,filename)
-                not filter or filter.empty? or /#{filter}/ !~ filename
-            end
-        else
-            def the_same(filter,filename)
-                not filter or filter.empty? or /#{filter}/ =~ filename
-            end
-        end
-        @files.keys.each do |name|
-            if @files[name].size > 1 then
-                data = Array.new
-                @files[name].each do |path|
-                    filename = File.join(path,name)
-                    # if not filter or filter.empty? or /#{filter}/ =~ filename then
-                    if the_same(filter,filename) then
-                        if FileTest.file?(filename) then
-                            if delete then
-                                data << FileData.new(1,filename,File.size(filename),File.mtime(filename))
-                                begin
-                                    File.delete(filename) if delete
-                                rescue
-                                end
-                            else
-                                data << FileData.new(2,filename,File.size(filename),File.mtime(filename))
-                            end
-                        else
-                            # data << FileData.new(3,filename)
-                        end
-                    end
-                end
-                if data.length > 1 then
-                    if strict then
-                        # if data.collect do |d| d.size end.uniq! then
-                            # data.sort! do |a,b| b.size <=> a.size end
-                            # data.each do |d| puts d.report end
-                            # puts ''
-                        # end
-                        data.sort! do |a,b|
-                            if a.size and b.size then
-                                b.size <=> a.size
-                            else
-                                0
-                            end
-                        end
-                        bunch = Array.new
-                        done = false
-                        data.each do |d|
-                            if bunch.size == 0 then
-                                bunch << d
-                            elsif bunch[0].size == d.size then
-                                bunch << d
-                            else
-                                if bunch.size > 1 then
-                                    bunch.each do |b|
-                                        puts b.report
-                                    end
-                                    done = true
-                                end
-                                bunch = [d]
-                            end
-                        end
-                        puts '' if done
-                    else
-                        case sort
-                            when 'size'    then data.sort! do |a,b| a.size <=> b.size end
-                            when 'revsize' then data.sort! do |a,b| b.size <=> a.size end
-                            when 'date'    then data.sort! do |a,b| a.date <=> b.date end
-                            when 'revdate' then data.sort! do |a,b| b.date <=> a.date end
-                        end
-                        data.each do |d| puts d.report end
-                        puts ''
-                    end
-                end
-            end
-        end
-    end
-
-end
-
-
-    # k = KpseFast.new # (root)
-    # k.set_test_patterns
-    # k.load_cnf
-    # k.expand_variables
-    # k.load_lsr
-
-    # k.show_test_patterns
-
-    # puts k.list_variables
-    # puts k.list_expansions
-    # k.list_lsr
-    # puts k.expansion("$TEXMF")
-    # puts k.expanded_path("TEXINPUTS","context")
-
-    # k.progname, k.engine, k.format = 'context', 'pdftex', 'tfm'
-    # k.scandisk = false # == must_exist
-    # k.expand_variables
-
-    # 10.times do |i| puts k.find_file('texnansi-lmr10.tfm') end
-
-    # puts "expand braces $TEXMF"
-    # puts k.expand_braces("$TEXMF")
-    # puts "expand path $TEXMF"
-    # puts k.expand_path("$TEXMF")
-    # puts "expand var $TEXMF"
-    # puts k.expand_var("$TEXMF")
-    # puts "expand path $TEXMF"
-    # puts k.show_path('tfm')
-    # puts "expand value $TEXINPUTS"
-    # puts k.var_value("$TEXINPUTS")
-    # puts "expand value $TEXINPUTS.context"
-    # puts k.var_value("$TEXINPUTS.context")
-
-    # exit
-
-
-
-# kpse_merge_file: 'C:/data/develop/context/ruby/base/kpse/drb.rb'
-
-require 'drb'
-# kpse_merge_done: require 'base/kpse/trees'
-
-class KpseServer
-
-    attr_accessor :port
-
-    def initialize(port=7000)
-        @port = port
-    end
-
-    def start
-        puts "starting drb service at port #{@port}"
-        DRb.start_service("druby://localhost:#{@port}", KpseTrees.new)
-        trap(:INT) do
-            DRb.stop_service
-        end
-        DRb.thread.join
-    end
-
-    def stop
-        # todo
-    end
-
-end
-
-class KpseClient
-
-    attr_accessor :port
-
-    def initialize(port=7000)
-        @port = port
-        @kpse = nil
-    end
-
-    def start
-        # only needed when callbacks are used / slow, due to Socket::getaddrinfo
-        # DRb.start_service
-    end
-
-    def object
-        @kpse = DRbObject.new(nil,"druby://localhost:#{@port}")
-    end
-
-end
-
-
-# SERVER_URI="druby://localhost:8787"
-#
-#   # Start a local DRbServer to handle callbacks.
-#   #
-#   # Not necessary for this small example, but will be required
-#   # as soon as we pass a non-marshallable object as an argument
-#   # to a dRuby call.
-#   DRb.start_service
-#
-
-
-# kpse_merge_file: 'C:/data/develop/context/ruby/base/kpse/trees.rb'
-
-require 'monitor'
-# kpse_merge_done: require 'base/kpsefast'
-
-class KpseTrees < Monitor
-
-    def initialize
-        @trees = Hash.new
-    end
-
-    def pattern(filenames)
-        filenames.join('|').gsub(/\\+/o,'/').downcase
-    end
-
-    def choose(filenames,environment)
-        current = pattern(filenames)
-        load(filenames,environment) unless @trees[current]
-        puts "enabling tree #{current}"
-        current
-    end
-
-    def fetch(filenames,environment) # will send whole object !
-        current = pattern(filenames)
-        load(filenames,environment) unless @trees[current]
-        puts "fetching tree #{current}"
-        @trees[current]
-    end
-
-    def load(filenames,environment)
-        current = pattern(filenames)
-        puts "loading tree #{current}"
-        @trees[current] = KpseFast.new
-        @trees[current].push_environment(environment)
-        @trees[current].load_cnf(filenames)
-        @trees[current].expand_variables
-        @trees[current].load_lsr
-    end
-
-    def set(tree,key,value)
-        case key
-            when 'progname' then @trees[tree].progname = value
-            when 'engine'   then @trees[tree].engine   = value
-            when 'format'   then @trees[tree].format   = value
-        end
-    end
-    def get(tree,key)
-        case key
-            when 'progname' then @trees[tree].progname
-            when 'engine'   then @trees[tree].engine
-            when 'format'   then @trees[tree].format
-        end
-    end
-
-    def load_cnf(tree)
-        @trees[tree].load_cnf
-    end
-    def load_lsr(tree)
-        @trees[tree].load_lsr
-    end
-    def expand_variables(tree)
-        @trees[tree].expand_variables
-    end
-    def expand_braces(tree,str)
-        @trees[tree].expand_braces(str)
-    end
-    def expand_path(tree,str)
-        @trees[tree].expand_path(str)
-    end
-    def expand_var(tree,str)
-        @trees[tree].expand_var(str)
-    end
-    def show_path(tree,str)
-        @trees[tree].show_path(str)
-    end
-    def var_value(tree,str)
-        @trees[tree].var_value(str)
-    end
-    def find_file(tree,filename)
-        @trees[tree].find_file(filename)
-    end
-    def find_files(tree,filename,first)
-        @trees[tree].find_files(filename,first)
-    end
-
-end
-
-
-# kpse_merge_file: 'C:/data/develop/context/ruby/base/kpsedirect.rb'
-
-class KpseDirect
-
-    attr_accessor :progname, :format, :engine
-
-    def initialize
-        @progname, @format, @engine = '', '', ''
-    end
-
-    def expand_path(str)
-        clean_name(`kpsewhich -expand-path=#{str}`.chomp)
-    end
-
-    def expand_var(str)
-        clean_name(`kpsewhich -expand-var=#{str}`.chomp)
-    end
-
-    def find_file(str)
-        clean_name(`kpsewhich #{_progname_} #{_format_} #{str}`.chomp)
-    end
-
-    def _progname_
-        if @progname.empty? then '' else "-progname=#{@progname}" end
-    end
-    def _format_
-        if @format.empty?   then '' else "-format=\"#{@format}\"" end
-    end
-
-    private
-
-    def clean_name(str)
-        str.gsub(/\\/,'/')
-    end
-
-end
-
-
-# kpse_merge_file: 'C:/data/develop/context/ruby/base/merge.rb'
-
-# module    : base/merge
-# copyright : PRAGMA Advanced Document Engineering
-# version   : 2006
-# author    : Hans Hagen
-#
-# project   : ConTeXt / eXaMpLe
-# concept   : Hans Hagen
-# info      : j.hagen@xs4all.nl
-
-
-# this module will package all the used modules in the file itself
-# so that we can relocate the file at wish, usage:
-#
-# merge:
-#
-# unless SelfMerge::ok? && SelfMerge::merge then
-#     puts("merging should happen on the path were the base inserts reside")
-# end
-#
-# cleanup:
-#
-# unless SelfMerge::cleanup then
-#     puts("merging should happen on the path were the base inserts reside")
-
-module SelfMerge
-
-    @@kpsemergestart = "\# kpse_merge_start"
-    @@kpsemergestop  = "\# kpse_merge_stop"
-    @@kpsemergefile  = "\# kpse_merge_file: "
-    @@kpsemergedone  = "\# kpse_merge_done: "
-
-    @@filename = File.basename($0)
-    @@ownpath  = File.expand_path(File.dirname($0))
-    @@modroot  = '(base|graphics|rslb|www)' # needed in regex in order not to mess up SelfMerge
-    @@modules  = $".collect do |file| File.expand_path(file) end
-
-    @@modules.delete_if do |file|
-        file !~ /^#{@@ownpath}\/#{@@modroot}.*$/
-    end
-
-    def SelfMerge::ok?
-        begin
-            @@modules.each do |file|
-                return false unless FileTest.file?(file)
-            end
-        rescue
-            return false
-        else
-            return true
-        end
-    end
-
-    def SelfMerge::merge
-        begin
-            if SelfMerge::ok? && rbfile = IO.read(@@filename) then
-                begin
-                    inserts = "#{@@kpsemergestart}\n\n"
-                    @@modules.each do |file|
-                        inserts << "#{@@kpsemergefile}'#{file}'\n\n"
-                        inserts << IO.read(file).gsub(/^#.*?\n$/,'')
-                        inserts << "\n\n"
-                    end
-                    inserts << "#{@@kpsemergestop}\n\n"
-                    # no gsub! else we end up in SelfMerge
-                    rbfile.sub!(/#{@@kpsemergestart}\s*#{@@kpsemergestop}/mois) do
-                        inserts
-                    end
-                    rbfile.gsub!(/^(.*)(require [\"\'].*?#{@@modroot}.*)$/) do
-                        pre, post = $1, $2
-                        if pre =~ /#{@@kpsemergedone}/ then
-                            "#{pre}#{post}"
-                        else
-                            "#{pre}#{@@kpsemergedone}#{post}"
-                        end
-                    end
-                rescue
-                    return false
-                else
-                    begin
-                        File.open(@@filename,'w') do |f|
-                            f << rbfile
-                        end
-                    rescue
-                        return false
-                    end
-                end
-            end
-        rescue
-            return false
-        else
-            return true
-        end
-    end
-
-    def SelfMerge::cleanup
-        begin
-            if rbfile = IO.read(@@filename) then
-                begin
-                    rbfile.sub!(/#{@@kpsemergestart}(.*)#{@@kpsemergestop}\s*/mois) do
-                        "#{@@kpsemergestart}\n\n#{@@kpsemergestop}\n\n"
-                    end
-                    rbfile.gsub!(/^(.*#{@@kpsemergedone}.*)$/) do
-                        str = $1
-                        if str =~ /require [\"\']/ then
-                            str.gsub(/#{@@kpsemergedone}/, '')
-                        else
-                            str
-                        end
-                    end
-                rescue
-                    return false
-                else
-                    begin
-                        File.open(@@filename,'w') do |f|
-                            f << rbfile
-                        end
-                    rescue
-                        return false
-                    end
-                end
-            end
-        rescue
-            return false
-        else
-            return true
-        end
-    end
-
-    def SelfMerge::replace
-        if SelfMerge::ok? then
-            SelfMerge::cleanup
-            SelfMerge::merge
-        end
-    end
-
-end
-
-
-# kpse_merge_stop
-
-
-
-$mswindows = Config::CONFIG['host_os'] =~ /mswin/
-$separator = File::PATH_SEPARATOR
-$version   = "2.0.3"
-$ownpath   = File.dirname($0)
-
-if $mswindows then
-    require "win32ole"
-    require "Win32API"
-end
-
-# exit if defined?(REQUIRE2LIB)
-
-$stdout.sync = true
-$stderr.sync = true
-
-$applications = Hash.new
-$suffixinputs = Hash.new
-$predefined   = Hash.new
-
-$suffixinputs['pl']  = 'PERLINPUTS'
-$suffixinputs['rb']  = 'RUBYINPUTS'
-$suffixinputs['py']  = 'PYTHONINPUTS'
-$suffixinputs['lua'] = 'LUAINPUTS'
-$suffixinputs['jar'] = 'JAVAINPUTS'
-$suffixinputs['pdf'] = 'PDFINPUTS'
-
-$predefined['texexec']  = 'texexec.rb'
-$predefined['texutil']  = 'texutil.rb'
-$predefined['texfont']  = 'texfont.pl'
-$predefined['texshow']  = 'texshow.pl'
-
-$predefined['makempy']  = 'makempy.pl'
-$predefined['mptopdf']  = 'mptopdf.pl'
-$predefined['pstopdf']  = 'pstopdf.rb'
-
-$predefined['examplex'] = 'examplex.rb'
-$predefined['concheck'] = 'concheck.rb'
-
-$predefined['runtools'] = 'runtools.rb'
-$predefined['textools'] = 'textools.rb'
-$predefined['tmftools'] = 'tmftools.rb'
-$predefined['ctxtools'] = 'ctxtools.rb'
-$predefined['rlxtools'] = 'rlxtools.rb'
-$predefined['pdftools'] = 'pdftools.rb'
-$predefined['mpstools'] = 'mpstools.rb'
-$predefined['exatools'] = 'exatools.rb'
-$predefined['xmltools'] = 'xmltools.rb'
-$predefined['luatools'] = 'luatools.lua'
-$predefined['mtxtools'] = 'mtxtools.rb'
-
-$predefined['newpstopdf']   = 'pstopdf.rb'
-$predefined['newtexexec']   = 'texexec.rb'
-$predefined['pdftrimwhite'] = 'pdftrimwhite.pl'
-
-$makelist = [
-    # context
-    'texexec',
-    'texutil',
-    'texfont',
-    # mp/ps
-    'pstopdf',
-    'mptopdf',
-    'makempy',
-    # misc
-    'ctxtools',
-    'pdftools',
-    'xmltools',
-    'textools',
-    'mpstools',
-    'tmftools',
-    'exatools',
-    'runtools',
-    'rlxtools',
-    'luatools',
-    'mtxtools',
-    #
-    # no, 'texmfstart'
-]
-
-$scriptlist   = 'rb|pl|py|lua|jar'
-$documentlist = 'pdf|ps|eps|htm|html'
-
-$editor       = ENV['TEXMFSTART_EDITOR'] || ENV['EDITOR'] || ENV['editor'] || 'scite'
-
-$crossover    = true # to other tex tools, else only local
-$kpse         = nil
-
-def set_applications(page=1)
-
-    $applications['unknown']  = ''
-    $applications['perl']     = $applications['pl']  = 'perl'
-    $applications['ruby']     = $applications['rb']  = 'ruby'
-    $applications['python']   = $applications['py']  = 'python'
-    $applications['lua']      = $applications['lua'] = 'luatex --luaonly'
-    $applications['java']     = $applications['jar'] = 'java'
-
-    if $mswindows then
-        $applications['pdf']  = ['',"pdfopen --page #{page} --file",'acroread']
-        $applications['html'] = ['','netscape','mozilla','opera','iexplore']
-        $applications['ps']   = ['','gview32','gv','gswin32','gs']
-    else
-        $applications['pdf']  = ["pdfopen --page #{page} --file",'acroread']
-        $applications['html'] = ['netscape','mozilla','opera']
-        $applications['ps']   = ['gview','gv','gs']
-    end
-
-    $applications['htm']      = $applications['html']
-    $applications['eps']      = $applications['ps']
-
-end
-
-set_applications()
-
-def check_kpse
-    if $kpse then
-        # already done
-    else
-        begin
-            if KpseRemote::available? then
-                $kpse = KpseRemote.new
-                if $kpse.okay? then
-                    puts("kpse     : remote") if $verbose
-                else
-                    $kpse = KpseDirect.new
-                    puts("kpse     : direct (forced)") if $verbose
-                end
-            else
-                $kpse = KpseDirect.new
-                puts("kpse     : direct") if $verbose
-            end
-        rescue
-            puts("kpse     : direct (fallback)") if $verbose
-        end
-    end
-end
-
-if $mswindows then
-
-    GetShortPathName = Win32API.new('kernel32', 'GetShortPathName', ['P','P','N'], 'N')
-    GetLongPathName  = Win32API.new('kernel32', 'GetLongPathName',  ['P','P','N'], 'N')
-
-    def dowith_pathname (filename,filemethod)
-        filename = filename.gsub(/\\/o,'/') # no gsub! because filename can be frozen
-        case filename
-            when /\;/o then
-                # could be a path spec
-                return filename
-            when /\s+/o then
-                # danger lurking
-                buffer = ' ' * 260
-                length = filemethod.call(filename,buffer,buffer.size)
-                if length>0 then
-                    return buffer.slice(0..length-1)
-                else
-                    # when the path or file does not exist, nothing is returned
-                    # so we try to handle the path separately from the basename
-                    basename = File.basename(filename)
-                    pathname = File.dirname(filename)
-                    length = filemethod.call(pathname,buffer,260)
-                    if length>0 then
-                        return buffer.slice(0..length-1) + '/' + basename
-                    else
-                        return filename
-                    end
-                end
-            else
-                # no danger
-                return filename
-        end
-    end
-
-    def longpathname (filename)
-        dowith_pathname(filename,GetLongPathName)
-    end
-
-    def shortpathname (filename)
-        dowith_pathname(filename,GetShortPathName)
-    end
-
-else
-
-    def longpathname (filename)
-        filename
-    end
-
-    def shortpathname (filename)
-        filename
-    end
-
-end
-
-class File
-
-    # def File.needsupdate(oldname,newname)
-        # begin
-            # if $mswindows then
-                # return File.stat(oldname).mtime > File.stat(newname).mtime
-            # else
-                # return File.stat(oldname).mtime != File.stat(newname).mtime
-            # end
-        # rescue
-            # return true
-        # end
-    # end
-
-    @@update_eps = 1
-
-    def File.needsupdate(oldname,newname)
-        begin
-            oldtime = File.stat(oldname).mtime.to_i
-            newtime = File.stat(newname).mtime.to_i
-            if newtime >= oldtime then
-                return false
-            elsif oldtime-newtime < @@update_eps then
-                return false
-            else
-                return true
-            end
-        rescue
-            return true
-        end
-    end
-
-    def File.syncmtimes(oldname,newname)
-        return
-        begin
-            if $mswindows then
-                # does not work (yet) / gives future timestamp
-                # t = File.mtime(oldname) # i'm not sure if the time is frozen, so we do it here
-                # File.utime(0,t,oldname,newname)
-            else
-                t = File.mtime(oldname) # i'm not sure if the time is frozen, so we do it here
-                File.utime(0,t,oldname,newname)
-            end
-        rescue
-        end
-    end
-
-    def File.timestamp(name)
-        begin
-            "#{File.stat(name).mtime}"
-        rescue
-            return 'unknown'
-        end
-    end
-
-end
-
-def hashed (arr=[])
-    arg = if arr.class == String then arr.split(' ') else arr.dup end
-    hsh = Hash.new
-    if arg.length > 0
-        hsh['arguments'] = ''
-        done = false
-        arg.each do |s|
-            if done then
-                hsh['arguments'] += ' ' + s
-            else
-                kvl = s.split('=')
-                if kvl[0].sub!(/^\-+/,'') then
-                    hsh[kvl[0]] = if kvl.length > 1 then kvl[1] else true end
-                else
-                    hsh['file'] = s
-                    done = true
-                end
-            end
-        end
-    end
-    return hsh
-end
-
-def launch(filename)
-    if $browser && $mswindows then
-        filename = filename.gsub(/\.[\/\\]/) do
-            Dir.getwd + '/'
-        end
-        report("launching #{filename}")
-        ie = WIN32OLE.new("InternetExplorer.Application")
-        ie.visible = true
-        ie.navigate(filename)
-        return true
-    else
-        return false
-    end
-end
-
-# env|environment
-# rel|relative
-# loc|locate|kpse|path|file
-
-def expanded(arg) # no "other text files", too restricted
-    arg.gsub(/(env|environment)\:([a-zA-Z\-\_\.0-9]+)/o) do
-        method, original, resolved = $1, $2, ''
-        if resolved = ENV[original] then
-            report("environment variable #{original} expands to #{resolved}") unless $report
-            resolved
-        else
-            report("environment variable #{original} cannot be resolved") unless $report
-            original
-        end
-    end . gsub(/(rel|relative)\:([a-zA-Z\-\_\.0-9]+)/o) do
-        method, original, resolved = $1, $2, ''
-        ['.','..','../..'].each do |r|
-            if FileTest.file?(File.join(r,original)) then
-                resolved = File.join(r,original)
-                break
-            end
-        end
-        if resolved.empty? then
-            original
-        else
-            resolved
-        end
-    end . gsub(/(kpse|loc|locate|file|path)\:([a-zA-Z\-\_\.0-9]+)/o) do
-        method, original, resolved = $1, $2, ''
-        if $program && ! $program.empty? then
-            # pstrings = ["-progname=#{$program}"]
-            pstrings = [$program]
-        else
-            # pstrings = ['','-progname=context']
-            pstrings = ['','context']
-        end
-        # auto suffix with texinputs as fall back
-        if ENV["_CTX_K_V_#{original}_"] then
-            resolved = ENV["_CTX_K_V_#{original}_"]
-            report("environment provides #{original} as #{resolved}") unless $report
-            resolved
-        else
-            check_kpse
-            pstrings.each do |pstr|
-                if resolved.empty? then
-                    # command = "kpsewhich #{pstr} #{original}"
-                    # report("running #{command}")
-                    report("locating '#{original}' in program space '#{pstr}'")
-                    begin
-                        # resolved = `#{command}`.chomp
-                        $kpse.progname = pstr
-                        $kpse.format = ''
-                        resolved = $kpse.find_file(original).gsub(/\\/,'/')
-                    rescue
-                        resolved = ''
-                    end
-                end
-                # elsewhere in the tree
-                if resolved.empty? then
-                    # command = "kpsewhich #{pstr} -format=\"other text files\" #{original}"
-                    # report("running #{command}")
-                    report("locating '#{original}' in program space '#{pstr}' using format 'other text files'")
-                    begin
-                        # resolved = `#{command}`.chomp
-                        $kpse.progname = pstr
-                        $kpse.format = 'other text files'
-                        resolved = $kpse.find_file(original).gsub(/\\/,'/')
-                    rescue
-                        resolved = ''
-                    end
-                end
-            end
-            if resolved.empty? then
-                original = File.dirname(original) if method =~ /path/
-                report("#{original} is not resolved") unless $report
-                ENV["_CTX_K_V_#{original}_"] = original if $crossover
-                original
-            else
-                resolved = File.dirname(resolved) if method =~ /path/
-                report("#{original} is resolved to #{resolved}") unless $report
-                ENV["_CTX_K_V_#{original}_"] = resolved if $crossover
-                resolved
-            end
-        end
-    end
-end
-
-def changeddir?(path)
-    if path.empty? then
-        return true
-    else
-        oldpath = File.expand_path(path)
-        begin
-            Dir.chdir(path) if not path.empty?
-        rescue
-            report("unable to change to directory: #{path}")
-        else
-            report("changed to directory: #{path}")
-        end
-        newpath = File.expand_path(Dir.getwd)
-        return oldpath == newpath
-    end
-end
-
-def runcommand(command)
-    if $locate then
-        command = command.split(' ').collect do |c|
-            if c =~ /\//o then
-                begin
-                    cc = File.expand_path(c)
-                    c = cc if FileTest.file?(cc)
-                rescue
-                end
-            end
-            c
-        end . join(' ')
-        print command # to stdout and no newline
-    elsif $execute then
-        report("using 'exec' instead of 'system' call: #{command}")
-        exec(command) if changeddir?($path)
-    else
-        report("using 'system' call: #{command}")
-        system(command) if changeddir?($path)
-    end
-end
-
-def runoneof(application,fullname,browserpermitted)
-    if browserpermitted && launch(fullname) then
-        return true
-    else
-        report("starting #{$filename}") unless $report
-        output("\n") if $report && $verbose
-        applications = $applications[application.downcase]
-        if ! applications then
-            output("problems with determining application type")
-            return true
-        elsif applications.class == Array then
-            if $report then
-                output([fullname,expanded($arguments)].join(' '))
-                return true
-            else
-                applications.each do |a|
-                    return true if runcommand([a,fullname,expanded($arguments)].join(' '))
-                end
-            end
-        elsif applications.empty? then
-            if $report then
-                output([fullname,expanded($arguments)].join(' '))
-                return true
-            else
-                return runcommand([fullname,expanded($arguments)].join(' '))
-            end
-        else
-            if $report then
-                output([applications,fullname,expanded($arguments)].join(' '))
-                return true
-            else
-                return runcommand([applications,fullname,expanded($arguments)].join(' '))
-            end
-        end
-        return false
-    end
-end
-
-def report(str)
-    $stdout.puts(str) if $verbose
-end
-
-def output(str)
-    $stdout.puts(str)
-end
-
-def usage
-    print "version  : #{$version} - 2003/2006 - www.pragma-ade.com\n"
-    print("\n")
-    print("usage    : texmfstart [switches] filename [optional arguments]\n")
-    print("\n")
-    print("switches : --verbose --report --browser --direct --execute --locate --iftouched --ifchanged\n")
-    print("           --program --file --page --arguments --batch --edit --report --clear\n")
-    print("           --make --lmake --wmake --path --stubpath --indirect --before --after\n")
-    print("           --tree --autotree --environment --showenv\n")
-    print("\n")
-    print("example  : texmfstart pstopdf.rb cow.eps\n")
-    print("           texmfstart --locate examplex.rb\n")
-    print("           texmfstart --execute examplex.rb\n")
-    print("           texmfstart --browser examplap.pdf\n")
-    print("           texmfstart showcase.pdf\n")
-    print("           texmfstart --page=2 --file=showcase.pdf\n")
-    print("           texmfstart --program=yourtex yourscript.rb arg-1 arg-2\n")
-    print("           texmfstart --direct xsltproc kpse:somefile.xsl somefile.xml\n")
-    print("           texmfstart --direct ruby rel:wn-cleanup-1.rb oldfile.xml newfile.xml\n")
-    print("           texmfstart bin:xsltproc env:somepreset path:somefile.xsl somefile.xml\n")
-    print("           texmfstart --iftouched=normal,lowres downsample.rb normal lowres\n")
-    print("           texmfstart --ifchanged=somefile.dat --direct processit somefile.dat\n")
-    print("           texmfstart bin:scite kpse:texmf.cnf\n")
-    print("           texmfstart --exec bin:scite *.tex\n")
-    print("           texmfstart --edit texmf.cnf\n")
-    print("           texmfstart --edit kpse:texmf.cnf\n")
-    print("           texmfstart --serve\n")
-    print("\n")
-    print("           texmfstart --stubpath=/usr/local/bin [--make --remove] --verbose all\n")
-    print("           texmfstart --stubpath=auto [--make --remove] all\n")
-    print("\n")
-    check_kpse
-end
-
-# somehow registration does not work out (at least not under windows)
-
-def tag(name)
-    if $crossover then "_CTX_K_S_#{name}_" else "TEXMFSTART.#{name}" end
-end
-
-def registered?(filename)
-    return ENV[tag(filename)] != nil
-end
-
-def registered(filename)
-    return ENV[tag(filename)] || 'unknown'
-end
-
-def register(filename,fullname)
-    if fullname && ! fullname.empty? then # && FileTest.file?(fullname)
-        ENV[tag(filename)] = fullname
-        report("registering '#{filename}' as '#{fullname}'")
-        return true
-    else
-        return false
-    end
-end
-
-def find(filename,program)
-    begin
-        filename = filename.sub(/script:/o, '') # so we have bin: and script: and nothing
-        if $predefined.key?(filename) then
-            report("expanding '#{filename}' to '#{$predefined[filename]}'")
-            filename = $predefined[filename]
-        end
-        if registered?(filename) then
-            report("already located '#{filename}'")
-            return registered(filename)
-        end
-        # create suffix list
-        if filename =~ /^(.*)\.(.+)$/ then
-            filename = $1
-            suffixlist = [$2]
-        else
-            suffixlist = [$scriptlist.split('|'),$documentlist.split('|')].flatten
-        end
-        # first we honor a given path
-        if filename =~ /[\\\/]/ then
-            report("trying to honor '#{filename}'")
-            suffixlist.each do |suffix|
-                fullname = filename+'.'+suffix
-                if FileTest.file?(fullname) && register(filename,fullname)
-                    return shortpathname(fullname)
-                end
-            end
-        end
-        filename.sub!(/^.*[\\\/]/, '')
-        # next we look at the current path and the callerpath
-        pathlist = [ ]
-        progpath = $applications[suffixlist[0]]
-        threadok = registered("THREAD") !~ /unknown/
-        pathlist << ['.','current']
-        pathlist << [$ownpath,'caller']                                 if $ownpath != '.'
-        pathlist << ["#{$ownpath}/../#{progpath}",'caller']             if progpath
-        pathlist << [registered("THREAD"),'thread']                     if threadok
-        pathlist << ["#{registered("THREAD")}/../#{progpath}",'thread'] if progpath && threadok
-        pathlist.each do |p|
-            if p && ! p.empty? && ! (p[0] == 'unknown') then
-                suffixlist.each do |suffix|
-                    fname = "#{filename}.#{suffix}"
-                    fullname = File.expand_path(File.join(p[0],fname))
-                    report("locating '#{fname}' in #{p[1]} path '#{p[0]}'")
-                    if FileTest.file?(fullname) && register(filename,fullname) then
-                        report("'#{fname}' located in #{p[1]} path")
-                        return shortpathname(fullname)
-                    end
-                end
-            end
-        end
-        # now we consult environment settings
-        fullname = nil
-        check_kpse
-        $kpse.progname = program
-        suffixlist.each do |suffix|
-            begin
-                break unless $suffixinputs[suffix]
-                environment = ENV[$suffixinputs[suffix]] || ENV[$suffixinputs[suffix]+".#{$program}"]
-                if ! environment || environment.empty? then
-                    begin
-                        # environment = `kpsewhich -expand-path=\$#{$suffixinputs[suffix]}`.chomp
-                        environment = $kpse.expand_path("\$#{$suffixinputs[suffix]}")
-                    rescue
-                        environment = nil
-                    else
-                        if environment && ! environment.empty? then
-                            report("using kpsewhich variable #{$suffixinputs[suffix]}")
-                        end
-                    end
-                elsif environment && ! environment.empty? then
-                    report("using environment variable #{$suffixinputs[suffix]}")
-                end
-                if environment && ! environment.empty? then
-                    environment.split($separator).each do |e|
-                        e.strip!
-                        e = '.' if e == '\.' # somehow . gets escaped
-                        e += '/' unless e =~ /[\\\/]$/
-                        fullname = e + filename + '.' + suffix
-                        report("testing '#{fullname}'")
-                        if FileTest.file?(fullname) then
-                            break
-                        else
-                            fullname = nil
-                        end
-                    end
-                end
-            rescue
-                report("environment string '#{$suffixinputs[suffix]}' cannot be used to locate '#{filename}'")
-                fullname = nil
-            else
-                return shortpathname(fullname) if register(filename,fullname)
-            end
-        end
-        return shortpathname(fullname) if register(filename,fullname)
-        # then we fall back on kpsewhich
-        suffixlist.each do |suffix|
-            # TDS script scripts location as per 2004
-            if suffix =~ /(#{$scriptlist})/ then
-                begin
-                    report("using 'kpsewhich' to locate '#{filename}' in suffix space '#{suffix}' (1)")
-                    # fullname = `kpsewhich -progname=#{program} -format=texmfscripts #{filename}.#{suffix}`.chomp
-                    $kpse.format = 'texmfscripts'
-                    fullname = $kpse.find_file("#{filename}.#{suffix}").gsub(/\\/,'/')
-                rescue
-                    report("kpsewhich cannot locate '#{filename}' in suffix space '#{suffix}' (1)")
-                    fullname = nil
-                else
-                    return shortpathname(fullname) if register(filename,fullname)
-                end
-            end
-            # old TDS location: .../texmf/context/...
-            begin
-                report("using 'kpsewhich' to locate '#{filename}' in suffix space '#{suffix}' (2)")
-                # fullname = `kpsewhich -progname=#{program} -format="other text files" #{filename}.#{suffix}`.chomp
-                $kpse.format = 'other text files'
-                fullname = $kpse.find_file("#{filename}.#{suffix}").gsub(/\\/,'/')
-            rescue
-                report("kpsewhich cannot locate '#{filename}' in suffix space '#{suffix}' (2)")
-                fullname = nil
-            else
-                return shortpathname(fullname) if register(filename,fullname)
-            end
-        end
-        return shortpathname(fullname) if register(filename,fullname)
-        # let's take a look at the path
-        paths = ENV['PATH'].split($separator)
-        suffixlist.each do |s|
-            paths.each do |p|
-                suffixedname = "#{filename}.#{s}"
-                report("checking #{p} for #{filename}")
-                if FileTest.file?(File.join(p,suffixedname)) then
-                    fullname = File.join(p,suffixedname)
-                    return  shortpathname(fullname) if register(filename,fullname)
-                end
-            end
-        end
-        # bad luck, we need to search the tree ourselves
-        if (suffixlist.length == 1) && (suffixlist.first =~ /(#{$documentlist})/) then
-            report("aggressively locating '#{filename}' in document trees")
-            begin
-                # texroot = `kpsewhich -expand-var=$SELFAUTOPARENT`.chomp
-                texroot = $kpse.expand_var("$SELFAUTOPARENT")
-            rescue
-                texroot = ''
-            else
-                texroot.sub!(/[\\\/][^\\\/]*?$/, '')
-            end
-            if not texroot.empty? then
-                sffxlst = suffixlist.join(',')
-                begin
-                    report("locating '#{filename}' in document tree '#{texroot}/doc*'")
-                    if (result = Dir.glob("#{texroot}/doc*/**/#{filename}.{#{sffxlst}}")) && result && result[0] && FileTest.file?(result[0]) then
-                        fullname = result[0]
-                    end
-                rescue
-                    report("locating '#{filename}.#{suffixlist.join('|')}' in tree '#{texroot}' aborted")
-                end
-            end
-            return shortpathname(fullname) if register(filename,fullname)
-        end
-        report("aggressively locating '#{filename}' in tex trees")
-        begin
-            # textrees = `kpsewhich -expand-var=$TEXMF`.chomp
-            textrees = $kpse.expand_var("$TEXMF")
-        rescue
-            textrees = ''
-        end
-        if not textrees.empty? then
-            textrees.gsub!(/[\{\}\!]/, '')
-            textrees = textrees.split(',')
-            if (suffixlist.length == 1) && (suffixlist.first =~ /(#{$documentlist})/) then
-                speedup = ['doc**','**']
-            else
-                speedup = ['**']
-            end
-            sffxlst = suffixlist.join(',')
-            speedup.each do |speed|
-                textrees.each do |tt|
-                    tt.gsub!(/[\\\/]$/, '')
-                    if FileTest.directory?(tt) then
-                        begin
-                            report("locating '#{filename}' in tree '#{tt}/#{speed}/#{filename}.{#{sffxlst}}'")
-                            if (result = Dir.glob("#{tt}/#{speed}/#{filename}.{#{sffxlst}}")) && result && result[0] && FileTest.file?(result[0]) then
-                                fullname = result[0]
-                                break
-                            end
-                        rescue
-                            report("locating '#{filename}' in tree '#{tt}' aborted")
-                            next
-                        end
-                    end
-                end
-                break if fullname && ! fullname.empty?
-            end
-        end
-        if register(filename,fullname) then
-            return shortpathname(fullname)
-        else
-            return ''
-        end
-    rescue
-        error, trace = $!, $@.join("\n")
-        report("fatal error: #{error}\n#{trace}")
-        # report("fatal error")
-    end
-end
-
-def run(fullname)
-    if ! fullname || fullname.empty? then
-        output("the file '#{$filename}' is not found")
-    elsif FileTest.file?(fullname) then
-        begin
-            case fullname
-                when /\.(#{$scriptlist})$/i then
-                    return runoneof($1,fullname,false)
-                when /\.(#{$documentlist})$/i then
-                    return runoneof($1,fullname,true)
-                else
-                    return runoneof('unknown',fullname,false)
-            end
-        rescue
-            report("starting '#{$filename}' in program space '#{$program}' fails (#{$!})")
-        end
-    else
-        report("the file '#{$filename}' in program space '#{$program}' is not accessible")
-    end
-    return false
-end
-
-def direct(fullname)
-    begin
-        return runcommand([fullname.sub(/^(bin|binary)\:/, ''),expanded($arguments)].join(' '))
-    rescue
-        return false
-    end
-end
-
-def edit(filename)
-    begin
-        return runcommand([$editor,expanded(filename),expanded($arguments)].join(' '))
-    rescue
-        return false
-    end
-end
-
-def make(filename,windows=false,linux=false,remove=false)
-    basename = File.basename(filename).gsub(/\.[^.]+?$/, '')
-    if $stubpath == 'auto' then
-        basename = File.dirname($0) + '/' + basename
-    else
-        basename = $stubpath + '/' + basename unless $stubpath.empty?
-    end
-    if filename == 'texmfstart' then
-        program = 'ruby'
-        command = 'kpsewhich --format=texmfscripts --progname=context texmfstart.rb'
-        filename = `#{command}`.chomp.gsub(/\\/, '/')
-        if filename.empty? then
-            report("failure: #{command}")
-            return
-        elsif not remove then
-            if windows then
-                ['bat','exe'].each do |suffix|
-                    if FileTest.file?("#{basename}.#{suffix}") then
-                        report("windows stub '#{basename}.#{suffix}' skipped (already present)")
-                        return
-                    end
-                end
-            elsif linux && FileTest.file?(basename) then
-                report("unix stub '#{basename}' skipped (already present)")
-                return
-            end
-        end
-    else
-        program = nil
-        if filename =~ /[\\\/]/ && filename =~ /\.(#{$scriptlist})$/ then
-            program = $applications[$1]
-        end
-        filename = "\"#{filename}\"" if filename =~ /\s/
-        program = 'texmfstart' if $indirect || ! program || program.empty?
-    end
-    begin
-        callname = $predefined[filename.sub(/\.*?$/,'')] || filename
-        if remove then
-            if windows && (File.delete(basename+'.bat') rescue false) then
-                report("windows stub '#{basename}.bat' removed (calls #{callname})")
-            elsif linux && (File.delete(basename) rescue false) then
-                report("unix stub '#{basename}' removed (calls #{callname})")
-            end
-        else
-            if windows && f = open(basename+'.bat','w') then
-                f.binmode
-                f.write("@echo off\015\012")
-                f.write("#{program} #{callname} %*\015\012")
-                f.close
-                report("windows stub '#{basename}.bat' made (calls #{callname})")
-            elsif linux && f = open(basename,'w') then
-                f.binmode
-                f.write("#!/bin/sh\012")
-                f.write("#{program} #{callname} \"$@\"\012")
-                f.close
-                report("unix stub '#{basename}' made (calls #{callname})")
-            end
-        end
-    rescue
-        report("failed to make stub '#{basename}' #{$!}")
-        return false
-    else
-        return true
-    end
-end
-
-def process(&block)
-    if $iftouched then
-        files = $directives['iftouched'].split(',')
-        oldname, newname = files[0], files[1]
-        if oldname && newname && File.needsupdate(oldname,newname) then
-            report("file #{oldname}: #{File.timestamp(oldname)}")
-            report("file #{newname}: #{File.timestamp(newname)}")
-            report("file is touched, processing started")
-            yield
-            File.syncmtimes(oldname,newname)
-        else
-            report("file #{oldname} is untouched")
-        end
-    elsif $ifchanged then
-        filename = $directives['ifchanged']
-        checkname = filename + ".md5"
-        oldchecksum, newchecksum = "old", "new"
-        begin
-            newchecksum = MD5.new(IO.read(filename)).hexdigest.upcase
-        rescue
-            newchecksum = "new"
-        else
-            begin
-                oldchecksum = IO.read(checkname).chomp
-            rescue
-                oldchecksum = "old"
-            end
-        end
-        if $verbose then
-            report("old checksum #{filename}: #{oldchecksum}")
-            report("new checksum #{filename}: #{newchecksum}")
-        end
-        if oldchecksum != newchecksum then
-            report("file is changed, processing started")
-            begin
-                File.open(checkname,'w') do |f|
-                    f << newchecksum
-                end
-            rescue
-            end
-            yield
-        else
-            report("file #{filename} is unchanged")
-        end
-    else
-        yield
-    end
-end
-
-def checkenvironment(tree)
-    report('')
-    ENV['TMP'] = ENV['TMP'] || ENV['TEMP'] || ENV['TMPDIR'] || ENV['HOME']
-    case RUBY_PLATFORM
-        when /(mswin|bccwin|mingw|cygwin)/i then ENV['TEXOS'] = ENV['TEXOS'] || 'texmf-mswin'
-        when /(linux)/i                     then ENV['TEXOS'] = ENV['TEXOS'] || 'texmf-linux'
-        when /(darwin|rhapsody|nextstep)/i  then ENV['TEXOS'] = ENV['TEXOS'] || 'texmf-macosx'
-    #   when /(netbsd|unix)/i               then # todo
-        else                                     # todo
-    end
-    ENV['TEXOS']   = "#{ENV['TEXOS'].sub(/^[\\\/]*/, '').sub(/[\\\/]*$/, '')}"
-    ENV['TEXPATH'] = tree.sub(/\/+$/,'') # + '/'
-    ENV['TEXMFOS'] = "#{ENV['TEXPATH']}/#{ENV['TEXOS']}"
-    report('')
-    report("preset : TEXPATH => #{ENV['TEXPATH']}")
-    report("preset : TEXOS   => #{ENV['TEXOS']}")
-    report("preset : TEXMFOS => #{ENV['TEXMFOS']}")
-    report("preset : TMP => #{ENV['TMP']}")
-    report('')
-end
-
-def loadfile(filename)
-    begin
-        IO.readlines(filename).each do |line|
-            case line.chomp
-                when /^[\#\%]/ then
-                    # comment
-                when /^(.*?)\s*(\>|\=|\<)\s*(.*)\s*$/ then
-                    # = assign | > prepend | < append
-                    key, how, value = $1, $2, $3
-                    begin
-                        # $SAFE = 0
-                        value.gsub!(/\%(.*?)\%/) do
-                            ENV[$1] || ''
-                        end
-                        # value.gsub!(/\;/,$separator) if key =~ /PATH/i then
-                        case how
-                            when '=', '<<' then ENV[key] = value
-                            when '?', '??' then ENV[key] = ENV[key] || value
-                            when '<', '+=' then ENV[key] = (ENV[key] || '') + $separator + value
-                            when '>', '=+' then ENV[key] = value + $separator + (ENV[key] ||'')
-                        end
-                    rescue
-                        report("user set failed : #{key} (#{$!})")
-                    else
-                        report("user set : #{key} => #{ENV[key]}")
-                    end
-            end
-        end
-    rescue
-        report("error in reading file '#{filename}'")
-    end
-end
-
-def loadtree(tree)
-    begin
-        unless tree.empty? then
-            if File.directory?(tree) then
-                setuptex = File.join(tree,'setuptex.tmf')
-            else
-                setuptex = tree.dup
-            end
-            if FileTest.file?(setuptex) then
-                report("tex tree definition: #{setuptex}")
-                checkenvironment(File.dirname(setuptex))
-                loadfile(setuptex)
-            else
-                report("no setup file '#{setuptex}'")
-            end
-        end
-    rescue
-        # maybe tree is empty or boolean (no arg given)
-    end
-end
-
-def loadenvironment(environment)
-    begin
-        unless environment.empty? then
-            filename = if $path.empty? then environment else File.expand_path(File.join($path,environment)) end
-            if FileTest.file?(filename) then
-                report("environment : #{environment}")
-                loadfile(filename)
-            else
-                report("no environment file '#{environment}'")
-            end
-        end
-    rescue
-        report("problem while loading '#{environment}'")
-    end
-end
-
-def show_environment
-    if $showenv then
-        keys = ENV.keys.sort
-        size = 0
-        keys.each do |k|
-            size = k.size if k.size > size
-        end
-        report('')
-        keys.each do |k|
-            report("#{k.rjust(size)} => #{ENV[k]}")
-        end
-        report('')
-    end
-end
-
-def execute(arguments)
-
-    arguments = arguments.split(/\s+/) if arguments.class == String
-
-    $directives = hashed(arguments)
-
-    $help        = $directives['help']        || false
-    $batch       = $directives['batch']       || false
-    $filename    = $directives['file']        || ''
-    $program     = $directives['program']     || 'context'
-    $direct      = $directives['direct']      || false
-    $edit        = $directives['edit']        || false
-    $page        = $directives['page']        || 1
-    $browser     = $directives['browser']     || false
-    $report      = $directives['report']      || false
-    $verbose     = $directives['verbose']     || false
-    $arguments   = $directives['arguments']   || ''
-    $execute     = $directives['execute']     || $directives['exec'] || false
-    $locate      = $directives['locate']      || false
-
-    $autotree    = if $directives['autotree'] then (ENV['TEXMFSTART_TREE'] || ENV['TEXMFSTARTTREE'] || '') else '' end
-
-    $path        = $directives['path']        || ''
-    $tree        = $directives['tree']        || $autotree || ''
-    $environment = $directives['environment'] || ''
-
-    $make        = $directives['make']        || false
-    $remove      = $directives['remove']      || $directives['delete'] || false
-    $unix        = $directives['unix']        || false
-    $windows     = $directives['windows']     || $directives['mswin'] || false
-    $stubpath    = $directives['stubpath']    || ''
-    $indirect    = $directives['indirect']    || false
-
-    $before      = $directives['before']      || ''
-    $after       = $directives['after']       || ''
-
-    $iftouched   = $directives['iftouched']   || false
-    $ifchanged   = $directives['ifchanged']   || false
-
-    $openoffice  = $directives['oo']          || false
-
-    $crossover   = false if $directives['clear']
-
-    $showenv     = $directives['showenv']     || false
-    $verbose     = true if $showenv
-
-    $serve       = $directives['serve']       || false
-
-    $verbose = true if (ENV['_CTX_VERBOSE_'] =~ /(y|yes|t|true|on)/io) && ! $locate && ! $report
-
-    set_applications($page)
-
-    # private:
-
-    $selfmerge   = $directives['selfmerge'] || false
-    $selfcleanup = $directives['selfclean'] || $directives['selfcleanup'] || false
-
-    ENV['_CTX_VERBOSE_'] = 'yes' if $verbose
-
-    if $openoffice then
-        if ENV['OOPATH'] then
-            if FileTest.directory?(ENV['OOPATH']) then
-                report("using open office python")
-                if $mswindows then
-                    $applications['python'] = $applications['py']  = "\"#{File.join(ENV['OOPATH'],'program','python.bat')}\""
-                else
-                    $applications['python'] = $applications['py']  = File.join(ENV['OOPATH'],'python')
-                end
-                report("python path #{$applications['python']}")
-            else
-                report("environment variable 'OOPATH' does not exist")
-            end
-        else
-            report("environment variable 'OOPATH' is not set")
-        end
-    end
-
-    if $selfmerge then
-        output("ruby libraries are cleaned up") if SelfMerge::cleanup
-        output("ruby libraries are merged")     if SelfMerge::merge
-        return true
-    elsif $selfcleanup then
-        output("ruby libraries are cleaned up") if SelfMerge::cleanup
-        return true
-    elsif $serve then
-        if ENV['KPSEMETHOD'] && ENV['KPSEPORT'] then
-            # # kpse_merge_done: require 'base/kpseremote'
-            begin
-                KpseRemote::start_server
-            rescue
-                return false
-            else
-                return true
-            end
-        else
-            usage
-            puts("")
-            puts("message  : set 'KPSEMETHOD' and 'KPSEPORT' variables")
-            return false
-        end
-    elsif $help || ! $filename || $filename.empty? then
-        usage
-        loadtree($tree)
-        loadenvironment($environment)
-        show_environment()
-        return true
-    elsif $batch && $filename && ! $filename.empty? then
-        # todo, take commands from file and avoid multiple starts and checks
-        return false
-    else
-        report("texmfstart version #{$version}")
-        loadtree($tree)
-        loadenvironment($environment)
-        show_environment()
-        if $make || $remove then
-            if $filename == 'all' then
-                makelist = $makelist
-            else
-                makelist = [$filename]
-            end
-            makelist.each do |filename|
-                if $windows then
-                    make(filename,true,false,$remove)
-                elsif $unix then
-                    make(filename,false,true,$remove)
-                else
-                    make(filename,$mswindows,!$mswindows,$remove)
-                end
-            end
-            return true # guess
-        elsif $browser && $filename =~ /^http\:\/\// then
-            return launch($filename)
-        else
-            begin
-                process do
-                    if $direct || $filename =~ /^bin\:/ then
-                        return direct($filename)
-                    elsif $edit && ! $editor.empty? then
-                        return edit($filename)
-                    else # script: or no prefix
-                        command = find(shortpathname($filename),$program)
-                        if command then
-                            register("THREAD",File.dirname(File.expand_path(command)))
-                            return run(command)
-                        else
-                            report('unable to locate program')
-                            return false
-                        end
-                    end
-                end
-            rescue
-                report('fatal error in starting process')
-                return false
-            end
-        end
-    end
-
-end
-
-if execute(ARGV) then
-    report("\nexecution was successful") if $verbose
-    exit(0)
-else
-    report("\nexecution failed") if $verbose
-    exit(1)
-end
-
-# exit (if ($?.to_i rescue 0) > 0 then 1 else 0 end)
diff --git a/Master/bin/i386-linux/texsis b/Master/bin/i386-linux/texsis
deleted file mode 120000
index f68cc91498e..00000000000
--- a/Master/bin/i386-linux/texsis
+++ /dev/null
@@ -1 +0,0 @@
-pdftex
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/textools b/Master/bin/i386-linux/textools
deleted file mode 100755
index 7445eac371c..00000000000
--- a/Master/bin/i386-linux/textools
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-texmfstart textools.rb "$@"
diff --git a/Master/bin/i386-linux/texutil b/Master/bin/i386-linux/texutil
deleted file mode 100755
index 607154af059..00000000000
--- a/Master/bin/i386-linux/texutil
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-texmfstart texutil.rb "$@"
diff --git a/Master/bin/i386-linux/tftopl b/Master/bin/i386-linux/tftopl
deleted file mode 100755
index e2ac54060ca..00000000000
--- a/Master/bin/i386-linux/tftopl
+++ /dev/null
diff --git a/Master/bin/i386-linux/thumbpdf b/Master/bin/i386-linux/thumbpdf
deleted file mode 120000
index 98a72428616..00000000000
--- a/Master/bin/i386-linux/thumbpdf
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/scripts/thumbpdf/thumbpdf.pl
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/tie b/Master/bin/i386-linux/tie
deleted file mode 100755
index 669db278e6a..00000000000
--- a/Master/bin/i386-linux/tie
+++ /dev/null
diff --git a/Master/bin/i386-linux/tmftools b/Master/bin/i386-linux/tmftools
deleted file mode 100755
index 7531a966390..00000000000
--- a/Master/bin/i386-linux/tmftools
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-texmfstart tmftools.rb "$@"
diff --git a/Master/bin/i386-linux/tpic2pdftex b/Master/bin/i386-linux/tpic2pdftex
deleted file mode 100755
index 70c1a33c7e8..00000000000
--- a/Master/bin/i386-linux/tpic2pdftex
+++ /dev/null
@@ -1,407 +0,0 @@
-#!/bin/sh -
-#
-# $Id: tpic2pdftex,v 1.94 2007/01/14 19:05:32 hahe Exp $
-#
-# Experimental awk-script for conversion of tpic \specials as produced
-# by (groff-)pic into pdfTeX \pdfliteral sections for further processing
-# by pdftex.
-#
-# Usage:
-#   $ pic -t somefile.pic | tpic2pdftex > somefile.tex
-#
-#   Process somefile.tex by pdftex/pdflatex.
-#
-# tpic \special desciption see e. g.:
-#   Goossens, Rahtz, Mittelbach: The LaTeX Graphics Companion,
-#   Addison-Wesley, 1997, pp. 464.
-#
-# Bugs:
-#   Spline curve shapes not fully authentic (unknown algorithm).
-#   Bounding box does not care for line thickness (groff pic feature).
-#   Splines might be outside bounding box.
-#
-# Copyright (C) 2002--2004 by Hartmut Henkel
-#
-# 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
-#
-# The author may be contacted via the e-mail address
-#
-#         hartmut_henkel@gmx.de
-#
-# NEWS:
-#   14 Jan. 2007 - make it executable shell script, calling awk
-#   16 Dec. 2004 - Replaced // {print} by {print} (some AWKs did choke)
-#   09 Apr. 2004 - Locale check: Decimal point in float numbers?
-#   30 Oct. 2003 - Replaced print statements by printf to avoid
-#   underflow numbers like 1e-14 in \pdfliterals. Remove trailing
-#   zeroes of floating point numbers.
-#   02 May  2003 - Lines starting with \ allow TeX insertions,
-#   e. g. of pdfTeX \pdfliteral{}
-#   29 Apr. 2003 - Changed for pic of groff 1.19
-#   16 Mar. 2003 - Bug corrected: Dashed lines shorter than minimum
-#   dash-pause length now drawn solid.
-#   11 Nov. 2002 - Spline drawing improved: First half of first and last
-#   half of last spline segments are drawn by straight lines.
-#   28 Nov. 2002 - Arc and circle drawing cleaned up. Full circle is now
-#   drawn by 4 Bezier curves, as is common use. Arcs split evenly into
-#   Bezier curves, to minimize max. error.
-#   02 Dec. 2002 - Experimental pic (groff > 1.18.1) with improved
-#   vertical picture positioning supported.
-#   04 Dec. 2002 - Experiment with modified pic (\vtop -> \vbox),
-#   Formula for Bezier constant c reduced.
-#
-########################################################################
-
-AWK=${AWK:-gawk}
-export LANG="C"
-
-AWKPROG='
-# begin of awk input file
-
-function qprintf(a) {
-  gsub(/0* /," ", a);   # trailing zeroes in %f
-  gsub(/\. /," ", a);   # orphaned decimal dots
-  gsub(/0*]/,"]", a);   # trailing zeroes in brackets
-  gsub(/0X/,"0", a);    # guard integer zeroes
-  gsub(/-0 /,"0 ", a);  # correct -0 to 0
-  print a;
-}
-
-function startpdfliteral() {
-  if (pdfliteral == 0) {
-    print "\\pdfliteral{";
-    printf("q [] 0 d %d J %d j\n", linecap, linejoin);   # no qprintf!
-    qprintf(sprintf("%f w", linethickness * wscale));
-  }
-  pdfliteral = 1;
-}
-
-function stoppdfliteral() {
-  if (pdfliteral == 1) {
-    print "Q";
-    print "}%";
-  }
-  pdfliteral = 0;
-}
-
-########################################################################
-
-BEGIN{
-  wscale = 72.0 / 1000;
-  tpicmode = 0;
-  pdfliteral = 0;
-  pointbuf = 0;
-  filled = 0;
-  fillval = 0;
-  linecap = 1;
-  linejoin = 1;
-  defaultlinethickness = 8;
-  drawarc = 0;
-  pi = atan2(0, -1);
-  if (match(sprintf("%f", 0.5), /\./) == 0) {
-    print "ERROR: Floating point numbers miss decimal point. Do"
-    print "  export LANG=\"C\""
-    print "before calling awk."
-    print "ERROR: Floating point numbers miss decimal point. Do" > "/dev/stderr"
-    print "  export LANG=\"C\"" > "/dev/stderr"
-    print "before calling awk." > "/dev/stderr"
-    exit 1;
-  }
-}
-
-########################################################################
-
-# the following expression triggers tpic processing for pic <= 1.18.1
-
-/^\\setbox\\graph=\\vtop{/ {
-  pdfliteral = 0;
-  tpicmode = 1;
-  linethickness = defaultlinethickness;
-}
-
-# the following expression triggers tpic processing for pic = 1.19
-
-/^\\expandafter\\setbox\\csname graph\\endcsname/ {
-  pdfliteral = 0;
-  tpicmode = 1;
-  linethickness = defaultlinethickness;
-}
-
-# TeX parts end \pdfliteral, and also TeX parts embedded in .PS ... .PE
-# section end \pdfliteral
-
-/^  *\\graphtemp|^  *\\rlap|^  *\\advance|^\\|^  *\\hbox/ {
-  if(tpicmode == 1)
-    stoppdfliteral();
-}
-
-/^}%/ {
-  if(tpicmode == 1)
-    tpicmode = 0;
-}
-
-########################################################################
-
-# all specials handling
-
-/^  *\\special/ {
-  if(tpicmode == 1)
-    startpdfliteral();
-}
-
-# <pn> set pen size
-
-/^  *\\special{pn/ {
-  gsub(/[{}]/, " ");
-  linethickness = $3 + 0;
-  qprintf(sprintf("%f w", linethickness * wscale));
-  next;
-}
-
-# <pa> add point to path
-
-/^  *\\special{pa/ {
-  gsub(/[{}]/, " ");
-  x[pointbuf] = $3 + 0;
-  y[pointbuf] = $4 + 0;
-  pointbuf++;
-  next;
-}
-
-# <fp> print path as straight lines
-
-/^  *\\special{fp/ {
-  if (filled == 1)
-    qprintf(sprintf("q %f g", 1 - fillval));
-  qprintf(sprintf("%f %f m", x[0] * wscale, -y[0] * wscale));
-  for (i = 1; i < pointbuf; i++)
-    qprintf(sprintf("%f %f l", x[i] * wscale, -y[i] * wscale));
-  if (filled == 1)
-    print "B Q";
-  else
-    print "S";
-  pointbuf = 0;
-  filled = 0;
-  next;
-}
-
-# <da> print path as straight dashed lines
-
-/^  *\\special{da/ {
-  gsub(/[{}]/, " ");
-  don = ($3 + 0) * 1000;
-  if (filled == 1) {
-    qprintf(sprintf("q %f g", 1 - fillval));
-    qprintf(sprintf("%f %f m", x[0] * wscale, -y[0] * wscale));
-    for (i = 1; i < pointbuf; i++)
-      qprintf(sprintf("%f %f l", x[i] * wscale, -y[i] * wscale));
-    print "f Q";
-  }
-  for (i = 1; i < pointbuf; i++) {
-    dx = x[i] - x[i - 1];
-    dy = y[i] - y[i - 1];
-    len = sqrt(dx * dx + dy * dy);
-    non = int(0.5 * len / don + 0.75);
-    noff = non - 1;
-    lon = don * non;
-    loff = len - lon;
-    if(noff > 0) {
-      doff = loff / noff;
-      qprintf(sprintf("q [%f %f] 0X d", don * wscale, doff * wscale));
-    } else {
-      print "q [] 0 d";
-    }
-    qprintf(sprintf("%f %f m", x[i - 1] * wscale, -y[i - 1] * wscale));
-    qprintf(sprintf("%f %f l", x[i] * wscale, -y[i] * wscale));
-    print "S Q";
-  }
-  pointbuf = 0;
-  filled = 0;
-  next;
-}
-
-# <dt> print path as straight dotted lines
-
-/^  *\\special{dt/ {
-  gsub(/[{}]/, " ");
-  dt = ($3 + 0) * 1000;
-  if (filled == 1) {
-    qprintf(sprintf("q %f g", 1 - fillval));
-    qprintf(sprintf("%f %f m", x[0] * wscale, -y[0] * wscale));
-    for (i = 1; i < pointbuf; i++)
-      qprintf(sprintf("%f %f l", x[i] * wscale, -y[i] * wscale));
-    print "f Q";
-  }
-  for (i = 1; i < pointbuf; i++) {
-    dx = x[i] - x[i - 1];
-    dy = y[i] - y[i - 1];
-    len = sqrt(dx * dx + dy * dy);
-    dl = int (len / dt + 0.5);
-    if (!dl)
-      dtl = len;
-    else
-      dtl = len / dl;
-    qprintf(sprintf("q [0X %f] 0X d", dtl * wscale));
-    qprintf(sprintf("%f %f m", x[i - 1] * wscale, -y[i - 1] * wscale));
-    qprintf(sprintf("%f %f l", x[i] * wscale, -y[i] * wscale));
-    print "S Q";
-  }
-  pointbuf = 0;
-  filled = 0;
-  next;
-}
-
-# <ip> like <fp>, but path actually not drawn
-
-/^  *\\special{ip/ {
-  if (filled == 1)
-    qprintf(sprintf("q %f g", 1 - fillval));
-  qprintf(sprintf("%f %f m", x[0] * wscale, -y[0] * wscale));
-  for (i = 1; i < pointbuf; i++)
-    qprintf(sprintf("%f %f l", x[i] * wscale, -y[i] * wscale));
-  if (filled == 1)
-    print "f Q";
-  else
-    print "f";
-  pointbuf = 0;
-  filled = 0;
-  next;
-}
-
-# <sp> like <fp>, but path printed as splines
-
-/^  *\\special{sp/ {
-  gsub(/[{}]/, " ");
-  don = ($3 + 0) * 1000;
-  a = 0.68; # fudge, visually optimized
-  x[pointbuf] = x[pointbuf - 1];
-  y[pointbuf] = y[pointbuf - 1];
-
-  if (don > 0)
-    qprintf(sprintf("q [%f] 0X d", don * wscale));
-  if (don < 0)
-    qprintf(sprintf("q [0X %f] 0X d", -don * wscale));
-
-  qprintf(sprintf("%f %f m", x[0] * wscale, -y[0] * wscale));
-
-  if(pointbuf < 3)
-    qprintf(sprintf("%f %f l", x[pointbuf - 1] * wscale, -y[pointbuf - 1] * wscale));
-  else {
-    qprintf(sprintf("%f %f l", 0.5 * (x[0] + x[1]) * wscale, \
-     -0.5 * (y[0] + y[1]) * wscale)); # start straight, see cstr116.ps
-    for (i = 1; i < pointbuf - 1; i++)
-      qprintf(sprintf("%f %f %f %f %f %f c", \
-        (a * x[i] + (1 - a) * 0.5 * (x[i] + x[i - 1])) * wscale, \
-       -(a * y[i] + (1 - a) * 0.5 * (y[i] + y[i - 1])) * wscale, \
-        (a * x[i] + (1 - a) * 0.5 * (x[i] + x[i + 1])) * wscale, \
-       -(a * y[i] + (1 - a) * 0.5 * (y[i] + y[i + 1])) * wscale, \
-        0.5 * (x[i] + x[i + 1]) * wscale, -0.5 * (y[i] + y[i + 1]) * wscale));
-    qprintf(sprintf("%f %f l", x[pointbuf - 1] * wscale, -y[pointbuf - 1] * wscale));
-  }
-  if (filled == 1) {
-    qprintf(sprintf("q %f g", 1 - fillval));
-    print "B Q";
-  }
-  else
-    print "S";
-  if (don != 0)
-    print "Q";
-  pointbuf = 0;
-  filled = 0;
-  next;
-}
-
-# <sh> prepare shading of object interior
-
-/^  *\\special{sh/ {
-  gsub(/[{}]/, " ");
-  fillval = $3 + 0;
-  filled = 1;
-  next;
-}
-
-# <ar> draw arc
-# <ia> like <ar>, but arc actually not drawn
-
-/^  *\\special{ar/ {
-  drawarc = 1;
-}
-
-/^  *\\special{ar|^  *\\special{ia/ {
-  gsub(/[{}]/, " ");
-  xc = $3 + 0;
-  yc = $4 + 0;
-  rx = $5 + 0;
-  ry = $6 + 0;
-  s = $7 + 0;
-  e = $8 + 0;
-  if (e - s > 2 * pi) e = s + 2 * pi;
-  if (s - e > 2 * pi) e = s - 2 * pi;
-  curvespercircle = 4; # max. number Bezier curves per circle
-  phi_max = 1.001 * 2 * pi / curvespercircle;
-  if (e > s)
-    imax = int ((e - s) / phi_max) + 1;
-  else
-    imax = int ((s - e) / phi_max) + 1;
-  phi = (e - s) / imax;
-
-  # parameter for Bezier control vectors, c(90 deg.) = 0.55228...:
-  c = 4 * (1 - cos(0.5 * phi)) / (3 * sin(0.5 * phi));
-
-  x0 = rx * cos(s) + xc;
-  y0 = ry * sin(s) + yc;
-  qprintf(sprintf("%f %f m", x0 * wscale, -y0 * wscale));
-  for (i = 0; i < imax; i++) {
-    x1 = x0 - rx * c * sin(s + i * phi);
-    y1 = y0 + ry * c * cos(s + i * phi);
-    x3 = rx * cos(s + (i + 1) * phi) + xc;
-    y3 = ry * sin(s + (i + 1) * phi) + yc;
-    x2 = x3 + rx * c * sin(s + (i + 1) * phi);
-    y2 = y3 - ry * c * cos(s + (i + 1) * phi);
-    qprintf(sprintf("%f %f %f %f %f %f c", x1 * wscale, -y1 * wscale, \
-      x2 * wscale, -y2 * wscale, x3 * wscale, -y3 * wscale));
-    x0 = x3;
-    y0 = y3;
-  }
-  if(drawarc == 1) {
-    if (filled == 1) {
-      qprintf(sprintf("h q %f g", 1 - fillval));
-      print "B Q";
-    }
-    else
-      print "S";
-  } else {
-    if (filled == 1) {
-      qprintf(sprintf("h q %f g", 1 - fillval));
-      print "f Q";
-    }
-    else
-      print "f";
-  }
-  filled = 0;
-  drawarc = 0;
-  next;
-}
-
-########################################################################
-
-{print}
-
-########################################################################
-'
-# end of awk input file
-
-$AWK "$AWKPROG" "$@"
diff --git a/Master/bin/i386-linux/ttf2afm b/Master/bin/i386-linux/ttf2afm
deleted file mode 100755
index 550baf96232..00000000000
--- a/Master/bin/i386-linux/ttf2afm
+++ /dev/null
diff --git a/Master/bin/i386-linux/ttf2pk b/Master/bin/i386-linux/ttf2pk
deleted file mode 100755
index 12b14c1b455..00000000000
--- a/Master/bin/i386-linux/ttf2pk
+++ /dev/null
diff --git a/Master/bin/i386-linux/ttf2tfm b/Master/bin/i386-linux/ttf2tfm
deleted file mode 100755
index 15c4bd37838..00000000000
--- a/Master/bin/i386-linux/ttf2tfm
+++ /dev/null
diff --git a/Master/bin/i386-linux/ttftotype42 b/Master/bin/i386-linux/ttftotype42
deleted file mode 100755
index fa9f905dde2..00000000000
--- a/Master/bin/i386-linux/ttftotype42
+++ /dev/null
diff --git a/Master/bin/i386-linux/updmap b/Master/bin/i386-linux/updmap
deleted file mode 100755
index 02482d2bce3..00000000000
--- a/Master/bin/i386-linux/updmap
+++ /dev/null
@@ -1,1402 +0,0 @@
-#!/bin/sh
-# updmap: utility to maintain map files for outline fonts.
-# Thomas Esser. Public domain.
-# Run with --help for usage.
-
-###############################################################################
-# program history:
-#   Post-te retirement, now maintained in TeX Live; see
-#     Build/texk/tetex/ChangeLog for further changes.
-#   Fr Jul 22 07:22:38 CEST 2005
-#      write hint about log file into output files
-#   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
-#      honor $TMPDIR, $TEMP and $TMP, not just $TMP
-#   Do Mär 10 19:31:39 CET 2005
-#      add a few quotes for $cnfFile with whitespace
-#   Sa Jan 15 18:13:46 CET 2005
-#      avoid multiple variable assignments in one statement
-#   Sa Dez 25 12:44:23 CET 2004
-#      implementaion adopted for teTeX-3.0 (tcfmgr)
-#   Mi Nov  3 16:33:22 CET 2004
-#      add "--setoption option=value" syntax
-#   Fr Okt 29 21:05:53 CEST 2004
-#      add --enable Map=... / --enable MixedMap=...
-#   Mi Okt 20 19:17:19 CEST 2004
-#      transcript added; even better warnings / error messages
-#   So Okt 17 19:07:17 CEST 2004
-#      improved warnings / error messages
-#      added --syncwithtrees
-#      added --listavailablemaps
-#   Mi Okt  6 16:37:49 CEST 2004
-#      commenty may start with any of *#;%
-#   Sun Aug  1 11:42:14 CEST 2004, te
-#      remove pdftex related hacks; pdftex no longer needs them!
-#   Thu May 13 22:04:23 CEST 2004, te
-#      support user with new map file locations
-#   Fri Mar 19 15:22:55 CET 2004, te
-#      output "xxx yyy" instead of " xxx yyy " (less blanks)
-#   Fri Jan  2 22:41:11 CET 2004, te:
-#      add version string
-#   Wed Aug 20 18:51:47 CEST 2003
-#      store map files to fonts/map, add options for dvipsoutputdir,
-#      pdftexoutputdir, dvipdfmoutputdir
-#   Mon Mar 24 13:40:55 CET 2003
-#      fix fmex[789] for dvipdfm (no -r option)
-#   Sun Mar 23 18:58:00 CET 2003
-#      make the script robust against whitespace in filenames
-#   Mon Jan 27 22:38:44 CET 2003
-#      don't call a function before processOptions; we may loose our
-#      argument list with some broken shells
-#   Mon Jan 27 06:55:28 CET 2003
-#      fix unportable egrep / sed
-#   Sat Jan 18 10:10:26 CET 2003
-#      use $tmp8 in dvips2dvipdfm()
-#   Thu Jan  2 23:14:34 CET 2003
-#      add umask 022, so generated files are always world-readable
-#   Sun Oct 27 11:33:04 CET 2002
-#      write output in normalized format
-#      add support for dvipdfm
-#   Mon Sep 22 19:18:57 CEST 2002
-#      fix typo: buildin -> builtin
-#   Mon Sep  2 19:18:57 CEST 2002
-#      fix condensed <-> narrow mapping
-#   Sun Sep  1 15:02:28 CEST 2002
-#      add dvipsDownloadBase35 / pdftexDownloadBase14 options
-#   Wed May 22 20:00:13 CEST 2002
-#      listmaps option added by Gerben Wierda
-#   Tue May 21 05:27:37 CEST 2002
-#      now removing map files before rewriting them; fixes permission problems
-#   Tue May 21 05:05:34 CEST 2002:
-#      cli options added: showoptions, setoption, enable, disable, nomkmap
-#      now even more verbose; now reporting non-existing map files
-#      fixing trap for MAC OS/X compatibility
-#   Fri May 17 22:38:37 CEST 2002:
-#      rewritten from teTeX-1.0 version; Completely new designed.
-###############################################################################
-
-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
-
-export PATH
-
-# hack around a bug in zsh:
-test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
-
-# the version string
-version=1193268062 # seconds since `00:00:00 1970-01-01 UTC'
-                   # date '+%s' (with GNU date)
-
-# 
-###############################################################################
-# help()
-#   display help message and exit
-###############################################################################
-help()
-{
-  cat <<eof
-Usage: updmap [OPTION]...  [COMMAND]...
-
-Update the default font map files used by pdftex, dvips, and dvipdfm, as
-determined by updmap.cfg.  Among other things, these font map files are
-used to determine which fonts should be found as bitmaps and which as
-outlines, and to determine which fonts are included in the output.
-
-By default, the filename database is also rebuilt (with mktexlsr).
-
-Valid options:
-  --cnffile FILE            read FILE for the updmap configuration
-  --pdftexoutputdir DIR     specify output directory (pdftex syntax)
-  --dvipsoutputdir DIR      specify output directory (dvips syntax)
-  --dvipdfmoutputdir DIR    specify output directory (dvipdfm syntax)
-  --outputdir DIR           specify output directory (for all files)
-  --copy                    cp generic files rather than using symlinks
-  --nomkmap                 do not recreate map files
-  --nohash                  do not run texhash
-  -n, --dry-run             only show the configuration, no output
-  --quiet                   reduce verbosity
-
-Valid commands:
-  --help                    show this message
-  --edit                    edit $cnfFileShort file
-  --showoptions ITEM        show alternatives for options
-  --setoption OPTION VALUE  set option, where OPTION is one of:
-                             dvipsPreferOutline LW35 dvipsDownloadBase35
-                             pdftexDownloadBase14 dvipdfmDownloadBase14
-  --setoption OPTION=VALUE  see above, just different syntax
-  --enable MAPTYPE MAPFILE  add MAPFILE as a MAPTYPE, one of: Map MixedMap
-  --enable Map=MAPFILE      add MAPFILE as a Map
-  --enable MixedMap=MAPFILE add or enable MAPFILE as a MixedMap
-  --disable MAPFILE         disable MAPFILE, whether Map or MixedMap
-  --syncwithtrees           entries with unavailable map files will be
-                             disabled in the config file
-  --listmaps                list all active and inactive maps
-  --listavailablemaps       same as --listmaps, but without
-                             unavailable map files
-
-Explanation of the map types: the (only) difference between Map and
-MixedMap is that MixedMap entries are not added to psfonts_pk.map.  The
-purpose is to help users with printers that render Type 1 outline fonts
-worse than mode-tuned Type 1 bitmap fonts.  So MixedMap is used for
-fonts that are available as both Type 1 and Metafont.
-
-To see the precise locations of the various files that will be read and
-written, run updmap -n.
-
-Report bugs to <tex-k@tug.org>.
-eof
-  (exit 0); exit
-}
-
-###############################################################################
-# verboseMsg(msg)
-#   print `msg' to stderr is $verbose is true
-###############################################################################
-verboseMsg() {
-  test -n "$log" && echo ${1+"$@"} >> "$log"
-  $verbose && echo ${1+"$@"} >&2
-}
-
-###############################################################################
-# verboseCat()
-#   cat to stderr is $verbose is true
-###############################################################################
-verboseCat() {
-  if $verbose; then
-    if test -n "$log"; then
-      cat ${1+"$@"} | tee -a "$log" >&2
-    else
-      cat ${1+"$@"} >&2
-    fi
-  else
-    test -n "$log" && cat ${1+"$@"} >> "$log"
-  fi
-}
-
-###############################################################################
-# warn(msg)
-#   print `msg' to stderr
-###############################################################################
-warn()
-{
-  test -n "$log" && echo ${1+"$@"} >> "$log"
-  echo ${1+"$@"} >&2
-}
-
-###############################################################################
-# abort(errmsg)
-#   print `errmsg' to stderr and exit with error code 1
-###############################################################################
-abort()
-{
-  warn "$progname: $1."
-  cleanup 1
-}
-
-###############################################################################
-# cfgval(variable)
-#   read variable ($1) from config file, first match wins
-###############################################################################
-cfgval()
-{
-  cat "$cnfFile" | sed -n 's/^'"$1"'[	 =][	 =]*//p' | sed q
-}
-
-###############################################################################
-# setupSymlinks()
-#   set symlink (or copy)
-#    for psfonts.map according to dvipsPreferOutline variable,
-#    and for pdftex.map and dvipdfm.map according to pdftexDownloadBase14.
-###############################################################################
-setupSymlinks()
-{
-  (
-  cd "$dvipsoutputdir" || exit 1
-  rm -f psfonts.map
-  if test "x$dvipsPreferOutline" = xtrue; then
-    $link_cmd psfonts_t1.map psfonts.map
-  else
-    $link_cmd psfonts_pk.map psfonts.map
-  fi
-
-  cd "$pdftexoutputdir" || exit 1
-  rm -f pdftex.map
-  if test "x$pdftexDownloadBase14" = xtrue; then
-    $link_cmd pdftex_dl14.map pdftex.map
-  else
-    $link_cmd pdftex_ndl14.map pdftex.map
-  fi
-
-  cd "$dvipdfmoutputdir" || exit 1
-  rm -f dvipdfm.map
-  if test "x$dvipdfmDownloadBase14" = xtrue; then
-    $link_cmd dvipdfm_dl14.map dvipdfm.map
-  else
-    $link_cmd dvipdfm_ndl14.map dvipdfm.map
-  fi
-  )
-}
-
-###############################################################################
-# transLW35(args ...)
-#   transform fontname and filenames according to transformation specified
-#   by mode
-###############################################################################
-transLW35()
-{
-  case $mode in
-    ""|URWkb)
-      cat ${1+"$@"}
-      ;;
-    URW)
-      fileURW ${1+"$@"}
-      ;;
-    ADOBE|ADOBEkb)
-      psADOBE ${1+"$@"} | file$mode
-      ;;
-  esac
-}
-
-###############################################################################
-# catMaps(regex)
-#   filter config file by regex for map lines and extract the map filenames.
-#   These are then looked up (by kpsewhich in locateMap) and the content of
-#   all map files is send to stdout.
-###############################################################################
-catMaps()
-{
-  rm -f $catMapsFailed
-  egrep "$1" "$cnfFile" \
-    | sed 's@#.*@@' \
-       | awk '{print $2}' \
-       | sort \
-       | uniq \
-       | grep . > $tmp4
-
-  while read map; do
-    file=`locateMap "$map"` || { touch $catMapsFailed; break; }
-
-    # output the file; also output a newline, because the final newline
-    # might be missing in the map file; Empty lines are filtered out later,
-    # so it does not really hurt do do this here.
-    test -n "$file" && { cat "$file"; echo; }
-  done < $tmp4
-  if test -f $catMapsFailed; then
-    false; return 1
-  else
-    true; return 0
-  fi
-}
-
-###############################################################################
-# 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()
-{
-  file=$1; pat=$2; line=$3
-
-  if grep "$pat" "$file" >/dev/null; then
-    ed "$file" >/dev/null 2>&1 <<-eof
-	/$pat/
-	c
-	$line
-	.
-	w
-	q
-eof
-  else
-    echo "$line" >> "$file"
-  fi
-}
-
-###############################################################################
-# setOption (option, value)
-#   sets option to value in the config file (replacing the existing setting
-#   or by adding a new line to the config file).
-###############################################################################
-setOption()
-{
-  opt=$1
-  val=$2
-  case "$opt" in
-    LW35)
-      case "$val" in
-        URWkb|URW|ADOBE|ADOBEkb)
-          ;;
-        *)
-          abort "invalid value $val for option $opt"
-          ;;
-      esac
-      ;;
-    dvipsPreferOutline|dvipsDownloadBase35|pdftexDownloadBase14|dvipdfmDownloadBase14)
-      case "$val" in
-        true|false)
-          ;;
-        *)
-          abort "invalid value $val for option $opt"
-      esac
-      ;;
-    *)
-      abort "unsupported option $opt"
-      ;;
-  esac
-
-  configReplace "$cnfFile" "^$opt[ 	]" "$opt $val"
-}
-
-###############################################################################
-# enableMap (type, map)
-#   enables an entry in the config file for map with a given type.
-###############################################################################
-enableMap()
-{
-  case $1 in
-    Map|MixedMap)
-      ;;
-    *)
-      abort "invalid mapType $1"
-      ;;
-  esac
-
-  # a map can only have one type, so we carefully disable everything
-  # about map here:
-  disableMap "$2"
-
-  # now enable with the right type:
-  configReplace "$cnfFile" "^#![ 	]*$1[ 	]*$2" "$1 $2"
-}
-
-###############################################################################
-# disableMap (map)
-#   disables map in config file (any type)
-###############################################################################
-disableMap()
-{
-  #mapType=`awk '($1 == "MixedMap" || $1 == "Map") && $2 == map { print $1 }' \
-  #           map=$1 <"$cnfFile" | sort | uniq`
-  map=$1
-  mapType=`egrep "^(MixedMap|Map)[ 	]*$map( |	|$)" "$cnfFile" | awk '{print $1}' | sort | uniq`
-  for type in $mapType; do
-    configReplace "$cnfFile" "^$type[ 	]*$1" "#! $type $1"
-  done
-}
-
-###############################################################################
-# psADOBE()
-#   transform fontnames from URW to Adobe
-###############################################################################
-psADOBE()
-{
-  sed \
-    -e 's/ URWGothicL-Demi / AvantGarde-Demi /' \
-    -e 's/ URWGothicL-DemiObli / AvantGarde-DemiOblique /' \
-    -e 's/ URWGothicL-Book / AvantGarde-Book /' \
-    -e 's/ URWGothicL-BookObli / AvantGarde-BookOblique /' \
-    -e 's/ URWBookmanL-DemiBold / Bookman-Demi /' \
-    -e 's/ URWBookmanL-DemiBoldItal / Bookman-DemiItalic /' \
-    -e 's/ URWBookmanL-Ligh / Bookman-Light /' \
-    -e 's/ URWBookmanL-LighItal / Bookman-LightItalic /' \
-    -e 's/ NimbusMonL-Bold / Courier-Bold /' \
-    -e 's/ NimbusMonL-BoldObli / Courier-BoldOblique /' \
-    -e 's/ NimbusMonL-Regu / Courier /' \
-    -e 's/ NimbusMonL-ReguObli / Courier-Oblique /' \
-    -e 's/ NimbusSanL-Bold / Helvetica-Bold /' \
-    -e 's/ NimbusSanL-BoldCond / Helvetica-Narrow-Bold /' \
-    -e 's/ NimbusSanL-BoldItal / Helvetica-BoldOblique /' \
-    -e 's/ NimbusSanL-BoldCondItal / Helvetica-Narrow-BoldOblique /' \
-    -e 's/ NimbusSanL-Regu / Helvetica /' \
-    -e 's/ NimbusSanL-ReguCond / Helvetica-Narrow /' \
-    -e 's/ NimbusSanL-ReguItal / Helvetica-Oblique /' \
-    -e 's/ NimbusSanL-ReguCondItal / Helvetica-Narrow-Oblique /' \
-    -e 's/ CenturySchL-Bold / NewCenturySchlbk-Bold /' \
-    -e 's/ CenturySchL-BoldItal / NewCenturySchlbk-BoldItalic /' \
-    -e 's/ CenturySchL-Roma / NewCenturySchlbk-Roman /' \
-    -e 's/ CenturySchL-Ital / NewCenturySchlbk-Italic /' \
-    -e 's/ URWPalladioL-Bold / Palatino-Bold /' \
-    -e 's/ URWPalladioL-BoldItal / Palatino-BoldItalic /' \
-    -e 's/ URWPalladioL-Roma / Palatino-Roman /' \
-    -e 's/ URWPalladioL-Ital / Palatino-Italic /' \
-    -e 's/ StandardSymL / Symbol /' \
-    -e 's/ NimbusRomNo9L-Medi / Times-Bold /' \
-    -e 's/ NimbusRomNo9L-MediItal / Times-BoldItalic /' \
-    -e 's/ NimbusRomNo9L-Regu / Times-Roman /' \
-    -e 's/ NimbusRomNo9L-ReguItal / Times-Italic /' \
-    -e 's/ URWChanceryL-MediItal / ZapfChancery-MediumItalic /' \
-    -e 's/ Dingbats / ZapfDingbats /' \
-    ${1+"$@"}
-}
-
-###############################################################################
-# fileADOBEkb()
-#   transform filenames from URW to ADOBE (both berry names)
-###############################################################################
-fileADOBEkb()
-{
-  sed \
-    -e 's/\([^A-Za-z]\)uagd8a.pfb/\1pagd8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uagdo8a.pfb/\1pagdo8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uagk8a.pfb/\1pagk8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uagko8a.pfb/\1pagko8a.pfb/' \
-    -e 's/\([^A-Za-z]\)ubkd8a.pfb/\1pbkd8a.pfb/' \
-    -e 's/\([^A-Za-z]\)ubkdi8a.pfb/\1pbkdi8a.pfb/' \
-    -e 's/\([^A-Za-z]\)ubkl8a.pfb/\1pbkl8a.pfb/' \
-    -e 's/\([^A-Za-z]\)ubkli8a.pfb/\1pbkli8a.pfb/' \
-    -e 's/\([^A-Za-z]\)ucrb8a.pfb/\1pcrb8a.pfb/' \
-    -e 's/\([^A-Za-z]\)ucrbo8a.pfb/\1pcrbo8a.pfb/' \
-    -e 's/\([^A-Za-z]\)ucrr8a.pfb/\1pcrr8a.pfb/' \
-    -e 's/\([^A-Za-z]\)ucrro8a.pfb/\1pcrro8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvb8a.pfb/\1phvb8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvb8ac.pfb/\1phvb8an.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvbo8a.pfb/\1phvbo8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvbo8ac.pfb/\1phvbo8an.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvr8a.pfb/\1phvr8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvr8ac.pfb/\1phvr8an.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvro8a.pfb/\1phvro8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvro8ac.pfb/\1phvro8an.pfb/' \
-    -e 's/\([^A-Za-z]\)uncb8a.pfb/\1pncb8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uncbi8a.pfb/\1pncbi8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uncr8a.pfb/\1pncr8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uncri8a.pfb/\1pncri8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uplb8a.pfb/\1pplb8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uplbi8a.pfb/\1pplbi8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uplr8a.pfb/\1pplr8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uplri8a.pfb/\1pplri8a.pfb/' \
-    -e 's/\([^A-Za-z]\)usyr.pfb/\1psyr.pfb/' \
-    -e 's/\([^A-Za-z]\)utmb8a.pfb/\1ptmb8a.pfb/' \
-    -e 's/\([^A-Za-z]\)utmbi8a.pfb/\1ptmbi8a.pfb/' \
-    -e 's/\([^A-Za-z]\)utmr8a.pfb/\1ptmr8a.pfb/' \
-    -e 's/\([^A-Za-z]\)utmri8a.pfb/\1ptmri8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uzcmi8a.pfb/\1pzcmi8a.pfb/' \
-    -e 's/\([^A-Za-z]\)uzdr.pfb/\1pzdr.pfb/' \
-    ${1+"$@"}
-}
-
-###############################################################################
-# fileURW()
-#   transform filenames from URWkb (berry names) to URW (vendor names)
-###############################################################################
-fileURW()
-{
-  sed \
-    -e 's/\([^A-Za-z]\)uagd8a.pfb/\1a010015l.pfb/' \
-    -e 's/\([^A-Za-z]\)uagdo8a.pfb/\1a010035l.pfb/' \
-    -e 's/\([^A-Za-z]\)uagk8a.pfb/\1a010013l.pfb/' \
-    -e 's/\([^A-Za-z]\)uagko8a.pfb/\1a010033l.pfb/' \
-    -e 's/\([^A-Za-z]\)ubkd8a.pfb/\1b018015l.pfb/' \
-    -e 's/\([^A-Za-z]\)ubkdi8a.pfb/\1b018035l.pfb/' \
-    -e 's/\([^A-Za-z]\)ubkl8a.pfb/\1b018012l.pfb/' \
-    -e 's/\([^A-Za-z]\)ubkli8a.pfb/\1b018032l.pfb/' \
-    -e 's/\([^A-Za-z]\)ucrb8a.pfb/\1n022004l.pfb/' \
-    -e 's/\([^A-Za-z]\)ucrbo8a.pfb/\1n022024l.pfb/' \
-    -e 's/\([^A-Za-z]\)ucrr8a.pfb/\1n022003l.pfb/' \
-    -e 's/\([^A-Za-z]\)ucrro8a.pfb/\1n022023l.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvb8a.pfb/\1n019004l.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvb8ac.pfb/\1n019044l.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvbo8a.pfb/\1n019024l.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvbo8ac.pfb/\1n019064l.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvr8a.pfb/\1n019003l.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvr8ac.pfb/\1n019043l.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvro8a.pfb/\1n019023l.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvro8ac.pfb/\1n019063l.pfb/' \
-    -e 's/\([^A-Za-z]\)uncb8a.pfb/\1c059016l.pfb/' \
-    -e 's/\([^A-Za-z]\)uncbi8a.pfb/\1c059036l.pfb/' \
-    -e 's/\([^A-Za-z]\)uncr8a.pfb/\1c059013l.pfb/' \
-    -e 's/\([^A-Za-z]\)uncri8a.pfb/\1c059033l.pfb/' \
-    -e 's/\([^A-Za-z]\)uplb8a.pfb/\1p052004l.pfb/' \
-    -e 's/\([^A-Za-z]\)uplbi8a.pfb/\1p052024l.pfb/' \
-    -e 's/\([^A-Za-z]\)uplr8a.pfb/\1p052003l.pfb/' \
-    -e 's/\([^A-Za-z]\)uplri8a.pfb/\1p052023l.pfb/' \
-    -e 's/\([^A-Za-z]\)usyr.pfb/\1s050000l.pfb/' \
-    -e 's/\([^A-Za-z]\)utmb8a.pfb/\1n021004l.pfb/' \
-    -e 's/\([^A-Za-z]\)utmbi8a.pfb/\1n021024l.pfb/' \
-    -e 's/\([^A-Za-z]\)utmr8a.pfb/\1n021003l.pfb/' \
-    -e 's/\([^A-Za-z]\)utmri8a.pfb/\1n021023l.pfb/' \
-    -e 's/\([^A-Za-z]\)uzcmi8a.pfb/\1z003034l.pfb/' \
-    -e 's/\([^A-Za-z]\)uzdr.pfb/\1d050000l.pfb/' \
-    ${1+"$@"}
-}
-
-###############################################################################
-# fileADOBE()
-#   transform filenames from URWkb (berry names) to ADOBE (vendor names)
-###############################################################################
-fileADOBE()
-{
-  sed \
-    -e 's/\([^A-Za-z]\)uagd8a.pfb/\1agd_____.pfb/' \
-    -e 's/\([^A-Za-z]\)uagdo8a.pfb/\1agdo____.pfb/' \
-    -e 's/\([^A-Za-z]\)uagk8a.pfb/\1agw_____.pfb/' \
-    -e 's/\([^A-Za-z]\)uagko8a.pfb/\1agwo____.pfb/' \
-    -e 's/\([^A-Za-z]\)ubkd8a.pfb/\1bkd_____.pfb/' \
-    -e 's/\([^A-Za-z]\)ubkdi8a.pfb/\1bkdi____.pfb/' \
-    -e 's/\([^A-Za-z]\)ubkl8a.pfb/\1bkl_____.pfb/' \
-    -e 's/\([^A-Za-z]\)ubkli8a.pfb/\1bkli____.pfb/' \
-    -e 's/\([^A-Za-z]\)ucrb8a.pfb/\1cob_____.pfb/' \
-    -e 's/\([^A-Za-z]\)ucrbo8a.pfb/\1cobo____.pfb/' \
-    -e 's/\([^A-Za-z]\)ucrr8a.pfb/\1com_____.pfb/' \
-    -e 's/\([^A-Za-z]\)ucrro8a.pfb/\1coo_____.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvb8a.pfb/\1hvb_____.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvb8ac.pfb/\1hvnb____.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvbo8a.pfb/\1hvbo____.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvbo8ac.pfb/\1hvnbo___.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvr8a.pfb/\1hv______.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvr8ac.pfb/\1hvn_____.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvro8a.pfb/\1hvo_____.pfb/' \
-    -e 's/\([^A-Za-z]\)uhvro8ac.pfb/\1hvno____.pfb/' \
-    -e 's/\([^A-Za-z]\)uncb8a.pfb/\1ncb_____.pfb/' \
-    -e 's/\([^A-Za-z]\)uncbi8a.pfb/\1ncbi____.pfb/' \
-    -e 's/\([^A-Za-z]\)uncr8a.pfb/\1ncr_____.pfb/' \
-    -e 's/\([^A-Za-z]\)uncri8a.pfb/\1nci_____.pfb/' \
-    -e 's/\([^A-Za-z]\)uplb8a.pfb/\1pob_____.pfb/' \
-    -e 's/\([^A-Za-z]\)uplbi8a.pfb/\1pobi____.pfb/' \
-    -e 's/\([^A-Za-z]\)uplr8a.pfb/\1por_____.pfb/' \
-    -e 's/\([^A-Za-z]\)uplri8a.pfb/\1poi_____.pfb/' \
-    -e 's/\([^A-Za-z]\)usyr.pfb/\1sy______.pfb/' \
-    -e 's/\([^A-Za-z]\)utmb8a.pfb/\1tib_____.pfb/' \
-    -e 's/\([^A-Za-z]\)utmbi8a.pfb/\1tibi____.pfb/' \
-    -e 's/\([^A-Za-z]\)utmr8a.pfb/\1tir_____.pfb/' \
-    -e 's/\([^A-Za-z]\)utmri8a.pfb/\1tii_____.pfb/' \
-    -e 's/\([^A-Za-z]\)uzcmi8a.pfb/\1zcmi____.pfb/' \
-    -e 's/\([^A-Za-z]\)uzdr.pfb/\1zd______.pfb/' \
-    ${1+"$@"}
-}
-
-###############################################################################
-# locateWeb2c (file ...)
-#   apply kpsewhich with format 'web2c files'
-###############################################################################
-locateWeb2c()
-{
-  kpsewhich --format='web2c files' ${1+"$@"}
-}
-
-###############################################################################
-# locateMap (file ...)
-#   apply kpsewhich with format 'map'
-###############################################################################
-locateMap()
-{
-
-  # Always use the "migration checking version". This might become
-  # consigurable, but for now, we always want to check.
-  if :; then
-    locateMapMigrate "$@"
-    return $?
-  fi
-
-  # The old version of the code; not used at the moment.
-  for map
-  do
-    file=`kpsewhich --format=map "$map"`
-    if test -f "$file"; then
-      verboseMsg "$progname: using map file \`$file'"
-      echo "$file"
-    else
-      warn "map file \`$map' not found."
-    fi
-  done
-}
-
-###############################################################################
-# locateMapMigrate (file ...)
-#   look for map file; assist user with possibly files in wrong locations;
-#   also watch out for possibly hidden conflicts
-###############################################################################
-locateMapMigrate()
-{
-  for map
-  do
-    # look up using the new search path
-    file=`kpsewhich --format=map "$map"`
-
-    # look up using the old search path
-    file2=`kpsewhich --format='dvips config' "$map"`
-
-    # Well, the search paths should not overlap. If they do, and if
-    # file1 = file2, we don't want to complain about file2, so:
-    test "x$file" = "x$file2" && file2=
-
-    if test -f "$file"; then
-
-      verboseMsg "$progname: using map file \`$file'"
-      echo "$file"
-
-      # we have found the file where we should. If we have additional
-      # ones: complain!
-      if test -f "$file2"; then
-        mapCmp "$file" "$file2" \
-          && mapWarn obsoleteCopy "$map" "$file2" \
-          || mapWarn manualResolve "$map" "$file" "$file2"
-      fi
-
-    else
-      if test -f "$file2"; then
-        # bad: map file exists in the wrong location only
-        mapWarn badLocation "$map" "$file2"
-      else
-        # bad: map file does not exist at all
-        mapWarn notFound "$map"
-      fi
-      false; return 1
-    fi
-  done
-  true; return 0
-}
-
-###############################################################################
-# mapCmp(file, file2)
-#   compare two map files like cmp; but less strict, so changes regarding
-#   whitespaces, comments etc. are tolerated. Important is only the
-#   return value here.
-###############################################################################
-mapCmp()
-{
-  file=$1; file2=$2
-
-  # For reasons of speed only. Avoid normalizeLines if files are 100%
-  # the same.
-  cmp "$file" "$file2" >/dev/null 2>&1 && return 0
-
-  normalizeLines <"$file" >"$tmpdir/mapCmp-1"
-  normalizeLines <"$file2" >"$tmpdir/mapCmp-2"
-  cmp "$tmpdir/mapCmp-1" "$tmpdir/mapCmp-2" >/dev/null 2>&1
-}
-
-###############################################################################
-# mapWarn()
-###############################################################################
-mapWarn()
-{
-
-  case $1 in
-  obsoleteCopy)
-    warn "
-!!! WARNING: Identical copy of used file for \`$2'
-    exists in obsolete location
-      $3
-    Please, consider removing this file.
-"
-    touch $mapWarnCalled
-    ;;
-  manualResolve)
-    warn "
-!!! WARNING: While searching for the right map file for \`$2', we have
-    found the file
-      $3
-    in the right location and we are using this
-    file. However, a map file with different content has been found in
-    the obsolete location
-      $4
-    Please, see which version you want to use and eventually update the
-    content of the used map file. Additionally, consider removing the
-    obsolete file.
-"
-    touch $mapWarnCalled
-    ;;
-  badLocation)
-    map=$2
-    location=$3
-
-    m="
-!!! ERROR: The right location for map files has been
-    changed for this release and the map file \`$map' has
-    not been found in the right location, but in the obsolete
-    location
-      $location
-    instead.
-
-    To fix this, please move this file into an appropriate
-    subdirectory of fonts/map in one of your texmf trees.
-
-    For more information about the changed search paths, see
-    the release notes section in the teTeX manual. You probably
-    can read this document by executing the command
-      texdoc TETEXDOC
-    else visit the web page
-      http://tug.org/texlive/mapenc.html
-"
-    warn "$m"
-    false; return 1
-    ;;
-  notFound)
-    warn "
-!!! ERROR! The map file \`$2' has not been found at all.
-
-    Either put this file into the right place or remove the
-    reference from the configuration file. An automatic way
-    to disable unavailable map files is to call
-      $progname --syncwithtrees
-
-    For manual editing, call
-      $progname --edit
-"
-
-    false; return 1
-    ;;
-  esac
-}
-
-###############################################################################
-# cleanup()
-#   clean up the temp area and exit with proper exit status
-###############################################################################
-cleanup()
-{
-  rc=$1
-  $needsCleanup && test -n "$tmpdir" && test -d "$tmpdir" \
-    && { cd / && rm -rf "$tmpdir"; }
-  (exit $rc); exit $rc
-}
-
-###############################################################################
-# setupTmpDir()
-#   set up a temp directory and a trap to remove it
-###############################################################################
-setupTmpDir()
-{
-  $needsCleanup && return
-
-  trap 'cleanup 1' 1 2 3 7 13 15
-  needsCleanup=true
-  mkdir "$tmpdir" || abort "could not create directory \`$tmpdir'"
-}
-
-###############################################################################
-# showOptions(item)
-#   show Options for an item
-###############################################################################
-showOptions()
-{
-  item=$1
-
-  case "$item" in
-    LW35)
-      echo "URWkb URW ADOBE ADOBEkb"
-      ;;
-    dvipsPreferOutline|pdftexDownloadBase14|dvipdfmDownloadBase14|dvipsDownloadBase35)
-      echo "true false"
-      ;;
-    *)
-      abort "Unknown item \"$item\". Choose one of LW35, dvipsPreferOutline, dvipsDownloadBase35, pdftexDownloadBase14 or dvipdfmDownloadBase14"
-      ;;
-  esac
-
-  (exit 0); exit 0
-}
-
-###############################################################################
-# mktexdir(args)
-#   call mktexdir script, disable all features (to prevent sticky directories)
-###############################################################################
-mktexdir()
-{
-  MT_FEATURES=none "$TEXMFMAIN/web2c/mktexdir" "$@" >&2
-}
-
-###############################################################################
-# setupDestDir()
-#   Assign output directories which are not yet assigned. Always use
-#   the TEXMFVAR for this.
-###############################################################################
-setupDestDir()
-{
-  vartexmf=`kpsewhich -var-value=TEXMFVAR`
-
-  # dvips
-  if test -z "$dvipsoutputdir"; then
-    dvipsoutputdir=$vartexmf/fonts/map/dvips/updmap
-  fi
-
-  # pdftex
-  if test -z "$pdftexoutputdir"; then
-    pdftexoutputdir=$vartexmf/fonts/map/pdftex/updmap
-  fi
-
-  # dvipdfm
-  if test -z "$dvipdfmoutputdir"; then
-    dvipdfmoutputdir=$vartexmf/fonts/map/dvipdfm/updmap
-  fi
-
-  mktexdir "$dvipsoutputdir" "$pdftexoutputdir" "$dvipdfmoutputdir" >/dev/null 2>&1
-  for d in "$dvipsoutputdir" "$pdftexoutputdir" "$dvipdfmoutputdir"; do
-    test -d "$d" || abort "output directory \`$d' does not exist"
-    test -w "$d" || abort "output directory \`$d' is not writable"
-  done
-
-}
-
-###############################################################################
-# setupLog(cfgFile)
-#   try to set up a log file in $TEXMFVAR/web2c
-###############################################################################
-setupLog()
-{
-  vartexmf=`kpsewhich -var-value=TEXMFVAR`
-  dir=$vartexmf/web2c
-  mktexdir "$dir" >/dev/null 2>&1
-  log="$dir/$progname.log"
-  if test -d "$dir" && test -w "$dir"; then
-    rm -f "$log"
-    > "$log"
-  fi
-  if test -w "$log"; then
-    if $chicken_mode; then
-      log=
-    else
-      date > "$log"
-      verboseMsg "$progname: This is $progname, version $version"
-      verboseMsg "$progname: using transcript file \`$log'"
-    fi
-  else
-    log=
-    verboseMsg "$progname: This is $progname, version $version"
-    verboseMsg "$progname: no permissions for writing $dir/$progname.log', so no transcript"
-  fi
-}
-
-###############################################################################
-# setupCfgFile()
-#   find config file if none specified on cmd line.
-###############################################################################
-setupCfgFile()
-{
-  case "$cnfFile" in
-    "") cnfFile=`locateWeb2c $cnfFileShort`
-        case "$cnfFile" in
-          "") abort "config file $cnfFileShort not found"
-        esac;;
-  esac
-  setupLog
-}
-
-###############################################################################
-# processOptions()
-#   process cmd line options
-###############################################################################
-processOptions()
-{
-  while
-    case $1 in
-      --quiet|-q)
-          verbose=false;;
-      --cnffile)
-          cfgparam=1; cnfFile=$2; shift;;
-      --cnffile=*)
-          cfgparam=1; cnfFile=`echo "$1" | sed 's/--cnffile=//'`;;
-      --copy)
-          link_cmd="cp";;
-      --dry-run|-n)
-          chicken_mode=true;;
-      --dvipsoutputdir)
-          dvipsoutputdirparam=1; dvipsoutputdir=$2; shift;;
-      --dvipsoutputdir=*)
-          dvipsoutputdirparam=1; dvipsoutputdir=`echo "$1" | sed 's/--dvipsoutputdir=//'`;;
-      --pdftexoutputdir)
-          pdftexoutputdirparam=1; pdftexoutputdir=$2; shift;;
-      --pdftexoutputdir=*)
-          pdftexoutputdirparam=1; pdftexoutputdir=`echo "$1" | sed 's/--pdftexoutputdir=//'`;;
-      --dvipdfmoutputdir)
-          dvipdfmoutputdirparam=1; dvipdfmoutputdir=$2; shift;;
-      --dvipdfmoutputdir=*)
-          dvipdfmoutputdirparam=1; dvipdfmoutputdir=`echo "$1" | sed 's/--dvipdfmoutputdir=//'`;;
-      --outputdir)
-          dvipsoutputdirparam=1; dvipsoutputdir=$2
-          pdftexoutputdirparam=1; pdftexoutputdir=$2
-          dvipdfmoutputdirparam=1; dvipdfmoutputdir=$2
-          shift
-          ;;
-      --outputdir=*)
-          outputdir=`echo "$1" | sed 's/--outputdir=//'`
-          dvipsoutputdirparam=1; dvipsoutputdir=$outputdir
-          pdftexoutputdirparam=1; pdftexoutputdir=$outputdir
-          dvipdfmoutputdirparam=1; dvipdfmoutputdir=$outputdir
-          ;;
-      --setoption)
-          cfgmaint=1
-          cmd=setoption
-          case $2 in
-            *=*)
-              setoptionOpt=`echo $2 | sed 's@=.*@@'`
-              setoptionVal=`echo $2 | sed 's@[^=]*=@@'`
-              shift
-            ;;
-            *)
-              test $# -ge 3 || { abort "--setoption needs two parameters: option value"; }
-              setoptionOpt=$2; setoptionVal=$3; shift; shift
-            ;;
-          esac
-          ;;
-      --enable)
-          cfgmaint=1
-          cmd=enable
-          case $2 in 
-            Map=*)
-              enableMapType=Map; enableMapFile=`echo "$2" | sed 's/Map=//'`; shift;;
-            MixedMap=*)
-              enableMapType=MixedMap; enableMapFile=`echo "$2" | sed 's/MixedMap=//'`; shift;;
-            Map|MixedMap)
-              test $# -ge 3 || { abort "--enable needs two parameters: mapType mapFile"; }
-              enableMapType=$2; enableMapFile=$3; shift; shift;;
-            *)
-              abort "--enable needs two parameters mapType mapFile";;
-          esac
-          ;;
-      --syncwithtrees)
-          cfgmaint=1
-          cmd=syncwithtrees;;
-      --disable)
-          cfgmaint=1
-          cmd=disable; disableMapFile=$2; shift
-          ;;
-      --disable=*)
-          cfgmaint=1
-          disableMapFile=`echo "$1" | sed 's/--disable=//'`
-          cmd=disable
-          ;;
-      --edit|-e)
-          cfgmaint=1
-          cmd=edit;;
-      --listmaps|-l)
-          cmd=listmaps;;
-      --listavailablemaps)
-          cmd=listavailablemaps;;
-      --showoptions)
-          cmd=showoptions; showoptionsItem=$2; shift;;
-      --showoptions=*)
-          cmd=showoptions; showoptionsItem=`echo "$1" | sed 's/--showoptions=//'`;;
-     
-      --nohash)
-          texhashEnabled=false;;
-      --nomkmap)
-          mkmapEnabled=false;;
-      --help|-help|-h)
-          help;;
-      --version)
-          echo "$progname version $version."; (exit 0); exit 0;;
-      "") break;;
-      *) abort "$progname: unknown option \`$1'. Try $progname --help for help";;
-    esac
-  do test $# -gt 0 && shift; done
-
-  if test -n "$cfgparam"; then
-    if test -z "$cnfFile" || test ! -f "$cnfFile"; then
-      abort "config file \`$cnfFileShort' not found"
-    fi
-  fi
-
-  if test -n "$dvipdoutputdirparam"; then
-    if test -z "$dvipdoutputdir" || test ! -d "$dvipdoutputdir"; then
-      abort "dvips output directory \`$1' not found"
-    fi
-  fi
-  if test -n "$pdftexoutputdirparam"; then
-    if test -z "$pdftexoutputdir" || test ! -d "$pdftexoutputdir"; then
-      abort "pdftex output directory \`$1' not found"
-    fi
-  fi
-  if test -n "$dvipdfmoutputdirparam"; then
-    if test -z "$dvipdfmoutputdir" || test ! -d "$dvipdfmoutputdir"; then
-      abort "dvipdfm output directory \`$1' not found"
-    fi
-  fi
-
-}
-
-###############################################################################
-# listMaps()
-#   list all maps mentioned in the config file
-###############################################################################
-listMaps()
-{
-  egrep '^(#! *)?(Mixed)?Map' "$cnfFile"
-}
-
-###############################################################################
-# listAvailableMaps()
-#   list maps mentioned in the config file if they are available
-###############################################################################
-listAvailableMaps()
-{
-  # loop over each possible line in the config file (-> $line)
-  # extract the name of the map file (-> $m)
-  # check if the map file exists and in that case echo the line
-  OLDIFS=$IFS
-  IFS='
-'
-  for line in `egrep '^(#! *)?(Mixed)?Map' "$cnfFile"`; do
-    m=`echo "$line" | sed 's@[ 	]*$@@; s@.*[ 	]@@'`
-    kpsewhich --format=map "$m" >/dev/null && echo "$line"
-  done
-  IFS=$OLDIFS
-}
-
-###############################################################################
-# syncWithTrees()
-#   update the config file: uncomment all lines which refer to map files that
-#   are unavailabe in the texmf trees
-###############################################################################
-syncWithTrees()
-{
-  for i in `egrep '^(Mixed)?Map' "$cnfFile" | sed 's@.* @@'`; do
-    kpsewhich --format=map "$i" >/dev/null || echo "$i"
-  done > $tmp1
-  {
-    sed 's@/@\\/@g; s@^@/^MixedMap[ 	]*@; s@$@$/s/^/#! /@' <$tmp1
-    sed 's@/@\\/@g; s@^@/^Map[ 	]*@; s@$@$/s/^/#! /@' <$tmp1
-  } > $tmp2
-  sed -f $tmp2 "$cnfFile" > $tmp3 && cat $tmp3 > "$cnfFile"
-}
-
-###############################################################################
-# normalizeLines()
-#   remove comments, whitespace is exactly one space, no empty lines,
-#   no whitespace at end of line, one space before and after ",
-#   no CR's (as in skaknew).
-###############################################################################
-normalizeLines()
-{
-  sed \
-      -e '/^[*#;%]/d' \
-      -e 's@[ 	][ 	]*@ @g' \
-      -e '/^ *$/d' \
-      -e 's@ $@@' \
-      -e 's@ *" *@ " @g' \
-      -e 's@" \([^"]*\) "@"\1"@g' \
-   | tr -d '\r' \
-   | sort | uniq
-}
-
-###############################################################################
-# dvips2dvipdfm()
-#   reads from stdin, writes to stdout. It transforms "dvips"-like syntax into
-#   "dvipdfm"-like syntax. It is a very ugly hack.
-###############################################################################
-dvips2dvipdfm()
-{
-  sed -e 's@$@ %@' \
-      -e 's@^\(\([^ ]*\).*\)@\1\2@' \
-      -e 's@\(.*<\[* *\([^ ]*\)\.enc\(.*\)\)@\1 \2@' \
-      -e '/%[^ ]*$/s@$@ default@' \
-      -e 's@\(.*<<* *\([^ ]*\)\.pf[ab].*\)@\1 \2@' \
-      -e '/%[^ ]* [^ ]*$/s@\( \([^ ]*\).*\)$@\1 \2@' \
-      -e 's@\(.*[" ]\([.0-9-][.0-9-]*\) *ExtendFont.*\)@\1 -e \2@' \
-      -e 's@\(.*[" ]\([.0-9-][.0-9-]*\) *SlantFont.*\)@\1 -s \2@' \
-      -e 's@.*%@@' |
-  awk '$1 == $3 && $2 == "default" {$2=""; $3=""} {print}' > $tmp8
-
-  egrep '^(cm|eu|la|lc|line|msam|xy)' $tmp8 \
-    | sed 's@$@ -r@; s@\(fmex[789]\) -r$@\1@'
-  egrep -v '^(cm|eu|la|lc|line|msam|xy)' $tmp8
-}
-
-
-###############################################################################
-# mkMaps()
-#   the main task of this script: create the output files
-###############################################################################
-mkMaps()
-{
-  newline='
-'
-  mode=`cfgval LW35`
-  dvipsPreferOutline=`cfgval dvipsPreferOutline`
-  dvipsDownloadBase35=`cfgval dvipsDownloadBase35`
-  pdftexDownloadBase14=`cfgval pdftexDownloadBase14`
-  dvipdfmDownloadBase14=`cfgval dvipdfmDownloadBase14`
-
-  # defaults
-  test -z "$mode" && mode=URWkb
-  test -z "$dvipsPreferOutline" && dvipsPreferOutline=true
-  test -z "$dvipsDownloadBase35" && dvipsDownloadBase35=false
-  test -z "$pdftexDownloadBase14" && pdftexDownloadBase14=false
-  test -z "$dvipdfmDownloadBase14" && dvipdfmDownloadBase14=false
-
-  outputFiles="$dvipsoutputdir/download35.map
-$dvipsoutputdir/builtin35.map
-$dvipsoutputdir/psfonts_t1.map
-$dvipsoutputdir/psfonts_pk.map
-$pdftexoutputdir/pdftex_dl14.map
-$pdftexoutputdir/pdftex_ndl14.map
-$dvipdfmoutputdir/dvipdfm_dl14.map
-$dvipdfmoutputdir/dvipdfm_ndl14.map
-$dvipsoutputdir/ps2pk.map"
-
-  outputLinks="$dvipsoutputdir/psfonts.map
-$pdftexoutputdir/pdftex.map
-$dvipdfmoutputdir/dvipdfm.map"
-
-  allOutput="$outputFiles
-$outputLinks"
-
-  notfound=false
-  OLDIFS=$IFS; IFS=$newline
-  for o in $allOutput; do
-    test -f "$o" || notfound=true
-  done
-  IFS=$OLDIFS
-  $notfound || texhashEnabled=false
-
-  verboseCat <<-eof
-	updmap is creating new map files using the following configuration:
-
-	  config file: \`$cnfFile'
-	  dvips output directory: \`$dvipsoutputdir'
-	  pdftex output directory: \`$pdftexoutputdir'
-	  dvipdfm output directory: \`$dvipdfmoutputdir'
-
-	  prefer outlines: \`$dvipsPreferOutline'
-	  texhash enabled: \`$texhashEnabled'
-	  download standard fonts (dvips): \`$dvipsDownloadBase35'
-	  download standard fonts (pdftex): \`$pdftexDownloadBase14'
-	  download standard fonts (dvipdfm): \`$dvipdfmDownloadBase14'
-eof
-
-  verboseMsg
-  verboseMsg "$progname: scanning for LW35 support files"
-  dvips35=`locateMap dvips35.map` || cleanup 1
-  pdftex35=`locateMap pdftex35.map` || cleanup 1
-  dvipdfm35=`locateMap dvipdfm35.map` || cleanup 1
-  ps2pk35=`locateMap ps2pk35.map` || cleanup 1
-
-  if $chicken_mode; then
-    echo
-    echo "$progname: chicken mode, skipping all output generation, goodbye."
-    exit 0
-  fi
-  
-  verboseMsg
-  verboseMsg "$progname: Scanning for MixedMap entries:"
-  catMaps '^MixedMap' > $tmp1 || cleanup 1
-
-  verboseMsg
-  verboseMsg "$progname: Scanning for Map entries:"
-  catMaps '^Map' > $tmp2 || cleanup 1
-  verboseMsg
-
-  # files should be world-readable
-  umask 022
-
-  OLDIFS=$IFS; IFS=$newline
-  for file in $allOutput; do
-    rm -f "$file"
-    cat > "$file" <<-eof
-	% $file: maintained by the script updmap.
-	%   Don't change this file directly. Edit texmf/web2c/$cnfFileShort
-	%   and run updmap to recreate this file.
-eof
-    if test -n "$log"; then
-    cat >> "$file" <<-eof
-	% A log of the updmap run that has created this file is available here:
-	%   $log
-eof
-    fi
-  done
-  IFS=$OLDIFS
-
-  verboseMsg "$progname: Generating output for ps2pk..."
-  { transLW35 "$ps2pk35"; cat $tmp1 $tmp2; } \
-    | normalizeLines >> "$dvipsoutputdir/ps2pk.map"
-
-  verboseMsg "$progname: Generating output for dvips..."
-  { transLW35 "$ps2pk35"; } \
-    | normalizeLines >> "$dvipsoutputdir/download35.map"
-  { transLW35 "$dvips35"; } \
-    | normalizeLines >> "$dvipsoutputdir/builtin35.map"
-
-  if test "x$dvipsDownloadBase35" = xtrue; then
-    dftdvips=$ps2pk35
-  else
-    dftdvips=$dvips35
-  fi
-  { transLW35 "$dftdvips"; cat $tmp1 $tmp2; } \
-    | normalizeLines >> "$dvipsoutputdir/psfonts_t1.map"
-  { transLW35 "$dftdvips"; cat $tmp2; } \
-    | normalizeLines >> "$dvipsoutputdir/psfonts_pk.map"
-
-  verboseMsg "$progname: Generating output for pdftex..."
-  # remove PaintType due to Sebastian's request
-  { transLW35 "$pdftex35"; cat $tmp1 $tmp2; } \
-    | grep -v PaintType | grep . > $tmp3
-  { transLW35 "$dvipdfm35"; cat $tmp1 $tmp2; } \
-    | grep -v PaintType | grep . > $tmp6
-  { transLW35 "$ps2pk35"; cat $tmp1 $tmp2; } \
-    | grep -v PaintType | grep . > $tmp7
-
-  <$tmp3 normalizeLines >> "$pdftexoutputdir/pdftex_ndl14.map"
-  <$tmp7 normalizeLines >> "$pdftexoutputdir/pdftex_dl14.map"
-
-  verboseMsg "$progname: Generating output for dvipdfm..."
-  <$tmp7 normalizeLines | dvips2dvipdfm | normalizeLines >> "$dvipdfmoutputdir/dvipdfm_dl14.map"
-  <$tmp6 normalizeLines | dvips2dvipdfm | normalizeLines >> "$dvipdfmoutputdir/dvipdfm_ndl14.map"
-  verboseMsg "$progname: All output generated."
-  verboseMsg
-
-  setupSymlinks
-  $texhashEnabled && { $verbose && texhash || texhash >/dev/null 2>&1; }
-
-  verboseMsg
-  verboseMsg "$progname: Files generated:"
-  OLDIFS=$IFS; IFS=$newline
-  ls -l $outputFiles | verboseCat
-  IFS=$OLDIFS
-  verboseMsg
-
-  verboseMsg "$progname: Map file links or copies:"
-  ls -l "$dvipsoutputdir"/psfonts.map \
-         "$pdftexoutputdir"/pdftex.map \
-         "$dvipdfmoutputdir"/dvipdfm.map | verboseCat
-
-  if test -f $mapWarnCalled; then
-    m="
-
-!!! NOTICE:
-
-    With this release, the search paths for map files have been changed
-    and we have found that some files exist in the new path as well as
-    in the obsolete path.
-
-    This is not an error per se, but please consider removing duplicates
-    from the old location and search the above output"
-
-    test -n "$log" && m="$m or the transcript file
-      $log
-   "
-
-    m="$m for warnings.
-
-    For more information about the changed search paths, see
-    the release notes section in the teTeX manual. You probably
-    can read this document by executing the command
-      texdoc TETEXDOC
-    else visit the web page
-      http://tug.org/texlive/mapenc.html
-"
-    warn "$m"
-  fi
-
-  verboseMsg
-  verboseMsg "$progname: Done."
-  return 0
-}
-
-###############################################################################
-# main()
-#   execution starts here
-###############################################################################
-main()
-{
-  # initialize global variables
-  progname=updmap
-  cmd=
-  log=
-  chicken_mode=false
-  link_cmd="ln -s"
-  
-  cfgparam=
-  outputdirparam=
-  cfgmaint=
-  texhashEnabled=true
-  mkmapEnabled=true
-  verbose=true
-  needsCleanup=false
-
-  cnfFileShort=updmap.cfg
-  cnfFile=
-  dvipsoutputdir=; pdftexoutputdir=; dvipdfmoutputdir=
-  : ${TEXMFMAIN=`kpsewhich -var-value=TEXMFMAIN`}
-
-  tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$
-  tmp1=$tmpdir/a
-  tmp2=$tmpdir/b
-  tmp3=$tmpdir/c
-  tmp4=$tmpdir/d
-  tmp5=$tmpdir/e
-  tmp6=$tmpdir/f
-  tmp7=$tmpdir/g
-  tmp8=$tmpdir/h
-  mapWarnCalled=$tmpdir/mapWarnCalled
-  catMapsFailed=$tmpdir/catMapsFailed
-
-  processOptions ${1+"$@"}
-
-  case "$cmd" in
-    showoptions) showOptions "$showoptionsItem"; (exit 0); exit;;
-    help)        help; (exit 0); exit;;
-  esac
-
-  setupCfgFile
-  case "$cmd" in
-    listmaps) listMaps; (exit 0); exit;;
-    listavailablemaps) listAvailableMaps; (exit 0); exit;;
-  esac
-
-  # keep a copy of config file, so that we can see if the file was modified
-  setupTmpDir
-
-  if test -n "$cfgmaint"; then
-    if test -z "$cfgparam"; then
-      co=`$TEXMFMAIN/texconfig/tcfmgr --tmp $tmpdir --cmd co --file $cnfFileShort`
-      test $? = 0 || cleanup 1
-      set x $co; shift
-      id=$1; cnfFile=$3; orig=$4
-      verboseMsg "$progname: initial config file is \`$orig'"
-    else
-      verboseMsg "$progname: config file is \`$cnfFile'"
-      cp "$cnfFile" $tmp5
-    fi
-
-    case "$cmd" in
-      edit)
-        ${VISUAL-${EDITOR-vi}} "$cnfFile";;
-      setoption)
-        setOption "$setoptionOpt" "$setoptionVal";;
-      enable)
-        enableMap "$enableMapType" "$enableMapFile";;
-      disable)
-        disableMap "$disableMapFile";;
-      syncwithtrees)
-        syncWithTrees;;
-    esac
-
-    unchanged=true
-    if test -z "$cfgparam"; then
-      ci=`$TEXMFMAIN/texconfig/tcfmgr --tmp $tmpdir --cmd ci --id $id`
-      test $? = 0 || cleanup 1
-      case "$ci" in
-        "") : ;;
-        *) unchanged=false
-           cnfFile=$ci
-           ;;
-      esac
-    else
-      cmp "$cnfFile" $tmp5 >/dev/null 2>&1 || unchanged=false
-    fi
-    case $unchanged in
-      true) if $mkmapEnabled; then
-              verboseMsg "$progname: configuration (updmap.cfg) unchanged. Map files will not be recreated."
-              mkmapEnabled=false
-            else
-              verboseMsg "$progname: configuration (updmap.cfg) unchanged."
-            fi;;
-      *)
-           verboseMsg "$progname: configuration file updated: \`$cnfFile'";;
-    esac
-  fi
-
-  $mkmapEnabled || return
-  setupDestDir
-  mkMaps
-}
-
-main ${1+"$@"}
-cleanup 0
diff --git a/Master/bin/i386-linux/updmap-sys b/Master/bin/i386-linux/updmap-sys
deleted file mode 100755
index 6f3c8365658..00000000000
--- a/Master/bin/i386-linux/updmap-sys
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# updmap-sys: Thomas Esser, public domain.
-
-# wrapper script for updmap with TEXMFVAR and TEXMFCONFIG set to
-#   TEXMFSYSVAR / TEXMFSYSCONFIG
-
-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
-
-export PATH
-
-# hack around a bug in zsh:
-test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
-
-v=`kpsewhich -var-value TEXMFSYSVAR`
-c=`kpsewhich -var-value TEXMFSYSCONFIG`
-
-TEXMFVAR="$v"
-TEXMFCONFIG="$c"
-export TEXMFVAR TEXMFCONFIG
-
-exec updmap ${1+"$@"}
diff --git a/Master/bin/i386-linux/utf8mex b/Master/bin/i386-linux/utf8mex
deleted file mode 120000
index f68cc91498e..00000000000
--- a/Master/bin/i386-linux/utf8mex
+++ /dev/null
@@ -1 +0,0 @@
-pdftex
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/vftovp b/Master/bin/i386-linux/vftovp
deleted file mode 100755
index ec6b365dc7c..00000000000
--- a/Master/bin/i386-linux/vftovp
+++ /dev/null
diff --git a/Master/bin/i386-linux/vpe b/Master/bin/i386-linux/vpe
deleted file mode 120000
index ed1727b6ff8..00000000000
--- a/Master/bin/i386-linux/vpe
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/scripts/vpe/vpe.pl
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/vptovf b/Master/bin/i386-linux/vptovf
deleted file mode 100755
index c451bdd43f1..00000000000
--- a/Master/bin/i386-linux/vptovf
+++ /dev/null
diff --git a/Master/bin/i386-linux/weave b/Master/bin/i386-linux/weave
deleted file mode 100755
index 7bdf9eaab97..00000000000
--- a/Master/bin/i386-linux/weave
+++ /dev/null
diff --git a/Master/bin/i386-linux/wordcount.sh b/Master/bin/i386-linux/wordcount.sh
deleted file mode 100755
index 95a89023f9e..00000000000
--- a/Master/bin/i386-linux/wordcount.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /usr/bin/sh
-# wordcount.sh 1.2 Copyright 2000/02/21 Michael John Downes
-# This script has no restrictions on its use, distribution, or sale.
-#
-# This is a Unix Bourne shell script that counts the characters and
-# spaces in a LaTeX document by running it through LaTeX using
-# wordcount.tex, and then counting the lines in the resulting
-# wordcount.log file that match a special pattern. It assumes that you
-# have a program "grep" with a -c option meaning "Report the number of
-# matching lines". To use perl or some other tool instead of grep,
-# redefine $COUNT in some suitable way, below.
-#
-# The characters that are counted with this method are actual font
-# characters in the page body (excluding running heads): in math, each
-# subscript and superscript character is counted separately, even when
-# they appear one over the other; and so are the separate combining
-# pieces used to make large delimiters. Interword spaces are counted as
-# separate characters, and so are the spaces around mathrel symbols in
-# math formulas (equal signs and the like)---but not the spaces around
-# mathbin symbols (plus, minus, and the like).
-# 
-# You can count words by dividing the character count by 5 (or
-# whatever), or by counting the occurrences of interword spaces. The
-# latter method (illustrated here) is highly accurate at counting the
-# actual number of words---until tables or math formulas enter the
-# picture. In the case of tables, the number of words will tend to be
-# overestimated because tabskip glue, counted as an interword space,
-# appears on both sides of each table cell. (Not counting the tabskip
-# glue at all would result in an underestimate, and the underestimate
-# would tend to be slightly less accurate than the overestimate that we
-# have chosen to do.)
-#
-# And of course, in the case of math formulas, how do you define what is
-# a "word"?
-
-SCRIPT=`basename $0`
-LOGFILE=wordcount.log
-COUNT="grep -c"
-LATEX=latex
-
-die () {
-  echo "$@ was apparently unsuccessful."
-  exit 1
-}
-
-no_files_msg () {
-  echo "$SCRIPT: At least one file name must be supplied" \
-       "on the command line."
-  exit 1
-}
-
-case X$1 in
-  X) no_files_msg ;;
-  *) : ;;
-esac
-
-for f in "$@"
-do
-  # Since \? is not defined by LaTeX itself, this use via \csname causes
-  # it to be defined as \relax, and it then serves as a filename
-  # terminator. And within wordcount.tex if \? is found to be no longer
-  # undefined, certain messages are suppressed.
-  echo "$f" | $LATEX 'wordcount.tex\csname ?\endcsname' || die "LaTeX run"
-  # Count interword spaces and end-of-paragraph spaces
-  words=`$COUNT '3[.]0863[35]' $LOGFILE` || die "Log search"
-  # Count nonspace characters and interword spaces
-  chars=`$COUNT '3[.]0863[23]' $LOGFILE` || die "Log search"
-  # If you want to see what the log file looks like, comment out the
-  # following line:
-  rm $LOGFILE
-  echo "$f contains $chars characters and $words words."
-done
diff --git a/Master/bin/i386-linux/xdvi b/Master/bin/i386-linux/xdvi
deleted file mode 100755
index 679b3f05aa7..00000000000
--- a/Master/bin/i386-linux/xdvi
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# This is the xdvi wrapper script for teTeX, version 0.2.
-# Copyright Thomas Esser, 1998. Permission to distribute under the terms
-# of the GNU general public license version 2 or later.
-
-# This script sets some environment variables to make sure that xdvi's
-# resource file in $XDVIINPUTS/xdvi is read by xdvi.bin.
-
-test -f /bin/sh5 && test -z "$RUNNING_SH5" \
-  && test x"`(uname -s) 2>&1`" = xULTRIX \
-  && { RUNNING_SH5=true; export RUNNING_SH5; exec /bin/sh5 $0 ${1+"$@"}; }
-RUNNING_SH5=
-
-test -f /bin/bsh && test -z "$RUNNING_BSH" \
-  && test x"`(uname -s) 2>&1`" = xAIX \
-  && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; }
-RUNNING_BSH=
-
-# -help and -version only work if they are the only options. Therefore,
-# we cannot give the "-name xdvi" parameter in that case.
-# SU: Actually, with current xdvik, they should work in any position; but
-# we may keep this for compatibility with older versions and non-k xdvi.
-case "$#:$1" in
-  1:-help|1:-version)
-    NAMEOPT=;;
-  *)
-    NAMEOPT='-name xdvi';;
-esac
-
-xdviappfile=`kpsewhich -progname=xdvi --format='other text files' XDvi`
-if test -n "$xdviappfile"; then
-  xdviappdir=`dirname "$xdviappfile"`
-  xdviapppath="${xdviappdir}/%l_%t/%N:${xdviappdir}/%N"
-
-  # For R3, we have to set XAPPLRESDIR.
-  ### SU: removed, xdvik won't work with R3 anyway, and XAPPLRESDIR is
-  ### for user customizations in current X
-  ### XAPPLRESDIR="$xdviappdir"; export XAPPLRESDIR
-
-  # For R4 or later, we have to set XFILESEARCHPATH, since XAPPLRESDIR might
-  # be ignored (if XUSERFILESEARCHPATH is set)
-  XFILESEARCHPATH="$xdviapppath:${XFILESEARCHPATH-%D}"; export XFILESEARCHPATH
-fi
-
-exec xdvi-xaw.bin $NAMEOPT ${1+"$@"}
diff --git a/Master/bin/i386-linux/xdvi-xaw.bin b/Master/bin/i386-linux/xdvi-xaw.bin
deleted file mode 100755
index baa9da14620..00000000000
--- a/Master/bin/i386-linux/xdvi-xaw.bin
+++ /dev/null
diff --git a/Master/bin/i386-linux/xdvipdfmx b/Master/bin/i386-linux/xdvipdfmx
deleted file mode 100755
index b401fedae39..00000000000
--- a/Master/bin/i386-linux/xdvipdfmx
+++ /dev/null
diff --git a/Master/bin/i386-linux/xdvizilla b/Master/bin/i386-linux/xdvizilla
deleted file mode 100755
index 54f4b03ddfe..00000000000
--- a/Master/bin/i386-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/i386-linux/xelatex b/Master/bin/i386-linux/xelatex
deleted file mode 120000
index ef9fe406fd6..00000000000
--- a/Master/bin/i386-linux/xelatex
+++ /dev/null
@@ -1 +0,0 @@
-xetex
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/xetex b/Master/bin/i386-linux/xetex
deleted file mode 100755
index c423d762512..00000000000
--- a/Master/bin/i386-linux/xetex
+++ /dev/null
diff --git a/Master/bin/i386-linux/xmltex b/Master/bin/i386-linux/xmltex
deleted file mode 120000
index f68cc91498e..00000000000
--- a/Master/bin/i386-linux/xmltex
+++ /dev/null
@@ -1 +0,0 @@
-pdftex
-\ No newline at end of file
diff --git a/Master/bin/i386-linux/xmltools b/Master/bin/i386-linux/xmltools
deleted file mode 100755
index 03086d0436b..00000000000
--- a/Master/bin/i386-linux/xmltools
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-texmfstart xmltools.rb "$@"
author	Martin Schröder <martin@oneiros.de>	2008-03-15 16:01:48 +0000
committer	Martin Schröder <martin@oneiros.de>	2008-03-15 16:01:48 +0000
commit	6551b64647df0be3010eb5723b6e3a497d06b774 (patch)
tree	500019f0140609634c0b0445273866f2b3c8435d /Master/bin
parent	1e8fa10066d82d5e8fd7c96e1b58f978d8536b31 (diff)