diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/reledmac/reledpar.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/reledmac/reledpar.dtx | 54 |
1 files changed, 38 insertions, 16 deletions
diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index d1f7f51622f..94e2b43c3e5 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -256,10 +256,11 @@ % \changes{v2.6.0}{2015/11/13}{\protect\cs{Xlineflag} and \protect\cs{Xendlineflag} added} % \changes{v2.6.0}{2015/11/13}{Fix bug with footnote numbering when using the same series of familiar footnotes on both sides.} % \changes{v2.6.0}{2015/11/13}{Error message when calling \protect\cs{Pages} or \protect\cs{Columns} without previous \protect\env{pages} or \protect\env{pairs} environnment.} -% \changes{v2.6.0}{2015/11/13}{Fix compatibility with \protect\package{babel} (broken in v.2.0.0.} +% \changes{v2.6.0}{2015/11/13}{Fix compatibility with \protect\package{babel} (broken in v.2.0.0).} % \changes{v2.6.0}{2015/11/13}{No error messages about ends of left / right page when using the \protect\cs{syntaxonly} command of the \protect\package{syntonly} package.} % \hyphenation{man-u-script man-u-scripts} -% \changes{v2.6.0}{2015/11/13}{Fix bug with right side title number when using title commands before \protect\env{pages} or \protect\env{columns} environment.} +% \changes{v2.6.0}{2015/11/13}{Fix bug with right side title number when using title commands before \protect\env{pages} or \protect\env{columns} environments.} +% \changes{v2.6.1}{2015/11/20}{Fix bug, introduced in v2.6.0, with footnote numbering when using \protect\package{perpage} package.} % % % ^^A PW added following as the definitions are at some unknown elsewhere @@ -728,6 +729,23 @@ % For example if you have two left pages and two right pages, with one note by page, you will obtain the following numbering at the first run: 1 (left page), 3 (right page), 2 (left page), 4 (right page). But at the next run, you will obtain: 1 (left page), 2 (right page), 3 (left page), 4 (right page). % % If you use parallel columns, during the second of run of typesetting the footnote numbering will not run down the columns. Instead, it will read both column lines completely across the page, and number footnotes from left to right. +% \subsubsection{Using \protect\package{perpage} package}\label{perpage} +% +% It follows from what has been said in the preceding paragraph that if you use the \cs{MakePerPage} command of the \cs{perpage} package for footnotes called in parallel typesetting, you must append to the counter the suffix \verb+@typeset+. +% +% So do not set: +% \begin{verbatim} +% \MakePerPage{footnote} +% \MakePerPage{footnoteA} +% \MakePerPage{footnoteB} +% \end{verbatim} +% But set: +% \begin{verbatim} +% \MakePerPage{footnote@typeset} +% \MakePerPage{footnoteA@typeset} +% \MakePerPage{footnoteB@typeset} +% \end{verbatim} + % \subsubsection{Notes for one side only} % \DescribeMacro{\Xonlyside} % \DescribeMacro{\onlysideX} @@ -1135,7 +1153,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2015/11/13 v2.6.0 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2015/11/20 v2.6.1 reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} @@ -1512,8 +1530,8 @@ % \begin{macro}{\save@section@number} % \begin{macro}{\set@sectcountR} % \changes{v1.2.1}{2012/11/01}{For the right section, the counter is defined only once.} -% We do not want the numbering of the right-side section commands to be continuous with the numbering of the left side, -% however, we want they be continous with the numbering of contents typesette before the \env{pages} or \env{columns} env. +% We do not want the right side section commands to be numbered after the left side ones, +% instead we want them numbered after which is typeset before the \env{pages} or \env{columns} environments. % we switch the \LaTeX\ counter in \protect\cs{numberingR}. % % \begin{macrocode} @@ -2606,8 +2624,8 @@ % Every note, in parallel typesetting, has three associated counters. % \begin{enumerate} % \item A \LaTeX\ counter \verb+footnoteX+. This the only one manipulated by user, and the only one finally printed. -% \item A \TeX\ counter \verb+footnoteX@reading+. Its value is increased when reading the \cs{footnoteX} command in the side environments. It is used to get the correct footnote number from the \verb+.aux+ file to typeset in the main text. -% \item A \TeX\ counter \verb+footnoteX@typeset. Its value is increased when inserting footnotes. Its value is directly used in the footnote, and is stored in the \verb+aux+ files to be used on the next run for the main text. +% \item A \TeX\ counter \verb+footnoteX@reading+. Its value is incremented when reading the \cs{footnoteX} command in left or right side environments. It is used to get the correct footnote number from the \verb+.aux+ file to be typeset in the main text. +% \item A \LaTeX\ counter \verb+footnoteX@typeset. Its value is increased when inserting footnotes. Its value is directly used in the footnote, and is stored in the \verb+aux+ files to be used on the next run for the main text. % \end{enumerate} % % @@ -2615,7 +2633,7 @@ % So here, we only defined the new counters. % \begin{macrocode} \expandafter\newcount\csname footnote#1@reading\endcsname% - \expandafter\newcount\csname footnote#1@typeset\endcsname% + \newcounter{footnote#1@typeset}% % \end{macrocode} % % \subsubsection{Familiar footnotes without marks} @@ -2699,10 +2717,10 @@ } \newcommand{\get@familiarfootnote@number}{% \unless\ifnofamiliar@% - \def\do##1{\global\expandafter\csname footnote##1@typeset\endcsname=\csuse{saved@footnote##1}}% + \def\do##1{\setcounter{footnote##1@typeset}{\csuse{saved@footnote##1}}}% \dolistloop{\@series}% \fi% - \global\footnote@typeset=\saved@footnote% + \setcounter{footnote@typeset}{\saved@footnote}% } % \end{macrocode} % \end{macro} @@ -2737,10 +2755,10 @@ % As users can use classical footnotes of \LaTeX\ (\cs{footnote}) % in parallel texts, we must integrate the same tools to get correct number as for \macpackage' footnotes (\reff{familiarfootnotenumber}). % \begin{macro}{\footnote@reading} -% \begin{macro}{\footnote@typset} +% \begin{macro}{\footnote@typeset} % \begin{macrocode} \newcount\footnote@reading% -\newcount\footnote@typeset% +\newcounter{footnote@typeset}% % \end{macrocode} % \end{macro} % \end{macro} @@ -4903,7 +4921,7 @@ \expandafter\ifvoid\csname l@dRcolrawbox1\endcsname% \led@err@Columns@WithoutEnv% \else% - \l@dprintingcolumnstrue% + \global\l@dprintingcolumnstrue% \eledsection@correcting@skip=-\baselineskip% Correction for sections' titles \ifnum\l@dnumpstartsL=\l@dnumpstartsR\else \led@err@BadLeftRightPstarts{\the\l@dnumpstartsL}{\the\l@dnumpstartsR}% @@ -5026,7 +5044,9 @@ \global\l@dpscR=\z@ \global\l@dnumpstartsL=\z@ \global\l@dnumpstartsR=\z@ - \l@dprintingcolumnsfalse% + \if@ledgroup\else% + \global\l@dprintingcolumnsfalse% + \fi \ignorespaces \global\instanzaLfalse% \global\instanzaRfalse% @@ -5362,7 +5382,7 @@ % Get onto an empty even (left) page, then initialise counters, etc. % \begin{macrocode} \cleartol@devenpage% - \l@dprintingpagestrue% + \global\l@dprintingpagestrue% \begingroup% % \end{macrocode} % As \protect\cs{Pages} must be called outside of the pages environment, we have to redefine the \protect\cs{Lcolwidth} and \protect\cs{Rcolwidth} lengths, to prevent false overfull hboxes. @@ -5646,7 +5666,9 @@ \global\l@dnumpstartsR=\z@% \global\instanzaLfalse% \global\instanzaRfalse% - \l@dprintingpagesfalse% + \if@ledgroup\else% + \global\l@dprintingpagesfalse% + \fi% \finish@Pages@notes%Needed to prevent final notes overlap line number \ignorespaces\fi} |