From aad7c41e16efdf6fc8e62807c95b71dd2b1eb1e7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 22 May 2018 21:03:45 +0000 Subject: reledmac (22may18) git-svn-id: svn://tug.org/texlive/trunk@47794 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/reledmac/reledmac.dtx | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'Master/texmf-dist/source') diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx index d6cb63df18a..71ae2b71bb0 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -512,6 +512,7 @@ % \changes{v2.26.9}{2018/05/02}{Workaround with a bug of \protect\LaTeX 2018/04/01 patch level 3 to generate the .sty file from a .ins file} % \changes{v2.26.10}{2018/05/05}{Really fix bug with page number in footnote after \protect\cs{mainmatter} (bug introduced in v2.26.7)} % \changes{v2.26.10}{2018/05/05}{Add error message when insertion a \protect\cs{pstart} or \protect\cs{pend} inside \protect\cs{edtext} arguments} +% \changes{v2.26.11}{2018/05/21}{Allow to use \protect\cs{edtext} inside \protect\cs{sameword}} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -3112,10 +3113,10 @@ % \DescribeMacro{\edlineref} % \DescribeMacro{\sublineref} % \DescribeMacro{\pstartref} -% \DescribeMacro{\annotref} +% \DescribeMacro{\annotationref} % Elsewhere in the text, either before or after the \protect\cs{edlabel}, % you can refer to its location with \protect\cs{edpageref}\marg{lab}, -% \protect\cs{edlineref}\marg{lab}, \cs{edsublineref}\marg{lab}, \cs{pstartref}\marg{lab} or \cs{annotref}\marg{lab}, +% \protect\cs{edlineref}\marg{lab}, \cs{edsublineref}\marg{lab}, \cs{pstartref}\marg{lab} or \cs{annotationref}\marg{lab}, % that % will produce, respectively, the page, line, sub-line, pstart, the annotation, on which % the \protect\cs{edlabel}\marg{lab} command occurred. @@ -3152,7 +3153,7 @@ % \DescribeMacro{\xlineref} % \DescribeMacro{\xsublineref} % \DescribeMacro{\xpstartref} -% \DescribeMacro{\xannotref} +% \DescribeMacro{\xannotationref} % % However, there are situations in which you will want \macpackage\ to % return a number without displaying any @@ -4190,7 +4191,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2018/05/05 v2.26.10 typesetting critical editions]% +\ProvidesPackage{reledmac}[2018/05/21 v2.26.11 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -8229,12 +8230,13 @@ % \begin{macro}{\sw@noexpand} % \begin{macrocode} \newcommand{\swnoexpands}{% - \let\sameword\@firstofone%Allow to have nested \sameword + \let\sameword\l@secondmandarg%Allow to have nested \sameword \let\emph\@firstofone% \let\textit\@firstofone% \let\textbf\@firstofone% \let\textsc\@firstofone% \let\framebox\@firstofone% + \let\edtext\dummy@edtext% \RenewExpandableDocumentCommand{\edindex}{om}{}% \ifdefined\index% \RenewExpandableDocumentCommand{\index}{om}{}% @@ -18995,12 +18997,18 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\l@dgobblearg} +% \begin{macro}{\l@dgobbleoptarg} % \protect\cs{l@dgobbleoptarg}\oarg{arg}\marg{arg} replaces these two arguments (first is optional) by \protect\cs{relax}. % \changes{v1.12.5}{2014/08/28}{\protect\cs{l@dgobblearg} becomes \protect\cs{l@dgobbeloptarg}} % \begin{macrocode} \newcommand*{\l@dgobbleoptarg}[2][]{\relax}% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\l@secondmandarg} +% \protect\cs{l@secondoptarg}\oarg{arg}\marg{arg} gobble the first (optional) argument, and expand to the second (mandatory) argument. +% \begin{macrocode} +\NewExpandableDocumentCommand{\l@secondmandarg}{om}{#2}% % \end{macrocode} % \end{macro} % -- cgit v1.2.3