diff options
author | Karl Berry <karl@freefriends.org> | 2016-09-12 21:56:59 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-09-12 21:56:59 +0000 |
commit | 3385e73af37439a0afe6b8dd217b002c16cd67f8 (patch) | |
tree | 553f00d42c3ee292311c810cf37d95f39f7fbbd2 /Master/texmf-dist/source/latex/reledmac | |
parent | 111684e467e80f07f342c651e7649ba1fe5aeee1 (diff) |
reledmac (12sep16)
git-svn-id: svn://tug.org/texlive/trunk@42047 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/reledmac')
-rw-r--r-- | Master/texmf-dist/source/latex/reledmac/reledmac.dtx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx index 1fe5aa3a91a..775f819bc58 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -426,6 +426,7 @@ % \changes{v2.15.0}{2016/07/22}{Add `byline` arrangement.} % \changes{v2.15.0}{2016/07/22}{Fix \protect\cs{Xtxtbeforenotes} in ledgroup.} % \changes{v2.15.1}{2016/09/07}{Fix \protect\cs{edindex} in tabular environments.} +% \changes{v2.15.2}{2016/09/12}{Fix bug with \protect\package{fancyhdr} package 3.8 and later.} % \title{\Macpackage \\ % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} @@ -3762,7 +3763,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2016/09/07 v2.15.1 typeset critical editions]% +\ProvidesPackage{reledmac}[2016/09/12 v2.15.2 typeset critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -6483,6 +6484,7 @@ % \protect\cs{line@list@stuff}} % \changes{v0.7.0}{2005/02/25}{Deleted \protect\cs{page@start} from \protect\cs{line@list@stuff}} % \changes{v1.15.1}{2015/01/16}{Revert modification of 1.5.2 which makes bug with numbering. Leave vertical mode to solve spurious space before minipage.} + % \begin{macrocode} \iffirst@linenum@out@ \immediate\closeout\linenum@out% @@ -13835,8 +13837,14 @@ % \end{macrocode} % \protect\ltxclass{memoir} has not been loaded, so patch \protect\cs{@makecol} and % \protect\cs{@reinserts}. +% If the \package{fancyhdr} package $<$ 3.8 has been loaded, we patch the \cs{latex@makecol} command, because this package redefines in the preamble the standard \cs{@makecol}, to call \cs{latex@makecol} which have been \cs{let} to \cs{@makecol}. +% If this package is not loaded, we directly patch \cs{@makecol}. +% If the \package{fancyhdr} package $\geq$ 3.8, we also directly patch \cs{@makecol}, because \package{fancyhdr} does its own patch \cs{AtBeginDocument}. % \begin{macrocode} - \@ifpackageloaded{fancyhdr}{% + \ifboolexpr{% + test{\@ifpackageloaded{fancyhdr}}% + and test {\ifdef{\latex@makecol}}% + }{% \patchcmd% {\latex@makecol}% {\xdef\@freelist{\@freelist\@midlist}}% |