update screenplay.

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

2 files changed, 76 insertions, 71 deletions

diff --git a/Master/texmf-dist/tex/latex/screenplay/hardmarg.sty b/Master/texmf-dist/tex/latex/screenplay/hardmarg.sty
index e0e9b779217..64fa701a53d 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/11/04 v1.521
+\ProvidesPackage{hardmarg}[2006/11/15 v1.538
 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 ed23d5c8536..efa6df3cbf9 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/11/04 v1.521
+\ProvidesClass{screenplay}[2006/11/15 v1.538
 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.521}}
+    \PackageError{screenplay}{Unwanted option '\CurrentOption'}%
+    {There are no options available for class screenplay v1.538}}
 \ProcessOptions\relax
 \RequirePackage{ifthen}[2001/05/26]
 \LoadClass[12pt,letterpaper,onecolumn,oneside]{article}[2004/02/16]
@@ -81,38 +81,51 @@ released under the GNU General Public License]
 \renewcommand*{\textfraction}{1}
 \renewcommand*{\topfraction}{0}
 \renewcommand*{\bottomfraction}{0}
+\title{My First Screenplay}
+\newlength{\titheadskip}
+\setlength{\titheadskip}{2.25in}
 \newcommand{\nicholl}{
 \thispagestyle{empty}
-\vspace*{2.25in}
+\vspace*{\titheadskip}
 \begin{center}\MakeUppercase{\@title}\end{center}
 \newpage\setcounter{page}{1}
 }
+\author{Alan Smithee}
+\newcommand{\@realauthor}{\@author}
+\newcommand{\realauthor}[1]{\renewcommand{\@realauthor}{#1}}
 \newcommand{\@address}{Contact via Agency}
 \newcommand{\address}[1]{\renewcommand{\@address}{#1}}
 \newcommand{\@agent}{~}
 \newcommand{\agent}[1]{\renewcommand{\@agent}{#1}}
 \newlength{\titskip}
 \setlength{\titskip}{3.75in plus 0in minus 1.5in}
+\newlength{\addrwidth}
+\setlength{\addrwidth}{2.0in}
+\newlength{\addrseplen}
+\setlength{\addrseplen}{2.0in plus 0in minus 0.5in}
+\newcommand*{\bytext}{by}
+\newcommand*{\byskip}{\baselineskip}
 \newcommand{\coverpage}{
 \thispagestyle{empty}
-\vspace*{2.25in}
+\vspace*{\titheadskip}
 \begin{center}{\MakeUppercase{\@title}}\\
-\vspace{\baselineskip}
-by\\
-\vspace{\baselineskip}
+\vspace{\byskip}
+\bytext\\
+\vspace{\byskip}
 \@author
 \end{center}
 \vspace{\titskip}
-\parbox[t]{2.0in}{\@agent}\hspace{2.0in}
-\parbox[t]{2.0in}{\@author\\\@address}
+\parbox[t]{\addrwidth}{\@agent}\hspace{\addrseplen}
+\parbox[t]{\addrwidth}{\@realauthor\\\@address}
 \newpage\setcounter{page}{1}
 }
 \newcommand*{\more}{(MORE)}
 \newcommand*{\contd}{(CONT'D)}
-\newcommand{\paren}[2][\\]{%
-#1\parentab\parbox[t]{\parenwidth}{\raggedright(#2)\dialfix}\\
+\newcommand{\paren}[1]{%
+
+\parentab\parbox[t]{\parenwidth}{\raggedright(#1)\dialfix}\\
 }
-\newenvironment{dialogue}[2][]{
+\newenvironment{dialogue}[2][]{%
 
 \dialtab\dialnametab\hbox{\MakeUppercase{#2}}\\*
 \dialtab\begin{minipage}[b]{\dialwidth}
@@ -120,14 +133,15 @@ by\\
 \raggedright
 \ifthenelse{\not\equal{#1}{}}
 {
-\paren[]{#1}
+\paren{#1}
 }{}
-}{
+}{%
 \end{minipage}
 
 }
-\newcommand{\dialbreak}[2][]{
-\\\dialnametab\hbox{\more}%
+\newcommand{\dialbreak}[2][]{%
+\nopagebreak
+\dialnametab\hbox{\more}%
 \end{dialogue}
 \newpage
 \ifthenelse{\not\equal{#1}{}}
@@ -137,19 +151,10 @@ by\\
 \begin{dialogue}{\MakeUppercase{#2} \contd}
 }
 }
-\newcommand{\intslug}[2][]{
-
-\MakeUppercase{INT. #2}%
-\ifthenelse{\not\equal{#1}{}}
-                {%
-\slugspace\MakeUppercase{#1}\hspace{\fill}
-                }{}
-\nopagebreak
-
-}
-\newcommand{\extslug}[2][]{
+\newcommand*{\placesep}{.~}
+\newcommand{\slug}[3][]{%
 
-\MakeUppercase{EXT. #2}%
+\MakeUppercase{#2\placesep#3}%
 \ifthenelse{\not\equal{#1}{}}
                 {%
 \slugspace\MakeUppercase{#1}\hspace{\fill}
@@ -157,73 +162,73 @@ by\\
 \nopagebreak
 
 }
-\newcommand{\intextslug}[2][]{
+\newcommand*{\inttext}{INT}
+\newcommand{\intslug}[2][]{\slug[#1]{\inttext}{#2}}
+\newcommand*{\exttext}{EXT}
+\newcommand{\extslug}[2][]{\slug[#1]{\exttext}{#2}}
+\newcommand*{\sepintext}{./}
+\newcommand{\intextslug}[2][]{%
+\slug[#1]{\inttext\sepintext\exttext}{#2}}
+\newcommand{\extintslug}[2][]{%
+\slug[#1]{\exttext\sepintext\inttext}{#2}}
+\newcommand*{%
+\sccentre}[1]{\hspace*{\fill}{#1}\hspace{\fill}\hspace{\widthgutter}}
+\newcommand*{%
+\scflushright}[1]{\hspace*{\fill}{#1}\hspace{\widthgutter}}
+\newcommand*{\punctchar}{:}
+\newcommand*{\titleovertext}{TITLE~OVER}
+\newenvironment{titleover}[1][]{%
 
-\MakeUppercase{INT./EXT. #2}%
 \ifthenelse{\not\equal{#1}{}}
-                {%
-\slugspace\MakeUppercase{#1}\hspace{\fill}
-                }{}
-\nopagebreak
-
-}
-\newcommand{\extintslug}[2][]{
-
-\MakeUppercase{EXT./INT. #2}%
-\ifthenelse{\not\equal{#1}{}}
-                {%
-\slugspace\MakeUppercase{#1}\hspace{\fill}
-                }{}
-\nopagebreak
-
-}
-\newenvironment{titleover}[1][]{
-
-\ifthenelse{\not\equal{#1}{}}
-{
-TITLE OVER #1:
-}{
-TITLE OVER:
+{%
+\titleovertext #1\punctchar
+}{%
+\titleovertext\punctchar
 }%
 \\*[\baselineskip]
 \dialtab\begin{minipage}[b]{\dialwidth}
 \raggedright
-}{
+}{%
 \end{minipage}
 
 }
-\newcommand{\titbreak}{
-\\\dialnametab\hbox{\more}%
+\newcommand{\titbreak}{%
+\nopagebreak
+\dialnametab\hbox{\more}%
 \end{titleover}
 \newpage
-\begin{titleover}[\contd]
+\begin{titleover}[\contd]%
 }
-\newcommand{\centretitle}[1]{
+\newcommand{\centretitle}[1]{%
 
-TITLE OVER:\\*[\baselineskip]
-\hspace*{\fill}{#1}\hspace{\fill}\hspace{\widthgutter}
+\titleovertext\punctchar\\*[\baselineskip]%
+\sccentre{#1}
 
 }
-\newcommand{\fadein}{
+\newcommand*{\fadeintext}{FADE~IN}
+\newcommand{\fadein}{%
 
-FADE IN:
+\fadeintext\punctchar
 
 }
-\newcommand{\fadeout}{
+\newcommand*{\fadeouttext}{FADE~OUT}
+\newcommand{\fadeout}{%
 
-\hspace*{\fill}FADE OUT:\hspace{\widthgutter}
+\scflushright{\fadeouttext\punctchar}
 
 }
-\newcommand{\intercut}{
+\newcommand*{\intercuttext}{INTERCUT~WITH}
+\newcommand{\intercut}{%
 
-\hspace*{\fill}INTERCUT WITH:\hspace{\widthgutter}
+\scflushright{\intercuttext\punctchar}
 
 }
 \newcommand*{\pov}{P.O.V.}
-\newcommand*{\revert}{REVERSE \pov}
-\newcommand{\theend}{
+\newcommand*{\revert}{REVERSE~\pov}
+\newcommand*{\thirty}{THE~END}
+\newcommand{\theend}{%
 
-\hspace*{\fill}THE END\hspace{\fill}\hspace{\widthgutter}
+\sccentre{\thirty}
 
 }%THE END
 %%