From 0b9cd524d1f3d021301e0b9c8125f7eaf59dc118 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 9 Oct 2006 23:00:35 +0000 Subject: update of screenplay git-svn-id: svn://tug.org/texlive/trunk@2290 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/screenplay/example.tex | 2 +- .../texmf-dist/doc/latex/screenplay/screenplay.pdf | Bin 125399 -> 130042 bytes Master/texmf-dist/doc/latex/screenplay/test.pdf | Bin 3469 -> 3473 bytes Master/texmf-dist/doc/latex/screenplay/test.tex | 2 +- .../source/latex/screenplay/screenplay.dtx | 118 ++++++++++++++------- .../source/latex/screenplay/screenplay.ins | 7 +- .../texmf-dist/tex/latex/screenplay/hardmarg.sty | 46 ++++++++ .../texmf-dist/tex/latex/screenplay/screenplay.cls | 17 +-- Master/texmf-dist/tpm/screenplay.tpm | 11 +- Master/texmf/lists/screenplay | 1 + 10 files changed, 150 insertions(+), 54 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/screenplay/hardmarg.sty (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/screenplay/example.tex b/Master/texmf-dist/doc/latex/screenplay/example.tex index 5e2c80af562..2334479f5a4 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/10/02] +\documentclass{screenplay}[2006/10/08] \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 8b69830fa4d..fd2dbeeb1fd 100644 Binary files a/Master/texmf-dist/doc/latex/screenplay/screenplay.pdf and b/Master/texmf-dist/doc/latex/screenplay/screenplay.pdf differ diff --git a/Master/texmf-dist/doc/latex/screenplay/test.pdf b/Master/texmf-dist/doc/latex/screenplay/test.pdf index 6fe60b45f16..a5d5866525e 100644 Binary files a/Master/texmf-dist/doc/latex/screenplay/test.pdf and b/Master/texmf-dist/doc/latex/screenplay/test.pdf differ diff --git a/Master/texmf-dist/doc/latex/screenplay/test.tex b/Master/texmf-dist/doc/latex/screenplay/test.tex index 76f002c012e..08756bdbd31 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/10/02] +\documentclass{screenplay}[2006/10/08] \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 9fa28f09aef..b4421cc7897 100644 --- a/Master/texmf-dist/source/latex/screenplay/screenplay.dtx +++ b/Master/texmf-dist/source/latex/screenplay/screenplay.dtx @@ -34,7 +34,7 @@ % %\ProvidesFile{screenplay.drv} % \fi -%\ProvidesFile{screenplay}[2006/10/02 v1.500 +%\ProvidesFile{screenplay}[2006/10/08 v1.504 % 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] % % \fi % -% \CheckSum{300} +% \CheckSum{312} % \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} @@ -69,6 +69,9 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate] % \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{\|} % @@ -143,11 +146,12 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate] % \href{http://dvc.org.uk/sacrific.txt/screenplay.zip}% % {\texttt{http://dvc.org.uk/sacrific.txt/screenplay.zip}} % -% You use the command, \\ +% Use the command, \\ % \texttt{> latex screenplay.ins} \\ % to generate from \texttt{screenplay.dtx}\dots % \begin{itemize} % \item\texttt{screenplay.cls}---class file +% \item\texttt{hardmarg.sty}---optional style package % \item\texttt{example.tex}---example (very) mini-screenplay % \item\texttt{test.tex}---format test source file % \end{itemize} @@ -176,7 +180,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/02]| \\ +% |\documentclass{screenplay}[2006/10/08]| \\ % 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 @@ -275,6 +279,22 @@ 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{Hard Margins package} +% +% 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. +% +% 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. +% % \section{User customisation} % % \emph{\textbf{Don't!}} It really is a case of KISS for Draft @@ -283,9 +303,8 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate] % % 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}{ - }| +% 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. % @@ -335,7 +354,7 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate] % % \section{The Coding} % -% \texttt{screenplay.cls v1.500} was tested with\ldots +% \texttt{screenplay.cls v1.504} 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 @@ -355,7 +374,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/02 v1.500 +\ProvidesClass{screenplay}[2006/10/08 v1.504 LaTeX2e Draft Screenplay document class (C)2006 John Pate released under the GNU General Public License] @@ -364,7 +383,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.500}} + {There are no options available for class screenplay v1.504}} \ProcessOptions\relax % \end{macrocode} % |ifthen| needed for testing for optional args\ldots @@ -413,7 +432,7 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate] % hyphenation) % % \begin{macro}{Page Nums} -% Arabic top right\ldots +% Arabic top right, I'll live with where \TeX\ puts the margin\ldots % \begin{macrocode} \pagenumbering{arabic} \pagestyle{myheadings} @@ -544,7 +563,7 @@ 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.5in}} % \end{macrocode} % there's also a the space occupied by the optional copyright % year\ldots @@ -715,7 +734,6 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate] }{} \nopagebreak - }%intslug % \end{macrocode} % \end{macro} @@ -733,7 +751,6 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate] }{} \nopagebreak - }%extslug % \end{macrocode} % \end{macro} @@ -752,7 +769,6 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate] }{} \nopagebreak - }%intextslug % \end{macrocode} % \end{macro} @@ -771,7 +787,6 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate] }{} \nopagebreak - }%extintslug % \end{macrocode} % \end{macro} @@ -785,11 +800,11 @@ pdfsubject=LaTeX2e\ class\ documentation\ and\ source\ (C)2006\ John\ Pate] \newenvironment{titleover}[1][]{ \ifthenelse{\not\equal{#1}{}} -{%true +{ TITLE OVER (#1):\\ -}{%false +}{ TITLE OVER:\\ -}%ifthenelse +} \vspace{\baselineskip} \nopagebreak \dialtab\begin{minipage}[b]{\dialwidth} @@ -818,13 +833,11 @@ TITLE OVER:\\ % \begin{macrocode} \newcommand{\centretitle}[1]{ - TITLE OVER: \nopagebreak \hspace*{\fill}{#1}\hspace{\fill}\hspace{\widthfudge} - }%centretitle % \end{macrocode} % \end{macro} @@ -836,10 +849,8 @@ TITLE OVER: % \begin{macrocode} \newcommand{\fadein}{ - FADE IN: - }%fadein % \end{macrocode} % \end{macro} @@ -850,10 +861,8 @@ FADE IN: % \begin{macrocode} \newcommand{\fadeout}{ - \hspace*{\fill}FADE OUT:\hspace{\widthfudge} - }%fadeout % \end{macrocode} % \end{macro} @@ -861,41 +870,76 @@ FADE IN: % \begin{macrocode} \newcommand{\intercut}{ - \hspace*{\fill}INTERCUT WITH:\hspace{\widthfudge} - }%intercut % \end{macrocode} % \end{macro} -% IMHO this stuff is useful for description ... -% \begin{macro}{\pov} -% point of view\ldots +% \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 % \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*{\nb}{NOTE: } % \end{macrocode} % \end{macro} % \begin{macro}{\theend} -% Yeah! This is what we've been waiting for\ldots +% 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} - }%THE END % \end{macrocode} % \end{macro} %\iffalse % %\fi +%\iffalse +%<*hard> +%\fi +% \begin{macro}{hardmarg.sty} +% +% \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. +% +% Issue info as to what we do\ldots +% \begin{macrocode} +\ProvidesPackage{hardmarg}[2006/10/08 v1.504 +For use with class screenplay +(C)2006 John Pate +released under the GNU General Public License] +% \end{macrocode} +% Hard 1" right margin\ldots +% \begin{macrocode} +\setlength{\textwidth}{6.0in} +\renewcommand*{\widthfudge}{0in} +% \end{macrocode} +% Set dialogue to 3" width, right margin 2.5"\dots +% \begin{macrocode} +\renewcommand*{\dialwidth}{3.0in} +% \end{macrocode} +% Set parentheticals to 1.5" width, right margin 3.3"\ldots +% \begin{macrocode} +\renewcommand*{\parenwidth}{1.5in} +% \end{macrocode} +% \end{macro} +%\iffalse +% +%\fi % \section{Todo} % If anybody else uses it maybe they'll spot stuff that's % wrong but \textsl{Johnny} says, ``It works for me.'' @@ -938,7 +982,7 @@ FADE IN: %% see http://www.dvc.org.uk/sacrific.txt/ %% for more information on the document class. %% -\documentclass{screenplay}[2006/10/02] +\documentclass{screenplay}[2006/10/08] \begin{document} \titleauthor{For a Few Days More}{April Rider} {April Rider\\ @@ -996,7 +1040,7 @@ comes. %\fi %\iffalse %<*example> -\documentclass{screenplay}[2006/10/02] +\documentclass{screenplay}[2006/10/08] \begin{document} %% cover page, this command has to go first ... %% choose one of \titleauthor, \titleextra, \nicholl ... diff --git a/Master/texmf-dist/source/latex/screenplay/screenplay.ins b/Master/texmf-dist/source/latex/screenplay/screenplay.ins index 34fc75480ff..343f9cfc7cf 100644 --- a/Master/texmf-dist/source/latex/screenplay/screenplay.ins +++ b/Master/texmf-dist/source/latex/screenplay/screenplay.ins @@ -1,4 +1,4 @@ -% $Id: screenplay.ins,v 1.3 2006/09/27 10:51:52 johnny Exp $ +% $Id: screenplay.ins,v 1.4 2006/10/06 21:14:18 johnny Exp $ % screenplay.ins -- docstrip driver for the screenplay LaTeX2e class % % Please see the copyright notice in \preamble below. @@ -52,6 +52,7 @@ Hail Eris! All Hail Discordia! \askforoverwritefalse \generate{\file{screenplay.cls}{\from{screenplay.dtx}{class}} + \file{hardmarg.sty}{\from{screenplay.dtx}{hard}} \file{test.tex}{\from{screenplay.dtx}{rider}} \file{example.tex}{\from{screenplay.dtx}{example}} } @@ -64,7 +65,9 @@ Hail Eris! All Hail Discordia! \Msg{* screenplay.cls is stripped of comments (documentation) and must} \Msg{* be placed where LaTeX can find it before it may be used.} \Msg{*} -\Msg{* example.tex shows markup and explains some features of the class} +\Msg{* hardmarg.sty is an optional package to redefine margins.} +\Msg{*} +\Msg{* example.tex shows markup and explains some features of the class.} \Msg{*} \Msg{* test.tex reproduces part of the Academy model document to} \Msg{* demonstrate the veracity of screenplay class.} diff --git a/Master/texmf-dist/tex/latex/screenplay/hardmarg.sty b/Master/texmf-dist/tex/latex/screenplay/hardmarg.sty new file mode 100644 index 00000000000..8c7e84769d5 --- /dev/null +++ b/Master/texmf-dist/tex/latex/screenplay/hardmarg.sty @@ -0,0 +1,46 @@ +%% +%% This is file `hardmarg.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% screenplay.dtx (with options: `hard') +%% +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+= +%% +%% Authored by and Copyright (C)2006 by +%% John Pate +%% http://dvc.org.uk +%% Latest version is available as: +%% http://dvc.org.uk/sacrific.txt/screenplay.zip +%% +%% 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., 51 Franklin St, Fifth Floor, Boston, +%% MA 02110-1301 USA +%% +%% GPL v2 text also available as: +%% http://dvc.org.uk/gplv2.txt +%% +%% +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+= +\ProvidesPackage{hardmarg}[2006/10/08 v1.504 +For use with class screenplay +(C)2006 John Pate +released under the GNU General Public License] +\setlength{\textwidth}{6.0in} +\renewcommand*{\widthfudge}{0in} +\renewcommand*{\dialwidth}{3.0in} +\renewcommand*{\parenwidth}{1.5in} +%% +%% Hail Eris! All Hail Discordia! +%% +%% End of file `hardmarg.sty'. diff --git a/Master/texmf-dist/tex/latex/screenplay/screenplay.cls b/Master/texmf-dist/tex/latex/screenplay/screenplay.cls index 95502af65f7..89cd0267c00 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/02 v1.500 +\ProvidesClass{screenplay}[2006/10/08 v1.504 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.500}} + {There are no options available for class screenplay v1.504}} \ProcessOptions\relax \RequirePackage{ifthen}[2001/05/26] \LoadClass[12pt,letterpaper,onecolumn,oneside]{article}[2004/02/16] @@ -80,7 +80,7 @@ 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*{\titlesepspace}{\vspace{3.75in plus 0in minus 1.5in}} \newcommand*{\copyspace}{\vspace*{2ex plus 0ex minus 0ex}} \newcommand{\titleauthor}[4][]{ \thispagestyle{empty} @@ -189,11 +189,11 @@ by\\ \newenvironment{titleover}[1][]{ \ifthenelse{\not\equal{#1}{}} -{%true +{ TITLE OVER (#1):\\ -}{%false +}{ TITLE OVER:\\ -}%ifthenelse +} \vspace{\baselineskip} \nopagebreak \dialtab\begin{minipage}[b]{\dialwidth} @@ -231,8 +231,9 @@ FADE IN: \hspace*{\fill}INTERCUT WITH:\hspace{\widthfudge} }%intercut -\newcommand{\pov}{P.O.V. } -\newcommand{\nb}{NOTE: } +\newcommand*{\pov}{P.O.V. } +\newcommand*{\revert}{REVERSE \pov } +\newcommand*{\nb}{NOTE: } \newcommand{\theend}{ \hspace*{\fill}THE END\hspace{\fill}\hspace{\widthfudge} diff --git a/Master/texmf-dist/tpm/screenplay.tpm b/Master/texmf-dist/tpm/screenplay.tpm index d334c43bcd4..5e159d9be47 100644 --- a/Master/texmf-dist/tpm/screenplay.tpm +++ b/Master/texmf-dist/tpm/screenplay.tpm @@ -3,19 +3,20 @@ screenplay Package - 2006/10/04 12:03:02 + 2006/10/09 23:00:00 karl The screenplay package. - 194980 + 200561 - + +texmf-dist/tex/latex/screenplay/hardmarg.sty texmf-dist/tex/latex/screenplay/screenplay.cls texmf-dist/tpm/screenplay.tpm - + texmf-dist/doc/latex/screenplay/COPYING texmf-dist/doc/latex/screenplay/README texmf-dist/doc/latex/screenplay/example.tex @@ -23,7 +24,7 @@ texmf-dist/doc/latex/screenplay/screenplay.pdf texmf-dist/doc/latex/screenplay/test.pdf texmf-dist/doc/latex/screenplay/test.tex - + texmf-dist/source/latex/screenplay/screenplay.dtx texmf-dist/source/latex/screenplay/screenplay.ins diff --git a/Master/texmf/lists/screenplay b/Master/texmf/lists/screenplay index 1b42f6b093d..11285f30f49 100644 --- a/Master/texmf/lists/screenplay +++ b/Master/texmf/lists/screenplay @@ -6,6 +6,7 @@ texmf-dist/doc/latex/screenplay/test.pdf texmf-dist/doc/latex/screenplay/test.tex texmf-dist/source/latex/screenplay/screenplay.dtx texmf-dist/source/latex/screenplay/screenplay.ins +texmf-dist/tex/latex/screenplay/hardmarg.sty texmf-dist/tex/latex/screenplay/screenplay.cls texmf-dist/tpm/screenplay.tpm -- cgit v1.2.3