summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-02 23:38:24 +0000
committerKarl Berry <karl@freefriends.org>2016-05-02 23:38:24 +0000
commite2936ac0bd75c2ecc1e1b6505681e84ff0515dd0 (patch)
tree17c9f1a281fe53174eaa07482691be8b20902a65 /Master/texmf-dist/source
parentc970e86904ff1076f46506d6df9fa4a06a30ceab (diff)
reledmac (2may16)
git-svn-id: svn://tug.org/texlive/trunk@40840 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/reledmac/reledmac.dtx36
1 files changed, 26 insertions, 10 deletions
diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
index 06e07289a51..d5df4c8a5bb 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
@@ -392,6 +392,8 @@
% \changes{v2.9.0}{2016/03/23}{Fix bug with three- and two-column footnote setting (added in v.2.4.0).}
% \changes{v2.9.0}{2016/03/23}{Fix spurious space inside three-column familiar footnote.}
% \changes{v2.9.1}{2016/04/09}{Fix bug when notes start by ``plus'' or ``minus''.}
+% \changes{v2.9.2}{2016/04/30}{Fix bug with \protect\package{hyperref} package when a lemma starts by ``plus'' or ``minus'' (bug introduced in v.~2.7.0).}
+% \changes{v2.9.3}{2016/05/02}{Fix bug with line number position and reset added by v.~2.9.0}
% \title{\Macpackage \\
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
@@ -639,10 +641,15 @@
% but it does not expend the labor to check this thoroughly. If you have
% problems with a line or two misnumbered at the top of a page, try
% running \LaTeX\ once or twice more.
-%
+%
+% \section{Compatibility warning}
% However, the best way to be sure that one has made the right number of runs
% is to use some of \LaTeX's run scripts like \emph{latexmk}.
%
+% If you other class than \cs{article} or \cs{book} or modify geometry layout with \package{geometry} some setting should be made to have correct height for the blocks of note.
+%
+%Please read \reff{Xmaxhnotes}.
+%
% A file may mix \emph{numbered} and \emph{unnumbered} text.
%
% Numbered text is printed with marginal line numbers and can include
@@ -2082,8 +2089,8 @@
% \textbf{Be careful, the standard \LaTeX\ footnote rule, which is used by \macpackage, adds 2.6pt. These 2.6pt are not changed by this command.}
%
%
-% \subsubsection{Maximum height}
-% \DescribeMacro{\Xmaxhnotes}\label{Xmaxhnotes}
+% \subsubsection{Maximum height}\label{Xmaxhnotes}
+% \DescribeMacro{\Xmaxhnotes}
% By default, one series of critical notes can take up to 80\% of \cs{vsize}, before being broken to the next page.
% If you want to change the size use \protect\cs{Xmaxhnotes}\oarg{s}\marg{l}.
% Be careful : the length can't be flexible, and is relative to the the current font.
@@ -3257,6 +3264,9 @@
%
%
% \subsection{Known and suspected limitations}
+% \subsubsection{Not standard geometry}
+% If you use class other than \ltxclass{article} or \ltxclass{book}, or if you use the geometry package, you should use \protect{maxhnotesX} and / or \cs{Xmaxhnotes} as explained in \reff{Xmaxhnotes} in order to prevent footnotes overlapping bottom margin.
+%
% \subsubsection{\package{floatrow} package compatibility}
% The \package{floatrow} package must be loaded before the \macpackage.
% \subsubsection{`No room for a new'}\label{noroom}
@@ -3311,7 +3321,7 @@
% does not crop up at all often.
% \subsubsection{Paragraphed footnotes}\label{paragraphednotes:advanced}
% The restriction on explicit line-breaking in paragraphed footnotes,
-% mentioned in a footnote \reff{nobreaks}, and
+% mentioned on \reff{nobreaks}, and
% described in more detail on \reff{nobreaks-detail}, really is a
% nuisance if that is something you need to do. There are some possible
% solutions, described by Michael Downes\index{Downes, Michael},
@@ -3486,7 +3496,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2016/04/09 v2.9.1 typeset critical edition]%
+\ProvidesPackage{reledmac}[2016/05/02 v2.9.3 typeset critical edition]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -5248,6 +5258,12 @@
%
% \begin{macrocode}
\get@linelistfile{#1}%
+ \ifcontinuousnumberingwithcolumns
+ \global\page@numR=\page@numR\relax
+ \global\last@page@numR=\last@page@numR\relax
+ \global\page@num=\page@num\relax
+ \global\last@page@num=\last@page@num\relax
+ \fi
\endgroup
% \end{macrocode}
%
@@ -5488,8 +5504,8 @@
\ifbypage@R
\line@numR \z@ \subline@numR \z@
\fi
- \global\page@numR=#1\relax
- \global\last@page@numR=#1\relax
+ \page@numR=#1\relax
+ \last@page@numR=#1\relax
\def\next@page@numR{#1}%
\fi
\else
@@ -5498,8 +5514,8 @@
\ifbypage@
\line@num \z@ \subline@num \z@
\fi
- \global\page@num=#1\relax
- \global\last@page@num=#1\relax
+ \page@num=#1\relax
+ \last@page@num=#1\relax
\def\next@page@num{#1}%
\listxadd{\normal@page@break}{\the\absline@num}
\fi
@@ -17549,7 +17565,7 @@
}%
}}%
\Hy@RestoreSpaceFactor
- \penalty\@M\hskip\z@
+ \penalty\@M\hskip\z@\relax
\fi
}
% \end{macrocode}