From 8fd5b53b4f8bca37960bb736b26c30a1f6e4c575 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 26 Jun 2014 21:41:02 +0000 Subject: thalie (26jun14) git-svn-id: svn://tug.org/texlive/trunk@34435 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/thalie/README | 2 +- Master/texmf-dist/doc/latex/thalie/thalie.pdf | Bin 369598 -> 380751 bytes Master/texmf-dist/source/latex/thalie/thalie.dtx | 210 +++++++++++++++-------- Master/texmf-dist/source/latex/thalie/thalie.ins | 4 +- Master/texmf-dist/tex/latex/thalie/thalie.sty | 60 +++++-- 5 files changed, 184 insertions(+), 92 deletions(-) diff --git a/Master/texmf-dist/doc/latex/thalie/README b/Master/texmf-dist/doc/latex/thalie/README index 5524b4e2949..c58ab48d764 100644 --- a/Master/texmf-dist/doc/latex/thalie/README +++ b/Master/texmf-dist/doc/latex/thalie/README @@ -4,7 +4,7 @@ acts and scenes, to automatically build the dramatis personae, etc. LICENSE -Copyright 2010-2013 Louis Paternault +Copyright 2010-2014 Louis Paternault This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/doc/latex/thalie/thalie.pdf b/Master/texmf-dist/doc/latex/thalie/thalie.pdf index ee38544e993..23481798d3d 100644 Binary files a/Master/texmf-dist/doc/latex/thalie/thalie.pdf and b/Master/texmf-dist/doc/latex/thalie/thalie.pdf differ diff --git a/Master/texmf-dist/source/latex/thalie/thalie.dtx b/Master/texmf-dist/source/latex/thalie/thalie.dtx index 06a3d2d8d12..7744193e082 100644 --- a/Master/texmf-dist/source/latex/thalie/thalie.dtx +++ b/Master/texmf-dist/source/latex/thalie/thalie.dtx @@ -1,5 +1,5 @@ % \iffalse meta-comment -% Copyright 2010-2013 Louis Paternault +% Copyright 2010-2014 Louis Paternault % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -25,7 +25,7 @@ %\NeedsTeXFormat{LaTeX2e} %\ProvidesPackage{thalie} %<*package> - [2013/06/08 v0.5 A package to typeset drama plays] + [2014/06/26 v0.6 A package to typeset drama plays] % % %<*driver> @@ -34,11 +34,13 @@ \CodelineIndex \RecordChanges \usepackage{array} +\usepackage{attachfile} \usepackage{enumerate} \usepackage{multirow} \usepackage{hyperref} \usepackage{thalie} \usepackage{showexpl} +\lstset{language=[LaTeX]TeX, numbers=left, numberstyle=\tiny} \usepackage[francais,english]{babel} \begin{document} \DocInput{thalie.dtx} @@ -131,7 +133,7 @@ % % \subsection{Other classes and packages} % This package is far from being the only one that can be used to render drama -% plays. If you do not like my work, you can use one of the following one (and +% plays. If you do not like my work, you can use one of the following ones (and % I guess there exists others): % |drama| \cite{drama}, % |dramatist| \cite{dramatist}, @@ -146,9 +148,9 @@ % |dramatist| package seems really nice (I borrowed some ideas and copied some % code from it). There are actually a few improvements in my package compared % to |dramatist|: in my package, plays, acts and scenes appear in the table of -% content; it is possible to include several plays in a single document; there +% contents; it is possible to include several plays in a single document; there % are more options when building the dramatis person\ae{}; headers and footers -% are taken into accounts, etc. But these improvements are small; it might have +% are taken into account, etc. But these improvements are small; it might have % been smarter to contribute to |dramatist| instead of starting my own package. % The good part is that I have a package that exactly\footnote{Well, not % exactly: see the wish list page \pageref{sec:wishlist}. But I do not think @@ -179,9 +181,20 @@ % \LaTeX{} Package} \cite{dtxtut}, and \emph{\LaTeXe{} for class and package % writers} \cite{clsguide}. % +% \subsection{Examples} +% +% All the examples are taken from Edmond Rostand's \emph{Cyrano de Bergerac} +% \cite{cyrano}. The snippets are from the original (French) version of this +% play, roughly translated by myself (which means that they must be of poor +% quality). +% +% A part of this play (now in public domain), is +% \textattachfile[mimetype=text/plain,color=0 0 1]{cyrano.tex}{attached to this +% file}, as a working example of this package. +% % \subsection{Overview} % Documentation about how to use this package is given in section -% \ref{sec:usage}. In particular, section \ref{sec:sectionning} explains how to +% \ref{sec:usage}. In particular, section \ref{sec:sectioning} explains how to % use acts and scenes, section \ref{sec:characters} explains how to define % characters, and use these definitions to introduce characters' lines, and % section \ref{sec:directions} describes commands used to render stage @@ -207,7 +220,7 @@ % \emph{before} this package, otherwise localization will not be available. % % The effect of choosing a language or another is to translate some words. The -% corresponding commands, and the word they correspond to, are listed in table +% corresponding commands, and the words they correspond to, are listed in table % \ref{table:l10n}. % % \begin{table} @@ -228,7 +241,7 @@ % \label{table:l10n} % \end{table} % -% If the option for your language does not exists\footnote{You can also send me +% If the option for your language does not exist\footnote{You can also send me % the translation for your language, to improve this package.}, or if you want % to change the default words used here, you can redefine the commands listed % in table \ref{table:l10n}. For instance use @@ -247,7 +260,8 @@ % Name & Available options & Default \tabularnewline % \hline % \hline -% |characterstyle| & |bold| |margin| |center| |simple| & |simple| \tabularnewline +% |characterstyle| & |bold| |margin| |center| |simple| |arden| & |simple| \tabularnewline +% & |imprimerie-verse| |imprimerie-prose| & \tabularnewline % \hline % |playstyle| & \multirow{3}{*}{|center| |bigcenter| |box| |custom|} & |box| \tabularnewline % |actstyle| & & |bigcenter| \tabularnewline @@ -275,23 +289,23 @@ % |scenestyle|=\meta{style}. Description of available styles, and how to define % your own one, are described in section \ref{sec:sectionstyles}. % -% \subsubsection{Sectionning levels} -% If you use a table of contents, or if you also use ``usual'' sectionning +% \subsubsection{Sectioning levels} +% If you use a table of contents, or if you also use ``usual'' sectioning % commands (|\chapter|, |\section| and so on), the relative importance of % plays, acts and scenes is important. You can set this using options % |playlevel=|\meta{level}, |actlevel=|\meta{level} and % |scenelevel=|\meta{level}. The argument is the name of the corresponding -% sectionning level, i.e. one of |part|, |chapter|, |section|, |subsection|, +% sectioning level, i.e. one of |part|, |chapter|, |section|, |subsection|, % |subsubsection|, |paragraph| and |subparagraph|. % % Setting the interlude level is slightly different. While setting it using % |interludelevel=|\meta{level}, instead of choosing one of \LaTeX{} vanilla -% sectionning levels as the level, you may choose |play|, |act| or |scene|. It -% defines if an interlude is as the same level as a play, an act or a scene. +% sectioning levels as the level, you may choose |play|, |act| or |scene|. It +% defines if an interlude is at the same level as a play, an act or a scene. % -% \subsection{Sectionning} -% \label{sec:sectionning} -% Here begin the parts explicitely relative to drama. +% \subsection{Sectioning} +% \label{sec:sectioning} +% Here begin the parts explicitly relating to drama. % \subsubsection{Levels} % \DescribeMacro{\play} % \DescribeMacro{\play*} @@ -300,18 +314,19 @@ % \DescribeMacro{\scene} % \DescribeMacro{\scene*} % To introduce a new play, act or scene, use commands |\play|, |\act| and -% |\scene|. Their behaviour is as close as the ``usual'' sectionning commands +% |\scene|. Their behaviour is as close as the ``usual'' sectioning commands % (|\chapter|, |\section| and so on) as possible, i.e.: % \begin{itemize} % \item Their signature is |\play|\oarg{short title}\marg{longtitle} (the % optional short title is the one used in the table of content, and in headers % and footers). % \item A starred version (|\play*|, |\act*| and |\scene*|) is provided, which -% does not insert any line in the table of content. +% inserts a play (or act, or scene) which is not numbered, and does not insert +% any line in the table of content. % \item Headers and footers are changed (more information in section \ref{sec:header}). % \end{itemize} % -% Both commands |\act| and |\scene| (and their starred version) are designed to +% Both commands |\act| and |\scene| (and their starred versions) are designed to % deal with empty titles. Indeed, it is common not to give any name to acts and % scenes. % @@ -334,7 +349,7 @@ % numbered, but which should appear in the table of content. Command % |\interlude|\oarg{short title}\marg{long title} has this purpose. % -% You may choose the sectionning level an inturlude is equivalent to in the +% You may choose the sectioning level an interlude is equivalent to in the % package options. If your interludes are acts, use |interludelevel=act|; if % they are scenes, use |interludelevel=scene|. % @@ -360,7 +375,7 @@ % \iffalse %<*example> % \fi -% \begin{verbatim} +% \begin{lstlisting} \newcommand\customact[2]{ \begin{center} \textsc{#1} @@ -369,7 +384,7 @@ \end{center} } \WithSuffix\newcommand\customact*[1]{\customact{}{#1}} -% \end{verbatim} +% \end{lstlisting} % \iffalse % % \fi @@ -408,8 +423,8 @@ % \DescribeMacro{\actmark} % \DescribeMacro{\scenemark} % Once again, similar tools as those used by |\section| are provided to deal -% with headers and footers. When introducing, respectively, a new play, act or -% scene, commands |\playmark|\marg{label}, |\actmark|\marg{label} and +% with headers and footers. When introducing, a new play, act or % scene, +% respectively, commands |\playmark|\marg{label}, |\actmark|\marg{label} and % |\scenemark|\marg{label} are called, so that titles can be used in headers % and footers. If the default behaviour does not suit you (which should be the % case if you did not choose the default option for |playlevel|, |actlevel| or @@ -450,22 +465,20 @@ % \iffalse %<*example> % \fi -% \begin{LTXexample} +% \begin{LTXexample}[pos=b] \begin{dramatis} -\character[desc={a nurse}, - cmd={liz}]{Liz} -\character[desc={Liz's father}, - cmd={father}, drama={A sailor} - ]{The sailor} + \character[cmd={cyrano}, drama={Cyrano de Bergerac}]{Cyrano} + \character[cmd={lebret}]{Le Bret} + \character[cmd={bellerose}]{Bellerose} \end{dramatis} \bigskip -\liz Hello, I'm \lizname! +\lebret[to \cyranoname, holding his arm] +Let's talk ! -\father Hello. - -\liz[to herself] Go away... +\cyrano +Wait for the crowd to leave. \did{To \bellerosename} Can I stay? % \end{LTXexample} % \iffalse % @@ -538,7 +551,7 @@ % % \paragraph{Group of characters} % \DescribeEnv{charactergroup} -% It is possible to group several characters definition if they have the same +% It is possible to group several characters' definition if they have the same % description. This is done with environment % |charactergroup|\marg{description}. For example, one can use code of figure % \ref{fig:charactergroup} to define the three sons of another character. @@ -550,19 +563,26 @@ % \fi % \begin{LTXexample} \begin{dramatis} -\begin{charactergroup}{John's sons} - \character[desc={a baby}, cmd=jack]{Jack} - \character[cmd=paul]{Paul} - \character[cmd=peter]{Peter} +\begin{charactergroup}{Two musicians} + \character[desc={Gaston Henry}]{} + \character[desc={Damon}]{} \end{charactergroup} \end{dramatis} % \end{LTXexample} % \iffalse % % \fi -% \caption{Defining a group of characters} +% \caption[Defining a group of characters]{Defining a group of characters\footnotemark} % \label{fig:charactergroup} % \end{figure} +% \footnotetext{ +% I admit I am cheating here. As it was difficult to find a single play that +% illustrates every feature of this package, this snippet, in the original +% \emph{Cyrano de Bergerac}, is used to give the names of the actors playing the +% two musicians, which is a bit different from the purpose of the +% |charactergroup| environment. Still, you can see how it is rendered, +% which is the important part here. +% } % % The effect of this code will be, in the dramatis person\ae{}, to have a % nice brace mapping the three characters to their common description. @@ -574,33 +594,38 @@ % \begin{center}|\disposablecharacter|\oarg{directions}\marg{name}\end{center} % This command, used in the body, introduces a line for character |name|, with optional stage % directions. It is rendered the same way regular characters are rendered, but -% nothing is added to the dramatis person\ae{}. +% nothing is added to the dramatis person\ae{}. It is used in figure +% \ref{fig:setcharactername_example}. % % \subsubsection{Changing character's name} % \label{setcharactername} % \DescribeMacro{\setcharactername} % % \begin{figure}[p] +% On the first scenes of Cyrano de Bergerac, the main character (Cyrano) is +% somewhere in a crowd, and only appears as \emph{a voice}. He appears as +% Cyrano in the following verses. +% % \centering % \iffalse %<*example> % \fi -% \begin{LTXexample} +% \begin{LTXexample}[pos=b] \begin{dramatis}[hidden] - \character[desc={Liz's father}, cmd=father]{The sailor} - \character[desc={a nurse}, cmd=liz]{Liz} + \character[desc={Cyrano de Bergerac}, cmd=cyrano]{The voice} + \character[cmd=montfleury]{Montfleury} \end{dramatis} -\father Time to get back to my ship. +\cyrano Leave! -\liz Wait! Why did you help me? +\disposablecharacter{The crowd} Oh! -\father Because you are my daughter. -\setcharactername{father}{Liz's father} +\montfleury[losing his voice] ``Happy he who far away from court\ldots'' -\liz Mom said you abandonned us. +\setcharactername{cyrano}{Cyrano} -\father She lied. +\cyrano[emerging from the crowd, standing up on a chair {[}\ldots{]} with + a terrible nose] Ah! I am getting angry!\ldots % \end{LTXexample} % \iffalse % @@ -611,7 +636,7 @@ % % It is possible to change the name that appears to introduce character's lines % within the text. This can be used, for example, when a character is first -% reffered as \emph{A sailor}, until we learn his real identity, which is +% refered to as \emph{A sailor}, until we learn his real identity, which is % \emph{Liz's father}. An example is given in figure % \ref{fig:setcharactername_example}. % \begin{center}|\setcharactername|\marg{command}\marg{name}\end{center} @@ -627,14 +652,16 @@ % \ref{fig:character_example}). % % \paragraph{Choose style} +% \changes{v0.6}{2014/06/25}{Added character styles \texttt{imprimerie-verse}, \texttt{imprimerie-prose} and \texttt{arden}.} % Several styles are available, to typeset character's name and lines in % different ways. Change the style by loading package using option % |characterstyle=|\marg{style} (available styles are |bold|, |center|, -% |margin| and |simple|). -% Note that |center| and |simple| styles are French \emph{de facto} standards -% for typesetting drama plays, respectively in verse and in prose, as defined -% by the \emph{Imprimerie nationale} \cite{imprimerienationale}. Default style -% is |simple|. +% |margin|, |simple|, |imprimerie-verse|, |imprimerie-prose|). +% Note that |imprimerie-verse| and |imprimerie-prose| styles are French +% \emph{de facto} standards for typesetting drama plays, respectively in verse +% and in prose, as defined by the \emph{Imprimerie nationale} +% \cite{imprimerienationale}, and |arden| tries to mimick typesetting of the +% Arden Shakespeare series. Default style is |simple|. % % \paragraph{Customize style} % \DescribeMacro{\speakswithoutdirection} @@ -710,6 +737,9 @@ characterstyle/center/.code=\def\@characterstyle{center}, characterstyle/margin/.code=\def\@characterstyle{margin}, characterstyle/simple/.code=\def\@characterstyle{simple}, + characterstyle/arden/.code=\def\@characterstyle{arden}, + characterstyle/imprimerie-verse/.code=\def\@characterstyle{imprimerie-verse}, + characterstyle/imprimerie-prose/.code=\def\@characterstyle{imprimerie-prose}, characterstyle, } @@ -827,7 +857,7 @@ % \end{macro} % \end{macro} % -% \subsection{Sectionning} +% \subsection{Sectioning} % \subsubsection{Headears, footers, counters, etc.} % \begin{macro}{playmark} % \begin{macro}{actmark} @@ -908,7 +938,7 @@ } % \end{macrocode} % -% \subsubsection{Sectionning commands} +% \subsubsection{Sectioning commands} % % Some general commands to handle clearing pages, and table of contents. % \begin{macrocode} @@ -924,8 +954,8 @@ % % \begin{macro}{\play} % \begin{macro}{\play*} -% Define sectionning commands to introduce plays. As for |\section| (and -% other) sectionning command, the starred version does the same, excepted that +% Define sectioning commands to introduce plays. As for |\section| (and +% other) sectioning command, the starred version does the same, excepted that % nothing is written in the table of content. % \begin{macrocode} \newcommand{\play}[2][]{% @@ -970,7 +1000,7 @@ \ifthenelse{\equal{\@short}{}}{ \def\@label{\actname{} \theact{}} }{ - \def\@label{\actname{} \theact{}: } + \def\@label{\actname{} \theact{}\xspace: } } \@clearpage{\@actlevel} \actmark{\@label\@short} @@ -1007,7 +1037,7 @@ \ifthenelse{\equal{\@short}{}}{ \def\@label{\scenename{} \thescene{}} }{ - \def\@label{\scenename{} \thescene{}: } + \def\@label{\scenename{} \thescene{}\xspace: } } \@clearpage{\@scenelevel} \scenemark{\@label\@short} @@ -1043,7 +1073,7 @@ \ifthenelse{\equal{\@short}{}}{ \def\@label{\interludename{}} }{ - \def\@label{\interludename{}: } + \def\@label{\interludename{}\xspace: } } \ifthenelse{\equal{\@interludelevel}{play}}{ \@clearpage{\@playlevel} @@ -1118,11 +1148,11 @@ % Bold style \newcommand\speakswithdirection[2]{% \noindent% - {\bfseries\sffamily #1} \did{#2}{\bfseries\sffamily :}% + {\bfseries\sffamily #1} \emph{(#2)}\xspace:% } \newcommand\speakswithoutdirection[1]{% \noindent% - {\bfseries\sffamily #1 :}% + {\bfseries\sffamily #1\xspace:}% }% }{}% \ifthenelse{\equal{\@characterstyle}{center}}{% @@ -1138,15 +1168,43 @@ \end{center}% }% }{}% +\ifthenelse{\equal{\@characterstyle}{imprimerie-verse}}{% + % Style for verse plays defined by the French Imprimerie nationale + \newcommand\speakswithdirection[2]{% + \begin{center}% + \textsc{#1}, \emph{#2}% + \end{center}% + }% + \newcommand\speakswithoutdirection[1]{% + \begin{center}% + \textsc{#1}% + \end{center}% + }% +}{}% +\ifthenelse{\equal{\@characterstyle}{imprimerie-prose}}{% + % Style for prose plays defined by the French Imprimerie nationale + \newcommand\speakswithdirection[2]{% + \noindent\hspace*{-\parindent}\textsc{#1}, \emph{#2}\xspace:% + }% + \newcommand\speakswithoutdirection[1]{% + \noindent\hspace*{-\parindent}\textsc{#1}\xspace:% + }% +}{}% +\ifthenelse{\equal{\@characterstyle}{arden}}{% + \newcommand\speakswithdirection[2]{% + \noindent\hspace*{-\parindent}\textsc{\MakeLowercase{#1}} [\emph{#2}]\quad% + }% + \newcommand\speakswithoutdirection[1]{% + \noindent\hspace*{-\parindent}\textsc{\MakeLowercase{#1}}\quad% + }% +}{}% \ifthenelse{\equal{\@characterstyle}{simple}}{% % Simple style \newcommand\speakswithdirection[2]{% - \medskip% - \indent\textsc{#1}, \emph{#2} :% + \indent\textsc{#1}, \emph{#2}\xspace:% }% \newcommand\speakswithoutdirection[1]{% - \medskip% - \indent\textsc{#1} :% + \indent\textsc{#1}\xspace:% }% }{}% \ifthenelse{\equal{\@characterstyle}{margin}}{% @@ -1225,12 +1283,13 @@ % \end{macro} % % \begin{environment}{charactergroup} +% \changes{v0.6}{2013/11/02}{Groups of characters are now aligned with other caracters.} % Gathers definition of characters that share the same description. % \begin{macrocode} \newenvironment{charactergroup}[1]{% \gdef\@groupname{#1} \gappto{\@dramatis@hook}{ - \begin{math}\left. + \hspace{-7.2pt}\begin{math}\left. \begin{tabular}{ll} } }{% @@ -1285,7 +1344,7 @@ \@ifundefined{#1name}{% }{% \ClassError{thalie}{% - A command named \@backslashchar#1name already exists. We cannont define a + A command named \@backslashchar#1name already exists. We cannot define a new one.% }{% Choose another command name to introduce character #2's lines, such that @@ -1365,7 +1424,7 @@ % \begin{macro}{\onstage} % Centered stage direction. % \begin{macrocode} -\newcommand{\onstage}[1]{{\centering \emph{#1}\\}} +\newcommand{\onstage}[1]{{\centering \emph{#1}\par\medskip}} % \end{macrocode} % \end{macro} % @@ -1380,7 +1439,6 @@ % Bigger stage directions, in its own paragraph. % \begin{macrocode} \newenvironment{dida}{% - \medskip \begin{quote} \begin{em} }{% @@ -1475,6 +1533,10 @@ % \emph{Lexique des r\`egles typographiques en usage \`a l'Imprimerie nationale}, % 2002, % ISBN : 978-2-7433-0482-9 +% \bibitem{cyrano} +% {Edmond Rostand}, +% \emph{Cyrano de Bergerac}, +% 1897 % \bibitem{dtxtut} % {Scott Pakin}, % \emph{How to Package Your \LaTeX{} Package --- Tutorial on writing .dtx and .ins files}, diff --git a/Master/texmf-dist/source/latex/thalie/thalie.ins b/Master/texmf-dist/source/latex/thalie/thalie.ins index 92fe0437e2a..0d616d6c8f7 100644 --- a/Master/texmf-dist/source/latex/thalie/thalie.ins +++ b/Master/texmf-dist/source/latex/thalie/thalie.ins @@ -1,4 +1,4 @@ -%% Copyright 2013 Louis Paternault +%% Copyright 2014 Louis Paternault %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -21,7 +21,7 @@ \usedir{tex/latex/thalie} \preamble -Copyright 2013 Louis Paternault +Copyright 2014 Louis Paternault This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/thalie/thalie.sty b/Master/texmf-dist/tex/latex/thalie/thalie.sty index f746cd2bc96..bb6f82f0916 100644 --- a/Master/texmf-dist/tex/latex/thalie/thalie.sty +++ b/Master/texmf-dist/tex/latex/thalie/thalie.sty @@ -5,7 +5,7 @@ %% The original source files were: %% %% thalie.dtx (with options: `package') -%% Copyright 2013 Louis Paternault +%% Copyright 2014 Louis Paternault %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -23,7 +23,7 @@ %% and the derived file thalie.sty. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{thalie} - [2013/06/08 v0.5 A package to typeset drama plays] + [2014/06/26 v0.6 A package to typeset drama plays] \RequirePackage{ifthen} \RequirePackage{etoolbox} \RequirePackage{suffix} @@ -41,6 +41,9 @@ characterstyle/center/.code=\def\@characterstyle{center}, characterstyle/margin/.code=\def\@characterstyle{margin}, characterstyle/simple/.code=\def\@characterstyle{simple}, + characterstyle/arden/.code=\def\@characterstyle{arden}, + characterstyle/imprimerie-verse/.code=\def\@characterstyle{imprimerie-verse}, + characterstyle/imprimerie-prose/.code=\def\@characterstyle{imprimerie-prose}, characterstyle, } @@ -229,7 +232,7 @@ \ifthenelse{\equal{\@short}{}}{ \def\@label{\actname{} \theact{}} }{ - \def\@label{\actname{} \theact{}: } + \def\@label{\actname{} \theact{}\xspace: } } \@clearpage{\@actlevel} \actmark{\@label\@short} @@ -258,7 +261,7 @@ \ifthenelse{\equal{\@short}{}}{ \def\@label{\scenename{} \thescene{}} }{ - \def\@label{\scenename{} \thescene{}: } + \def\@label{\scenename{} \thescene{}\xspace: } } \@clearpage{\@scenelevel} \scenemark{\@label\@short} @@ -286,7 +289,7 @@ \ifthenelse{\equal{\@short}{}}{ \def\@label{\interludename{}} }{ - \def\@label{\interludename{}: } + \def\@label{\interludename{}\xspace: } } \ifthenelse{\equal{\@interludelevel}{play}}{ \@clearpage{\@playlevel} @@ -333,11 +336,11 @@ % Bold style \newcommand\speakswithdirection[2]{% \noindent% - {\bfseries\sffamily #1} \did{#2}{\bfseries\sffamily :}% + {\bfseries\sffamily #1} \emph{(#2)}\xspace:% } \newcommand\speakswithoutdirection[1]{% \noindent% - {\bfseries\sffamily #1 :}% + {\bfseries\sffamily #1\xspace:}% }% }{}% \ifthenelse{\equal{\@characterstyle}{center}}{% @@ -353,15 +356,43 @@ \end{center}% }% }{}% +\ifthenelse{\equal{\@characterstyle}{imprimerie-verse}}{% + % Style for verse plays defined by the French Imprimerie nationale + \newcommand\speakswithdirection[2]{% + \begin{center}% + \textsc{#1}, \emph{#2}% + \end{center}% + }% + \newcommand\speakswithoutdirection[1]{% + \begin{center}% + \textsc{#1}% + \end{center}% + }% +}{}% +\ifthenelse{\equal{\@characterstyle}{imprimerie-prose}}{% + % Style for prose plays defined by the French Imprimerie nationale + \newcommand\speakswithdirection[2]{% + \noindent\hspace*{-\parindent}\textsc{#1}, \emph{#2}\xspace:% + }% + \newcommand\speakswithoutdirection[1]{% + \noindent\hspace*{-\parindent}\textsc{#1}\xspace:% + }% +}{}% +\ifthenelse{\equal{\@characterstyle}{arden}}{% + \newcommand\speakswithdirection[2]{% + \noindent\hspace*{-\parindent}\textsc{\MakeLowercase{#1}} [\emph{#2}]\quad% + }% + \newcommand\speakswithoutdirection[1]{% + \noindent\hspace*{-\parindent}\textsc{\MakeLowercase{#1}}\quad% + }% +}{}% \ifthenelse{\equal{\@characterstyle}{simple}}{% % Simple style \newcommand\speakswithdirection[2]{% - \medskip% - \indent\textsc{#1}, \emph{#2} :% + \indent\textsc{#1}, \emph{#2}\xspace:% }% \newcommand\speakswithoutdirection[1]{% - \medskip% - \indent\textsc{#1} :% + \indent\textsc{#1}\xspace:% }% }{}% \ifthenelse{\equal{\@characterstyle}{margin}}{% @@ -421,7 +452,7 @@ \newenvironment{charactergroup}[1]{% \gdef\@groupname{#1} \gappto{\@dramatis@hook}{ - \begin{math}\left. + \hspace{-7.2pt}\begin{math}\left. \begin{tabular}{ll} } }{% @@ -461,7 +492,7 @@ \@ifundefined{#1name}{% }{% \ClassError{thalie}{% - A command named \@backslashchar#1name already exists. We cannont define a + A command named \@backslashchar#1name already exists. We cannot define a new one.% }{% Choose another command name to introduce character #2's lines, such that @@ -521,10 +552,9 @@ \newcommand{\disposablecharacter}[2][]{% \@speaks[#1]{#2}% } -\newcommand{\onstage}[1]{{\centering \emph{#1}\\}} +\newcommand{\onstage}[1]{{\centering \emph{#1}\par\medskip}} \newcommand{\did}[1]{\emph{(#1)} } \newenvironment{dida}{% - \medskip \begin{quote} \begin{em} }{% -- cgit v1.2.3