eledmac (9may14)

git-svn-id: svn://tug.org/texlive/trunk@33944 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 29 insertions, 13 deletions

diff --git a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
index c9945b9bc6c..20cb9e7fae5 100644
--- a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
diff --git a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
index 7b701d83de6..736ab9c5431 100644
--- a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
+++ b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
@@ -51,7 +51,7 @@
 %
 % \fi
 %
-% \CheckSum{8915}
+% \CheckSum{8924}
 %
 % \makeatletter
 % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -1322,6 +1322,14 @@
 % \DescribeMacro{\Xendnotefontsize}
 % \cs{Xendnotefontsize}\oarg{s}\marg{l} is used to define the font size of end critical footnotes of the series. The default value is \cs{footnotesize}.
 % The \meta{command} must not be a size in pt, but a standard LaTeX size, like \cs{small}.
+% \subsection{Font of the lemma}
+% \changes{v1.11.0}{2014/05/09}{Add hooks to disable the font selection for lemma in footnote.}
+% \DescribeMacro{\Xlemmadisablefontselection}
+% By default, font of the lemma in footnote is the same as font of the lemma in the main text. For example, if the lemma is in italic in the main text, it is also in italic in note. The command  \cs{Xlemmadisablefontselection}\oarg{s} allows to disable it for a specific series.
+%
+% \DescribeMacro{\Xendlemmadisablefontselection}
+% By default, font of the lemma in endnote is the same as font of the lemma in the main text. For example, if the lemma is in italic in the main text, it is also in italic in note. The command  \cs{Xendlemmadisablefontselection}\oarg{s} allows to disable it for a specific series.
+%
 %
 % \subsubsection{Styles of notes content}
 %
@@ -2777,7 +2785,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2014/05/01 v1.10.6 LaTeX port of EDMAC]
+\ProvidesPackage{eledmac}[2014/05/09 v1.11.0 LaTeX port of EDMAC]
 %    \end{macrocode}
 %
 %    Generally, these are the modifications to the original.
@@ -6810,7 +6818,7 @@
   \ledsetnormalparstuff%
   \hangindent=\csuse{Xhangindent@#4}
   \strut{\printlinefootnote{#1}{#4}}%
-  {\select@lemmafont#1|#2}%
+  {\nottoggle{Xlemmadisablefontselection@#4}{\select@lemmafont#1|#2}{#2}}%
   \iftoggle{nosep@}{\hskip\csuse{inplaceoflemmaseparator@#4}}{\ifcsempty{lemmaseparator@#4}%
     {\hskip\csuse{inplaceoflemmaseparator@#4}}%
     {\nobreak\hskip\csuse{beforelemmaseparator@#4}\csuse{lemmaseparator@#4}\hskip\csuse{afterlemmaseparator@#4}%
@@ -7538,7 +7546,7 @@
   \insertparafootsep{#4}%
   \ledsetnormalparstuff%
   \printlinefootnote{#1}{#4}%
-  {\select@lemmafont#1|#2}%
+  {\nottoggle{Xlemmadisablefontselection@#4}{\select@lemmafont#1|#2}{#2}}%
   \iftoggle{nosep@}{\hskip\csuse{inplaceoflemmaseparator@#4}}{\ifcsempty{lemmaseparator@#4}%
     {\hskip\csuse{inplaceoflemmaseparator@#4}}%
     {\nobreak\hskip\csuse{beforelemmaseparator@#4}\csuse{lemmaseparator@#4}\hskip\csuse{afterlemmaseparator@#4}%
@@ -7787,7 +7795,7 @@
   \hangindent=\csuse{Xhangindent@#4}
   \leavevmode
   \strut{\printlinefootnote{#1}{#4}}%
-  {\select@lemmafont#1|#2}%
+  {\nottoggle{Xlemmadisablefontselection@#4}{\select@lemmafont#1|#2}{#2}}%
   \iftoggle{nosep@}{\hskip\csuse{inplaceoflemmaseparator@#4}}{\ifcsempty{lemmaseparator@#4}%
     {\hskip\csuse{inplaceoflemmaseparator@#4}}%
     {\nobreak\hskip\csuse{beforelemmaseparator@#4}\csuse{lemmaseparator@#4}\hskip\csuse{afterlemmaseparator@#4}%
@@ -7900,7 +7908,7 @@
   \hangindent=\csuse{Xhangindent@#4}
   \leavevmode
   \strut{\printlinefootnote{#1}{#4}}%
-  {\select@lemmafont#1|#2}%
+  {\nottoggle{Xlemmadisablefontselection@#4}{\select@lemmafont#1|#2}{#2}}%
   \iftoggle{nosep@}{\hskip\csuse{inplaceoflemmaseparator@#4}}{\ifcsempty{lemmaseparator@#4}%
     {\hskip\csuse{inplaceoflemmaseparator@#4}}%
     {\nobreak\hskip\csuse{beforelemmaseparator@#4}\csuse{lemmaseparator@#4}\hskip\csuse{afterlemmaseparator@#4}%
@@ -8810,7 +8818,7 @@
 %  to avoid clash with the amsfonts package}
 %    \begin{macrocode}
 \def\endprint#1#2#3#4{{\csuse{bhookXendnote@#4}\csuse{Xendnotefontsize@#4}{\csuse{Xendnotenumfont@#4}\printendlines#1|}%
-      \enspace{\select@lemmafont#1|#2}\enskip#3\par}}
+      \enspace{\nottoggle{Xendlemmadisablefontselection@#4}{\select@lemmafont#1|#2}{#2}}\enskip#3\par}}
 \providecommand*{\@gobblethree}[3]{}
 
 \let\l@d@section=\@gobble
@@ -8969,6 +8977,8 @@
 %    \end{macrocode}
 % \subsection{Create all commands to memorize display options}
 %    \begin{macrocode}
+	\newtoggle{Xlemmadisablefontselection@#1}
+	\newtoggle{Xendlemmadisablefontselection@#1}
     \csgdef{Xhangindent@#1}{0pt}%
     \csgdef{hangindentX@#1}{0pt}
     \csgdef{hsizetwocol@#1}{0.45 \hsize}%
@@ -9299,6 +9309,8 @@
 \newhooktoggle@series{pstartinfootnote}
 \newhooktoggle@series{onlypstartinfootnote}
 \newhooktoggle@series{nonbreakableafternumber}
+\newhooktoggle@series{Xlemmadisablefontselection}
+\newhooktoggle@series{Xendlemmadisablefontselection}
 %    \end{macrocode}
 % \end{macro}
 % \subsection{Old commands, kept for backward compatibility}
diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
index 1030deafc0c..fe44396d779 100644
--- a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
+++ b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
@@ -24,7 +24,7 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2014/05/01 v1.10.6 LaTeX port of EDMAC]
+\ProvidesPackage{eledmac}[2014/05/09 v1.11.0 LaTeX port of EDMAC]
 \newif\ifledfinal
 \newif\ifparapparatus@
 \newif\ifnoquotation@
@@ -1456,7 +1456,7 @@
   \ledsetnormalparstuff%
   \hangindent=\csuse{Xhangindent@#4}
   \strut{\printlinefootnote{#1}{#4}}%
-  {\select@lemmafont#1|#2}%
+  {\nottoggle{Xlemmadisablefontselection@#4}{\select@lemmafont#1|#2}{#2}}%
   \iftoggle{nosep@}{\hskip\csuse{inplaceoflemmaseparator@#4}}{\ifcsempty{lemmaseparator@#4}%
     {\hskip\csuse{inplaceoflemmaseparator@#4}}%
     {\nobreak\hskip\csuse{beforelemmaseparator@#4}\csuse{lemmaseparator@#4}\hskip\csuse{afterlemmaseparator@#4}%
@@ -1682,7 +1682,7 @@
   \insertparafootsep{#4}%
   \ledsetnormalparstuff%
   \printlinefootnote{#1}{#4}%
-  {\select@lemmafont#1|#2}%
+  {\nottoggle{Xlemmadisablefontselection@#4}{\select@lemmafont#1|#2}{#2}}%
   \iftoggle{nosep@}{\hskip\csuse{inplaceoflemmaseparator@#4}}{\ifcsempty{lemmaseparator@#4}%
     {\hskip\csuse{inplaceoflemmaseparator@#4}}%
     {\nobreak\hskip\csuse{beforelemmaseparator@#4}\csuse{lemmaseparator@#4}\hskip\csuse{afterlemmaseparator@#4}%
@@ -1784,7 +1784,7 @@
   \hangindent=\csuse{Xhangindent@#4}
   \leavevmode
   \strut{\printlinefootnote{#1}{#4}}%
-  {\select@lemmafont#1|#2}%
+  {\nottoggle{Xlemmadisablefontselection@#4}{\select@lemmafont#1|#2}{#2}}%
   \iftoggle{nosep@}{\hskip\csuse{inplaceoflemmaseparator@#4}}{\ifcsempty{lemmaseparator@#4}%
     {\hskip\csuse{inplaceoflemmaseparator@#4}}%
     {\nobreak\hskip\csuse{beforelemmaseparator@#4}\csuse{lemmaseparator@#4}\hskip\csuse{afterlemmaseparator@#4}%
@@ -1842,7 +1842,7 @@
   \hangindent=\csuse{Xhangindent@#4}
   \leavevmode
   \strut{\printlinefootnote{#1}{#4}}%
-  {\select@lemmafont#1|#2}%
+  {\nottoggle{Xlemmadisablefontselection@#4}{\select@lemmafont#1|#2}{#2}}%
   \iftoggle{nosep@}{\hskip\csuse{inplaceoflemmaseparator@#4}}{\ifcsempty{lemmaseparator@#4}%
     {\hskip\csuse{inplaceoflemmaseparator@#4}}%
     {\nobreak\hskip\csuse{beforelemmaseparator@#4}\csuse{lemmaseparator@#4}\hskip\csuse{afterlemmaseparator@#4}%
@@ -2318,7 +2318,7 @@
  \immediate\write\l@d@end{\string\l@d@section{\the\section@num}}}
 
 \def\endprint#1#2#3#4{{\csuse{bhookXendnote@#4}\csuse{Xendnotefontsize@#4}{\csuse{Xendnotenumfont@#4}\printendlines#1|}%
-      \enspace{\select@lemmafont#1|#2}\enskip#3\par}}
+      \enspace{\nottoggle{Xendlemmadisablefontselection@#4}{\select@lemmafont#1|#2}{#2}}\enskip#3\par}}
 \providecommand*{\@gobblethree}[3]{}
 
 \let\l@d@section=\@gobble
@@ -2375,6 +2375,8 @@
 \newcommand{\newseries@}[1]{
     \xifinlist{#1}{\@series}{\eledmac@warning{Series #1 is still existing !}}
     {%
+\newtoggle{Xlemmadisablefontselection@#1}
+\newtoggle{Xendlemmadisablefontselection@#1}
     \csgdef{Xhangindent@#1}{0pt}%
     \csgdef{hangindentX@#1}{0pt}
     \csgdef{hsizetwocol@#1}{0.45 \hsize}%
@@ -2613,6 +2615,8 @@
 \newhooktoggle@series{pstartinfootnote}
 \newhooktoggle@series{onlypstartinfootnote}
 \newhooktoggle@series{nonbreakableafternumber}
+\newhooktoggle@series{Xlemmadisablefontselection}
+\newhooktoggle@series{Xendlemmadisablefontselection}
 \newcommand*{\notenumfont}{\normalfont}
 \newcommand*{\notefontsetup}{\footnotesize}
 \newif\ifledplinenum