Updated sources and documentation for tlaunch

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

5 files changed, 89 insertions, 60 deletions

diff --git a/Master/texmf-dist/doc/support/tlaunch/Changes b/Master/texmf-dist/doc/support/tlaunch/Changes
index 97e510793ab..288e3990219 100644
--- a/Master/texmf-dist/doc/support/tlaunch/Changes
+++ b/Master/texmf-dist/doc/support/tlaunch/Changes
@@ -1,12 +1,14 @@
+2017-02-01 Siep Kroonenberg <siepo@cybercomm.nl> Release 0.5.2
+
+	* Various silent command-line options added
+	* Updated documentation
+
 2017-02-01 Siep Kroonenberg <siepo@cybercomm.nl> Release 0.5.1
 
 	* Tlaunch uninst options are now called uninst and uninst_all
-    rather than uninst_keep_tldir and uninst.
-
+	  rather than uninst_keep_tldir and uninst.
 	* Added -v/--version option and help output
-
 	* Simpler root texmf.cnf in RUG example files
-
 	* Reorganized packaging
 
 2017-01-27 Siep Kroonenberg <siepo@cybercomm.nl> Release 0.5.0
diff --git a/Master/texmf-dist/doc/support/tlaunch/README b/Master/texmf-dist/doc/support/tlaunch/README
index e4c3e53c626..5fe26a136a2 100644
--- a/Master/texmf-dist/doc/support/tlaunch/README
+++ b/Master/texmf-dist/doc/support/tlaunch/README
@@ -16,10 +16,12 @@ Features:
 See the manual for placement of tlaunch.exe and tlaunch.ini, and for
 customizing the ini file.
 
-For trying this out on an existing local installation, a script
-tlaunchmode is included which can convert a classic installation
-into a launcher-based one and back. The manual has a section on this
-script which also explains how to install it.
+The launcher is already part of TeX Live. The 2017 installer has an
+option to make the installation launcher-based.
+
+A script tlaunchmode is included which can convert a classic
+installation into a launcher-based one and back. The manual has a
+section on this script.
 
 The file rug.zip contains as an example a more elaborate
 configuration, based on the installation at the Rijksuniversiteit
diff --git a/Master/texmf-dist/doc/support/tlaunch/figures/custom_ed.png b/Master/texmf-dist/doc/support/tlaunch/figures/custom_ed.png
index d0d1c6a5710..589802427cc 100644
--- a/Master/texmf-dist/doc/support/tlaunch/figures/custom_ed.png
+++ b/Master/texmf-dist/doc/support/tlaunch/figures/custom_ed.png
diff --git a/Master/texmf-dist/doc/support/tlaunch/tlaunch.pdf b/Master/texmf-dist/doc/support/tlaunch/tlaunch.pdf
index 53d5631b966..9d0167a08d4 100644
--- a/Master/texmf-dist/doc/support/tlaunch/tlaunch.pdf
+++ b/Master/texmf-dist/doc/support/tlaunch/tlaunch.pdf
diff --git a/Master/texmf-dist/doc/support/tlaunch/tlaunch.tex b/Master/texmf-dist/doc/support/tlaunch/tlaunch.tex
index a984e57a2eb..923e176cfa6 100644
--- a/Master/texmf-dist/doc/support/tlaunch/tlaunch.tex
+++ b/Master/texmf-dist/doc/support/tlaunch/tlaunch.tex
@@ -1,4 +1,24 @@
 \documentclass[11pt,a4paper,oneside]{report}
+
+% narrow margins, same layout
+\AtBeginDocument{%
+  \paperwidth\textwidth
+  \advance\paperwidth48bp
+  \oddsidemargin-48bp
+  \paperheight\textheight
+  \advance\paperheight48bp
+  % no header
+  %\headheight=0bp
+  %\headsep=0bp
+  % otherwise:
+  \advance\paperheight\headheight
+  \advance\paperheight\headsep
+  \advance\paperheight\footskip
+  \topmargin=-48bp
+  \pdfpagewidth=\paperwidth
+  \pdfpageheight=\paperheight
+}
+
 % fonts
 \usepackage{tgpagella}
 \let\slshape\itshape
@@ -45,7 +65,7 @@
 \newenvironment{ttdesc}{%
   \def\descriptionlabel##1{\hspace\labelsep\ttfamily\selectfont ##1}%
   \description}{\enddescription}
-\hyphenation{head-ache}
+\hyphenation{head-ache work-space}
 
 \title{TLaunch: a launcher for a \TL{} system}
 \author{Siep Kroonenberg}
@@ -55,7 +75,7 @@
 \thispagestyle{empty}
 \null\vfill
 {\small\parindent=0pt
-This manual is for tlaunch, the \TL{} Launcher, version 0.5.1.
+This manual is for tlaunch, the \TL{} Launcher, version 0.5.2.
 
 Copyright \textcopyright{} 2017 Siep Kroonenberg.
 
@@ -169,8 +189,7 @@ External scripts may run on demand, as the action associated with a
 button or a menu control; see section \ref{sec:utscripts}. Scripts
 may also run automatically, as supplemental initialization or
 cleanup; see the \texttt{pre\_config}, \texttt{post\_config} and
-\texttt{pre\_forget} variables in table \ref{tab:strings}. Examples
-uses:
+\texttt{pre\_forget} variables in table \ref{tab:strings}. Examples:
 \begin{itemize}
 \item Forgetting a previous release of \TL{} before configuring the
   current one. This only makes sense for a centrally-managed \TeX{}
@@ -190,19 +209,23 @@ uses:
 The ini file defines the menu items and buttons of the graphical
 interface. These controls can start up \GUI{} programs or run
 utility scripts, or run some predefined functions. The ini file also
-defines filetype associations, and may define scripts for doing
+defines filetype associations, and may specify scripts for doing
 additional configuration and cleanup.
 
 \subsection{Location}
 \label{sec:loc}
 
-One option is to place both the binary and the ini file in the
-root of the \TL{} installation. Another is to place the binary in
-\TL{} binary directory, \texttt{\emph{tlroot}/bin/win32}, and the
-ini file where \texttt{kpsewhich} can find it, \emph{e.g.} in
-\texttt{\emph{tlroot}/texmf-config/web2c}.
+In \TL, the binary is in the \TL{} binary directory,
+\texttt{\emph{tlroot}/bin/win32}, and the ini file is in
+\texttt{\emph{tlroot}/texmf-dist/web2c}. The installer may have
+created a modified higher-priority copy in
+\texttt{\emph{tlroot}/texmf-var/web2c}. A custom
+\texttt{tlaunch.ini} in \texttt{\emph{tlroot}/texmf-config/web2c}
+will override either. In this case, do not forget to update the
+filename database.
 
-The binary and the ini file should have the same first name.
+Another option is to place both the binary and the ini file in the
+root of the \TL{} installation.
 
 \subsection{Encoding}
 \label{sec:enc}
@@ -374,9 +397,11 @@ The following functions are available:
 \item [FU:clear] Undo all configuration and terminate
 \item [FU:initialize] Undo all configuration, terminate and
   restart. This forces re-initialization.
-\item [FU:editor\_select] See section \ref{sec:edsel} below
-\item [FU:default\_editor] See section \ref{sec:edsel} below
+\item [FU:editor\_select] See section \ref{sec:edsel}
+\item [FU:default\_editor] See section \ref{sec:edsel}
 \item [FU:about] An About box
+\item [FU:uninst\_all] See section \ref{sec:lbased}
+\item [FU:uninst] See section \ref{sec:lbased}
 \end{ttdesc}
 
 \subsection{Menus and buttons}
@@ -426,14 +451,14 @@ Quit=FU:quit
 \subsection{The General section}
 \label{sec:gen}
 
-Here, three keywords are allowed:
+This section is optional. Three keywords are allowed:
 \begin{ttdesc}
 \item[Filetypes] Allowed values are
   \begin{itemize}
   \item \texttt{none}: do not set or change filetype associations
   \item \texttt{new}: create filetype associations only if they do
     not override existing ones; default
-  \item \texttt{overwrite} create filetype associations regardless
+  \item \texttt{overwrite}: create filetype associations regardless
     of existing ones
   \end{itemize}
 \item[searchpath] {\sloppy Allowed values are 0 (leave searchpath
@@ -455,7 +480,7 @@ FILETYPES=new
 SEARCHPATH=1
 KEEPTEMPS=0
 \end{verbatim}
-Since these are all default settings, one may as well omit this section.
+The above values are the defaults.
 
 \section{Editor choice}
 \label{sec:edsel}
@@ -505,24 +530,34 @@ Installation and uninstallation are triggered by command-line
 parameters:
 
 \begin{ttdesc}
-\item[user\_inst] Install the launcher for a single user
+\item[user\_inst] Install the launcher for a single user. This
+  includes doing the first-time initialization as in a regular
+  invokation.
+\item[user\_inst\_silent] Silent single-user install
 \item[admin\_inst] Install the launcher for all users
+\item[admin\_inst\_silent] Silent multi-user install
 \item[uninst] Undo installation but leave the \TL{}
-  directory tree alone
+  directory tree alone. Also runs the forgetter for the current
+  user silently, if it exists.
 \item[uninst\_all] Undo installation and remove the \TL{} directory
-  tree. This is the only option of these four which touches the \TL{}
-  installation itself.
+  tree. Also runs the forgetter for the current user silently, if it
+  exists. This is the only option of these four which touches the
+  \TL{} installation itself.
+\item[silent] (Only for the forgetter) Remove settings silently
 \end{ttdesc}
 
-If there is a forgetter for the current user, both uninst options
-will run it. A command-line option \texttt{silent} will ensure
-that the forgetter will run without user interaction.
+The new launcher mode option of the 2017 \TL{} installer invokes the
+launcher with one of the silent installer options.
+
+Within the launcher, there are functions \texttt{FU:uninst\_all} and
+\texttt{FU:uninst} which can be assigned to a menu- or button
+control. If necessary, the launcher will pop up a \textsc{uac}
+prompt and restart in elevated mode.
 
-Within the launcher, there are corresponding functions
-\texttt{FU:uninst\_all} and \texttt{FU:uninst} which can be
-assigned to a menu- or button control. If necessary, the launcher
-will pop up a \textsc{uac} prompt and restart in elevated
-mode.
+If for either the path setting option or the file associations
+option a non-default value was selected, the \TL{} installer creates
+a higher-priority \texttt{tlaunch.ini} with corresponding settings,
+even if launcher mode was not selected.
 
 \subsection{The tlaunchmode script}
 \label{sec:tlaunchmode}
@@ -531,20 +566,10 @@ The included Perl script tlaunchmode can convert a local \TL{}
 installation between classic and launcher-based. Run with a
 parameter `on', the script turns launcher mode on; with `off' it
 reverts the installation to classic, and anything else prints a
-brief help message.
+brief help message.  It is already part of \TL.
 
 It aborts if admin permissions are required but missing.
 
-It can be installed in the usual way: put it under the scripts
-subdirectory of some texmf tree, run \texttt{mktexlsr} on that tree,
-and copy in the \texttt{\emph{tlroot}\bslb bin\bslb win32} directory
-\texttt{runscript.exe} to \texttt{tlaunchmode.exe}.
-
-Although at the moment there is no mechanism to make the path- and
-file association settings in the ini file conform to those set
-during a classic installation, those orginal settings are restored
-when converting back to classic mode.
-
 \subsection{\TeX{} Live Manager}
 
 Nothing special has been done for the \TL{} Manager. It can be
@@ -552,7 +577,8 @@ assigned to a menu- or button control, although this makes little
 sense for a centrally managed network installation. If necessary it
 will automatically pop up a \textsc{uac} prompt.
 
-\chapter[The launcher at the RUG]{The launcher at the Rijksuniversiteit Groningen}
+\chapter[The launcher at the RUG]{The launcher at the
+  Rijksuniversiteit Groningen}
 \label{chap:rug}
 
 \begin{figure}[tb]
@@ -613,8 +639,8 @@ described in Appendix \ref{sec:roam}.
 This desktop is also available remotely, which works reasonably well
 most of the time.
 
-For \TL, I submit a wish list of settings to the workspace
-management people, and they enter everything into the RES
+For \TL, I submit a wish list of settings to be captured to the
+workspace management people, and they enter everything into the RES
 system. Unfortunately, the RES system has its quirks, and what I
 expect to happen is not always what actually does happen. But this
 is not the place to expand on my trials and tribulations with RES.
@@ -720,9 +746,9 @@ things.
 
 In the absence of any registry settings, SumatraPDF assumes that it
 is a portable setup, and tries to write user configuration to its
-own directory. Its developers informed me what registry setting
-would convince SumatraPDF otherwise, so that it would write its
-configuration data to the user's profile.
+own directory. Following advise from its developers, I created a
+registry setting to convince SumatraPDF otherwise, and let it write
+its configuration data to the user's profile.
 
 Checks for updates are disabled in a similar way as for \TS.
 
@@ -745,17 +771,16 @@ installation.
 \section{Moving the \XeTeX{} font cache}
 \label{sec:xecache}
 
-{\sloppy At the time of writing, the default location of the
-  \XeTeX{} font cache in \TL{} is \texttt{\$TEXMFYSVAR/\dbr
-    fonts/\dbr cache}, \emph{i.e.}  \texttt{\emph{tlroot}/\dbr
-    texmf-var/\dbr fonts/\dbr cache}. In a multi-user or network
-  install, this location is not user-writable. Since this was a
-  problem, a line
+The default location of the \XeTeX{} font cache in \TL{} is
+\texttt{\$TEXMFYSVAR/\dbr fonts/\dbr cache}, \emph{i.e.}
+\texttt{\emph{tlroot}/\dbr texmf-var/\dbr fonts/\dbr cache}. In a
+multi-user or network install, this location is not
+user-writable. Since this was a problem, a line
 \begin{verbatim}
 FC_CACHEDIR = $TEXMFVAR/fonts/cache
 \end{verbatim}
 in the file \texttt{\emph{tlroot}/\dbr texmf.cnf} moved the cache to a
-user-writable location.\par}
+user-writable location.
 
 Since I generate the \TL{} installation on a Linux system, the
 configured \TL{} font paths in \texttt{\$TEXMFSYSVAR/\dbr fonts/\dbr