update screenplay

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

8 files changed, 212 insertions, 281 deletions

diff --git a/Master/texmf-dist/doc/latex/screenplay/example.tex b/Master/texmf-dist/doc/latex/screenplay/example.tex
index 9ae6f55b9a0..2d281872341 100644
--- a/Master/texmf-dist/doc/latex/screenplay/example.tex
+++ b/Master/texmf-dist/doc/latex/screenplay/example.tex
@@ -32,44 +32,27 @@
 %% http://dvc.org.uk/gplv2.txt
 %% 
 %% +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-\documentclass{screenplay}[2006/10/25]
-\begin{document}
-%% cover page, this command has to go first ...
-%% choose one of \titleauthor, \titleextra, \nicholl ...
-%%
-%% copyright year is [optional]
-%% (apparently putting your copyright on things upsets studio moguls)
-\titleauthor[2006]
-{Example .tex}
-{John Pate}{%
-Your address\\
+\documentclass{screenplay}[2006/11/03]
+
+\title{Example .tex File}
+
+\author{John Pate}
+
+\address{the address\\
 here if you're\\
 going postal\\
 UK\\
-\vspace{2ex} % skip a line
 +44~(0)131~999~9999\\
 johnny@dvc.org.uk
 }
-%% ... or use ...
-%% \titleextra{%
-%% \copyright 2006 John Pate\\
-%% ALL RIGHTS RESERVED
-%% }
-%% {Example .tex}
-%% {John Pate}{%
-%% Your address\\
-%% here if you're\\
-%% going postal\\ \\
-%% +44~(0)131~999~9999\\
-%% http://dvc.org.uk\\%
-%% johnny@dvc.org.uk%
-%% }
-%%
-%% or for the Nicholl Fellowships ...
-%% \nicholl{Example .tex}
-%%
-%% end cover page
-%%
+
+%% ... preamble finished, let's go ...
+\begin{document}
+
+%% Make a title page ...
+\coverpage
+%% ...or use \nicholl
+
 %% TeX allows quite a lot of leeway in whitespace, so I've messed this
 %% up a bit.  I find keeping the format structured helps me a lot tho.
 %% Note: but don't have blank lines *inside* the body of text in
@@ -89,7 +72,8 @@ sabotaged the unit and killed the
 President! Was it one of us?
 \end{dialogue}
 \begin{dialogue}{Brown}
-Who else is mad but us, Condi~--
+Who else is mad but us, Condi\ldots
+ \paren{beat}
 and Bliar?
 \end{dialogue}
 
diff --git a/Master/texmf-dist/doc/latex/screenplay/screenplay.pdf b/Master/texmf-dist/doc/latex/screenplay/screenplay.pdf
index f1ef2b50897..18046fbed66 100644
--- a/Master/texmf-dist/doc/latex/screenplay/screenplay.pdf
+++ b/Master/texmf-dist/doc/latex/screenplay/screenplay.pdf
diff --git a/Master/texmf-dist/doc/latex/screenplay/test.pdf b/Master/texmf-dist/doc/latex/screenplay/test.pdf
index 563a2680907..f2c51654bb2 100644
--- a/Master/texmf-dist/doc/latex/screenplay/test.pdf
+++ b/Master/texmf-dist/doc/latex/screenplay/test.pdf
diff --git a/Master/texmf-dist/doc/latex/screenplay/test.tex b/Master/texmf-dist/doc/latex/screenplay/test.tex
index 24e53e39922..431f84103ee 100644
--- a/Master/texmf-dist/doc/latex/screenplay/test.tex
+++ b/Master/texmf-dist/doc/latex/screenplay/test.tex
@@ -38,13 +38,14 @@
 %% see http://www.dvc.org.uk/sacrific.txt/
 %% for more information on the document class.
 %%
-\documentclass{screenplay}[2006/10/25]
-\begin{document}
-\titleauthor{For a Few Days More}{April Rider}
-{April Rider\\
-555 George St NNW\\
+\documentclass{screenplay}[2006/11/03]
+\title{For a Few Days More}
+\author{April Rider}
+\address{555 George St NNW\\
 Kaplan, ND 77777\\
 999-999-9999}
+\begin{document}
+\coverpage
 \fadein
 \intslug[day]{Driskill Hotel Seminar Room}
 JOE and APRIL burst through the doors into a clean, well-lit
diff --git a/Master/texmf-dist/source/latex/screenplay/screenplay.dtx b/Master/texmf-dist/source/latex/screenplay/screenplay.dtx
index 55a0f51e2e8..efbc80e5d3a 100644
--- a/Master/texmf-dist/source/latex/screenplay/screenplay.dtx
+++ b/Master/texmf-dist/source/latex/screenplay/screenplay.dtx
@@ -34,10 +34,10 @@
 %</dtx>
 %<driver>\ProvidesFile{screenplay.drv}
 % \fi
-%\ProvidesFile{screenplay}[2006/10/25 v1.516
-%	LaTeX2e Draft Screenplay document class
-%	(C)2006 John Pate
-%	released under the GNU General Public License]
+%\ProvidesFile{screenplay}[2006/11/03 v1.518
+%    LaTeX2e Draft Screenplay document class
+%    (C)2006 John Pate
+%    released under the GNU General Public License]
 % \iffalse
 %<*driver>
 \documentclass{article}
@@ -54,7 +54,7 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 %</driver>
 % \fi
 %
-% \CheckSum{332}
+% \CheckSum{309}
 % \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}
@@ -174,25 +174,40 @@ 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/25]| \\
+% |\documentclass{screenplay}[2006/11/03]| \\
 % 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
-% but this can't be guaranteed. Per this revision, anything marked
-% with \texttt{[2006/09/23]} or later will produce the expected results.
 %
-% Your second command is, of course\ldots\\ 
+% You are now in the \textit{document preamble} where you should
+% initialise the values of some commands.
+%
+% You must define the title of screenplay\ldots\\
+% |\title{The Title of Your Opus}| \\
+% \ldots it will be uppercased automagically so don't fuss.
+% If it's for the \textit{Nicholl Competition} you're done.
+% However, you may as well also initialise\ldots \\
+% |\author{Your Name}| \\
+% \ldots capitalised as in ordinary writing, it's not munged
+% in the typesetting, and\ldots\\
+% |\address{99 Any Street \\| \\
+% |Any Town \\ Postcode / Zip \\| \\
+% |Phone \\| \\
+% |email@whereami }| 
+%
+% The preamble is closed, of course, by\ldots\\ 
 % |\begin{document}| 
 %
-% The first typesetting command, in the body of the document, must
-% be the one to build the title page.  For the
-% \textit{Nicholl Competition} this is simply,\\
-% |\nicholl{the title of your screenplay}| \\
-% for other formats, please refer to \textbf{The Coding} section or
-% \texttt{example.tex}.
+% The first typesetting command, in the body of the document, should
+% be one to build the title page.
+% For the \textit{Nicholl Competition} this is |\nicholl|,
+% \emph{alternatively} for the style used when submitting to
+% an Agent, etc.\ use |\coverpage| (which uses your address
+% and name from the preamble).
 %
-% The next command is always |\fadein| to produce the words FADE~IN:
-% left justified. 
+% The first thing you need to see in your screenplay is 
+% FADE~IN: left justified with a blank line underneath.
+% Scripts always start this way, because they do.  You deploy
+% the |\fadein| command for this.
 %
 % Next would typically be a slugline, \\
 % |\intslug[day]{Johnny's House}| \\
@@ -241,7 +256,7 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 % the document.  \texttt{example.tex} demonstrates this, read through
 % the raw \texttt{.tex} file and try modifying it as indicated.
 % It's likely you will have to put quite a few linebreaks
-% `by hand' into dialogue text due to the restricted margins.
+% ``by hand'' into dialogue text due to the restricted margins.
 %
 % \textbf{Do not put in pagebreaks until you have really, really,
 % really finished editing.}
@@ -363,7 +378,7 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 % \changes{1.1.5}{2006 Oct 19}{minor code changes, revision to
 % comments, v1.511}
 %
-% \texttt{screenplay.cls v1.516} was tested with\ldots 
+% \texttt{screenplay.cls v1.518} 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
@@ -383,7 +398,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/25 v1.516
+\ProvidesClass{screenplay}[2006/11/03 v1.518
 	LaTeX2e Draft Screenplay document class
 	(C)2006 John Pate
 	released under the GNU General Public License]
@@ -392,7 +407,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.516}}
+        {There are no options available for class screenplay v1.518}}
 \ProcessOptions\relax
 %    \end{macrocode}
 % |ifthen| needed for testing for optional args\ldots 
@@ -414,7 +429,7 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 % \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
+% 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}}
@@ -427,26 +442,23 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 % font stuff, ignore)\ldots 
 %    \begin{macrocode}
 \RequirePackage{courier}[2004/09/15]
-\renewcommand*\familydefault{\ttdefault}
+\renewcommand*{\familydefault}{\ttdefault}
 %    \end{macrocode}
-% Can load hyphenation ability for non-standard font\ldots
-%    \begin{macrocode}
-%\RequirePackage[htt]{hyphenat}
-%    \end{macrocode}
-% but \emph{don't}, you should \emph{not} hyphenate for Nicholl format
-% you want this\dots 
+% You should \emph{not} hyphenate or full justify for Nicholl format\ldots
 %    \begin{macrocode}
 \raggedright
 %    \end{macrocode}
-% (you'll have to nuke |\raggedright| wherever found to test out
-% hyphenation---but don't bother!)
-%
 %    \begin{macro}{Page Nums}
 % Arabic top right, I'll live with where \TeX\ puts the margin\ldots
 %    \begin{macrocode}
 \pagenumbering{arabic}
 \pagestyle{myheadings}
 %    \end{macrocode}
+% (You can force the page numbers out towards the right with \\
+% |\markright{\hspace*{6.2in}}| \\
+% in the document preamble, at the cost of `|Overfull hbox|' warnings,
+% if you like.)
+%    \end{macro}
 %    \begin{macro}{CR/LF}
 % Line spacing / pitch---it looks to me the standard
 % \LaTeXe\ \texttt{courier} font is correct pitch,
@@ -488,7 +500,7 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 % \changes{1.1.4}{2006 Oct 17}{minor code changes, revision to documentation, v1.509}
 % See specs, 
 % fudge factors (i.e.\ a ``gutter'') are needed to resemble
-% the `correct' layout---take a ruler to it and \texttt{script.pdf}.
+% the ``correct'' layout---take a ruler to it and \texttt{script.pdf}.
 %
 % 0.1" represents |1 em| in \texttt{courier} 12pt 10 pitch.
 %    \begin{macro}{left margin}
@@ -513,7 +525,6 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 %    \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}
@@ -522,7 +533,7 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 \setlength{\widthgutter}{0.1in}
 \addtolength{\textwidth}{\widthgutter}
 %    \end{macrocode}
-% (later on, we must adjust centring and flush right to the `correct'
+% (later on, we must adjust centring and flush right to the ``correct''
 % margin by subtracting |\widthgutter|).
 %    \end{macro}
 %
@@ -563,124 +574,96 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 \renewcommand*{\bottomfraction}{0}
 %    \end{macrocode}
 %    \end{macro}
-% \textbf{Title Page} 
+%    \begin{macro}{Title Pages}
+% \changes{1.1.8}{2006 Nov 01}{revisions to title page build,
+% documentation, v1.517}
+% \changes{1.1.9}{2006 Nov 03}{minor revision to title page build, v1.518}
 %
-% Use one of |\nicholl|, |\titleauthor|, |\titleextra| to taste.
-% This must be the first command after |\begin{document}|.
+% Use one of |\nicholl| or |\coverpage| to taste.
+% This must be the first typesetting command after |\begin{document}|.
+% (|\title| and |\author| code is already defined in the |article| class.)
 %
 % \begin{macro}{\nicholl}
-% |\nicholl{title of your magnum opus}| \\
-% for Nicholl Competition---just the title, not bolded\ldots
+% For Nicholl Competition---just the title\ldots
 %    \begin{macrocode}
-\newcommand{\nicholl}[1]{
+\newcommand{\nicholl}{
 	\thispagestyle{empty}
 	\vspace*{2.25in}
-	\begin{center}\MakeUppercase{#1}\end{center}
+	\begin{center}\MakeUppercase{\@title}\end{center}
 	\newpage\setcounter{page}{1}
-}%nicholl
+}
 %    \end{macrocode}
 % \end{macro}
-% Now the ability to make the the type of cover pages for
-% Draft Scripts submitted to agents, 
-% |\titleauthor| being of the form suggested in \texttt{script.pdf}.
-%
-% You may have to adjust the |\titlesepspace| if you put in
-% a lot of text but if you do there's probably too much\ldots
+%    \begin{macro}{\address}
+% Your address details for the title page\ldots
 %    \begin{macrocode}
-\newcommand*{\titlesepspace}{\vspace{3.75in plus 0in minus 1.5in}}
+\newcommand{\@address}{Contact via Agency}
+\newcommand{\address}[1]{\renewcommand{\@address}{#1}}
 %    \end{macrocode}
-% there's also a the space occupied by the optional copyright
-% year\ldots
+% \ldots see also\ldots
+%    \end{macro}
+%    \begin{macro}{\agent}
+% Some people like to put copyright and WGA registration
+% details on their submitted scripts\ldots although the received
+% wisdom is that this marks you as an amateur, you can use
+% this macro.
+%
+% I'm calling this |\agent| to pretend you're putting
+% your Agent's details instead of your own address---hence
+% if you don't define |\address| (and use |\coverpage|) you'll
+% get the boilerplate text ``Contact via Agency'' under your
+% name in the ``author's address details'' area.  What
+% you would do is omit your own address and only have your
+% Agent's address.  Putting this the other side of the page
+% makes it immediately clear what's who.  No really, there's
+% no need to use this \emph{unless} you're with an agency
+% but it's your script\dots
 %    \begin{macrocode}
-\newcommand*{\copyspace}{\vspace*{2ex plus 0ex minus 0ex}}
+\newcommand{\@agent}{~}
+\newcommand{\agent}[1]{\renewcommand{\@agent}{#1}}
 %    \end{macrocode}
-%
-% \begin{macro}{\titleauthor}
-% |\titleauthor| |[year]| |{title}| |{author's name}| \\
-% 		|{contact details\\email etc}| \\
-% the copyright notice doesn't fit the spec so optional\dots if you
-% put it on the web though \copyright\ certainly won't hurt! 
+%    \end{macro}
+%    \begin{macro}{\titlesepspace}
+% Determines how far down below the title the extra info
+% on the title page is written.
+% You may have to adjust the |\titlesepspace| if you put in
+% a lot of text for |\address| and/or |\agent| but if you do
+% there's probably too much---it's a rubber length\ldots
 %    \begin{macrocode}
-\newcommand{\titleauthor}[4][]{
+\newlength{\titlesepspace}
+\setlength{\titlesepspace}{3.75in plus 0in minus 1.5in}
 %    \end{macrocode}
-% no page number\ldots
+%    \end{macro}
+%    \begin{macro}{\coverpage}
+% Now the ability to make the the type of title page for
+% Draft Scripts submitted to Agents, 
 %    \begin{macrocode}
+\newcommand{\coverpage}{
 	\thispagestyle{empty}
-%    \end{macrocode}
-% 0.5" topmargin +\ldots
-%    \begin{macrocode}
 	\vspace*{2.25in}
-%    \end{macrocode}
-% centre and bold the title (bolding the title is probably the only
-% embellishment you're allowed)\ldots
-%    \begin{macrocode}
-	\begin{center}{\textbf{\MakeUppercase{#2}}}\\
+	\begin{center}{\MakeUppercase{\@title}}\\
 		\vspace{\baselineskip}
 		by\\
 		\vspace{\baselineskip}
-		#3\\
-		\vspace*{\baselineskip}
-%    \end{macrocode}
-% logic for handling optional \copyright\ argument\ldots
-%    \begin{macrocode}
-	\ifthenelse{\not\equal{#1}{}}
-	{
-		\scriptsize\copyright\normalsize#1
-	}{
-		\copyspace
-	}
+		\@author
 	\end{center}
+	\vspace{\titlesepspace}
 %    \end{macrocode}
-% |\titlesepspace| is a rubber length, try not put in excessive
-% amounts of text though\ldots
-%    \begin{macrocode}
-	\titlesepspace
-%    \end{macrocode}
-% Details in a |\parbox| 5" out from left margin\ldots
-%    \begin{macrocode}
-	\hspace*{4.0in}\parbox[t]{2.0in}{\raggedright#4} 
-%    \end{macrocode}
-% reset page numbers for actual blurb\ldots
-%    \begin{macrocode}
-	\newpage\setcounter{page}{1}
-}%titleauthor
-%    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\tilteextra}
-% |\titleextra{extra blurb}| |{title}| |{author's name}| \\
-%		|{contact details\\email etc}| \\
-% for title page---author details with extra blurb
-% not recommended by \texttt{script.pdf} but by popular request,
-% apparently some people like to put in copyright and
-% WGA registration details on their submitted scripts.
-% No really, you shouldn't use this one but it's your script\dots
+% |\agent| details at left margin in a |\parbox|, 2" space then
+% |\author| and |\address| details in a |\parbox|\ldots
 %    \begin{macrocode}
-\newcommand{\titleextra}[4]{
-	\thispagestyle{empty}
-	\vspace*{2.25in}
-	\begin{center}{\textbf{\MakeUppercase{#2}}}\\
-		\vspace{\baselineskip}
-		by\\
-		\vspace{\baselineskip}
-		#3\\
-		\vspace*{\baselineskip}
-		\copyspace
-	\end{center}
-	\titlesepspace
+\parbox[t]{2.0in}{\@agent}\hspace{2.0in}
+\parbox[t]{2.0in}{\@author\\\@address} 
 %    \end{macrocode}
-% Extra details 3" out in a |\parbox|, 2" space then other details
-% in a |\parbox| 5" out\ldots
+% Reset page numbers\ldots
 %    \begin{macrocode}
-	\parbox[t]{2.0in}{\raggedright#1}\hspace*{2.0in}
-		\parbox[t]{2.0in}{\raggedright#4} 
 	\newpage\setcounter{page}{1}
-}%titleextra
+}
 %    \end{macrocode}
-% \end{macro}
+%    \end{macro}
 % End title page---author details 
-% \end{macro}
-%
-%    \begin{macro}{\more, \contd}
+%    \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
@@ -694,7 +677,6 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 \newcommand*{\contd}{(CONT'D)}
 %    \end{macrocode}
 %    \end{macro}
-%
 % \textbf{Dialogue blocks}\ldots
 %    \begin{macro}{\paren}
 % |\paren{hello world}| \\
@@ -704,7 +686,7 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 %    \begin{macrocode}
 \newcommand{\paren}[2][\\]{%
 #1\parentab\parbox[t]{\parenwidth}{\raggedright(#2)\dialfix}\\
-}%paren
+}
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{dialogue env}
@@ -729,7 +711,7 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 }{
 \end{minipage}
 
-}%dialogue
+}
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\dialbreak}
@@ -752,7 +734,7 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 }{
 \begin{dialogue}{\MakeUppercase{#2} \contd}
 }
-}%dialbreak
+}
 %    \end{macrocode}
 %    \end{macro}
 % \textbf{Sluglines}\\
@@ -774,7 +756,7 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
                 }{}
 \nopagebreak 
 
-}%intslug
+}
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\extslug}
@@ -791,7 +773,7 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
                 }{}
 \nopagebreak
 
-}%extslug
+}
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\intextslug}
@@ -809,7 +791,7 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
                 }{}
 \nopagebreak
 
-}%intextslug
+}
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\extintslug}
@@ -827,7 +809,7 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
                 }{}
 \nopagebreak
 
-}%extintslug
+}
 %    \end{macrocode}
 %    \end{macro}
 % \textbf{Title Over}
@@ -851,7 +833,7 @@ TITLE OVER:
 }{
 \end{minipage}
 
-}%titleover
+}
 %    \end{macrocode}
 %    \end{macro}
 %
@@ -863,7 +845,7 @@ TITLE OVER:
 \end{titleover}
 \pagebreak
 \begin{titleover}[\contd]
-}%titbreak
+}
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\centretitle}
@@ -876,25 +858,23 @@ TITLE OVER:
 TITLE OVER:\\*[\baselineskip]
 \hspace*{\fill}{#1}\hspace{\fill}\hspace{\widthgutter}
 
-}%centretitle
+}
 %    \end{macrocode}
 %    \end{macro}
 % \textbf{Other macros}
 %
 %    \begin{macro}{\fadein}
-% |\fadein| \\
-% always the \emph{first} thing in your script, for some reason\ldots
+% Always the \emph{first} thing in your script, for some reason\ldots
 %    \begin{macrocode}
 \newcommand{\fadein}{
 
 FADE IN:
 
-}%fadein
+}
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\fadeout}
-% |\fadeout| \\
-% always the last thing in your script for some reason,
+% Always the last thing in your script for some reason,
 % flush right with adjustment for gutter\ldots
 %
 %    \begin{macrocode}
@@ -902,7 +882,7 @@ FADE IN:
 
 \hspace*{\fill}FADE OUT:\hspace{\widthgutter}
 
-}%fadeout
+}
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\intercut}
@@ -912,10 +892,10 @@ FADE IN:
 
 \hspace*{\fill}INTERCUT WITH:\hspace{\widthgutter}
 
-}%intercut
+}
 %    \end{macrocode}
 %    \end{macro}
-%    \begin{macro}{\pov, \revert}
+%    \begin{macro}{\pov \revert}
 % \changes{1.1.7}{2006 Oct 25}{minor revisions, v1.516}
 % Switch point of view\ldots
 %    \begin{macrocode}
@@ -953,7 +933,7 @@ FADE IN:
 %
 % Issue info as to what we do\ldots
 %    \begin{macrocode}
-\ProvidesPackage{hardmarg}[2006/10/25 v1.516
+\ProvidesPackage{hardmarg}[2006/11/03 v1.518
 For use with class screenplay
 (C)2006 John Pate
 released under the GNU General Public License]
@@ -1016,7 +996,7 @@ released under the GNU General Public License]
 % 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.
+% 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:
@@ -1059,8 +1039,7 @@ released under the GNU General Public License]
 % 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}
+% You can easily tell which is which because \texttt{test.pdf}
 % numbers the first page whilst \texttt{script.pdf} starts numbering
 % on page~2.  
 %
@@ -1069,6 +1048,7 @@ released under the GNU General Public License]
 %
 % Feel free to help with documentation.
 %
+% \pagebreak
 % \section{A note for our Sponsor}
 %
 % I don't think I'm alone when I say\ldots 
@@ -1076,9 +1056,8 @@ released under the GNU General Public License]
 %
 % \Huge Hail Eris!
 %
-%  All Hail Discordia!
-%
 % \bigskip
+%  All Hail Discordia!
 % \normalsize
 % \pagebreak
 %
@@ -1090,13 +1069,14 @@ 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/25]
-\begin{document}
-\titleauthor{For a Few Days More}{April Rider}
-{April Rider\\
-555 George St NNW\\
+\documentclass{screenplay}[2006/11/03]
+\title{For a Few Days More}
+\author{April Rider}
+\address{555 George St NNW\\
 Kaplan, ND 77777\\
 999-999-9999}
+\begin{document}
+\coverpage
 \fadein
 \intslug[day]{Driskill Hotel Seminar Room}
 JOE and APRIL burst through the doors into a clean, well-lit
@@ -1148,44 +1128,27 @@ comes.
 %\fi
 %\iffalse
 %<*example>
-\documentclass{screenplay}[2006/10/25]
-\begin{document}
-%% cover page, this command has to go first ...
-%% choose one of \titleauthor, \titleextra, \nicholl ...
-%%
-%% copyright year is [optional]
-%% (apparently putting your copyright on things upsets studio moguls)
-\titleauthor[2006]
-{Example .tex}
-{John Pate}{%
-Your address\\
+\documentclass{screenplay}[2006/11/03]
+
+\title{Example .tex File}
+
+\author{John Pate}
+
+\address{the address\\
 here if you're\\
 going postal\\
 UK\\
-\vspace{2ex} % skip a line
 +44~(0)131~999~9999\\
 johnny@dvc.org.uk
 }
-%% ... or use ...
-%% \titleextra{%
-%% \copyright 2006 John Pate\\
-%% ALL RIGHTS RESERVED 
-%% }
-%% {Example .tex}
-%% {John Pate}{%
-%% Your address\\
-%% here if you're\\
-%% going postal\\ \\
-%% +44~(0)131~999~9999\\
-%% http://dvc.org.uk\\%
-%% johnny@dvc.org.uk%
-%% }
-%%
-%% or for the Nicholl Fellowships ...
-%% \nicholl{Example .tex}
-%%
-%% end cover page
-%%
+
+%% ... preamble finished, let's go ...
+\begin{document}
+
+%% Make a title page ...
+\coverpage
+%% ...or use \nicholl
+
 %% TeX allows quite a lot of leeway in whitespace, so I've messed this
 %% up a bit.  I find keeping the format structured helps me a lot tho.
 %% Note: but don't have blank lines *inside* the body of text in
@@ -1206,7 +1169,8 @@ sabotaged the unit and killed the
 President! Was it one of us?
 \end{dialogue}
 \begin{dialogue}{Brown}
-Who else is mad but us, Condi~--
+Who else is mad but us, Condi\ldots
+ \paren{beat}
 and Bliar?
 \end{dialogue}
 
diff --git a/Master/texmf-dist/tex/latex/screenplay/hardmarg.sty b/Master/texmf-dist/tex/latex/screenplay/hardmarg.sty
index 7264746835a..a7ee5aa5c79 100644
--- a/Master/texmf-dist/tex/latex/screenplay/hardmarg.sty
+++ b/Master/texmf-dist/tex/latex/screenplay/hardmarg.sty
@@ -32,7 +32,7 @@
 %% http://dvc.org.uk/gplv2.txt
 %% 
 %% +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-\ProvidesPackage{hardmarg}[2006/10/25 v1.516
+\ProvidesPackage{hardmarg}[2006/11/03 v1.518
 For use with class screenplay
 (C)2006 John Pate
 released under the GNU General Public License]
diff --git a/Master/texmf-dist/tex/latex/screenplay/screenplay.cls b/Master/texmf-dist/tex/latex/screenplay/screenplay.cls
index ccce7fb2449..5aea9b6187f 100644
--- a/Master/texmf-dist/tex/latex/screenplay/screenplay.cls
+++ b/Master/texmf-dist/tex/latex/screenplay/screenplay.cls
@@ -33,13 +33,13 @@
 %% 
 %% +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
 \NeedsTeXFormat{LaTeX2e}[2003/12/01]
-\ProvidesClass{screenplay}[2006/10/25 v1.516
+\ProvidesClass{screenplay}[2006/11/03 v1.518
 LaTeX2e Draft Screenplay document class
 (C)2006 John Pate
 released under the GNU General Public License]
 \DeclareOption*{%
         \PackageError{screenplay}{Unwanted option '\CurrentOption'}%
-        {There are no options available for class screenplay v1.516}}
+        {There are no options available for class screenplay v1.518}}
 \ProcessOptions\relax
 \RequirePackage{ifthen}[2001/05/26]
 \LoadClass[12pt,letterpaper,onecolumn,oneside]{article}[2004/02/16]
@@ -47,7 +47,7 @@ released under the GNU General Public License]
 \setlength{\paperheight}{11in}
 \setlength{\paperwidth}{8.5in}
 \RequirePackage{courier}[2004/09/15]
-\renewcommand*\familydefault{\ttdefault}
+\renewcommand*{\familydefault}{\ttdefault}
 \raggedright
 \pagenumbering{arabic}
 \pagestyle{myheadings}
@@ -81,55 +81,37 @@ released under the GNU General Public License]
 \renewcommand*{\textfraction}{1}
 \renewcommand*{\topfraction}{0}
 \renewcommand*{\bottomfraction}{0}
-\newcommand{\nicholl}[1]{
+\newcommand{\nicholl}{
 \thispagestyle{empty}
 \vspace*{2.25in}
-\begin{center}\MakeUppercase{#1}\end{center}
+\begin{center}\MakeUppercase{\@title}\end{center}
 \newpage\setcounter{page}{1}
-}%nicholl
-\newcommand*{\titlesepspace}{\vspace{3.75in plus 0in minus 1.5in}}
-\newcommand*{\copyspace}{\vspace*{2ex plus 0ex minus 0ex}}
-\newcommand{\titleauthor}[4][]{
-\thispagestyle{empty}
-\vspace*{2.25in}
-\begin{center}{\textbf{\MakeUppercase{#2}}}\\
-\vspace{\baselineskip}
-by\\
-\vspace{\baselineskip}
-#3\\
-\vspace*{\baselineskip}
-\ifthenelse{\not\equal{#1}{}}
-{
-\scriptsize\copyright\normalsize#1
-}{
-\copyspace
 }
-\end{center}
-\titlesepspace
-\hspace*{4.0in}\parbox[t]{2.0in}{\raggedright#4}
-\newpage\setcounter{page}{1}
-}%titleauthor
-\newcommand{\titleextra}[4]{
+\newcommand{\@address}{Contact via Agency}
+\newcommand{\address}[1]{\renewcommand{\@address}{#1}}
+\newcommand{\@agent}{~}
+\newcommand{\agent}[1]{\renewcommand{\@agent}{#1}}
+\newlength{\titlesepspace}
+\setlength{\titlesepspace}{3.75in plus 0in minus 1.5in}
+\newcommand{\coverpage}{
 \thispagestyle{empty}
 \vspace*{2.25in}
-\begin{center}{\textbf{\MakeUppercase{#2}}}\\
+\begin{center}{\MakeUppercase{\@title}}\\
 \vspace{\baselineskip}
 by\\
 \vspace{\baselineskip}
-#3\\
-\vspace*{\baselineskip}
-\copyspace
+\@author
 \end{center}
-\titlesepspace
-\parbox[t]{2.0in}{\raggedright#1}\hspace*{2.0in}
-\parbox[t]{2.0in}{\raggedright#4}
+\vspace{\titlesepspace}
+\parbox[t]{2.0in}{\@agent}\hspace{2.0in}
+\parbox[t]{2.0in}{\@author\\\@address}
 \newpage\setcounter{page}{1}
-}%titleextra
+}
 \newcommand*{\more}{(MORE)}
 \newcommand*{\contd}{(CONT'D)}
 \newcommand{\paren}[2][\\]{%
 #1\parentab\parbox[t]{\parenwidth}{\raggedright(#2)\dialfix}\\
-}%paren
+}
 \newenvironment{dialogue}[2][]{
 
 \dialtab\dialnametab\hbox{\MakeUppercase{#2}}\\*
@@ -143,7 +125,7 @@ by\\
 }{
 \end{minipage}
 
-}%dialogue
+}
 \newcommand{\dialbreak}[2][]{
 \\\dialnametab\hbox{\more}%
 \end{dialogue}
@@ -154,7 +136,7 @@ by\\
 }{
 \begin{dialogue}{\MakeUppercase{#2} \contd}
 }
-}%dialbreak
+}
 \newcommand{\intslug}[2][]{
 
 \MakeUppercase{INT. #2}%
@@ -164,7 +146,7 @@ by\\
                 }{}
 \nopagebreak
 
-}%intslug
+}
 \newcommand{\extslug}[2][]{
 
 \MakeUppercase{EXT. #2}%
@@ -174,7 +156,7 @@ by\\
                 }{}
 \nopagebreak
 
-}%extslug
+}
 \newcommand{\intextslug}[2][]{
 
 \MakeUppercase{INT./EXT. #2}%
@@ -184,7 +166,7 @@ by\\
                 }{}
 \nopagebreak
 
-}%intextslug
+}
 \newcommand{\extintslug}[2][]{
 
 \MakeUppercase{EXT./INT. #2}%
@@ -194,7 +176,7 @@ by\\
                 }{}
 \nopagebreak
 
-}%extintslug
+}
 \newenvironment{titleover}[1][]{
 
 \ifthenelse{\not\equal{#1}{}}
@@ -209,34 +191,34 @@ TITLE OVER:
 }{
 \end{minipage}
 
-}%titleover
+}
 \newcommand{\titbreak}{
 \\\dialnametab\hbox{\more}%
 \end{titleover}
 \pagebreak
 \begin{titleover}[\contd]
-}%titbreak
+}
 \newcommand{\centretitle}[1]{
 
 TITLE OVER:\\*[\baselineskip]
 \hspace*{\fill}{#1}\hspace{\fill}\hspace{\widthgutter}
 
-}%centretitle
+}
 \newcommand{\fadein}{
 
 FADE IN:
 
-}%fadein
+}
 \newcommand{\fadeout}{
 
 \hspace*{\fill}FADE OUT:\hspace{\widthgutter}
 
-}%fadeout
+}
 \newcommand{\intercut}{
 
 \hspace*{\fill}INTERCUT WITH:\hspace{\widthgutter}
 
-}%intercut
+}
 \newcommand*{\pov}{P.O.V.}
 \newcommand*{\revert}{REVERSE \pov}
 \newcommand{\theend}{
diff --git a/Master/texmf-dist/tpm/screenplay.tpm b/Master/texmf-dist/tpm/screenplay.tpm
index 95f966d4e2d..cc98ce8cfc4 100644
--- a/Master/texmf-dist/tpm/screenplay.tpm
+++ b/Master/texmf-dist/tpm/screenplay.tpm
@@ -3,20 +3,20 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/screenplay.zip">
     <TPM:Name>screenplay</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/11/02 19:29:31</TPM:Date>
+    <TPM:Date>2006/11/03 14:56:15</TPM:Date>
     <TPM:Version></TPM:Version>
     <TPM:Creator>karl</TPM:Creator>
     <TPM:Title>The screenplay package.</TPM:Title>
     <TPM:Description></TPM:Description>
     <TPM:Author></TPM:Author>
-    <TPM:Size>209083</TPM:Size>
+    <TPM:Size>227809</TPM:Size>
     <TPM:Build/>
-    <TPM:RunFiles size="9289">
+    <TPM:RunFiles size="8853">
 texmf-dist/tex/latex/screenplay/hardmarg.sty
 texmf-dist/tex/latex/screenplay/screenplay.cls
 texmf-dist/tpm/screenplay.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="173517">
+    <TPM:DocFiles size="173335">
 texmf-dist/doc/latex/screenplay/COPYING
 texmf-dist/doc/latex/screenplay/README
 texmf-dist/doc/latex/screenplay/example.tex
@@ -24,7 +24,7 @@ texmf-dist/doc/latex/screenplay/screenplay.pdf
 texmf-dist/doc/latex/screenplay/test.pdf
 texmf-dist/doc/latex/screenplay/test.tex
     </TPM:DocFiles>
-    <TPM:SourceFiles size="45003">
+    <TPM:SourceFiles size="44369">
 texmf-dist/source/latex/screenplay/screenplay.dtx
 texmf-dist/source/latex/screenplay/screenplay.ins
     </TPM:SourceFiles>