screenplay-pkg (6aug17)

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

1 files changed, 11 insertions, 7 deletions

diff --git a/Master/texmf-dist/tex/latex/screenplay-pkg/screenplay-pkg.sty b/Master/texmf-dist/tex/latex/screenplay-pkg/screenplay-pkg.sty
index ef1c5536c2c..fc4dddecc6b 100644
--- a/Master/texmf-dist/tex/latex/screenplay-pkg/screenplay-pkg.sty
+++ b/Master/texmf-dist/tex/latex/screenplay-pkg/screenplay-pkg.sty
@@ -7,7 +7,8 @@
 % in the form of a package so that screenplay fragments can be included
 % within another document class.
 %
-% The main documentation for the package is contained in 
+% The main documentation for the package is contained in the screenplay class
+% documentation. Please read that in addition the included documentation.
 %
 % All commands related to the titlepage in screenplay.cls have been
 % eliminated.
@@ -17,7 +18,7 @@
 %    \begin{screenplay} ... \end{screenplay} 
 %
 % Two additional user commands are added to allow for user adjustment of the
-% fragment font and linespacing (the setspace package is used for spacing).
+% fragment font and linespacing (the setspace package is used for spacing unless memoir is loaded).
 %
 %    \screenspacing{} % sets the linespacing for screenplay fragments; default
 %                       is \onehalfspacing
@@ -51,26 +52,29 @@
 % screenplay-pkg-example.tex and screenplay-pkg-example.pdf.
 %
 % Version 1.0 2015/07/11
+% Version 1.1 2017/08/05 Added memoir support
 %
 
 \NeedsTeXFormat{LaTeX2e}[2003/12/01]
-\ProvidesPackage{screenplay-pkg}[2015/07/11 v1.0
+\ProvidesPackage{screenplay-pkg}[2017/08/05 v1.1
 LaTeX2e Draft Screenplay tools adapted from the screenplay document class
 original code (C)2006 John Pate
-package modifications (C)2015 Alan Munn
+package modifications (C)2015-2017 Alan Munn
 released under the LPPL]
 \DeclareOption*{%
     \PackageError{screenplay-pkg}{Unwanted option '\CurrentOption'}%
     {There are no options available for screenplay-pkg}}
 \ProcessOptions\relax
 \RequirePackage{ifthen}[2001/05/26]
-% Use setspace for linespacing AM
-\RequirePackage{setspace}
+% Use setspace or memoir for linespacing AM
+\@ifclassloaded{memoir}
+	{\newcommand*{\@screenspacing}{\OnehalfSpacing}}
+	{\RequirePackage{setspace}
+	 \newcommand*{\@screenspacing}{\onehalfspacing}}
 % screenplay font will default to ttfamily AM
 \newcommand*{\@screenfont}{\ttfamily}
 % screenplay font can be changed with \screenfont macro AM
 \newcommand*{\screenfont}[1]{\renewcommand\@screenfont{#1}}
-\newcommand*{\@screenspacing}{\onehalfspacing}
 \newcommand*{\screenspacing}[1]{\renewcommand\@screenspacing{#1}}
 \newcommand*{\dialfix}{\vspace{2pt}}
 % new command to set the internal spacing and formatting of