From 9d551b24b421b2b832adda5d54a5ec0e6db99934 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 9 Oct 2022 20:17:16 +0000 Subject: thalie (9oct22) git-svn-id: svn://tug.org/texlive/trunk@64664 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/thalie/CHANGELOG.md | 6 ++++ Master/texmf-dist/doc/latex/thalie/README.md | 10 +++--- Master/texmf-dist/doc/latex/thalie/thalie.pdf | Bin 475823 -> 484998 bytes Master/texmf-dist/source/latex/thalie/thalie.dtx | 44 +++++++++++++---------- Master/texmf-dist/tex/latex/thalie/thalie.sty | 4 +-- 5 files changed, 38 insertions(+), 26 deletions(-) diff --git a/Master/texmf-dist/doc/latex/thalie/CHANGELOG.md b/Master/texmf-dist/doc/latex/thalie/CHANGELOG.md index 6321921e29a..f91eca7082e 100644 --- a/Master/texmf-dist/doc/latex/thalie/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/thalie/CHANGELOG.md @@ -1,3 +1,9 @@ +* thalie 0.12a (2022-10-09) + + * The `xspace` option also affects \did. + + -- Louis Paternault + * thalie 0.11b (2022-06-16) * Fix sloppy previous release. diff --git a/Master/texmf-dist/doc/latex/thalie/README.md b/Master/texmf-dist/doc/latex/thalie/README.md index 96ee7129e85..f6babe79fe7 100644 --- a/Master/texmf-dist/doc/latex/thalie/README.md +++ b/Master/texmf-dist/doc/latex/thalie/README.md @@ -5,13 +5,13 @@ It defines commands to introduce characters' lines, to render stage direction, to divide a play into acts and scenes, to automatically build the dramatis personae, etc. -- Version 0.11b (2022-06-16) +- Version 0.12a (2022-10-09) - Usage and installation instruction are available in the [documentation](http://mirrors.ctan.org/macros/latex/contrib/thalie/thalie.pdf). - Examples - - [French play, in verse](https://framagit.org/spalax/thalie/raw/v0.11b/examples/cyrano.pdf) ([source](https://framagit.org/spalax/thalie/raw/v0.11b/examples/cyrano.tex)) - - [French play, in prose](https://framagit.org/spalax/thalie/raw/v0.11b/examples/domjuan.pdf) ([source](https://framagit.org/spalax/thalie/raw/v0.11b/examples/domjuan.tex)) - - [English play, in prose](https://framagit.org/spalax/thalie/raw/v0.11b/examples/hamlet.pdf) ([source](https://framagit.org/spalax/thalie/raw/v0.11b/examples/hamlet.tex)) - - [English play, in verse](https://framagit.org/spalax/thalie/raw/v0.11b/examples/henry.pdf) ([source](https://framagit.org/spalax/thalie/raw/v0.11b/examples/henry.tex)) + - [French play, in verse](https://framagit.org/spalax/thalie/raw/v0.12a/examples/cyrano.pdf) ([source](https://framagit.org/spalax/thalie/raw/v0.12a/examples/cyrano.tex)) + - [French play, in prose](https://framagit.org/spalax/thalie/raw/v0.12a/examples/domjuan.pdf) ([source](https://framagit.org/spalax/thalie/raw/v0.12a/examples/domjuan.tex)) + - [English play, in prose](https://framagit.org/spalax/thalie/raw/v0.12a/examples/hamlet.pdf) ([source](https://framagit.org/spalax/thalie/raw/v0.12a/examples/hamlet.tex)) + - [English play, in verse](https://framagit.org/spalax/thalie/raw/v0.12a/examples/henry.pdf) ([source](https://framagit.org/spalax/thalie/raw/v0.12a/examples/henry.tex)) License ------- diff --git a/Master/texmf-dist/doc/latex/thalie/thalie.pdf b/Master/texmf-dist/doc/latex/thalie/thalie.pdf index 2cc0c71438d..5cb97d8e2fd 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 646c4e41dd0..d9ba4474890 100644 --- a/Master/texmf-dist/source/latex/thalie/thalie.dtx +++ b/Master/texmf-dist/source/latex/thalie/thalie.dtx @@ -25,7 +25,7 @@ %\NeedsTeXFormat{LaTeX2e} %\ProvidesPackage{thalie} %<*package> - [2022/06/16 v0.11b A package to typeset drama plays] + [2022/10/09 v0.12a A package to typeset drama plays] % % %<*driver> @@ -80,7 +80,7 @@ % % \GetFileInfo{thalie.dtx} % -% \DoNotIndex{\@backslashchar, \@ifnextchar, \protect\`} +% \DoNotIndex{\@backslashchar, \@ifnextchar} % \DoNotIndex{\#,\$,\%,\&,\@,\\,\{,\},\^,\_,\~,\ ,\!,\(,\),\,} % \DoNotIndex{\addcontentsline, \addto, \ae, \AND, \arabic, \abovedisplayshortskip, \abovedisplayskip, \addtolength} % \DoNotIndex{\begin, \bfseries, \boolean, \baselineskip, \belowdisplayskip, \belowdisplayshortskip, \boolfalse, \booltrue} @@ -119,9 +119,10 @@ % \@speaks, % \@verseadjust, % } -% \DoNotIndex{\newcommand, \newcounter, \newenvironment, \noindent, \noexpand, \NOT, \newif, \newlength, \newline, \nopagebreak} +% \DoNotIndex{\newcommand, \newcounter, \newenvironment, \noindent, \noexpand, \NOT, \newif, \newlength, \newline, \nopagebreak, \notbool} % \DoNotIndex{\OR} -% \DoNotIndex{\par, \pgfkeys, \ProcessPgfPackageOptions, \protect, \protected@xappto, \parindent, \parskip, \predisplaysize, \prevgraf, \providebool} +% \DoNotIndex{\par, \pgfkeys, \ProcessPgfPackageOptions, \protect, \protected@xappto, \parindent, \parskip, \predisplaysize, \prevgraf, \providebool, \providecommand} +% \expandafter\DoNotIndex\expandafter{\string\ } ^^A From https://www.latex-project.org/cgi-bin/ltxbugs2html?pr=latex%2F3540 % \DoNotIndex{\quad} % \DoNotIndex{\refstepcounter, \renewcommand, \RequirePackage, \right, \Roman, \relax, \rightmargin} % \DoNotIndex{\section, \setboolean, \setlength, \sffamily, \smallskip} @@ -260,7 +261,7 @@ % \label{sec:usage} % % \subsection{Localization} -% \changes{v0.9a}{2017/04/22}{Add section \emph{Localization}.} +% \changes{v0.09a}{2017/04/22}{Add section \emph{Localization}.} % % By default, commands \lstinline|\act|, \lstinline|\scene|, etc. use English words, but they are % translated to the current language used by |babel| or @@ -303,8 +304,9 @@ % \label{table:packageoptions} % \end{table} % -% \subsubsection{Space following character commands} -% \changes{v0.7}{2015/12/28}{New package option \texttt{xspace}.} +% \subsubsection{Space following character commands and stage directions} +% \label{option:xspace} +% \changes{v0.07}{2015/12/28}{New package option \texttt{xspace}.} % As commands introducing characters' lines and displaying characters' names % may be frequently used, it might be tempting to omit the following \lstinline|{}| For % instance, one might prefer to write: @@ -331,7 +333,7 @@ % If package option |xspace| is set (e.g. |xspace=true|), space is automatically % added after those commands if necessary\footnote{This is done with % the |$\backslash$xspace| command (from the |xspace| package), hence the name.}; -% otherwise, it is not. +% otherwise, it is not. The same rule applies after a |\did| command. % % For historical reasons, the option |xspace| default is |true|, but this might % change in some later non-backward compatible version. @@ -925,7 +927,7 @@ No! It's a bit short, young man\ldots % \ref{fig:character_example}). % % \paragraph{Choose style} -% \changes{v0.6}{2014/06/25}{New character styles \texttt{imprimerie-verse}, \texttt{imprimerie-prose} and \texttt{arden}.} +% \changes{v0.06}{2014/06/25}{New 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|, @@ -969,11 +971,14 @@ No! It's a bit short, young man\ldots % \DescribeMacro{\did} % \DescribeEnv{dida} % We define two ways to render stage directions: a short one, that is printed -% inline, and a long one, printed in its own paragraph. They act a bit like -% \lstinline|$\formula$| and \lstinline|\[\formula\]| for formulas. +% inline, and a long one, printed in its own paragraph\footnote{For people writing math: +% They act a bit like \lstinline|$1+1=2$| and \texttt{\bbackslash[1+1=2\bbackslash]} for formulas.}. % The first way is the command \lstinline|\did|\marg{directions}. The second way is the % environment |dida|. % +% Note that option \lstinline|xspace| may be used to automatically add a space, +% if necessary, after a \lstinline|\did| command (see section \ref{option:xspace}, page \pageref{option:xspace}). +% % \DescribeMacro{\onstage} % Some stage directions are displayed centered under the scene or act % definition (I often see it in classical drama, where the list of characters @@ -1207,7 +1212,7 @@ So is Lysander. % \subsection{Localization} % \label{sec:l10n} % -% \changes{v0.9a}{2017/04/22}{Use package |translations| for localization.} +% \changes{v0.09a}{2017/04/22}{Use package |translations| for localization.} % % Language cannot be defined directly in this package. Instead, the language % currently used by |babel| or |polyglossia| is used to translate the following @@ -1280,7 +1285,7 @@ So is Lysander. % % \section{Examples} % \label{sec:examples} -% \changes{v0.9a}{2017/04/22}{Add section \emph{Examples}.} +% \changes{v0.09a}{2017/04/22}{Add section \emph{Examples}.} % % \subsection{Characters' lines} % \label{sec:examples:characterslines} @@ -1850,13 +1855,13 @@ One! % \end{environment} % % \begin{environment}{dramatisenv} -% \changes{v0.9a}{2017/04/22}{It is now possible to customize style of dramatis person\ae.} +% \changes{v0.09a}{2017/04/22}{It is now possible to customize style of dramatis person\ae.} % \begin{macro}{\dramatischaracter} % \begin{macro}{\dramatischaractername} % \begin{macro}{\dramatischaracterdescription} % \begin{macro}{\characterspace} % \begin{environment}{charactergroup} -% \changes{v0.6}{2013/11/02}{Groups of characters are now aligned with other caracters.} +% \changes{v0.06}{2013/11/02}{Groups of characters are now aligned with other caracters.} % Customizable commands to build dramatis person\ae. % \begin{macrocode} % Environment used to *display* dramatis personae. @@ -2053,8 +2058,9 @@ One! % % \begin{macro}{\did} % Inline stage directions. +% \changes{v0.12a}{2022/10/09}{The \texttt{xspace} option also affects \texttt{\bbackslash{}did}.} % \begin{macrocode} -\newcommand{\did}[1]{\emph{(#1)} } +\newcommand{\did}[1]{\emph{(#1)}\@maybexspace} % \end{macrocode} % \end{macro} % @@ -2080,7 +2086,7 @@ One! % \subsection{Splitting verses} % \begin{macro}{\pauseverse} -% \changes{v0.7}{2015/12/28}{New commands \texttt{\bbackslash{}pauseverse}, \texttt{\bbackslash{}resumeverse}, \texttt{\bbackslash{}adjustverse}.} +% \changes{v0.07}{2015/12/28}{New commands \texttt{\bbackslash{}pauseverse}, \texttt{\bbackslash{}resumeverse}, \texttt{\bbackslash{}adjustverse}.} % \changes{v0.10c}{2021/09/26}{Document other implementations of \texttt{\bbackslash{}pauseverse} and \texttt{\bbackslash{}resumeverse}} % \begin{macro}{\resumeverse} % \begin{macro}{\adjustverse} @@ -2218,7 +2224,7 @@ One! % \end{macrocode} % % \begin{macro}{\setthalieoptions} -% \changes{v0.9a}{2017/04/22}{Add command \texttt{\bbackslash{}setthalieoptions}.} +% \changes{v0.09a}{2017/04/22}{Add command \texttt{\bbackslash{}setthalieoptions}.} % Redefine package options. % \begin{macrocode} \newcommand{\setthalieoptions}[1]{% @@ -2227,7 +2233,7 @@ One! % \end{macrocode} % \end{macro} % -% \changes{v0.5}{2013/06/08}{First published version.} +% \changes{v0.05}{2013/06/08}{First published version.} % % \addcontentsline{toc}{section}{Change History} % \PrintChanges diff --git a/Master/texmf-dist/tex/latex/thalie/thalie.sty b/Master/texmf-dist/tex/latex/thalie/thalie.sty index fb64196749d..fb29b37ca53 100644 --- a/Master/texmf-dist/tex/latex/thalie/thalie.sty +++ b/Master/texmf-dist/tex/latex/thalie/thalie.sty @@ -23,7 +23,7 @@ %% and the derived file thalie.sty. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{thalie} - [2022/06/16 v0.11b A package to typeset drama plays] + [2022/10/09 v0.12a A package to typeset drama plays] \RequirePackage{pgfkeys} @@ -488,7 +488,7 @@ \@speaks[#1]{#2}% } \newcommand{\onstage}[1]{{\centering \emph{#1}\par\medskip}} -\newcommand{\did}[1]{\emph{(#1)} } +\newcommand{\did}[1]{\emph{(#1)}\@maybexspace} \newenvironment{dida}{% \begin{quote} \begin{em} -- cgit v1.2.3