From 9e7da4a10152b2d4e13563fd86ec830328532014 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 28 Feb 2018 23:46:15 +0000 Subject: reledmac (28feb18) git-svn-id: svn://tug.org/texlive/trunk@46767 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/reledmac/reledmac.dtx | 73 +++++++++++++++------- .../texmf-dist/source/latex/reledmac/reledpar.dtx | 25 ++++++-- 2 files changed, 71 insertions(+), 27 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 01d28e59495..52886e74712 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -504,6 +504,7 @@ % \changes{v2.26.5}{2018/01/28}{Check that users have a enough recent version of \protect\package{xparse}} % \changes{v2.26.5}{2018/01/18}{Fix bug when using \protect\cs{eledsection} with the \protect\option{continuousnumberingwithcolumns} of \protect\parpackage} % \changes{v2.26.5}{2018/01/28}{Fix bug with \protect\option{continuousnumberingwithcolumns}} +% \changes{v2.26.6}{2018/02/28}{Fix bug with \protect\cs{lineation} by page and nexted \protect\cs{edtext} between two pages (added in v.~2.24.0)} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -3439,6 +3440,8 @@ % Note that the file \verb+.idx+ will contain the right reference only after the third run, because of the internal indexing mechanism of \protect\macpackage. % That means you must first run (Xe/Lua)\LaTeX three times, then run \verb+makeindex+, and then finally run (Xe/Lua)\LaTeX\ again, in order to get an index with the right page numbers. % +% Also note that using \cs{edtext} in familiar footnotes refers to the line where the footnotes are called +% \subsection{Use with \package{imakeidx} or \package{indextools}} % If the \protect\package{imakeidx} or \protect\package{indextools} package is used then the macro takes an optional % argument, which is the name of a raw index file. For example % |\edindex[line]{item}| will use |line.idx| as the raw file instead of @@ -3453,7 +3456,6 @@ % \item Declare the index with the macro \cs{makeindex} of \package{imakeidx} and \package{indextools}. % \end{enumerate} % -% Also note that using \cs{edtext} in familiar footnotes refers to the line where the footnotes are called % \subsection{Referring to critical notes} % If you want to refer to a word inside an % \protect\cs{edtext}\marg{lemma}\marg{app} command, \protect\cs{edindex} should be defined inside @@ -4181,7 +4183,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2018/01/28 v2.26.5 typesetting critical editions]% +\ProvidesPackage{reledmac}[2018/02/28 v2.26.6 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -5089,6 +5091,7 @@ \global\sub@lock \z@ \global\sublines@false \global\let\next@page@num=\relax + \global\let\this@section@next@page@num=\relax% \global\let\sub@change=\relax \global\last@page@num=-10000% \ifdefined\line@numR% @@ -5122,6 +5125,13 @@ \ifnum\l@dnumpstartsL=0% \led@err@NumberingWithoutPstart% \fi% +% \end{macrocode} +% For the continuousnumberingwithcolumn options, we need to store some value globally, for the next \cs{endnumbering}. +% We didn't modify this counter globally, because that creates problem for nested \cs{edtext}. +% \begin{macrocode} + \global\page@num=\this@section@page@num% + \global\last@page@num=\this@section@last@page@num% + \global\let\next@page@num\this@section@next@page@num% \ifl@dpairing \global\pst@rtedLfalse \else @@ -5159,14 +5169,14 @@ % show that numbering continues across the gap.\footnote{Peter Wilson's thanks % to Wayne Sullivan,\index{Sullivan, Wayne} who suggested the idea % behind these macros.} -% The \cs{pausenumbering@page@num} counter stores the \cs{next@page@num} when the \cs{pause@numbering} is called. +% The \cs{pausenumbering@page@num} counter stores the \cs{this@section@next@page@num} when the \cs{pause@numbering} is called. % \begin{macrocode} \newcount\pausenumbering@page@num% \newcommand{\pausenumbering}{% - \ifx\next@page@num\relax% + \ifx\this@section@next@page@num\relax% \global\pausenumbering@page@num=0% \else% - \global\pausenumbering@page@num=\next@page@num% + \global\pausenumbering@page@num=\this@section@next@page@num% \fi% \ifautopar\global\autopar@pausetrue\fi% \endnumbering\global\numberingtrue} @@ -6006,7 +6016,12 @@ % \end{macro} % \end{macro} % \end{macro} -% +% \begin{macro}{\this@section@page@num} +% The \cs{this@section@page@num} stores the page number of the on which a numbering section finish. +% \begin{macrocode} +\newcount\this@section@page@num% +% \end{macrocode} +% \end{macro} % \begin{macro}{\ifnoteschanged@} % \begin{macro}{\noteschanged@true} % \begin{macro}{\noteschanged@false} @@ -6273,7 +6288,7 @@ % these to the macro. It is now: \\ % \protect\cs{@nl}\marg{page counter number}\marg{printed page number} \\ % We do not (yet) use the printed number (i.e., the \protect\cs{thepage}) but -% it may come in handy later. The macro \protect\cs{fix@page} checks if a new +% it may come in handy later. The macro \cs{@page} checks if a new % page has started. % % Exactly what \protect\cs{@nl} does depends @@ -6283,12 +6298,11 @@ % \changes{v0.3.0}{2004/02/14}{Added a bunch of code to \protect\cs{@nl} for handling % \protect\cs{setlinenum}} % \changes{v0.6.0}{2004/11/16}{Extended \protect\cs{@nl} to include the page number} -% \changes{v0.6.0}{2004/11/16}{Added \protect\cs{fix@page} to \protect\cs{@nl}} % \changes{v0.7.0}{2005/02/22}{Added \protect\cs{@nl@reg}} % \begin{macrocode} \newcommand*{\@nl}[2]{% - \fix@page{#1}% + \@page{#1}% \ifledRcol% \@nl@regR% \else% @@ -6361,15 +6375,18 @@ % % % \begin{macro}{\last@page@num} -% \begin{macro}{\fix@page} -% \protect\cs{fix@page} basically replaces \protect\cs{@page}. It determines whether or not +% \begin{macro}{\this@section@last@page@num} +% \begin{macro}{\@page} +% \protect\cs{@page} determines whether or not % a new page has been started, based on the page values held by \protect\cs{@nl}. -% \changes{v0.6.0}{2004/11/16}{Added \protect\cs{last@page@num} and \protect\cs{fix@page}} % \begin{macrocode} \newcount\last@page@num \last@page@num=-10000 + +\newcount\this@section@last@page@num% + \this@section@last@page@num=-10000% -\newcommand*{\fix@page}[1]{% +\newcommand*{\@page}[1]{% \ifledRcol \ifnum #1=\last@page@numR \else @@ -6389,9 +6406,12 @@ }% \fi% \fi - \global\page@numR=#1% - \global\last@page@numR=#1% - \global\def\next@page@numR{#1}% + \page@numR=#1% + \this@section@page@numR=#1% + \last@page@numR=#1% + \this@section@last@page@numR=#1% + \def\next@page@numR{#1}% + \gdef\this@section@next@page@numR{#1}% \fi \else \ifnum #1=\last@page@num @@ -6400,19 +6420,29 @@ \csnumgdef{@lastline@forpage@\the\page@num}{\the\line@num}% \ifbypage@ \ifx\l@dchset@num\relax%Not resetting if preceded by a \setlinenum - \line@num \z@ \subline@num \z@% + \line@num \z@% + \subline@num \z@% \global\csdef{reset@line\the\numexpr\absline@num+1\relax @\the\section@num}{}% \fi% \fi - \global\page@num=#1% - \global\last@page@num=#1% - \global\def\next@page@num{#1}% + \page@num=#1% + \global\this@section@page@num=#1% + \last@page@num=#1% + \global\this@section@last@page@num=#1% + \def\next@page@num{#1}% +% \end{macrocode} +% And we set a flag that tells \cs{@nl} that a new page number is +% to be set, because other associated actions shouldn't occur until the +% next line-start occurs. +% \begin{macrocode} + \gdef\this@section@next@page@num{#1}% \listxadd{\normal@page@break}{\the\absline@num} \fi \fi} % \end{macrocode} % \end{macro} % \end{macro} +% \end{macro} % % \begin{macro}{\@pend} % \begin{macro}{\@pendR} @@ -9121,7 +9151,8 @@ {\global\@firstlineofpagetrue}% \ifcsdef{reset@line\the\absline@num @\the\section@num}% {% - \global\line@num=\z@ \global\subline@num=\z@% + \global\line@num=\z@% + \global\subline@num=\z@% \resetprevline@% }% {}% diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index f3f10c08641..9990a9cdf4f 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -327,6 +327,7 @@ % \changes{v2.21.2}{2018/01/08}{Fix bug with \protect\cs{Xpstart} and \protect\cs{edtextlater}} % \changes{v2.21.3}{2018/01/18}{Fix bug when using \protect\cs{numberpstarttrue} and alterning between manual \protect\cs{pstart} and automatic \protect\cs{pstart} produced by \protect\cs{autopar}} % \changes{v2.21.4}{2018/01/18}{Fix bug with using \protect\cs{eledsection} and related when alternate normal typesetting and parallel typesetting} +% \changes{v2.21.5}{2018/01/18}{Compatibility with reledmac v.~2.26.6} % ^^A PW added following as the definitions are at some unknown elsewhere % % \newcommand{\egstart}{% @@ -1372,7 +1373,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2018/01/28 v2.21.4 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2018/02/28 v2.21.5 reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} @@ -1821,6 +1822,7 @@ \global\sub@lockR \z@ \global\sublines@Rfalse \global\let\next@page@numR\relax + \global\let\this@section@next@page@numR\relax% \global\let\sub@change\relax \global\last@page@numR=-10000% \global\stopmsdata@inserted@true% @@ -1873,6 +1875,9 @@ \ifnum\l@dnumpstartsR=0% \led@err@NumberingWithoutPstart% \fi% + \global\page@numR=\this@section@page@numR% + \global\last@page@numR=\this@section@last@page@numR% + \global\let\next@page@numR\this@section@next@page@numR% \ifl@dpairing \global\pst@rtedRfalse \else @@ -1953,10 +1958,10 @@ % \begin{macrocode} \newcount\pausenumbering@page@numR% \newcommand*{\pausenumberingR}{% - \ifx\next@page@numR\relax% + \ifx\this@section@next@page@numR\relax% \global\pausenumbering@page@numR=0% \else% - \global\pausenumbering@page@numR=\next@page@numR% + \global\pausenumbering@page@numR=\this@section@next@page@numR% \fi% \endnumberingR% \global\numberingRtrue% @@ -2446,12 +2451,14 @@ % \end{macro} % % \begin{macro}{\page@numR} -% The right text page number. +% \begin{macro}{\this@section@page@numR} +% The right text page numbers. % \begin{macrocode} \newcount\page@numR - +\newcount\this@section@page@numR% % \end{macrocode} % \end{macro} +% \end{macro} % \subsubsection{Specific to \parpackage} % \begin{macro}{\linesinpar@listL} % \begin{macro}{\linesinpar@listR} @@ -2582,18 +2589,24 @@ % \end{macro} % \end{macro} % \begin{macro}{\last@page@numR} +% \begin{macro}{\this@section@last@page@numR} % \begin{macro}{\fix@page} % \protect\cs{last@page@numR} store the page number of the last right page. -% It is modified by \protect\cs{fix@page}, defined by \reledmac. +% \protect\cs{this@section@last@page@numR} store the page number of the last right page of the current section. Is value is modified globally, contrary to \cs{last@page@numR}. +% Both are modified by \protect\cs{fix@page}, defined by \reledmac. +% % \changes{v2.0.0}{2105/06/28}{\protect\cs{fix@page} is defined only once in \reledmac} % % \begin{macrocode} \newcount\last@page@numR \last@page@numR=-10000 +\newcount\this@section@last@page@numR% + \this@section@last@page@numR=-10000% % \end{macrocode} % \end{macro} % \end{macro} +% \end{macro} % % % \begin{macro}{\@adv} -- cgit v1.2.3