dramatist (20dec14)

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

2 files changed, 40 insertions, 29 deletions

diff --git a/Master/texmf-dist/source/latex/dramatist/dramatist.dtx b/Master/texmf-dist/source/latex/dramatist/dramatist.dtx
index 64b27a31ae3..3643b74f1eb 100644
--- a/Master/texmf-dist/source/latex/dramatist/dramatist.dtx
+++ b/Master/texmf-dist/source/latex/dramatist/dramatist.dtx
@@ -1,6 +1,6 @@
 %\iffalse
 %% dramatist.dtx
-%% Copyright (C) 2003-2005 Massimiliano Dominici
+%% Copyright (C) 2003-2014 Massimiliano Dominici
 %
 % 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
@@ -104,7 +104,7 @@
 %
 %\DoNotIndex{\@afterheading,\@afterindentfalse,\@break@tfor,\@empty}
 %\DoNotIndex{\@ifstar,\@let@token,\@namedef,\@nameuse,\@nil}
-%\DoNotIndex{\@tempswafalse,\@tempswatrue,\@tfor,\\,\ }
+%\DoNotIndex{\@tempswafalse,\@tempswatrue,\@tfor,\\}
 %\DoNotIndex{\ae,\baselineskip,\begin,\bgroup,\centering}
 %\DoNotIndex{\csname,\def,\do,\egroup,\else,\emph,\end}
 %\DoNotIndex{\expandafter,\fi,\futurelet,\hspace,\if@tempswa}
@@ -123,10 +123,17 @@
 %\DoNotIndex{\global,\ht,\left,\leftmargini,\newsavebox,\raggedright,\right,\Roman,\rule}
 %\DoNotIndex{\tbox,\usebox,\xdef,\@undefined,\c@secnumdepth,\endlist,\list,\m@ne,\newdimen}
 %\DoNotIndex{\parsep,\thispagestyle}
-%
+%\expandafter\DoNotIndex\expandafter{\string\}}
+% \begingroup
+%     \makeatletter
+%     \lccode`9=32\relax
+%     \lowercase{%^^A
+%       \edef\x{\noexpand\DoNotIndex{\@backslashchar9}}%^^A
+%     }%^^A
+%   \expandafter\endgroup\x%
 %\title{The \Filename{dramatist} package\thanks{This file has version
 %number \fileversion{} dated \filedate{}.} \\User Guide}
-%\author{Massimiliano Dominici\\\texttt{mlgdominici@interfree.it}}
+%\author{Massimiliano Dominici\\\texttt{mlgdominici@gmail.com}}
 %\date{\filedate}
 %\maketitle
 %
@@ -504,7 +511,7 @@
 %
 %If you encounter new bugs, or have suggestions about the solution
 %of the known ones, please send me a mail to this address:
-%\texttt{mlgdominici@interfree.it.}
+%\texttt{mlgdominici@gmail.com.}
 %
 %\section{Code}
 %
@@ -512,7 +519,7 @@
 %
 %    \begin{macrocode}
 %<*dramatist>
-\ProvidesPackage{dramatist}[2005/12/01 v1.2d Package for typesetting drama -- Author: Massimiliano Dominici]
+\ProvidesPackage{dramatist}[2014/12/18 v1.2e Package for typesetting drama -- Author: Massimiliano Dominici]
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{xspace}
 %    \end{macrocode}
@@ -685,6 +692,7 @@
 %\changes{v1.1}{2004/01/19}{\cs{act} is now defined in a standard way
 %and has an optional argument (to use for footnotes and the like).}
 %\changes{v1.2}{2004/05/10}{Shared code moved to \cs{@openact}.}
+%\changes{v1.2e}{2014/12/18}{Now \cs{act} actually uses \cs{actcontentsline}.}
 %|\act| switches between |\@act| and |\@sact|; in the first case a
 %line is added to the table of contents and an argument is assigned
 %to |\actmark|. The actual task of printing the heading is left to
@@ -695,7 +703,7 @@
     \secdef\@act\@sact}
 \newcommand\@act[1][]{%
     \phantomsection
-    \addcontentsline{toc}{chapter}{\actname\ \theact}
+    \addcontentsline{toc}{chapter}{\actcontentsline}
     \actmark{\actname\ \theact}
     \m@ke@cthead{#1}
     \@afterindentfalse
@@ -709,6 +717,7 @@
 %\begin{macro}{\Act}
 %\changes{v1.2}{2004/05/10}{Introduced macro \cs{Act} for sections
 %with a title.}
+%\changes{v1.2e}{2014/12/18}{Now \cs{Act} actually uses \cs{actcontentsline}.}
 %|\Act| is defined in the standard way for sectioning commands. For
 %its starred version relies upon |\@sact|
 %    \begin{macrocode}
@@ -718,7 +727,7 @@
 \def\@Act[#1]#2{%
     \phantomsection
     \ifnum\c@secnumdepth>\m@ne
-        \addcontentsline{toc}{chapter}{\actname\ \theact\ #1}
+        \addcontentsline{toc}{chapter}{\actcontentsline~#1}
     \else
         \addcontentsline{toc}{chapter}{#1}
     \fi
@@ -764,6 +773,7 @@
 %way and has an optional argument (to use for footnotes and the
 %like).}
 %\changes{v1.2}{2004/05/10}{Shared code moved to \cs{@penscene}.}
+%\changes{v1.2e}{2014/12/18}{Now \cs{scene} actually uses \cs{scenecontentsline}.}
 %|\scene| switches between |\@scene| and |\@sscene|; in the first case a
 %line is added to the table of contents and an argument is assigned
 %to |\scenemark|. The actual task of printing the heading is left to
@@ -774,7 +784,7 @@
     \secdef\@scene\@sscene}
 \newcommand\@scene[1][]{%
     \phantomsection
-    \addcontentsline{toc}{section}{\scenename\ \thescene}
+    \addcontentsline{toc}{section}{\scenecontentsline}
     \scenemark{\scenename\ \thescene}
     \m@kescenehead{#1}
     \@afterindentfalse
@@ -788,6 +798,7 @@
 %\begin{macro}{\Scene}
 %\changes{v1.2}{2004/05/10}{Introduced macro \cs{Scene} for sections
 %with a title.}
+%\changes{v1.2e}{2014/12/18}{Now \cs{Scene} actually uses \cs{scenecontentsline}.}
 %|\Scene| is defined in the standard way for sectioning commands. For
 %its starred version relies upon |\@sscene|
 %    \begin{macrocode}
@@ -797,7 +808,7 @@
 \def\@Scene[#1]#2{%
     \phantomsection
     \ifnum\c@secnumdepth>\z@
-        \addcontentsline{toc}{section}{\scenename\ \thescene\ #1}
+        \addcontentsline{toc}{section}{\scenecontentsline~#1}
     \else
         \addcontentsline{toc}{section}{#1}
     \fi
@@ -1075,7 +1086,7 @@
 %\end{macro}
 %\subsection{Configuration settings}
 %    \begin{macrocode}
-\newcommand\actcontentsline[1]{\actname\ \theact}
+\newcommand\actcontentsline{\actname\ \theact}
 \newcommand{\actnamefont}{\scshape\Large}
 \newcommand{\actnumfont}{\actnamefont}
 \newcommand{\acttitlefont}{\actnamefont}
@@ -1083,7 +1094,7 @@
 \newcommand{\printactname}{\centering\actnamefont \actname}
 \newcommand{\printactnum}{\actnumfont \theact}
 \newcommand{\printacttitle}[1]{\acttitlefont\ #1}
-\newcommand\scenecontentsline[1]{\scenename\ \thescene}
+\newcommand\scenecontentsline{\scenename\ \thescene}
 \newcommand{\scenenamefont}{\scshape\large}
 \newcommand{\scenenumfont}{\scenenamefont}
 \newcommand{\scenetitlefont}{\scenenamefont}
diff --git a/Master/texmf-dist/source/latex/dramatist/dramatist.ins b/Master/texmf-dist/source/latex/dramatist/dramatist.ins
index f88ceeb7956..a273f0fc578 100644
--- a/Master/texmf-dist/source/latex/dramatist/dramatist.ins
+++ b/Master/texmf-dist/source/latex/dramatist/dramatist.ins
@@ -1,17 +1,17 @@
-\input docstrip.tex

-

-{\usedir{tex/latex/dramatist}

-

-\generate{\file{dramatist.sty}{\from{dramatist.dtx}{dramatist}}

-         }

-}

-{\usedir{doc/latex/dramatist}

-

-\generate{\file{schiller.tex}{\from{dramatist.dtx}{schiller}}

-         }

-\generate{\file{marlowe-verse.tex}{\from{dramatist.dtx}{vmarlowe}}

-         }

-\generate{\file{marlowe-poemscol.tex}{\from{dramatist.dtx}{pmarlowe}}

-         }

-}

-\endbatchfile

+\input docstrip.tex
+
+{\usedir{tex/latex/dramatist}
+
+\generate{\file{dramatist.sty}{\from{dramatist.dtx}{dramatist}}
+         }
+}
+%{\usedir{doc/latex/dramatist}
+%
+%\generate{\file{schiller.tex}{\from{dramatist.dtx}{schiller}}
+%         }
+%\generate{\file{marlowe-verse.tex}{\from{dramatist.dtx}{vmarlowe}}
+%         }
+%\generate{\file{marlowe-poemscol.tex}{\from{dramatist.dtx}{pmarlowe}}
+%         }
+%}
+\endbatchfile