several updates (sorry Karl, it was a long train ride):

updates of packages: screenplay, bussproofs computational-complexity
     dvdcoll gnuplottex mathmode movie15 pgf pstricks-add pst-labo 
     trfsigns (dvi->pdf move, COPYING file to doc) toptesi tocvsec2 thumb 
     textfit (doc move)
added to tpm-ctan-check: typogrid trsym trfsigns tracking toptesi toolbox
     todo tocvsec2 tocloft tocbibind titling titlefoot thumb textopo textfit
     teubner tensor


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

12 files changed, 337 insertions, 668 deletions

diff --git a/Master/texmf-dist/source/latex/computational-complexity/cc.dtx b/Master/texmf-dist/source/latex/computational-complexity/cc.dtx
index 339684336ff..7199d8aaf9e 100644
--- a/Master/texmf-dist/source/latex/computational-complexity/cc.dtx
+++ b/Master/texmf-dist/source/latex/computational-complexity/cc.dtx
@@ -3096,7 +3096,7 @@ multilingual,english]{cc}
 %  \changes{v2.06}{2006/10/13}{Made full stop in section and
 %    subsection headings optional.}
 %    \begin{macrocode}
-\def\opt@fullstop#1{#1{\tracingall\has@fullstop#1.\@@@
+\def\opt@fullstop#1{#1{\has@fullstop#1.\@@@
 \if@tempswa\else
 \has@exlamationmark#1!\@@@
 \if@tempswa\else
diff --git a/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.dtx b/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.dtx
index b4ac6b8abea..fd8d857a6ee 100644
--- a/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.dtx
+++ b/Master/texmf-dist/source/latex/gnuplottex/gnuplottex.dtx
@@ -42,8 +42,8 @@
 %<package> \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package> \ProvidesPackage{gnuplottex}
 %<*package>
-    [2006/04/02 v0.1 gnuplot graphs in LaTeX]
-\RequirePackage{graphicx,moreverb,keyval}
+    [2006/10/28 v0.2 gnuplot graphs in LaTeX]
+\RequirePackage{latexsym,graphicx,moreverb,keyval}
 %</package>
 %
 %<*driver>
@@ -60,7 +60,7 @@
 %</driver>                                                       
 % \fi
 %
-% \CheckSum{223}                                                   
+% \CheckSum{164}                                                   
 %
 % \CharacterTable                                                
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -80,6 +80,7 @@
 %
 %
 % \changes{v0.1}{2006/04/02}{Initial version.}
+% \changes{v0.2}{2006/10/28}{Changed gnuplot output to LaTeX, simplified code.}
 %
 % \GetFileInfo{gnuplottex.dtx}
 %
@@ -98,9 +99,9 @@
 % The gnuplot code is extracted from the document and written to
 % \texttt{.gnuplot}
 % files. Then, if shell escape is used, the graph files are automatically
-% processed and converted to PostScript or PDF files, which will then be included. If
+% processed and converted to LaTeX files, which will then be included. If
 % shell escape isn't used, the user will have to manually convert the
-% files.
+% files by running gnuplot on the extracted .gnuplot files.
 %
 % Shell escape is available in the web2c \TeX{} compiler, it allows the execution
 % of shell code during the compilation of a \TeX{} document. It's disabled by
@@ -109,9 +110,8 @@
 %
 % \section{Requirements}
 %
-% To use gnuplottex, you'll need the \texttt{graphicx}, \texttt{keyval} and
-% \texttt{moreverb} packages, epstopdf if you want to use the pdf
-% option, and of course, gnuplot.
+% To use gnuplottex, you'll need the \texttt{graphicx}, \texttt{latexsym},
+% \texttt{keyval} and \texttt{moreverb} packages and, of course, gnuplot.
 %
 % \section{Usage}
 %
@@ -123,8 +123,6 @@
 %     \item[\oarg{noshell}] Don't use shell escape, graphs must be generated
 %     manually.
 %     \item[\oarg{miktex}] We're using mikTeX.
-%			\item[\oarg{pdf}] PDF output, generate .pdf files of the graphs out of
-%			.ps.
 % \end{description}
 %
 % The following environments can be used to include graphs:
@@ -135,8 +133,9 @@
 % The code necessary to write the plot to a file will be inserted by this
 % package.
 %
-% You may specify width or height of the picture using
-% [width=\meta{width}] or [height=\meta{height}] as in the \texttt{includegraphics} command.
+% You may specify a scaling factor for the graphs by adding the parameter after
+% the beginning of the environment, like so:
+% \verb=\begin{gnuplottex}=[scale=\meta{scale}]
 %
 % \StopEventually{}
 %
@@ -146,12 +145,10 @@
 %    \begin{macrocode}
 \newif\ifShellEscape
 \newif\ifmiktex \miktexfalse
-\newif\ifpdf \pdffalse
 
 \DeclareOption{shell}{\ShellEscapetrue}
 \DeclareOption{noshell}{\ShellEscapefalse}
 \DeclareOption{miktex}{\global\miktextrue}
-\DeclareOption{pdf}{\pdftrue}
 
 \ExecuteOptions{shell}
 \ProcessOptions\relax
@@ -187,9 +184,9 @@
 
 \def\gnuplotverbatimwrite#1{%
     \def\BeforeStream
-    {\message{Opening gnuplot stream=\figname.gnuplot}%
-        \immediate\write\verbatim@out{\string set terminal postscript eps enhanced}
-				\immediate\write\verbatim@out{\string set output '\figname.eps'}
+    {\message{Opening gnuplot stream #1}%
+        \immediate\write\verbatim@out{\string set terminal latex}
+				\immediate\write\verbatim@out{\string set output '\figname.tex'}
     }
     \@bsphack
     \immediate\openout \verbatim@out #1
@@ -202,16 +199,25 @@
     \verbatim@start}
 \def\endgnuplotverbatimwrite{%
     \immediate\closeout\verbatim@out
-    \@esphack}
+    \@esphack
+		\catcode`\\0
+		\catcode`\{1
+		\catcode`\}2
+		\catcode`\$3
+		\catcode`\&4
+		\catcode`\^^M5
+		\catcode`\#6
+		\catcode`\^7
+		\catcode`\_8
+		\catcode`\ 10
+		\catcode`\%14}
 %    \end{macrocode}
 % 
 % \subsection{Environment definition}
 %    \begin{macrocode}
-\define@key{pic}{width}{\def\gnuplotwidth{#1}}
-\define@key{pic}{height}{\def\gnuplotheight{#1}}
+\define@key{pic}{scale}{\def\gnuplotscale{#1}}
 \newenvironment{gnuplot}[1][]{\stepcounter{fignum}%
-		\let\gnuplotwidth\undefined
-		\let\gnuplotheight\undefined
+		\def\gnuplotscale{1}
 		\setkeys{pic}{#1}
     \xdef\gnuplotCutFile{\figname.gnuplot}
     \gnuplotverbatimwrite{\gnuplotCutFile}}
@@ -222,66 +228,24 @@
 % \subsection{\texttt{.gnuplot} file processing}
 %    \begin{macrocode}
 \long\gdef\gnuplotgraphicsprocess{%
-    \ifShellEscape
+		\ifShellEscape
 				\IfFileExists{\figname.gnuplot}{%
 						\immediate\write18{gnuplot \figname.gnuplot}
-						\IfFileExists{\figname.eps}{%
-								\ifpdf
-										\immediate\write18{epstopdf \figname.eps}
-										\IfFileExists{\figname.pdf}{%
-												\PackageInfo{gnuplottex}
-												{\figname.gnuplot converted}}
-												{\PackageWarningNoLine{gnuplottex}
-														{Conversion of \figname.gnuplot failed.}}
-								\else
-										\PackageInfo{gnuplottex}
-										{\figname.gnuplot converted}
-								\fi}
-								{\PackageWarningNoLine{gnuplottex}
-										{Conversion of \figname.gnuplot failed.}}}{}
-				\fi}
+						\IfFileExists{\figname.tex}{%
+								\PackageInfo{gnuplottex}
+								{\figname.gnuplot converted}}
+						{\PackageWarningNoLine{gnuplottex}
+								{Conversion of \figname.gnuplot failed.}}}{}
+		\fi}
 %    \end{macrocode}
 %
 % \subsection{Graph inclusion}
 %    \begin{macrocode}
 \long\gdef\gnuplotgraphicsinclude{\gnuplotgraphicsprocess%
-		\ifpdf
-				\IfFileExists{\figname.pdf}{%
-						\ifx\gnuplotwidth\undefined
-								\ifx\gnuplotheight\undefined
-										\includegraphics{\figname}
-								\else
-										\includegraphics[height=\gnuplotheight]{\figname}
-								\fi
-						\else
-								\ifx\gnuplotheight\undefined
-										\includegraphics[width=\gnuplotwidth]{\figname}
-								\else
-										\includegraphics[width=\gnuplotwidth,height=\gnuplotheight]{\figname}
-								\fi
-						\fi
-				}
-				{\PackageWarningNoLine{gnuplottex}
-						{Please convert \figname.gnuplot manually}}
-		\else
-				\IfFileExists{\figname.eps}{%
-						\ifx\gnuplotwidth\undefined
-								\ifx\gnuplotheight\undefined
-										\includegraphics{\figname}
-								\else
-										\includegraphics[height=\gnuplotheight]{\figname}
-								\fi
-						\else
-								\ifx\gnuplotheight\undefined
-										\includegraphics[width=\gnuplotwidth]{\figname}
-								\else
-										\includegraphics[width=\gnuplotwidth,height=\gnuplotheight]{\figname}
-								\fi
-						\fi
-				}
-				{\PackageWarningNoLine{gnuplottex}
-						{Please convert \figname.gnuplot manually}}
-		\fi
+		\IfFileExists{\figname.tex}{%
+				\scalebox{\gnuplotscale}{\input{\figname}}}
+		{\PackageWarningNoLine{gnuplottex}
+				{Please convert \figname.gnuplot manually}}
 }
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/source/latex/screenplay/screenplay.dtx b/Master/texmf-dist/source/latex/screenplay/screenplay.dtx
index b4421cc7897..55a0f51e2e8 100644
--- a/Master/texmf-dist/source/latex/screenplay/screenplay.dtx
+++ b/Master/texmf-dist/source/latex/screenplay/screenplay.dtx
@@ -34,7 +34,7 @@
 %</dtx>
 %<driver>\ProvidesFile{screenplay.drv}
 % \fi
-%\ProvidesFile{screenplay}[2006/10/08 v1.504
+%\ProvidesFile{screenplay}[2006/10/25 v1.516
 %	LaTeX2e Draft Screenplay document class
 %	(C)2006 John Pate
 %	released under the GNU General Public License]
@@ -54,7 +54,7 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 %</driver>
 % \fi
 %
-% \CheckSum{312}
+% \CheckSum{332}
 % \changes{1.0.0}{2006 Sep 23}{first \texttt{screenplay.dtx, 2006/09/23, v1.457}}
 % \changes{1.0.1}{2006 Sep 24}{minor code changes, revision to documentation,
 % v1.461}
@@ -68,10 +68,6 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 % v1.494}
 % \changes{1.0.6}{2006 Sep 30}{fixed typos, v1.496}
 % \changes{1.0.7}{2006 Oct 01}{revision to documentation, v1.499}
-% \changes{1.0.8}{2006 Oct 02}{minor format fix, v1.500}
-% \changes{1.0.9}{2006 Oct 06}{added \texttt{hardmarg.sty}, v1.502}
-% \changes{1.1.0}{2006 Oct 08}{minor code changes, v1.503}
-% \changes{1.1.1}{2006 Oct 08}{minor code changes, v1.504}
 %
 % \MakeShortVerb{\|}
 %
@@ -89,10 +85,10 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 % the \textit{Nicholl Fellowships in Screenwriting}.
 % Full-length feature film screenplays are submitted (for
 % a fee).  You can win money but, more importantly, placing in
-% the competition will make agents take notice.  The
-% \textit{Academy} recommends a particular format which this
+% the competition will make agents take notice.  
+% \textit{The Academy} recommends a particular format which this
 % \texttt{class} file attempts to duplicate, using a 
-% \texttt{.pdf} available from the Academy website as the
+% \texttt{.pdf} available from \textit{The Academy} website as the
 % model.  This format has various functions, amongst which is a
 % gate-keeping function to show you have at least a first idea.
 % It also gives readers a better chance of assessing how long,
@@ -104,12 +100,10 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 % Letter size paper.  I have a ream on my lap as I type: 20
 % pound, 106 bright, acid free.  My sister brought it from
 % America for me---it's very expensive to buy outside the US
-% and not easy to find.  However, if all else fails you can
-% have a stationer cut down A3 80gsm paper for you.  It won't
-% be the same weight but it's unlikely anyone will notice. One
-% might imagine it's at the photocopy stage that dealing with A4
-% in America becomes a nuisance---one more reason to put
-% your magnum opus to the bottom of the pile.
+% and not easy to find. One might imagine it's at the
+% photocopy stage that dealing with A4 in America becomes
+% a nuisance---one more reason to put your magnum opus
+% to the bottom of the pile.
 %
 % Of course, if you didn't know this already you likely
 % need to do some serious reading and research \emph{before}
@@ -163,9 +157,9 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 % \texttt{test.pdf}.
 %
 % Make sure everything in the printing chain can deal properly
-% with 8.5ins by 11ins letter paper.  Print out your
+% with 8.5ins by 11ins Letter paper.  Print out your
 % version of \texttt{test} and the provided \texttt{test.pdf}
-% (on letter paper of course!) and compare them.  The two
+% (on Letter paper of course!) and compare them.  The two
 % printouts should be dimensionally identical. The left margin
 % should measure as  \emph{exactly} 1.5ins.  If not you have
 % an old version of \texttt{dvips} and/or your printer driver
@@ -180,7 +174,7 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 % The formatting required is minimalist. \texttt{screenplay.cls} will
 % issue an error message if you use any options.
 %
-% |\documentclass{screenplay}[2006/10/08]| \\
+% |\documentclass{screenplay}[2006/10/25]| \\
 % is your first command, you can give the optional date argument in
 % case of any earlier copies of \texttt{screenplay.cls} lying around.
 % I'll try not to break things retro-actively with later revisions
@@ -208,7 +202,7 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 % I made the time of day optional because my screenplay had
 % stuff happening in space where there is no time of
 % day.  You will likely \emph{always} use either \textit{day}
-% or \textit{night}.  (Refer to the \textit{Academy's} information
+% or \textit{night}.  (Refer to \textit{The Academy's} information
 % on formatting.)  Likewise there's an |\extslug[]{}| for EXT.
 %
 % After a slugline you would typically have some description.  This
@@ -228,7 +222,7 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 % Do not put any blank lines in dialogue text.
 %
 % So you wander on with your screenplay requiring little in the
-% way of \LaTeXe's spiffy powers until you reach the end of the
+% way of \LaTeXe's powers until you reach the end of the
 % final scene.  Personally I use \texttt{Elvis} with a selection
 % of macros in my \texttt{.exrc} to save me having to type the
 % commands I've invented.
@@ -280,20 +274,24 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 % that has had manual linebreaks inserted but not manual pagebreaks.
 % 
 % \section{Hard Margins package}
-% 
+% \changes{1.0.9}{2006 Oct 06}{added \texttt{hardmarg.sty}, v1.502}
+%
 % Here we're emulating a typewriter.  On a typewriter, the left
 % margin is a hard stop, whereas the right margin is a bell
 % (those of us who typed in the stone age well remember
 % that ``ding'').  Even the best typist would run past the
 % right margins by a character or two once in a while, sometimes
-% deliberately.  Hence the ``fudge factors'' interpolated by me.
+% deliberately.  Hence the ``fudge factors'' interpolated by me,
+% which in days of yore would perhaps have been referred to as
+% the \textit{gutter}.
 % 
 % The provided \texttt{hardmarg.sty} shows you what happens
 % with the \textit{fudge factors} eliminated.  Place the command 
 % |usepackage{hardmarg}| in the document preamble
 % (i.e.\ between |\documentclass{|\ldots|}| and |\begin{document}|) 
 % and judge for yourself.  Personally I'll stick with my 
-% \textit{fudge}.  All the brainwork makes me crave carbs anyway.
+% \textit{fudge}.  All the brain-work makes me crave carbs anyway.
+% But if you want, use it to fix your script to tighter margins.
 % 
 % \section{User customisation}
 %
@@ -306,25 +304,31 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 % class file by redefining the |\slugspace| command 
 % e.g.\ |\renewcommand*{\slugspace}{ - }|
 % which will change the default 3em space to |em hyphen em| spacing.
-% Likewise you could |\renewcommand*{\pov}{POV }| to lose the dots.
+% Likewise you could |\renewcommand*{\pov}{POV}| to lose the dots.
+% If for some strange reason you don't like \textit{The Academy's} use
+% of uppercase for (MORE) and (CONT'D) you can |\renewcommand*| the
+% |\more| and |\contd| macros.
 %
 % Should you not want page number 1 to appear on the first page
 % of the body of the script put the |\thispagestyle{empty}| command
 % in your document source file immediately \emph{after} the command
 % to build the title page.
 %
-% \section{Specs from the Academy}
+% Likely, in the usual \LaTeXe\ fashion, you should develop your own
+% style package  depending on what conventions you want to use.
+%
+% \section{Specs from \textit{The Academy}}
 %
-% Be sure to read, carefully, and inwardly digest, \\
+% Be sure to read, carefully, and inwardly digest and re-read, \\
 % \href{http://www.oscars.org/nicholl/format.html}%
 % {\texttt{http://www.oscars.org/nicholl/format.html}} \\
-% and view, \\
+% and, \\
 % \href{http://www.oscars.org/nicholl/script.pdf}%
 % {\texttt{http://www.oscars.org/nicholl/script.pdf}}, \\
-% the model document.
+% (the model document).
 %
 %   \begin{itemize}
-% \item Letter paper 8.5"x11.0" \\
+% \item 20lb Letter paper (8.5"x11.0") \\
 % Courier 12pt, 10 pitch 
 % 
 % \item\textbf{Page} \nopagebreak \\
@@ -353,8 +357,13 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 % \StopEventually{\PrintIndex\PrintChanges}
 %
 % \section{The Coding}
+% \changes{1.0.8}{2006 Oct 02}{minor format fix, v1.500}
+% \changes{1.1.0}{2006 Oct 08}{minor code changes, v1.503}
+% \changes{1.1.1}{2006 Oct 08}{minor code changes, v1.504}
+% \changes{1.1.5}{2006 Oct 19}{minor code changes, revision to
+% comments, v1.511}
 %
-% \texttt{screenplay.cls v1.504} was tested with\ldots 
+% \texttt{screenplay.cls v1.516} was tested with\ldots 
 % \begin{itemize}
 %	\item pdfe\TeX\ 3.141592-1.21a-2.2 (\Web2C\ 7.5.4)
 %	\item \texttt{dvips(k)} 5.95a
@@ -374,7 +383,7 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 %    \end{macrocode}
 % Say it like it is\ldots
 %    \begin{macrocode}
-\ProvidesClass{screenplay}[2006/10/08 v1.504
+\ProvidesClass{screenplay}[2006/10/25 v1.516
 	LaTeX2e Draft Screenplay document class
 	(C)2006 John Pate
 	released under the GNU General Public License]
@@ -383,7 +392,7 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 %    \begin{macrocode}
 \DeclareOption*{%
         \PackageError{screenplay}{Unwanted option '\CurrentOption'}%
-        {There are no options available for class screenplay v1.504}}
+        {There are no options available for class screenplay v1.516}}
 \ProcessOptions\relax
 %    \end{macrocode}
 % |ifthen| needed for testing for optional args\ldots 
@@ -392,20 +401,21 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 %    \end{macrocode}
 % Use \texttt{article} class for its base functionality,
 % \emph{must} be
-% American letter paper \emph{not} A4, \texttt{screenplay.cls}
+% American Letter paper \emph{not} A4, \texttt{screenplay.cls}
 % eats any papersize options and ignores them\ldots
 %    \begin{macrocode}
 \LoadClass[12pt,letterpaper,onecolumn,oneside]{article}[2004/02/16]
 %    \end{macrocode}
-% \texttt{geometry} package makes dvips/pdf do the right thang
-% for letter paper\ldots
+% \texttt{geometry} package puts marks in to suggest to dvi interpretors
+% to do the right thang for Letter paper\ldots
 %    \begin{macrocode}
 \RequirePackage[dvips,letterpaper]{geometry}[2002/07/08]
 %    \end{macrocode}
-% \ldots and make sure your printer driver knows letter.
-% Yes, you \emph{must} use American 8.5"x11" letter
-% paper---stationers in the UK call it `quarto' paper,
-% see\ldots\\
+% \ldots and make sure your printer driver (which means
+% \textit{Ghostscript} in my case) knows Letter.
+% I say again, you \emph{must} use American 8.5"x11" Letter
+% paper---stationers in the UK may call it `US Quarto' if they've
+% even heard of it, see\ldots\\
 % \href{http://www.gwydir.demon.co.uk/jo/units/print.htm}%
 % {\texttt{http://www.gwydir.demon.co.uk/jo/units/print.htm}}
 %    \begin{macrocode}
@@ -429,7 +439,7 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 \raggedright
 %    \end{macrocode}
 % (you'll have to nuke |\raggedright| wherever found to test out
-% hyphenation)
+% hyphenation---but don't bother!)
 %
 %    \begin{macro}{Page Nums}
 % Arabic top right, I'll live with where \TeX\ puts the margin\ldots
@@ -440,20 +450,23 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 %    \begin{macro}{CR/LF}
 % Line spacing / pitch---it looks to me the standard
 % \LaTeXe\ \texttt{courier} font is correct pitch,
-% 12pt line-spacing is what's in \texttt{script.pdf}\ldots
+% 12pt skip is what's in \texttt{script.pdf}\ldots
 %    \begin{macrocode}
 \setlength{\baselineskip}{12pt plus 0pt minus 0pt}
 %    \end{macrocode}
 % and this |\baselinestretch| appears to emulate \texttt{script.pdf}
-% closely\dots
+% closely and, more importantly, measures up as matching the effect
+% of the |\baselineskip| value---it matches what \textit{Movie Magic
+% Screenwriter} does, for instance\dots
 %    \begin{macrocode}
 \renewcommand*{\baselinestretch}{0.8}
 %    \end{macrocode}
-% adjust space above |\minipage| in dialogue to emulate
-% description linebreaks, must be adjusted if |\baselinestretch|
-% is altered\ldots
+% \textit{vspace} adjustment in |\minipage| and |\parbox| in dialogue
+% to correct line spacing, should likely be adjusted if
+% |\baselinestretch| is altered for some (crazy) reason\ldots
+% \changes{1.1.3}{2006 Oct 16}{minor format fix, v1.508}
 %    \begin{macrocode}
-\newcommand*{\dialfix}{\vspace{3pt}}
+\newcommand*{\dialfix}{\vspace{2pt}}
 %    \end{macrocode}
 % skip one line between paras\ldots
 %    \begin{macrocode}
@@ -472,40 +485,55 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 % (will result in a total of |3em| space).
 %    \end{macro}
 %    \begin{macro}{Margins/tabs}
+% \changes{1.1.4}{2006 Oct 17}{minor code changes, revision to documentation, v1.509}
 % See specs, 
-% fudge factors are needed to resemble the `correct'
-% layout, take a ruler to it and \texttt{script.pdf}\ldots
+% fudge factors (i.e.\ a ``gutter'') are needed to resemble
+% the `correct' layout---take a ruler to it and \texttt{script.pdf}.
 %
-% left margin 1.5", default 1" +
+% 0.1" represents |1 em| in \texttt{courier} 12pt 10 pitch.
+%    \begin{macro}{left margin}
+% 1.5", default 1" +
 %    \begin{macrocode}
 \setlength{\evensidemargin}{0.5in}
 \setlength{\oddsidemargin}{0.5in}
 %    \end{macrocode}
-% top margin (0.5" to number, 1" to body)\ldots
+%    \end{macro}
+%    \begin{macro}{top margin}
+% 0.5" to number, 1" to body\ldots
 %    \begin{macrocode}
 \setlength{\topmargin}{-0.5in}
 \setlength{\headsep}{0.4in}
 \setlength{\topskip}{0in}
 %    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{bottom margin}
 % 11" - (1" top margin) - (0.5" bottom) = 
 %    \begin{macrocode}
 \setlength{\textheight}{9.5in}
 %    \end{macrocode}
 % \ldots bottom can go to 1.5" for page breaking purposes.
+%    \end{macro}
 %
+%    \begin{macro}{right margin}
 % 6" width for description text to give 1" right margin, +0.1" fudge\ldots 
 %    \begin{macrocode}
-\setlength{\textwidth}{6.1in}
-%    \end{macrocode}
-% \ldots so we can adjust centring and flush right to the `correct'
-% margin\ldots
-%    \begin{macrocode}
-\newcommand*{\widthfudge}{0.1in}
+\setlength{\textwidth}{6.0in}
+\newlength{\widthgutter}
+\setlength{\widthgutter}{0.1in}
+\addtolength{\textwidth}{\widthgutter}
 %    \end{macrocode}
+% (later on, we must adjust centring and flush right to the `correct'
+% margin by subtracting |\widthgutter|).
+%    \end{macro}
+%
 % \textbf{Tabbing / spacing dialogues}\\
 % Width of dialogue text, 3" with 0.2" fudge\ldots
 %    \begin{macrocode}
-\newcommand*{\dialwidth}{3.2in}
+\newlength{\dialwidth}
+\setlength{\dialwidth}{3.0in}
+\newlength{\dialgutter}
+\setlength{\dialgutter}{0.2in}
+\addtolength{\dialwidth}{\dialgutter}
 %    \end{macrocode}
 %	3" from left edge of page (1.5" left margin + 1.5")\ldots
 %    \begin{macrocode}
@@ -518,19 +546,15 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 %    \end{macrocode}
 %	parenthetical 1.5" with 0.2" fudge\ldots
 %    \begin{macrocode}
-\newcommand*{\parenwidth}{1.7in}
+\newlength{\parenwidth}
+\setlength{\parenwidth}{1.5in}
+\addtolength{\parenwidth}{\dialgutter}
 %    \end{macrocode}
 %	parenthetical, tab in 3.7" (margin + |\dialtab| + |\parentab|)
 % from left edge of page\ldots
 %    \begin{macrocode}
 \newcommand*{\parentab}{\hspace{0.7in}}
 %    \end{macrocode}
-% fix for formatting of multi-line parenthetical
-% (I really should look at the \TeX\ source sometime because
-% I don't know why I had to do this.)\ldots
-%    \begin{macrocode}
-\newcommand*{\parenkludge}{\dialfix}
-%    \end{macrocode}
 %
 % AFAICS floats not involved\ldots
 %    \begin{macrocode}
@@ -655,6 +679,22 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 % \end{macro}
 % End title page---author details 
 % \end{macro}
+%
+%    \begin{macro}{\more, \contd}
+% \changes{1.1.6}{2006 Oct 22}{minor code changes, revision to
+% documentation, v1.512}
+% \textbf{More and Continued.} You may want to use these
+% macros if you feel it's necessary to follow what appears to
+% be the ``older'' style where they aren't only used for
+% pagebreaks\ldots
+%    \begin{macrocode}
+\newcommand*{\more}{(MORE)}
+%    \end{macrocode}
+%    \begin{macrocode}
+\newcommand*{\contd}{(CONT'D)}
+%    \end{macrocode}
+%    \end{macro}
+%
 % \textbf{Dialogue blocks}\ldots
 %    \begin{macro}{\paren}
 % |\paren{hello world}| \\
@@ -663,7 +703,7 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 % the optional argument is for internal use \emph{only}\ldots
 %    \begin{macrocode}
 \newcommand{\paren}[2][\\]{%
-#1\parentab\parbox[t]{\parenwidth}{\raggedright(#2)\parenkludge}\\
+#1\parentab\parbox[t]{\parenwidth}{\raggedright(#2)\dialfix}\\
 }%paren
 %    \end{macrocode}
 %    \end{macro}
@@ -678,7 +718,7 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 %    \begin{macrocode}
 \newenvironment{dialogue}[2][]{
 
-\dialtab\dialnametab\hbox{\MakeUppercase{#2}}\nopagebreak\\
+\dialtab\dialnametab\hbox{\MakeUppercase{#2}}\\*
 \dialtab\begin{minipage}[b]{\dialwidth}
 \dialfix
 \raggedright
@@ -703,14 +743,14 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 % have killed every muthafucka in the room!\dots
 %    \begin{macrocode}
 \newcommand{\dialbreak}[2][]{
-\\\dialnametab\hbox{(MORE)}%
+\\\dialnametab\hbox{\more}%
 \end{dialogue}
 \pagebreak
 \ifthenelse{\not\equal{#1}{}}
 {
-\begin{dialogue}[#1]{\MakeUppercase{#2} (CONT'D)}
+\begin{dialogue}[#1]{\MakeUppercase{#2} \contd}
 }{
-\begin{dialogue}{\MakeUppercase{#2} (CONT'D)}
+\begin{dialogue}{\MakeUppercase{#2} \contd}
 }
 }%dialbreak
 %    \end{macrocode}
@@ -801,12 +841,11 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 
 \ifthenelse{\not\equal{#1}{}}
 {
-TITLE OVER (#1):\\
+TITLE OVER #1:
 }{
-TITLE OVER:\\
-}
-\vspace{\baselineskip}
-\nopagebreak
+TITLE OVER:
+}%
+\\*[\baselineskip]
 \dialtab\begin{minipage}[b]{\dialwidth}
 \raggedright
 }{
@@ -820,28 +859,27 @@ TITLE OVER:\\
 % pagebreak for titleover environment\ldots
 %    \begin{macrocode}
 \newcommand{\titbreak}{
-\\\dialnametab\hbox{(MORE)}%
+\\\dialnametab\hbox{\more}%
 \end{titleover}
 \pagebreak
-\begin{titleover}[CONT'D]
+\begin{titleover}[\contd]
 }%titbreak
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\centretitle}
 % |\centretitle| |{short text}| \\
-% titleover for short text most often a date\ldots
+% titleover for short text most often a date, centred with
+% adjustment for gutter\ldots
 %    \begin{macrocode}
 \newcommand{\centretitle}[1]{
 
-TITLE OVER:
-\nopagebreak
-
-\hspace*{\fill}{#1}\hspace{\fill}\hspace{\widthfudge}
+TITLE OVER:\\*[\baselineskip]
+\hspace*{\fill}{#1}\hspace{\fill}\hspace{\widthgutter}
 
 }%centretitle
 %    \end{macrocode}
 %    \end{macro}
-% \textbf{Other spiffy macros}
+% \textbf{Other macros}
 %
 %    \begin{macro}{\fadein}
 % |\fadein| \\
@@ -856,50 +894,46 @@ FADE IN:
 %    \end{macro}
 %    \begin{macro}{\fadeout}
 % |\fadeout| \\
-% always the last thing in your script, for some reason\ldots
+% always the last thing in your script for some reason,
+% flush right with adjustment for gutter\ldots
 %
 %    \begin{macrocode}
 \newcommand{\fadeout}{
 
-\hspace*{\fill}FADE OUT:\hspace{\widthfudge}
+\hspace*{\fill}FADE OUT:\hspace{\widthgutter}
 
 }%fadeout
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\intercut}
+% flush right with adjustment for gutter\ldots
 %    \begin{macrocode}
 \newcommand{\intercut}{
 
-\hspace*{\fill}INTERCUT WITH:\hspace{\widthfudge}
+\hspace*{\fill}INTERCUT WITH:\hspace{\widthgutter}
 
 }%intercut
 %    \end{macrocode}
 %    \end{macro}
-% \textbf{Misc}---IMHO this stuff is useful for description,
-% maybe you should develop your own style package for your
-% own screenplays\ldots
 %    \begin{macro}{\pov, \revert}
-% switch point of view\ldots
+% \changes{1.1.7}{2006 Oct 25}{minor revisions, v1.516}
+% Switch point of view\ldots
 %    \begin{macrocode}
-\newcommand*{\pov}{P.O.V. }
+\newcommand*{\pov}{P.O.V.}
 %    \end{macrocode}
 % \ldots switch it back\ldots
 %    \begin{macrocode}
-\newcommand*{\revert}{REVERSE \pov }
-%    \end{macrocode}
-%    \end{macro}
-%    \begin{macro}{\nb}
-%    \begin{macrocode}
-\newcommand*{\nb}{NOTE: }
+\newcommand*{\revert}{REVERSE \pov}
 %    \end{macrocode}
 %    \end{macro}
+%
 %    \begin{macro}{\theend}
 % But this is what we've all been waiting for\ldots
 % OK, so this is actually the \emph{last} thing in the script\ldots
 %    \begin{macrocode}
 \newcommand{\theend}{
 
-\hspace*{\fill}THE END\hspace{\fill}\hspace{\widthfudge}
+\hspace*{\fill}THE END\hspace{\fill}\hspace{\widthgutter}
 
 }%THE END
 %    \end{macrocode}
@@ -914,11 +948,12 @@ FADE IN:
 %
 % \textbf{Hard Margins package} \\
 % Re-defines margins to exactly as stated in \texttt{script.pdf}.
-% Try it out and see why I don't like it.
+% Try it out and see if you like it.  Also shows you what
+% todo if you want to fiddle with some of the margin settings\ldots
 %
 % Issue info as to what we do\ldots
 %    \begin{macrocode}
-\ProvidesPackage{hardmarg}[2006/10/08 v1.504
+\ProvidesPackage{hardmarg}[2006/10/25 v1.516
 For use with class screenplay
 (C)2006 John Pate
 released under the GNU General Public License]
@@ -926,20 +961,88 @@ released under the GNU General Public License]
 % Hard 1" right margin\ldots
 %    \begin{macrocode}
 \setlength{\textwidth}{6.0in}
-\renewcommand*{\widthfudge}{0in}
+%    \end{macrocode}
+% Flushright and centring use this, so eliminate it\ldots
+%    \begin{macrocode}
+\setlength{\widthgutter}{0in}
 %    \end{macrocode}
 % Set dialogue to 3" width, right margin 2.5"\dots
 %    \begin{macrocode}
-\renewcommand*{\dialwidth}{3.0in}
+\setlength{\dialwidth}{3.0in}
 %    \end{macrocode}
 % Set parentheticals to 1.5" width, right margin 3.3"\ldots
 %    \begin{macrocode}
-\renewcommand*{\parenwidth}{1.5in}
+\setlength{\parenwidth}{1.5in}
 %    \end{macrocode}
 %    \end{macro}
 %\iffalse
 %</hard>
 %\fi
+%
+% \section{More about paper}
+% \changes{1.1.2}{2006 Oct 12}{revision to documentation, v1.507}
+%
+% Unless you're in America, getting Letter paper will be a problem.
+% Another issue is that the recommended 20lb weight paper is
+% equivalent to 75gsm, a non-standard weight for metric papers.
+% (Well, strictly speaking the Americans have defined their measures
+% using metric standards but let's not get into that.)
+% Americans have a 24lb weight paper that's close to 80gsm.
+% I've got samples of Letter in both 20lb and 80gsm.  The same script, with
+% the same card covers (240gsm plain white card) measures 12mm vs 15mm
+% in thickness.  The 80gsm stuff is noticeably heavier and thicker
+% (less flexible).
+%
+% IMHO good quality 20lb is nicer in handling and you can very much
+% tell the difference.  Old-style typing paper was usually pretty
+% thin for ``normal'' use.
+%
+% Copy Shops will cut down A3 paper to 8.5" by 11" for you but
+% whether they'll get you 75gsm weight is another matter.  One
+% told me he could ``probably'' get 75gsm paper if I really
+% wanted it.  
+%
+% Buying Letter paper mail order in the UK is very expensive and
+% I haven't seen American-style pound bond weights quoted---the
+% ``heavy'' paper I have was sourced in the UK as
+% XEROX PREMIER 216mm~x~279mm 80gsm.
+%
+% Another issue is that the paper must be three-hole punched.  Specs
+% gleaned from the Internet suggest that Letter three-hole paper is
+% a central hole (i.e.\ 140mm down from the top edge) with the other
+% two holes 108mm up, and down, from that central hole.  I'm hoping
+% to get some genuine three-hole from America to check that out,
+% meantime I got a Copy Shop to drill a ream of paper for me (and
+% some card for covers).  I'd advise that if you can't buy punched
+% paper, get a Copy Shop to drill it for you.  It produces a vastly
+% neater result than using a hole punch---and a suitable hole punch
+% for ``home'' use is going to be rather expensive in any case.
+%
+% And then there's the paper fasteners\ldots\\
+% To cut a long story short, here's what you want:
+%   \begin{itemize}
+%	\item ACCO solid brass \#5 brads, 1.25" long, part number 71505;
+%	\item ACCO \#2 brass washers, part number 71511.
+%   \end{itemize}
+% \ldots and a rubber mallet to hammer them in with.
+% The rubber mallet is easy enough to come by but 
+% you'll have to source the paper fasteners from America (it seems to
+% be mainly the screenwriting fraternity that call them ``brads''
+% rather than paper fasteners, BTW).  The brass-plated ersatz
+% versions available in the UK are clearly \emph{not} up to the job
+% by a long shot. And beware that ACCO make a version that isn't
+% solid brass and is inferior to these all-brass ones, hence the
+% necessity for part numbers.
+%
+% The washers are for the side where the prongs are
+% folded over, you use \textbf{two brads}, each with a single washer,
+% one in the top and one in the bottom hole leaving the central hole empty.
+%
+% And while I'm on about paper, 120 pages is really the absolute
+% longest you should go.  A script that runs between 100 and 110
+% pages is a better bet---and that's with plenty of whitespace in the
+% passages of description.
+%
 % \section{Todo}
 % If anybody else uses it maybe they'll spot stuff that's
 % wrong but \textsl{Johnny} says, ``It works for me.''
@@ -952,7 +1055,10 @@ released under the GNU General Public License]
 %
 % A printout of the first page \texttt{script.pdf} and
 % \texttt{test.pdf} show identical pitch and the inter-line
-% spacing is pretty damn close.
+% spacing is pretty close.  However, I chose a |\baselinestretch|
+% value to complement the |\baselineskip| and be more typographically
+% correct rather than exactly match \texttt{script.pdf}.
+%
 % You can easily tell which is which because, as well as the
 % title being in bold on the cover page, \texttt{test.pdf}
 % numbers the first page whilst \texttt{script.pdf} starts numbering
@@ -973,7 +1079,9 @@ released under the GNU General Public License]
 %  All Hail Discordia!
 %
 % \bigskip
-%\normalsize
+% \normalsize
+% \pagebreak
+%
 %\iffalse
 %<*rider>
 %% Test document: facsimile of first page
@@ -982,7 +1090,7 @@ released under the GNU General Public License]
 %% see http://www.dvc.org.uk/sacrific.txt/
 %% for more information on the document class.
 %%
-\documentclass{screenplay}[2006/10/08]
+\documentclass{screenplay}[2006/10/25]
 \begin{document}
 \titleauthor{For a Few Days More}{April Rider}
 {April Rider\\
@@ -1040,7 +1148,7 @@ comes.
 %\fi
 %\iffalse
 %<*example>
-\documentclass{screenplay}[2006/10/08]
+\documentclass{screenplay}[2006/10/25]
 \begin{document}
 %% cover page, this command has to go first ...
 %% choose one of \titleauthor, \titleextra, \nicholl ...
@@ -1146,10 +1254,10 @@ Or even this.
 
 \extslug[day or nite]{NO WARRANTY -- EXPRESS OR IMPLIED}
 
-\pov I made the slugline DAY/NIGHT optional 'cause in space no-one can
+\pov\ I made the slugline DAY/NIGHT optional 'cause in space no-one can
 tell the time.  You probably will need to specify.
 
-\nb  Don't put in pagebreaks by hand until you're really, really
+Don't put in pagebreaks by hand until you're really, really
 finished editing!
 
 %% see what happens if you take out the linebreak
diff --git a/Master/texmf-dist/source/latex/textfit/catalog b/Master/texmf-dist/source/latex/textfit/catalog
deleted file mode 100644
index 149055a17fb..00000000000
--- a/Master/texmf-dist/source/latex/textfit/catalog
+++ /dev/null
@@ -1,11 +0,0 @@
-Name: textfit
-Author: Sebastian Rahtz  and Philip Taylor
-Address: 12 Cygnet Street, York Y02 1AG, UK
-Problems-To: spqr@ftp.tex.ac.uk
-Version: 5
-Description:  Package for scaling up text to a desired size. Works by
- deriving a new scale factor for the current font, and getting \TeX\ to
- reset the text.
-
-
-
diff --git a/Master/texmf-dist/source/latex/textfit/makefile b/Master/texmf-dist/source/latex/textfit/makefile
deleted file mode 100644
index 53292917c10..00000000000
--- a/Master/texmf-dist/source/latex/textfit/makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-textfit:
-	tex textfit.ins
-	latex textfit.dtx
-
-clean:
-	-rm *.aux *.toc *.idx *.drv *.sty *.cls *.dvi *.log
diff --git a/Master/texmf-dist/source/latex/textfit/manifest b/Master/texmf-dist/source/latex/textfit/manifest
deleted file mode 100644
index 101f6c17c41..00000000000
--- a/Master/texmf-dist/source/latex/textfit/manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-catalog
-makefile
-manifest
-readme
-textfit.dtx
-textfit.ins
diff --git a/Master/texmf-dist/source/latex/textfit/readme b/Master/texmf-dist/source/latex/textfit/readme
deleted file mode 100644
index a54be0850d9..00000000000
--- a/Master/texmf-dist/source/latex/textfit/readme
+++ /dev/null
@@ -1,10 +0,0 @@
-This package is used to scale up text to a desired size. Works by
-deriving a new scale factor for the current font, and getting \TeX\ to
-reset the text. See the commented source for usage.
-
-Install by running \TeX\ on textfit.ins and place `textfit.sty'
-where \LaTeX\ can find it.
-
-
-
-
diff --git a/Master/texmf-dist/source/latex/thumb/readme b/Master/texmf-dist/source/latex/thumb/readme
deleted file mode 100644
index edf5d16a59e..00000000000
--- a/Master/texmf-dist/source/latex/thumb/readme
+++ /dev/null
@@ -1,36 +0,0 @@
-		thump package for LaTeX2e
-
-This is a distribution of my thump package for making runing
-thump marks in documents.
-
-The distribution file are:
-
-	README		this file.
-	thump.dtx	documentation and source file
-	thump.ins	bacth file for docstrip
-
-To install this package, do in a temporary directory:
-	
-	1)
-			latex thump.ins
-	2)
-		move the files 
-			thump.sty
-		to some diretory seached by LaTeX, e.g. in teTeX:
-		/usr/lib/texmf/local/tex/latex/thump/, or %TEXINPUTS%
-		in DOS.
-	3)
-		do 
-			latex thump.dtx
-			latex thump.dtx
-			makeindex -s gind -o thump.ind thump.idx
-			makeindex -s gglo -o thump.gls thump.glo
-			latex thump.dtx
-		to produce the documentation.
-
-This package is copyright of Christian Holm, but is distributed
-under the GNU General Public Lisence.
-
-Happy typesetting :-)
-
-Christian Holm
diff --git a/Master/texmf-dist/source/latex/tocvsec2/README b/Master/texmf-dist/source/latex/tocvsec2/README
deleted file mode 100644
index 25d1e4c572e..00000000000
--- a/Master/texmf-dist/source/latex/tocvsec2/README
+++ /dev/null
@@ -1,24 +0,0 @@
-    The tocvsec2 package provides control over sectional numbering and/or the
-entries in the Table of Contents on a section by section basis. It is a
-replacement for the tocvsec package.
-NB. The tocvsec2 package also requires the stdclsdv and ifthen packages.
-
-    The distribution consists of the following files:
-README (this file)
-tocvsec2.ins
-tocvsec2.dtx
-
-    The distribution is provided under the terms of the LaTeX
-Project Public License (LPPL).
-
-    To install the package:
-o run: latex tocvsec2.ins (which will generate tocvsec2.sty)
-o run: latex tocvsec2.dtx
-o run: makeindex -s gind.ist tocvsec2
-o run: latex tocvsec2.dtx
-o Print tocvsec2.dvi for a hardcopy of the package manual 
-o Move tocvsec2.sty to a location where LaTeX will find it.
-
-1999/01/17
-Peter Wilson
-peter.r.wilson@boeing.com
diff --git a/Master/texmf-dist/source/latex/tocvsec2/tocvsec2.dtx b/Master/texmf-dist/source/latex/tocvsec2/tocvsec2.dtx
index cae5db10a1d..660083ed3b7 100644
--- a/Master/texmf-dist/source/latex/tocvsec2/tocvsec2.dtx
+++ b/Master/texmf-dist/source/latex/tocvsec2/tocvsec2.dtx
@@ -1,13 +1,23 @@
 % \iffalse meta-comment
 %
 % tocvsec2.dtx
-% Copyright 1999 Peter R. Wilson
+% Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com until June 2004
+%                            (or at: pandgwilson at earthlink dot net) 
+% Copyright 1999 --- 2004 Peter R. Wilson
 %
-% This program is provided under the terms of the
-% LaTeX Project Public License distributed from CTAN
-% archives in directory macros/latex/base/lppl.txt.
+% 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 the 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/06/01 or later.
+%
+% This work has the LPPL maintenance status "author-maintained".
+%
+% This work consists of the files listed in the README file.
 %
-% Author: Peter Wilson (CUA and NIST) (now at: peter.r.wilson@boeing.com)
 % 
 % 
 %<*driver>
@@ -22,7 +32,7 @@
 %
 % \fi
 %
-% \CheckSum{147}
+% \CheckSum{142}
 %
 % \DoNotIndex{\',\.,\@M,\@@input,\@addtoreset,\@arabic,\@badmath}
 % \DoNotIndex{\@centercr,\@cite}
@@ -68,9 +78,16 @@
 % \changes{v1.0}{1999/01/17}{First public release}
 % \changes{v1.1}{1999/01/24}{Added none and all `sections'}
 % \changes{v1.1}{1999/01/24}{Added maxsecnumdepth command}
+% \changes{v1.1a}{2004/05/10}{Changed license from LPPL v1.0 to v1.3}
+% \changes{v1.2}{2004/05/24}{Eliminated requirement for stdclsdv package}
 %
+% \def\dtxfile{tocvsec2.dtx}
 % \def\fileversion{v1.1}
 % \def\filedate{1999/01/24}
+% \def\fileversion{v1.1a}
+% \def\filedate{2004/05/10}
+% \def\fileversion{v1.2}
+% \def\filedate{2004/05/24}
 % \newcommand*{\Lpack}[1]{\textsf {#1}}           ^^A typeset a package
 % \newcommand*{\Lopt}[1]{\textsf {#1}}            ^^A typeset an option
 % \newcommand*{\file}[1]{\texttt {#1}}            ^^A typeset a file
@@ -79,15 +96,13 @@
 % \newcommand*{\Lenv}[1]{\texttt {#1}}            ^^A typeset an environment
 %
 % \title{The \Lpack{tocvsec2} package\thanks{This
-%        file has version number \fileversion, last revised
+%        file (\texttt{\dtxfile}) has version number \fileversion, last revised
 %        \filedate.}}
 %
 % \author{%
-% Peter Wilson\\
-% Catholic University of America\thanks{This work was originally
-% performed as
-% a Guest Researcher at the National Institute of Standards and Technology.} \\
-% Now at {\tt peter.r.wilson@boeing.com}
+% Peter Wilson\thanks{After May 2004 at: \texttt{pandgwilson at earthlink dot net}}\\
+% Catholic University of America \\
+% Now at \texttt{peter.r.wilson@boeing.com}
 % }
 % \date{\filedate}
 % \maketitle
@@ -97,12 +112,11 @@
 % in the Table of Contents on a section by section basis.
 % It is a replacement for the \Lpack{tocvsec} package, which should 
 % not be used.
-% Use of the
-% package requires the \Lpack{stdclsdv} and \Lpack{ifthen} packages to be available.
+% Use of the package requires the \Lpack{ifthen} package to be available.
 % \end{abstract}
 % \tableofcontents
 %
-% \StopEventually{}
+% ^^A \StopEventually{}
 %
 % 
 %
@@ -115,16 +129,17 @@
 % provides for control over the entries into the ToC on a section by section
 % basis. It also provides a means of locally controlling sectional numbering
 % without having to resort to the starred version of the sectional commands.
-% The package requires the \Lpack{stdclsdv} and \Lpack{ifthen} packages 
+% The package requires the \Lpack{ifthen} package 
 % to be available.
 % 
-% 
 % Portions of the package were developed as part of a class
 % and package bundle for typesetting ISO standards~\cite{PRW96i}.
 % This manual is typeset according to the conventions of the
 % \LaTeX{} \textsc{docstrip} utility which enables the automatic
 % extraction of the \LaTeX{} macro source files~\cite{GOOSSENS94}.
 %
+% \clearpage
+% 
 %    Section~\ref{sec:usc} describes the usage of the package.
 % Commented source code for the package is in Section~\ref{sec:code}.
 %
@@ -310,27 +325,23 @@
 %    \begin{macrocode}
 %<*usc>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tocvsec2}[1999/01/24 v1.1 variable ToC section entries]
-\RequirePackage{stdclsdv}
+\ProvidesPackage{tocvsec2}[2004/05/24 v1.2 variable ToC section entries]
 \RequirePackage{ifthen}
 %    \end{macrocode}
 %
 % In order to try and avoid name clashes with other packages, each internal
 % name will include the character string \texttt{t@c}.
 %
-% Issue warning(s) if there are no recognized sectional divisions. Skip
-% the rest of the code if necessary.
+% Issue warning if there are no recognized sectional divisions. 
 %    \begin{macrocode}
-\ifSCDknownclass
-  \ifSCDnodivs
-    \PackageWarning{tocvsec2}{There are no sectional divisions in this class}
-    \renewcommand{\SCDquit}{\endinput}
-  \fi
-\else
-  \PackageWarning{tocvsec2}%
-    {I don't recognize the class but I'll do my best}
-\fi
-\SCDquit
+\newif\ift@cchapter
+  \t@cchapterfalse
+\@ifundefined{chapter}{%
+  \@ifundefined{section}{%
+    \PackageWarning{tocvsec2}{%
+       I don't recognize any divisions but I'll do my best}}{}}%
+  {\t@cchaptertrue}
+
 %    \end{macrocode}
 %
 % \begin{macro}{\if@knownsect@c}
@@ -344,7 +355,7 @@
   \@knownsect@cfalse
   \ifthenelse{\equal{#1}{none}}{\setcounter{#2}{-10}
                                 \@knownsect@ctrue}{}
-  \ifthenelse{\equal{#1}{part}}{\ifSCDchapter
+  \ifthenelse{\equal{#1}{part}}{\ift@cchapter
                                   \setcounter{#2}{-1} 
                                 \else
                                   \setcounter{#2}{0}
@@ -388,7 +399,7 @@
     \addtocontents{toc}{\protect\setcounter{tocdepth}{-10}}
     \@knownsect@ctrue}{}
   \ifthenelse{\equal{#1}{part}}{%
-    \ifSCDchapter
+    \ift@cchapter
       \addtocontents{toc}{\protect\setcounter{tocdepth}{-1}}
     \else
       \addtocontents{toc}{\protect\setcounter{tocdepth}{0}}
diff --git a/Master/texmf-dist/source/latex/tocvsec2/tocvsec2.ins b/Master/texmf-dist/source/latex/tocvsec2/tocvsec2.ins
index 6dabd07e64d..032718107e1 100644
--- a/Master/texmf-dist/source/latex/tocvsec2/tocvsec2.ins
+++ b/Master/texmf-dist/source/latex/tocvsec2/tocvsec2.ins
@@ -1,17 +1,26 @@
-%%
 %% tocvsec2.ins
-%% Copyright 1998 Peter R. Wilson
+%% Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com until June 2004
+%%                            (or at: pandgwilson at earthlink dot net) 
+%% Copyright 1998 -- 2004 Peter R. Wilson
+%%
+%% 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 the 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/06/01 or later.
+%%
+%% This work has the LPPL maintenance status "author-maintained".
+%%
+%% This work consists of the files listed in the README file.
 %%
-%% This program is provided under the terms of the
-%% LaTeX Project Public License distributed from CTAN
-%% archives in directory macros/latex/base/lppl.txt.
 %%
-%% Author: Peter Wilson (CUA and NIST)
-%%         now at: peter.r.wilson@boeing.com
-%% 
 %% This file will generate fast loadable files and documentation
-%% driver files from the doc files in this package when run through
-%% LaTeX or TeX.
+%% driver files from the doc files in this work when run through
+%% LaTeX.
+%%
 %%
 %% --------------- start of docstrip commands ------------------
 %%
@@ -19,15 +28,24 @@
 \input docstrip.tex
 \preamble
 
- Copyright 1998 Peter R. Wilson
-
- This program is provided under the terms of the
- LaTeX Project Public License distributed from CTAN
- archives in directory macros/latex/base/lppl.txt.
-
-Author: Peter Wilson (CUA and NIST)
-        now at: peter.r.wilson@boeing.com
-
+----------------------------------------------------------------- 
+  Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com until June 2004
+                             (or at: pandgwilson at earthlink dot net) 
+  Copyright 1998 -- 2004 Peter R. Wilson
+ 
+  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 the 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/06/01 or later.
+ 
+  This work has the LPPL maintenance status "author-maintained".
+ 
+  This work consists of the files listed in the README file.
+----------------------------------------------------------------- 
 \endpreamble
 
 \keepsilent
diff --git a/Master/texmf-dist/source/latex/trfsigns/COPYING b/Master/texmf-dist/source/latex/trfsigns/COPYING
deleted file mode 100644
index e77696ae8dd..00000000000
--- a/Master/texmf-dist/source/latex/trfsigns/COPYING
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    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., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.