diff options
author | Karl Berry <karl@freefriends.org> | 2015-06-29 00:15:22 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-06-29 00:15:22 +0000 |
commit | 99ab05030fdb929862749f25df2f137362584aef (patch) | |
tree | a57286971adbf7ce61c52cb755e599fe5ae85772 /Master/texmf-dist/source/latex/eledmac | |
parent | a11217252edfb77b9feb9901511e71ec21c90665 (diff) |
eledmac (28jun15)
git-svn-id: svn://tug.org/texlive/trunk@37699 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/eledmac')
-rw-r--r-- | Master/texmf-dist/source/latex/eledmac/eledmac.dtx | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx index 846d9b10702..b31250b595f 100644 --- a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx +++ b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx @@ -63,7 +63,7 @@ % \fi % % \newcommand{\reff}[1]{\ref{#1} p.~\pageref{#1}} -% \CheckSum{11983} +% \CheckSum{11986} % % \makeatletter % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters @@ -270,6 +270,7 @@ % \changes{v1.23.2}{2015/05/29}{Compatibility with \LaTeX's release 2015.} % \changes{v1.24.0}{2015/06/02}{We can reinitialize \cs{AtEveryPstart} and \cs{AtEveryPend} providing to it an empty argument.} % \changes{v1.24.1}{2015/06/21}{\cs{lemma} is disabled when using `nocritical` option.} +% \changes{v1.24.2}{2015/06/26}{Fix incompatibility between `nofamiliar` option and `memoir` package.} % \hyphenation{man-u-script man-u-scripts} % % @@ -3230,7 +3231,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eledmac}[2015/06/21 v1.24.1 LaTeX port of EDMAC]% +\ProvidesPackage{eledmac}[2015/06/26 v1.24.2 LaTeX port of EDMAC]% % \end{macrocode} % % Generally, these are the modifications to the original. @@ -12029,14 +12030,17 @@ % \verb?\@doclearpage?. % \begin{macro}{\@mem@extranofeet} % \begin{macrocode} -\g@addto@macro{\@mem@extranofeet}{% - \unless\ifnocritical@% - \def\do#1{\ifvoid\csuse{#1footins}\else\@mem@nofootfalse\fi% - \ifvoid\csuse{footins#1}\else\@mem@nofootfalse\fi% +\g@addto@macro{\@mem@extranofeet}{%% + \def\do#1{% + \unless\ifnocritical@% + \ifvoid\csuse{#1footins}\else\@mem@nofootfalse\fi% + \fi% + \unless\ifnofamiliar@% + \ifvoid\csuse{footins#1}\else\@mem@nofootfalse\fi% + \fi% } - \dolistloop{\@series}% - \@led@extranofeet - \fi% + \dolistloop{\@series}% + \@led@extranofeet% }% }{% % \end{macrocode} |