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

1 files changed, 216 insertions, 108 deletions

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