Live:tex: working on installation section

git-svn-id: svn://tug.org/texlive/trunk@9308 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 233 insertions, 30 deletions

diff --git a/Master/texmf-doc/source/english/texlive-en/install-w32-main.png b/Master/texmf-doc/source/english/texlive-en/install-w32-main.png
new file mode 120000
index 00000000000..3117a49089b
--- /dev/null
+++ b/Master/texmf-doc/source/english/texlive-en/install-w32-main.png
@@ -0,0 +1 @@
+../../../doc/english/texlive-en/install-w32-main.png
\ No newline at end of file
diff --git a/Master/texmf-doc/source/english/texlive-en/installation.tex b/Master/texmf-doc/source/english/texlive-en/installation.tex
index b8d6d7721ab..29027fd8715 100644
--- a/Master/texmf-doc/source/english/texlive-en/installation.tex
+++ b/Master/texmf-doc/source/english/texlive-en/installation.tex
@@ -1,6 +1,182 @@
 \section{Installation}
 \label{sec:install}
 
+\subsection{Starting the installer}
+First, get and locate the installer, install-tl for Unix,
+install-tl.bat for Windows:
+
+\begin{itemize}
+\item For the \TK{} \DVD, go to its texlive- or texlive2008
+  subdirectory. Under Windows, the installer will probably start
+  automatically when you insert the \DVD.
+\item The net installer can be downloaded from CTAN, under
+  systems/texlive/tlnet. You can choose between install-tl.zip which
+  can be used under Unix and Windows and install-unx.tar.gz which is
+  Unix-only (including \MacOSX). Unpack it and go to the install-tl
+  subdirectory.
+\item You can also download an iso image from CTAN. However, even
+  the compressed image is about 1 GB in size. So use one of the other
+  options unless you have a good reason for preferring the iso
+  image. Under most Unices, including Linux and \MacOSX, you can
+  mount the image directly. Otherwise, burn the image to a physical
+  \DVD\ and mount it. The installer scripts install-tl and
+  install-tl.bat will be in the root. Under Windows, the installer
+  will probably start automatically when you insert the \DVD.
+\end{itemize}
+
+\subsubsection{Unix/Linux}
+
+\noindent
+Below, \texttt{>} denotes the shell prompt; user input is
+\Ucom{\texttt{underlined}}.
+Starting under Unix/Linux from a terminal emulator:
+
+\begin{alltt}
+> \Ucom{./install-tl}
+\end{alltt}
+if you are in the installer directory, otherwise
+\begin{alltt}
+> \Ucom{<path_to_installer>/install-tl}
+\end{alltt}
+For \GUI\ mode, use
+\begin{alltt}
+> \Ucom{./install-tl -gui}
+\end{alltt}
+For a complete listing of the various options:
+\begin{alltt}
+> \Ucom{./install-tl -help}
+\end{alltt}
+
+\subsubsection{Windows}
+
+As already noted, the \DVD\ installer will probably start
+automatically when you put the \DVD\ in the \DVD-drive. If not, or
+if you use the net installer, you can double-click install-tl.bat.
+
+You can also start the installer from the command-prompt:
+Below, \texttt{>} denotes the prompt; user input is
+\Ucom{\texttt{underlined}}.
+
+\begin{alltt}
+> \Ucom{install-tl}
+\end{alltt}
+if you are in the installer directory, otherwise
+\begin{alltt}
+> \Ucom{D:\bs{}install-tl}
+\end{alltt}
+for the downloadable iso, if \texttt{D:} is the optical drive, or
+\begin{alltt}
+> \Ucom{D:\bs{}texlive\bs install-tl}
+\end{alltt}
+for the \TK\ \DVD. For text mode, use
+\begin{alltt}
+> \Ucom{install-tl -no-gui}
+\end{alltt}
+For a complete listing of the various options:
+\begin{alltt}
+> \Ucom{install-tl -help}
+\end{alltt}
+
+\subsubsection{The text installer}
+
+This is the main text mode screen under Unix/Linux:
+
+\begin{verbatim}
+======================> TeX Live installation procedure <=====================
+
+=======> Note: Letters/digits in <angle brackets> indicate menu items <=======
+=======>       for commands or configurable options                   <=======
+
+
+ Detected platform: Intel x86 with GNU/Linux
+
+ <B> binary systems: 1 out of 16
+
+ <S> Installation scheme (scheme-full)
+
+ Customizing installation scheme:
+   <C> standard collections
+   <L> language collections
+   83 collections out of 84, disk space required: 1666 MB
+
+ <D> directories:
+   TEXDIR (the main TeX directory):
+     !! default location: /usr/local/texlive/2008
+     !! is not writable, please select a different one!
+   TEXMFLOCAL (directory for site-wide local files):
+     /usr/local/texlive/texmf-local
+   TEXMFSYSVAR (directory for variable and automatically generated data):
+     /usr/local/texlive/2008/texmf-var
+   TEXMFSYSCONFIG (directory for local config):
+     /usr/local/texlive/2008/texmf-config
+   TEXMFHOME (directory for user-specific files):
+     ~/texmf
+
+ <O> options:
+   [ ] use letter size instead of A4 by default
+   [X] create all format files
+   [X] install macro/font doc tree
+   [X] install macro/font source tree
+   [ ] create symlinks in standard directories
+
+ <V> Install for running from DVD
+
+Other actions:
+ <I> start installation to HD
+ <H> help
+ <Q> quit
+
+Enter command:
+\end{verbatim}
+
+You cannot tab around checkboxes or input fields. You just have to
+type something at the prompt and press the Enter key, and then the
+entire terminal screen will be rewritten, with adjusted content.
+
+The text installer interface is this primitive for a reason: it
+is designed to run on as many platforms as possible, even with a
+very barebones Perl (for Windows, a Perl subset is included).
+
+\subsubsection{The graphical installer}
+
+This is what the graphical installer looks like:
+
+\noindent
+%\includegraphics[width=\linewidth]{install-w32-main.png}
+\tlpng{install-w32-main}{\linewidth}
+
+Most differences in available options are due to
+this screenshot being from Windows, and the text screen above being
+from Linux.
+
+% de diverse submenus
+
+There is no submenu for selecting other platforms, the default
+directories are appropriate for Windows rather than for Unix, and
+there is no symlinks option.
+
+You find three submenus for selecting what you want to install: you
+can select a scheme, which is a very global way to tell the
+installer what you want, and you can refine this choice in the
+standard collections- and language collections menus. If you want
+more detail, you need run the tlmgr program afterwards.
+
+
+\subsection{Installing from source}
+
+As long as your platform has a decent Perl, you will be able to
+install everything \emph{except} the binaries. It is probably a good
+idea to uncheck the option to create all format files. Afterwards,
+unpack source.tar.bzip2 from the source subdirectory and run the
+Build script in the root of the unpacked archive. Don't forget to
+read the README in the same directory.
+
+\subsection{Starting the installer}
+
+The installer is called
+http://www.ctan.org/tex-archive/systems/texlive/tlnet/tldev/
+
+
 As introduced in section~\ref{sec:basic} (\p.\pageref{sec:basic}),
 \TL{} has three principal uses:
 
diff --git a/Master/texmf-doc/source/english/texlive-en/intro.tex b/Master/texmf-doc/source/english/texlive-en/intro.tex
index daa653a1839..300cdb1b43e 100644
--- a/Master/texmf-doc/source/english/texlive-en/intro.tex
+++ b/Master/texmf-doc/source/english/texlive-en/intro.tex
@@ -38,7 +38,7 @@ restriction, Windows requires less special treatment compared to
 Linux and Unix. There are no 64-bit executables for Windows, but the
 32-bit executables should run on 64-bit systems.
 
-See section~\ref{sec:multiple-dist} for alternative \TeX{} systems
+See section~\ref{sec:multiple-dist} for alternate solutions
 for Windows and \MacOSX.
 
 \subsection{Basic usage of \protect\TL{}}
diff --git a/Master/texmf-doc/source/english/texlive-en/live4ht.cfg b/Master/texmf-doc/source/english/texlive-en/live4ht.cfg
index affcc553fc8..9b21788d1a9 100644
--- a/Master/texmf-doc/source/english/texlive-en/live4ht.cfg
+++ b/Master/texmf-doc/source/english/texlive-en/live4ht.cfg
@@ -1,6 +1,6 @@
 % tex4ht configuration file for the TeX Live documentation.
 % Accumulated over many years.  Public domain.
-% 
+%
 % html specifies the main output format.
 % info for extra debugging info in the log files.
 
@@ -13,9 +13,14 @@
 <link rel="stylesheet" type="text/css" href="\jobname.css" />\Hnewline
 <link rel="stylesheet" type="text/css" href="tex-live.css" />\Hnewline
 }}
-
+% use png graphics as-is
+\Configure{graphics*}
+         {png}
+         {\Needs{""}%
+          \Picture[pict]{\csname Gin@base\endcsname.png}%
+         }
 % or LaTeX complains it is missing.
-\begin{document} 
+\begin{document}
 
 \EndPreamble
 
@@ -38,7 +43,7 @@
 \ifhackliterals
   % these definitions cause "missing } inserted" at \end{tabularx} in
   % French and Czech.  don't know why.
-  % 
+  %
   % don't make these into links, as happens with \path.  We only have a couple
   % special characters that actually occur.
   \def\dirname{\texttt\bgroup\catcode`\$=12 \catcode`\_=12 \finishliteral}
diff --git a/Master/texmf-doc/source/english/texlive-en/overview.tex b/Master/texmf-doc/source/english/texlive-en/overview.tex
index 2fab2d2c482..939e9038b16 100644
--- a/Master/texmf-doc/source/english/texlive-en/overview.tex
+++ b/Master/texmf-doc/source/english/texlive-en/overview.tex
@@ -51,39 +51,49 @@ the \TL{} distribution.  On the \pkgname{live} \DVD, the entire \TL{}
 hierarchy is in a subdirectory \dirname{texliveYYYY}, not at the top
 level of the disc.
 
-\smallskip
-\begingroup
-  \renewcommand{\arraystretch}{1.3}  % open up interrow spacing
-\begin{tabular}{>{\ttfamily}lp{.78\hsize}}
-bin        & The \TeX{} system programs, arranged by platform. \\
-readme.html & Readme html pages in various languages, with a quick
-	introduction and useful links \\
-source     & The source of all programs, including the main \Webc{}
-	  \TeX{} and \MF{} distributions. These are stored in
-various compressed archives. \\
-support    & Various auxiliary packages and programs.  These are
+%\smallskip
+%\begingroup
+%  \renewcommand{\arraystretch}{1.3}  % open up interrow spacing
+%\begin{tabular}{>{\ttfamily}lp{.78\hsize}}
+\begin{ttdescription}
+\item[bin] The \TeX{} system programs, arranged by platform.
+%
+\item[readme.html] Readme html pages in various languages, with a quick
+introduction and useful links
+%
+\item[source] The source of all programs, including the main \Webc{}
+  \TeX{} and \MF{} distributions. These are stored in
+various compressed archives.
+%
+\item[support] Various auxiliary packages and programs.  These are
   \emph{not} installed automatically.  This includes
-  assorted editors and \TeX\ shells. \\
-texmf      & Tree for the programs, along with their support files and
+  assorted editors and \TeX\ shells.
+%
+\item[texmf] Tree for the programs, along with their support files and
   documentation.  Does not include \TeX\ formats and packages.
-  (\texttt{TEXMFMAIN} in the next section.) \\
-texmf-dist & The main tree of formats and packages.
-  (\texttt{TEXMFDIST} in the next section.) \\
-texmf-doc  & Tree for self-contained pure documentation, arranged by
-  language.  \\
-texmf-var  & This is not strictly part of the distribution, but will
+  (\texttt{TEXMFMAIN} in the next section.)
+%
+\item[texmf-dist] The main tree of formats and packages.
+  (\texttt{TEXMFDIST} in the next section.)
+%
+\item[texmf-doc] Tree for self-contained pure documentation, arranged by
+  language.
+%
+\item[texmf-var] This is not strictly part of the distribution, but will
   be located next to the above texmf trees in a default
   installation; it can be located elsewhere. This tree contains
   files which are automatically generated and stored.
-  (\texttt{TEXMFSYSVAR} in the next section.) \\
-tlpkg	& Scripts, programs and data for managing the
+  (\texttt{TEXMFSYSVAR} in the next section.)
+%
+\item[tlpkg] Scripts, programs and data for managing the
   installation. It also contains private copies of
   Perl and Ghostscript for Windows, which are invisible outside \TL,
   and a new Windows PostScript viewer PSView.
-\end{tabular}
-\endgroup
+\end{ttdescription}
+%\end{tabular}
+%\endgroup
 
-\smallskip
+%\smallskip
 
 In addition to the directories above, the installation scripts and
 \filename{README} files (in various languages) are at the top level of
diff --git a/Master/texmf-doc/source/english/texlive-en/tex-live.sty b/Master/texmf-doc/source/english/texlive-en/tex-live.sty
index 5b4263b859c..ada0d4059d8 100644
--- a/Master/texmf-doc/source/english/texlive-en/tex-live.sty
+++ b/Master/texmf-doc/source/english/texlive-en/tex-live.sty
@@ -185,6 +185,15 @@
   \fi
   \\[5mm]
 }
+
+\def\tlpng#1#2{%
+  \ifnum \Status=2 % html, want relative path in output
+    \includegraphics[bb=0 0 1 1]{#1.png}
+  \else % not html, handled by TEXINPUTS in Makefile
+    \includegraphics[width=#2]{#1.png}
+  \fi
+  \\[5mm]
+}
 %
 % description-like environment that uses tt instead of bf, and doesn't
 % go to the left margin.  Without the \hfil, get an underfull box.
diff --git a/Master/texmf-doc/source/english/texlive-en/windows.tex b/Master/texmf-doc/source/english/texlive-en/windows.tex
index b4d545ade31..0fc9722841f 100644
--- a/Master/texmf-doc/source/english/texlive-en/windows.tex
+++ b/Master/texmf-doc/source/english/texlive-en/windows.tex
@@ -75,7 +75,9 @@ layout itself.
 The installer will warn you if a directory isn't
 writable or cannot be created. E.g. if you don't have write
 permissions for Program Files, you can choose
-\texttt{\~/texlive/2008} for TEXDIR. `\~' is shorthand for
+%\texttt{\~/texlive/2008} for TEXDIR. `\~' is shorthand for
+% using \verb instead of \texttt prevents generating png for tilde
+\verb|~/texlive/2008| for TEXDIR. `\verb|~|' is shorthand for
 \verb|%USERPROFILE%|, which is usually
 \verb|c:\Documents and Settings\<user>|. This is Windows' analogue
 to \verb|$HOME| under Unix.