From 81a826876504bdb8636e44c7c0fbb72557868405 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 20 Mar 2017 22:59:36 +0000 Subject: reledmac (20mar17) git-svn-id: svn://tug.org/texlive/trunk@43559 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/reledmac/reledmac.dtx | 69 +++++++++++++++++++--- .../texmf-dist/source/latex/reledmac/reledpar.dtx | 2 +- 2 files changed, 63 insertions(+), 8 deletions(-) (limited to 'Master/texmf-dist/source/latex/reledmac') diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx index 7920718c8da..79cd85bddbb 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -461,6 +461,7 @@ % \changes{v2.17.5}{2017/02/12}{Fix bug with \protect\cs{pstartref} when refering to the left side in parallel typesetting.} % \changes{v2.18.0}{2017/02/22}{Fix bug when using both \protect\cs{Xnumberonlyfirstintwolines} or \protect\cs{Xnumberonlyfirstinline} and \protect\cs{Xparafootsep} and \protect\cs{Xsymlinenum}.} % \changes{v2.18.0}{2017/02/22}{Fix bug when using a \protect\cs{edtext} in two lines or more in right-to-left typesetting with \protect\XeLaTeX.} +% \changes{v2.18.1}{2017/03/20}{Fix bug when using \protect\cs{msdata} with \protect\LuaLaTeX or with \protect\package{hyperref} package.} % \title{\Macpackage \\ % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} @@ -2877,10 +2878,6 @@ % % \subsubsection{Cross-referencing in order to define line number of a critical note} % \DescribeMacro{\xxref} -% The macros \protect\cs{xxref} and -% \protect\cs{edmakelabel} let you manipulate numbers -% and labels in ways which you may find helpful in tricky -% situations. % % The \protect\cs{xxref}\marg{lab1}\marg{lab2} command generates a reference to a sequence of % lines, for use in the second argument of \protect\cs{edtext}. @@ -2893,6 +2890,20 @@ % \verb"\edlabel{mouse}" was placed, and the ending numbers to those where % \verb"\edlabel{elephant}" occurs. % +% Here, an example of use: +% \begin{verbatim} +%\beginnumbering +% +%\pstart +%\edlabel{Queritur}Queritur utrum metaphysica sit scientia una. +%\pend +% +%\pstart +%\edtext{Et videtur quod non\edlabel{non}.}{\xxref{Queritur}{non}\lemma{queritur \dots{} non}\Afootnote{om. \emph{A}}} +%\pend +% +%\endnumbering +% \end{verbatim} % \subsection{Not automatic cross-referencing} % \DescribeMacro{\edmakelabel} % Sometimes the \protect\cs{edlabel} command cannot be used to specify exactly @@ -3870,7 +3881,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2017/02/23 v2.18.0a typesetting critical editions]% +\ProvidesPackage{reledmac}[2017/03/20 v2.18.1 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -15311,7 +15322,7 @@ % \begin{macro}{\ledleftnote} % \begin{macro}{\ledrightnote} % \begin{macro}{\ledinnernote} -% \begin{macro}{\ledouterote} +% \begin{macro}{\ledouternote} % \begin{macro}{\ledsidenote} % \protect\cs{ledleftnote}, \protect\cs{ledrightnote}, \protect\cs{ledinnernote}, \protect\cs{ledouternote} are the % user commands for left, right, inner and outer sidenotes. @@ -16870,8 +16881,12 @@ % \section{Apparatus of Manuscripts} % \subsection{User level macro} % \begin{macro}{\msdata} -% The user level \cs{msdata} command only writes the manuscripts data in numbered auxiliary file. +% \begin{macro}{\msdata@c} +% \begin{macro}{\msdata@cR} +% The user level \cs{msdata} command only writes the manuscripts data in numbered auxiliary file. There is two associated etoolbox counter. % \begin{macrocode} +\def\msdata@c{}% +\def\msdata@cR{}% \newcommand{\msdata}[1]{% \leavevmode% \unless\ifstopmsdata@inserted@% @@ -16880,10 +16895,18 @@ \fi% \global\stopmsdata@inserted@false% \unless\ifledRcol% + \numgdef{\msdata@c}{\msdata@c+1}% + \ifdef{\hypertarget}{% + \edlabel{\msdata@c:start:msdata}% + }{}% \protected@write\linenum@out{}{% \string\@msd{#1}% }% \else% + \numgdef{\msdata@cR}{\msdata@cR+1}% + \ifdef{\hypertarget}{% + \edlabel{\msdata@cR:start:msdata}% + }{}% \protected@write\linenum@outR{}{% \string\@msd{#1}% }% @@ -16891,6 +16914,8 @@ }% % \end{macrocode} % \end{macro} +% \end{macro} +% \end{macro} % \begin{macro}{\stopmsdata} % The user level \cs{stopmsdata} command only writes information about the end of manuscripts data in numbered auxiliary file. % \begin{macrocode} @@ -16900,10 +16925,16 @@ \protected@write\linenum@out{}{% \string\@stopmsd% }% + \ifdef{\hypertarget}{% + \edlabel{\msdata@c:end:msdata}% + }{}% \else% \protected@write\linenum@outR{}{% \string\@stopmsd% }% + \ifdef{\hypertarget}{% + \edlabel{\msdata@cR:end:msdata}% + }{}% \fi% \global\stopmsdata@inserted@true% }% @@ -17055,6 +17086,12 @@ \fi% \listxadd{\@msdata@list}{% \@msd@options@iffullpage% + \ifluatex% + \csxdef{footnote@luatextextdir}{\the\textdir}% + \csxdef{footnote@luatexpardir}{\the\pardir}% + \fi% + \csdef{@this@crossref@start}{\add@msd@c:start:msdata}% + \csdef{@this@crossref@end}{\add@msd@c:end:msdata}% \noexpand\csuse{v\@msdata@series footnote}{\@msdata@series}{{\expandonce\l@d@nums}{\ms@data@label}{\expandonce\@data}}% \reset@msd@options@iffullpage% }% @@ -17094,6 +17131,12 @@ \fi% \listxadd{\@msdata@list}{% \@msd@options@iffullpage% + \ifluatex% + \csxdef{footnote@luatextextdir}{\the\textdir}% + \csxdef{footnote@luatexpardir}{\the\pardir}% + \fi% + \csdef{@this@crossref@start}{\add@msd@cR:start:msdata}% + \csdef{@this@crossref@end}{\add@msd@cR:end:msdata}% \noexpand\csuse{v\@msdata@series footnote}{\@msdata@series}{{\expandonce\l@d@nums}{\ms@data@label}{\expandonce\@data}}% \reset@msd@options@iffullpage% }% @@ -17149,6 +17192,12 @@ {}% \listxadd{\@msdata@list}{% \@msd@options@iffullpage% + \ifluatex% + \csxdef{footnote@luatextextdir}{\the\textdir}% + \csxdef{footnote@luatexpardir}{\the\pardir}% + \fi% + \csdef{@this@crossref@start}{\add@msd@c:start:msdata}% + \csdef{@this@crossref@end}{\add@msd@c:end:msdata}% \noexpand\csuse{v\@msdata@series footnote}{\@msdata@series}{{\expandonce\l@d@nums}{\ms@data@label}{\expandonce\@data}}% \reset@msd@options@iffullpage% }% @@ -17187,6 +17236,12 @@ {}% \listxadd{\@msdata@list}{% \@msd@options@iffullpage% + \ifluatex% + \csxdef{footnote@luatextextdir}{\the\textdir}% + \csxdef{footnote@luatexpardir}{\the\pardir}% + \fi% + \csdef{@this@crossref@start}{\add@msd@cR:start:msdata}% + \csdef{@this@crossref@end}{\add@msd@cR:end:msdata}% \noexpand\csuse{v\@msdata@series footnote}{\@msdata@series}{{\expandonce\l@d@nums}{\ms@data@label}{\expandonce\@data}}% \reset@msd@options@iffullpage% }% diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index 5b678850de1..4e1d6cfb462 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -1136,7 +1136,7 @@ % When using \cs{stanzanumtrue} (\reff{reledmac-numbering-stanza}) in parallel typesetting, \verb+stanza+ counter is replaced by \verb+stanzaL+ counter in left side and by \verb+stanzaR+ counter in right side. Consequently, you can redefine \cs{thestanzaL} and \cs{thestanzaR} to change their aspect. % % \section{Side notes} -% As in \macpackage, you must use one of the following commands to add side notes: \protect\cs{ledsidenote}, \protect\cs{ledleftnote}, \protect\cs{ledrightnote}, \protect\cs{ledouterote}, \protect\cs{ledinnerrote}. +% As in \macpackage, you must use one of the following commands to add side notes: \protect\cs{ledsidenote}, \protect\cs{ledleftnote}, \protect\cs{ledrightnote}, \protect\cs{ledouternote}, \protect\cs{ledinnernote}. % % The \protect\cs{sidenotemargin} defines the margin of the sidenote for either left or right side, depending on the current environment. % -- cgit v1.2.3