screenplay-pkg (6aug17)

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

5 files changed, 20 insertions, 20 deletions

diff --git a/Master/texmf-dist/doc/latex/screenplay-pkg/README b/Master/texmf-dist/doc/latex/screenplay-pkg/README
index 5f39d80503c..51673ab5e31 100644
--- a/Master/texmf-dist/doc/latex/screenplay-pkg/README
+++ b/Master/texmf-dist/doc/latex/screenplay-pkg/README
@@ -1,6 +1,6 @@
 This is the screenplay-pkg package.
  Copyright 2006 by John Pate
- Copyright 2015 by Alan Munn
+ Copyright 2015-2017 by Alan Munn
 
  This package implements the tools of the screenplay document class
  in the form of a package so that screenplay fragments can be included
@@ -39,4 +39,4 @@ This is the screenplay-pkg package.
  This package consists of the file screenplay-pkg.sty and documentation files
  screenplay-pkg.tex, screenplay-pkg.pdf, screenplay-pkg-example.tex and screenplay-pkg-example.pdf.
 
- Version 1.0 2015/07/11
+ Version 1.1 2017/08/05
diff --git a/Master/texmf-dist/doc/latex/screenplay-pkg/screenplay-pkg-example.pdf b/Master/texmf-dist/doc/latex/screenplay-pkg/screenplay-pkg-example.pdf
index 773136f59de..68bfa74cc4c 100644
--- a/Master/texmf-dist/doc/latex/screenplay-pkg/screenplay-pkg-example.pdf
+++ b/Master/texmf-dist/doc/latex/screenplay-pkg/screenplay-pkg-example.pdf
diff --git a/Master/texmf-dist/doc/latex/screenplay-pkg/screenplay-pkg.pdf b/Master/texmf-dist/doc/latex/screenplay-pkg/screenplay-pkg.pdf
index f1cc920bdf4..095257965ba 100644
--- a/Master/texmf-dist/doc/latex/screenplay-pkg/screenplay-pkg.pdf
+++ b/Master/texmf-dist/doc/latex/screenplay-pkg/screenplay-pkg.pdf
diff --git a/Master/texmf-dist/doc/latex/screenplay-pkg/screenplay-pkg.tex b/Master/texmf-dist/doc/latex/screenplay-pkg/screenplay-pkg.tex
index e425b99d0d6..ffd88431372 100644
--- a/Master/texmf-dist/doc/latex/screenplay-pkg/screenplay-pkg.tex
+++ b/Master/texmf-dist/doc/latex/screenplay-pkg/screenplay-pkg.tex
@@ -3,7 +3,7 @@
 \documentclass[11pt]{article}
 \title{\textbf{The \textsf{screenplay-pkg} package}}
 \author{\textbf{Alan Munn}\\Department of Linguistics and Languages\\Michigan State University\\\texttt{\href{mailto:amunn@msu.edu}{amunn@msu.edu}}}
-\date{Version 1.0\\July 11, 2015}
+\date{Version 1.1\\August 5, 2017}
 \usepackage[T1]{fontenc}
 \usepackage[margin=1in]{geometry}
 \usepackage{titling}
@@ -67,7 +67,7 @@
 \abstract{\noindent\begin{quote}This is a package version of the \pkg{screenplay} document class. The class version is designed to produce a properly formatted screenplay manuscript. This package version allows portions of screenplays formatted using the class methods to be included into other document classes.
 \end{quote}
 \section{Introduction}
-This package arose out of a question asked on the StackExchange website: \href{http://tex.stackexchange.com/q/26227/}{Converting document classes into environments: is it possible?}. The question asked how easy it would be convert the class functionality into an environment.  This package is the result of that discussion.
+This package arose out of a question asked on the StackExchange website: \href{http://tex.stackexchange.com/q/26227/}{Converting document classes into environments: is it possible?} The question asked how easy it would be convert the class functionality into an environment.  This package is the result of that discussion.
 \section{Package use}
 To use the package just load it like any other package:
 
@@ -85,7 +85,7 @@ The |screenplay| environment provides an environment to wrap a screenplay fragme
 \end{lstlisting}
 
  Two additional user commands are added to allow for user adjustment of the
- fragment font and linespacing (the \pkg{setspace} package is used for spacing). American spellings of the centring commands have also been created. British spellings of these commands are retained:
+ fragment font and linespacing (the \pkg{setspace} package is used for spacing unless the \pkg{memoir} class is loaded). American spellings of the centring commands have also been created. British spellings of these commands are retained:
 
 \begin{center}
 
@@ -94,9 +94,10 @@ The |screenplay| environment provides an environment to wrap a screenplay fragme
 \textsf{Command}       & \textsf{Explantion}\\
     |\screenspacing{}| & sets the linespacing for screenplay fragments\\
     				   & default is |\onehalfspacing|\\
+				       & (if \pkg{memoir} is loaded, |\OnehalfSpacing|)\\
     |\screenfont{}|    & sets the font for screenplay fragments\\
     				   & default is |\ttfamily|\\
-    |\sccenter |	   & American spellings of centring commands now possible\\
+   |\sccenter |	       & American spellings of centring commands now possible\\
    |\centertitle|      & \\
 \bottomrule
 \end{tabular}
@@ -107,13 +108,8 @@ The |screenplay| environment provides an environment to wrap a screenplay fragme
 All commands from the \pkg{screenplay} class that relate to creating the title page have been removed from the package version of the class.
 \section{Troubleshooting and package dependencies}
 \subsection{Package dependencies}
-Note that the package uses the \pkg{setspace} package for linespacing. If you are using the \pkg{memoir} class which provide its own linespacing methods you will need to turn them off and use \pkg{setspace} instead. The \pkg{memoir} package provides a |\DisemulatePackage| command to do this:
-\begin{lstlisting}
-    \documentclass{memoir}
-    \DisemulatePackage{setspace}
-    \usepackage{screenplay-pkg}
-    ...
-\end{lstlisting}
+Note that the package uses the \pkg{setspace} package for linespacing. If you are using the \pkg{memoir} class which provides its own linespacing methods the package will use its linespacing commands instead.
+
 \subsection{Bugs}
 You are welcome to report bugs and submit feature requests, but I should warn you that this package is extremely low priority for me in terms of maintenance, as I do not use it at all.  If you are interested in taking it over, please get in touch with me.
 
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