update screenplay

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

7 files changed, 86 insertions, 62 deletions

diff --git a/Master/texmf-dist/doc/latex/screenplay/example.tex b/Master/texmf-dist/doc/latex/screenplay/example.tex
index 197aba9e2bf..5e2c80af562 100644
--- a/Master/texmf-dist/doc/latex/screenplay/example.tex
+++ b/Master/texmf-dist/doc/latex/screenplay/example.tex
@@ -32,7 +32,7 @@
 %% http://dvc.org.uk/gplv2.txt
 %% 
 %% +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-\documentclass{screenplay}[2006/09/30]
+\documentclass{screenplay}[2006/10/02]
 \begin{document}
 %% cover page, this command has to go first ...
 %% choose one of \titleauthor, \titleextra, \nicholl ...
diff --git a/Master/texmf-dist/doc/latex/screenplay/screenplay.pdf b/Master/texmf-dist/doc/latex/screenplay/screenplay.pdf
index 694777ae7c5..8b69830fa4d 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 c229ea72e46..6fe60b45f16 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 a4163b71a78..76f002c012e 100644
--- a/Master/texmf-dist/doc/latex/screenplay/test.tex
+++ b/Master/texmf-dist/doc/latex/screenplay/test.tex
@@ -38,7 +38,7 @@
 %% see http://www.dvc.org.uk/sacrific.txt/
 %% for more information on the document class.
 %%
-\documentclass{screenplay}[2006/09/30]
+\documentclass{screenplay}[2006/10/02]
 \begin{document}
 \titleauthor{For a Few Days More}{April Rider}
 {April Rider\\
diff --git a/Master/texmf-dist/source/latex/screenplay/screenplay.dtx b/Master/texmf-dist/source/latex/screenplay/screenplay.dtx
index 7f2e7bfe77a..9fa28f09aef 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/09/30 v1.496
+%\ProvidesFile{screenplay}[2006/10/02 v1.500
 %	LaTeX2e Draft Screenplay document class
 %	(C)2006 John Pate
 %	released under the GNU General Public License]
@@ -54,9 +54,8 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 %</driver>
 % \fi
 %
-% \CheckSum{295}
-% \changes{1.0.0}{2006 Sep 23}{initial version of \texttt{.dtx}, class date
-% \texttt{[2006/09/23], v1.457}}
+% \CheckSum{300}
+% \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}
 % \changes{1.0.2}{2006 Sep 26}{minor code changes, revision to documentation,
@@ -68,6 +67,8 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 % \changes{1.0.5}{2006 Sep 29}{minor code changes, revision to documentation,
 % 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}
 %
 % \MakeShortVerb{\|}
 %
@@ -175,7 +176,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/09/30]| \\
+% |\documentclass{screenplay}[2006/10/02]| \\
 % 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
@@ -274,6 +275,25 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 % There is also, at time of writing, a ``work-in-progress'' script
 % that has had manual linebreaks inserted but not manual pagebreaks.
 % 
+% \section{User customisation}
+%
+% \emph{\textbf{Don't!}}  It really is a case of KISS for Draft
+% Screenplay formatting.  There are a couple of things you might
+% get away with though\ldots
+%
+% You may want to change how the time of day is spaced from the
+% rest of the slugline.  You can do this without editing the
+% class file by redefining the |\slugspace| command in the preamble
+% (i.e.\ between |\documentclass{}| and |\begin{document}|) 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.
+%
+% 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}
 %
 % Be sure to read, carefully, and inwardly digest, \\
@@ -315,7 +335,7 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 %
 % \section{The Coding}
 %
-% \texttt{screenplay.cls v1.496} was tested with\ldots 
+% \texttt{screenplay.cls v1.500} 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
@@ -335,7 +355,7 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 %    \end{macrocode}
 % Say it like it is\ldots
 %    \begin{macrocode}
-\ProvidesClass{screenplay}[2006/09/30 v1.496
+\ProvidesClass{screenplay}[2006/10/02 v1.500
 	LaTeX2e Draft Screenplay document class
 	(C)2006 John Pate
 	released under the GNU General Public License]
@@ -344,7 +364,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.496}}
+        {There are no options available for class screenplay v1.500}}
 \ProcessOptions\relax
 %    \end{macrocode}
 % |ifthen| needed for testing for optional args\ldots 
@@ -414,7 +434,7 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 % description linebreaks, must be adjusted if |\baselinestretch|
 % is altered\ldots
 %    \begin{macrocode}
-\newcommand{\dialfix}{\vspace{3pt}}
+\newcommand*{\dialfix}{\vspace{3pt}}
 %    \end{macrocode}
 % skip one line between paras\ldots
 %    \begin{macrocode}
@@ -425,9 +445,16 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 \setlength{\parindent}{0in}
 %    \end{macrocode}
 %    \end{macro}
+%    \begin{macro}{\slugspace} 
+% Extra inter-word spacing in sluglines\ldots 
+%    \begin{macrocode}
+\newcommand*{\slugspace}{\hspace{2.0em plus 0em minus 0em}}
+%    \end{macrocode}
+% (will result in a total of |3em| space).
+%    \end{macro}
 %    \begin{macro}{Margins/tabs}
 % See specs, 
-% fudge factors needed to resemble the `correct'
+% fudge factors are needed to resemble the `correct'
 % layout, take a ruler to it and \texttt{script.pdf}\ldots
 %
 % left margin 1.5", default 1" +
@@ -451,43 +478,39 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 %    \begin{macrocode}
 \setlength{\textwidth}{6.1in}
 %    \end{macrocode}
-% Extra inter-word spacing in sluglines\ldots 
-%    \begin{macrocode}
-\newcommand{\slugspace}{\hspace{2.0em plus 0em minus 0em}}
-%    \end{macrocode}
-% \ldots could do it various other ways\ldots
+% \ldots so we can adjust centring and flush right to the `correct'
+% margin\ldots
 %    \begin{macrocode}
-%\newcommand{\slugspace}{ - }
-%\newcommand{\slugspace}{\quad}
+\newcommand*{\widthfudge}{0.1in}
 %    \end{macrocode}
 % \textbf{Tabbing / spacing dialogues}\\
 % Width of dialogue text, 3" with 0.2" fudge\ldots
 %    \begin{macrocode}
-\newcommand{\dialwidth}{3.2in}
+\newcommand*{\dialwidth}{3.2in}
 %    \end{macrocode}
 %	3" from left edge of page (1.5" left margin + 1.5")\ldots
 %    \begin{macrocode}
-\newcommand{\dialtab}{\hspace*{1.5in}}
+\newcommand*{\dialtab}{\hspace*{1.5in}}
 %    \end{macrocode}
 %	 \textbf{name}, tab in 4.2" (margin + |\dialtab| + |\dialnametab|)
 % from left edge of page\ldots
 %    \begin{macrocode}
-\newcommand{\dialnametab}{\hspace*{1.2in}}
+\newcommand*{\dialnametab}{\hspace*{1.2in}}
 %    \end{macrocode}
 %	parenthetical 1.5" with 0.2" fudge\ldots
 %    \begin{macrocode}
-\newcommand{\parenwidth}{1.7in}
+\newcommand*{\parenwidth}{1.7in}
 %    \end{macrocode}
 %	parenthetical, tab in 3.7" (margin + |\dialtab| + |\parentab|)
 % from left edge of page\ldots
 %    \begin{macrocode}
-\newcommand{\parentab}{\hspace{0.7in}}
+\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}
+\newcommand*{\parenkludge}{\dialfix}
 %    \end{macrocode}
 %
 % AFAICS floats not involved\ldots
@@ -521,12 +544,12 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 % 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{macrocode}
-\newcommand{\titlesepspace}{\vspace{3.75in plus 0in minus 1.0in}}
+\newcommand*{\titlesepspace}{\vspace{3.75in plus 0in minus 1.0in}}
 %    \end{macrocode}
 % there's also a the space occupied by the optional copyright
 % year\ldots
 %    \begin{macrocode}
-\newcommand{\copyspace}{\vspace*{2ex plus 0ex minus 0ex}}
+\newcommand*{\copyspace}{\vspace*{2ex plus 0ex minus 0ex}}
 %    \end{macrocode}
 %
 % \begin{macro}{\titleauthor}
@@ -584,9 +607,10 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate]
 % |\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,
+% not recommended by \texttt{script.pdf} but by popular request,
 % apparently some people like to put in copyright and
-% WGA registration details
+% WGA registration details on their submitted scripts.
+% No really, you shouldn't use this one but it's your script\dots
 %    \begin{macrocode}
 \newcommand{\titleextra}[4]{
 	\thispagestyle{empty}
@@ -798,7 +822,7 @@ TITLE OVER:\\
 TITLE OVER:
 \nopagebreak
 
-\hspace*{\fill}{#1}\hspace{\fill}
+\hspace*{\fill}{#1}\hspace{\fill}\hspace{\widthfudge}
 
 
 }%centretitle
@@ -827,19 +851,18 @@ FADE IN:
 \newcommand{\fadeout}{
 
 
-\hspace*{\fill}FADE OUT:
+\hspace*{\fill}FADE OUT:\hspace{\widthfudge}
 
 
 }%fadeout
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\intercut}
-% I don't bother with this but it's in \texttt{script.pdf}\ldots
 %    \begin{macrocode}
 \newcommand{\intercut}{
 
 
-\hspace*{\fill}INTERCUT WITH:
+\hspace*{\fill}INTERCUT WITH:\hspace{\widthfudge}
 
 
 }%intercut
@@ -864,7 +887,7 @@ FADE IN:
 \newcommand{\theend}{
 
 
-\hspace*{\fill}THE END\hspace{\fill}
+\hspace*{\fill}THE END\hspace{\fill}\hspace{\widthfudge}
 
 
 }%THE END
@@ -886,11 +909,10 @@ FADE IN:
 % 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.
-% You can easily tell which is which because \texttt{test.pdf}
-% numbers the first page, \texttt{script.pdf} starts numbering
-% on page~2.  You can suppress the first page number in your
-% own documents with the |\thispagestyle{empty}| command if
-% you so desire.  (The cover page is how \emph{I} want it.)
+% 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
+% on page~2.  
 %
 % If I get any \emph{useful} feedback I \emph{may} alter things
 % accordingly.
@@ -906,6 +928,7 @@ FADE IN:
 %
 %  All Hail Discordia!
 %
+% \bigskip
 %\normalsize
 %\iffalse
 %<*rider>
@@ -915,7 +938,7 @@ FADE IN:
 %% see http://www.dvc.org.uk/sacrific.txt/
 %% for more information on the document class.
 %%
-\documentclass{screenplay}[2006/09/30]
+\documentclass{screenplay}[2006/10/02]
 \begin{document}
 \titleauthor{For a Few Days More}{April Rider}
 {April Rider\\
@@ -973,7 +996,7 @@ comes.
 %\fi
 %\iffalse
 %<*example>
-\documentclass{screenplay}[2006/09/30]
+\documentclass{screenplay}[2006/10/02]
 \begin{document}
 %% cover page, this command has to go first ...
 %% choose one of \titleauthor, \titleextra, \nicholl ...
diff --git a/Master/texmf-dist/tex/latex/screenplay/screenplay.cls b/Master/texmf-dist/tex/latex/screenplay/screenplay.cls
index ba53ae09407..95502af65f7 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/09/30 v1.496
+\ProvidesClass{screenplay}[2006/10/02 v1.500
 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.496}}
+        {There are no options available for class screenplay v1.500}}
 \ProcessOptions\relax
 \RequirePackage{ifthen}[2001/05/26]
 \LoadClass[12pt,letterpaper,onecolumn,oneside]{article}[2004/02/16]
@@ -53,9 +53,10 @@ released under the GNU General Public License]
 \pagestyle{myheadings}
 \setlength{\baselineskip}{12pt plus 0pt minus 0pt}
 \renewcommand*{\baselinestretch}{0.8}
-\newcommand{\dialfix}{\vspace{3pt}}
+\newcommand*{\dialfix}{\vspace{3pt}}
 \setlength{\parskip}{\baselineskip}
 \setlength{\parindent}{0in}
+\newcommand*{\slugspace}{\hspace{2.0em plus 0em minus 0em}}
 \setlength{\evensidemargin}{0.5in}
 \setlength{\oddsidemargin}{0.5in}
 \setlength{\topmargin}{-0.5in}
@@ -63,13 +64,13 @@ released under the GNU General Public License]
 \setlength{\topskip}{0in}
 \setlength{\textheight}{9.5in}
 \setlength{\textwidth}{6.1in}
-\newcommand{\slugspace}{\hspace{2.0em plus 0em minus 0em}}
-\newcommand{\dialwidth}{3.2in}
-\newcommand{\dialtab}{\hspace*{1.5in}}
-\newcommand{\dialnametab}{\hspace*{1.2in}}
-\newcommand{\parenwidth}{1.7in}
-\newcommand{\parentab}{\hspace{0.7in}}
-\newcommand{\parenkludge}{\dialfix}
+\newcommand*{\widthfudge}{0.1in}
+\newcommand*{\dialwidth}{3.2in}
+\newcommand*{\dialtab}{\hspace*{1.5in}}
+\newcommand*{\dialnametab}{\hspace*{1.2in}}
+\newcommand*{\parenwidth}{1.7in}
+\newcommand*{\parentab}{\hspace{0.7in}}
+\newcommand*{\parenkludge}{\dialfix}
 \renewcommand*{\textfraction}{1}
 \renewcommand*{\topfraction}{0}
 \renewcommand*{\bottomfraction}{0}
@@ -79,8 +80,8 @@ released under the GNU General Public License]
 \begin{center}\MakeUppercase{#1}\end{center}
 \newpage\setcounter{page}{1}
 }%nicholl
-\newcommand{\titlesepspace}{\vspace{3.75in plus 0in minus 1.0in}}
-\newcommand{\copyspace}{\vspace*{2ex plus 0ex minus 0ex}}
+\newcommand*{\titlesepspace}{\vspace{3.75in plus 0in minus 1.0in}}
+\newcommand*{\copyspace}{\vspace*{2ex plus 0ex minus 0ex}}
 \newcommand{\titleauthor}[4][]{
 \thispagestyle{empty}
 \vspace*{2.25in}
@@ -212,7 +213,7 @@ TITLE OVER:\\
 TITLE OVER:
 \nopagebreak
 
-\hspace*{\fill}{#1}\hspace{\fill}
+\hspace*{\fill}{#1}\hspace{\fill}\hspace{\widthfudge}
 
 }%centretitle
 \newcommand{\fadein}{
@@ -222,19 +223,19 @@ FADE IN:
 }%fadein
 \newcommand{\fadeout}{
 
-\hspace*{\fill}FADE OUT:
+\hspace*{\fill}FADE OUT:\hspace{\widthfudge}
 
 }%fadeout
 \newcommand{\intercut}{
 
-\hspace*{\fill}INTERCUT WITH:
+\hspace*{\fill}INTERCUT WITH:\hspace{\widthfudge}
 
 }%intercut
 \newcommand{\pov}{P.O.V. }
 \newcommand{\nb}{NOTE: }
 \newcommand{\theend}{
 
-\hspace*{\fill}THE END\hspace{\fill}
+\hspace*{\fill}THE END\hspace{\fill}\hspace{\widthfudge}
 
 }%THE END
 %% 
diff --git a/Master/texmf-dist/tpm/screenplay.tpm b/Master/texmf-dist/tpm/screenplay.tpm
index ccad6d5ebf1..d334c43bcd4 100644
--- a/Master/texmf-dist/tpm/screenplay.tpm
+++ b/Master/texmf-dist/tpm/screenplay.tpm
@@ -3,19 +3,19 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/screenplay.zip">
     <TPM:Name>screenplay</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/09/30 21:00:31</TPM:Date>
+    <TPM:Date>2006/10/04 12:03:02</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>185882</TPM:Size>
+    <TPM:Size>194980</TPM:Size>
     <TPM:Build/>
-    <TPM:RunFiles size="7282">
+    <TPM:RunFiles size="7406">
 texmf-dist/tex/latex/screenplay/screenplay.cls
 texmf-dist/tpm/screenplay.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="150990">
+    <TPM:DocFiles size="155364">
 texmf-dist/doc/latex/screenplay/COPYING
 texmf-dist/doc/latex/screenplay/README
 texmf-dist/doc/latex/screenplay/example.tex
@@ -23,7 +23,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="36708">
+    <TPM:SourceFiles size="37791">
 texmf-dist/source/latex/screenplay/screenplay.dtx
 texmf-dist/source/latex/screenplay/screenplay.ins
     </TPM:SourceFiles>