summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/eledmac.pdfbin852315 -> 852435 bytes
-rw-r--r--Master/texmf-dist/source/latex/eledmac/eledmac.dtx39
-rw-r--r--Master/texmf-dist/tex/latex/eledmac/eledmac.sty38
3 files changed, 39 insertions, 38 deletions
diff --git a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
index 962eed4d7b2..0a16ae64c10 100644
--- a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
index c58c57b2c37..1264a5c1224 100644
--- a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
+++ b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
@@ -173,6 +173,7 @@
% \changes{v1.4.2}{2012/12/12}{Debug with some special classes.}
% \changes{v1.4.3}{2012/12/18}{Spurious space after familiar footnotes.}
% \changes{v1.4.4}{2013/02/18}{Label inside familiar footnotes.}
+% \changes{v1.4.5}{2013/03/02}{Bug with komasscript + eledpar + chapter.}
% \hyphenation{man-u-script man-u-scripts}
%
% \newcommand{\Lpack}[1]{\textsf{#1}}
@@ -2656,7 +2657,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2013/02/18 v1.4.4 LaTeX port of EDMAC]
+\ProvidesPackage{eledmac}[2013/03/02 v1.4.5 LaTeX port of EDMAC]
% \end{macrocode}
%
% In general there is the following modifications to the original
@@ -6426,7 +6427,7 @@
% The \cs{footnoteoption@}\oarg{side}\marg{options}\marg{value} change the value of on options of Xfootnote, to switch between true and false.
% \begin{macrocode}
\newcommandx*{\footnoteoptions@}[3][1=L,usedefault]{%
- \renewcommand{\do}[1]{%
+ \def\do##1{%
\ifstrequal{#1}{L}{% In Leftside
\xright@appenditem{\global\noexpand\settoggle{##1@}{#3}}\to\inserts@list% Switch toogle, in all case
\global\advance\insert@count \@ne% Increment the left insert counter.
@@ -8396,7 +8397,7 @@
}}
\newcommand{\doreinxtrafeeti}{%
- \renewcommand{\do}[1]{\ifvoid\csuse{footins##1}\else\insert\csuse{footins##1}{\unvbox\csuse{footins##1}}\fi}%
+ \def\do##1{\ifvoid\csuse{footins##1}\else\insert\csuse{footins##1}{\unvbox\csuse{footins##1}}\fi}%
\dolistloop{\@series}%
}
@@ -8433,7 +8434,7 @@
% \cs{series}\cs{series} creates one more newseries. It's the public command, which just loops on the private command \cs{newseries@}.
% \begin{macrocode}
\newcommand{\newseries}[1]{%
- \renewcommand{\do}[1]{\newseries@{##1}}%
+ \def\do##1{\newseries@{##1}}%
\docsvlist{#1}
}
% \end{macrocode}
@@ -8627,7 +8628,7 @@
\edef\series{#1}
\def\new{}
\listeadd{\new}{\series}
- \renewcommand{\do}[1]{\ifcsstring{series}{##1}{}{\listadd{\new}{##1}}}
+ \def\do##1{\ifcsstring{series}{##1}{}{\listadd{\new}{##1}}}
\dolistloop{\@series}
\xdef\@series{\new}
}
@@ -8639,7 +8640,7 @@
\newcommand{\seriesatend}[1]{
\edef\series{#1}
\def\new{}
- \renewcommand{\do}[1]{\ifcsstring{series}{##1}{}{\listadd{\new}{##1}}}
+ \def\do##1{\ifcsstring{series}{##1}{}{\listadd{\new}{##1}}}
\dolistloop{\@series}
\listeadd{\new}{\series}
\xdef\@series{\new}
@@ -8654,7 +8655,7 @@
% \cs{settoggle@series}\cs{series}{toggle}{value} is a generic command to switch one toggle for one series.
% \begin{macrocode}
\newcommand{\settoggle@series}[3]{%
- \renewcommand{\do}[1]{\global\settoggle{#2@##1}{#3}}
+ \def\do##1{\global\settoggle{#2@##1}{#3}}
\ifstrempty{#1}{%
\dolistloop{\@series}%
}%
@@ -8668,7 +8669,7 @@
% \cs{setcommand@series}\marg{series}\marg{command}\marg{value} is a generic command to change one command for one series.
% \begin{macrocode}
\newcommandx{\setcommand@series}[4][4]{%
- \renewcommand{\do}[1]{
+ \def\do##1{
\csgdef{#2@##1}{#3}
\ifstrequal{#4}{reload}{\csuse{foot\csuse{series@display##1}}{##1}}{}}
\ifstrempty{#1}{%
@@ -9165,7 +9166,7 @@
% within \cs{@reinserts}. The implementation may well have to change.
% \begin{macrocode}
\newcommand*{\doreinxtrafeetii}{%
- \renewcommand{\do}[1]{\ifvoid\csuse{##1footins}\else\insert\csuse{##1ootins}{\unvbox\csuse{##1footins}}\fi}
+ \def\do##1{\ifvoid\csuse{##1footins}\else\insert\csuse{##1ootins}{\unvbox\csuse{##1footins}}\fi}
\dolistloop{\@series}
}
@@ -9252,7 +9253,7 @@
% \begin{macro}{\@mem@extranofeet}
% \begin{macrocode}
\g@addto@macro{\@mem@extranofeet}{%
- \renewcommand{\do}[1]{\ifvoid\csuse{#1footins}\else\@mem@nofootfalse\fi%
+ \def\do##1{\ifvoid\csuse{#1footins}\else\@mem@nofootfalse\fi%
\ifvoid\csuse{footins#1}\else\@mem@nofootfalse\fi%
}
\dolistloop{\@series}%
@@ -10140,7 +10141,7 @@
% minipage environment.
% \begin{macrocode}
\newcommand*{\l@dedbeginmini}{%
- \renewcommand{\do}[1]{\csletcs{v##1footnote}{mpv##1footnote}}%
+ \def\do##1{\csletcs{v##1footnote}{mpv##1footnote}}%
\dolistloop{\@series}%
}
\newcommand*{\l@dedendmini}{%
@@ -10151,7 +10152,7 @@
\flush@notes
\fi
\fi
- \renewcommand{\do}[1]{\ifvoid\csuse{mp##1footins}\else\csuse{mp##1footgroup}{##1}\fi}%
+ \def\do##1{\ifvoid\csuse{mp##1footins}\else\csuse{mp##1footgroup}{##1}\fi}%
\dolistloop{\@series}%
}
@@ -10165,10 +10166,10 @@
% minipage environment.
% \begin{macrocode}
\newcommand*{\l@dfambeginmini}{%
- \renewcommand{\do}[1]{\csletcs{vfootnote##1}{mpvfootnote##1}}%
+ \def\do##1{\csletcs{vfootnote##1}{mpvfootnote##1}}%
\dolistloop{\@series}}
\newcommand*{\l@dfamendmini}{%
- \renewcommand{\do}[1]{\ifvoid\csuse{mpfootins##1}\else\csuse{mpfootgroup##1}{##1}\fi}%
+ \def\do##1{\ifvoid\csuse{mpfootins##1}\else\csuse{mpfootgroup##1}{##1}\fi}%
\dolistloop{\@series}}
% \end{macrocode}
% \end{macro}
@@ -11276,12 +11277,12 @@
% \begin{macrocode}
\newcommand{\l@dmodforcritext}{%
\let\critext\relax%
- \renewcommand{\do}[1]{\global\csletcs{##1footnote}{l@dgobbledarg}}
+ \def\do##1{\global\csletcs{##1footnote}{l@dgobbledarg}}
\dolistloop{\@series}%
\let\edindex\nulledindex%
\let\linenum\@gobble}
\newcommand{\l@drestoreforcritext}{%
- \renewcommand{\do}[1]{\csdef{##1footnote}##1##2/{\csuse{##1@@footnote}{##1}{##2}}}
+ \def\do##1{\csdef{##1footnote}##1##2/{\csuse{##1@@footnote}{##1}{##2}}}
\dolistloop{\@series}%
\let\edindex\xedindex}
@@ -11295,12 +11296,12 @@
% \begin{macrocode}
\newcommand{\l@dmodforedtext}{%
\let\edtext\relax
- \renewcommand{\do}[1]{\global\csletcs{##1footnote}{l@dgobblearg}}
+ \def\do##1{\global\csletcs{##1footnote}{l@dgobblearg}}
\dolistloop{\@series}%
\let\edindex\nulledindex
\let\linenum\@gobble}
\newcommand{\l@drestoreforedtext}{%
- \renewcommand{\do}[1]{\csgdef{##1footnote}##1{\csuse{##1@@footnote}{##1}}}
+ \def\do##1{\csgdef{##1footnote}##1{\csuse{##1@@footnote}{##1}}}
\dolistloop{\@series}%
\let\edindex\xedindex}
% \end{macrocode}
@@ -11376,7 +11377,7 @@
\let\critext\xcritext
\let\edtext\xedtext
\let\edindex\xedindex
- \renewcommand{\do}[1]{\global\csletcs{##1footnote}{##1@@footnote}}
+ \def\do##1{\global\csletcs{##1footnote}{##1@@footnote}}
\dolistloop{\@series}%
\let\linenum\@line@@num
\hilfsskip=\l@dcolwidth%
diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
index 5cbbc5894b6..04039c30b62 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}[2013/02/18 v1.4.4 LaTeX port of EDMAC]
+\ProvidesPackage{eledmac}[2013/03/02 v1.4.5 LaTeX port of EDMAC]
\newif\ifledfinal
\newif\ifparapparatus@
\newif\ifnoquotation@
@@ -1303,7 +1303,7 @@
\selectfont}
\newcommandx*{\footnoteoptions@}[3][1=L,usedefault]{%
- \renewcommand{\do}[1]{%
+ \def\do##1{%
\ifstrequal{#1}{L}{% In Leftside
\xright@appenditem{\global\noexpand\settoggle{##1@}{#3}}\to\inserts@list% Switch toogle, in all case
\global\advance\insert@count \@ne% Increment the left insert counter.
@@ -2123,7 +2123,7 @@
}}
\newcommand{\doreinxtrafeeti}{%
- \renewcommand{\do}[1]{\ifvoid\csuse{footins##1}\else\insert\csuse{footins##1}{\unvbox\csuse{footins##1}}\fi}%
+ \def\do##1{\ifvoid\csuse{footins##1}\else\insert\csuse{footins##1}{\unvbox\csuse{footins##1}}\fi}%
\dolistloop{\@series}%
}
@@ -2145,7 +2145,7 @@
\ifvoid\@nameuse{mpfootins#1}\else\@nameuse{mpfootgroup#1}{#1}\fi}%
}
\newcommand{\newseries}[1]{%
- \renewcommand{\do}[1]{\newseries@{##1}}%
+ \def\do##1{\newseries@{##1}}%
\docsvlist{#1}
}
\newcommand{\@series}{}
@@ -2267,20 +2267,20 @@
\edef\series{#1}
\def\new{}
\listeadd{\new}{\series}
- \renewcommand{\do}[1]{\ifcsstring{series}{##1}{}{\listadd{\new}{##1}}}
+ \def\do##1{\ifcsstring{series}{##1}{}{\listadd{\new}{##1}}}
\dolistloop{\@series}
\xdef\@series{\new}
}
\newcommand{\seriesatend}[1]{
\edef\series{#1}
\def\new{}
- \renewcommand{\do}[1]{\ifcsstring{series}{##1}{}{\listadd{\new}{##1}}}
+ \def\do##1{\ifcsstring{series}{##1}{}{\listadd{\new}{##1}}}
\dolistloop{\@series}
\listeadd{\new}{\series}
\xdef\@series{\new}
}
\newcommand{\settoggle@series}[3]{%
- \renewcommand{\do}[1]{\global\settoggle{#2@##1}{#3}}
+ \def\do##1{\global\settoggle{#2@##1}{#3}}
\ifstrempty{#1}{%
\dolistloop{\@series}%
}%
@@ -2289,7 +2289,7 @@
}%
}
\newcommandx{\setcommand@series}[4][4]{%
- \renewcommand{\do}[1]{
+ \def\do##1{
\csgdef{#2@##1}{#3}
\ifstrequal{#4}{reload}{\csuse{foot\csuse{series@display##1}}{##1}}{}}
\ifstrempty{#1}{%
@@ -2544,7 +2544,7 @@
\doreinxtrafeetii}
\newcommand*{\doreinxtrafeetii}{%
- \renewcommand{\do}[1]{\ifvoid\csuse{##1footins}\else\insert\csuse{##1ootins}{\unvbox\csuse{##1footins}}\fi}
+ \def\do##1{\ifvoid\csuse{##1footins}\else\insert\csuse{##1ootins}{\unvbox\csuse{##1footins}}\fi}
\dolistloop{\@series}
}
@@ -2581,7 +2581,7 @@
\@ifclassloaded{memoir}{%
\g@addto@macro{\@mem@extranofeet}{%
- \renewcommand{\do}[1]{\ifvoid\csuse{#1footins}\else\@mem@nofootfalse\fi%
+ \def\do##1{\ifvoid\csuse{#1footins}\else\@mem@nofootfalse\fi%
\ifvoid\csuse{footins#1}\else\@mem@nofootfalse\fi%
}
\dolistloop{\@series}%
@@ -2924,7 +2924,7 @@
\newcommand*{\l@dfeetendmini}{\l@dedendmini\l@dfamendmini}
\newcommand*{\l@dedbeginmini}{%
- \renewcommand{\do}[1]{\csletcs{v##1footnote}{mpv##1footnote}}%
+ \def\do##1{\csletcs{v##1footnote}{mpv##1footnote}}%
\dolistloop{\@series}%
}
\newcommand*{\l@dedendmini}{%
@@ -2935,15 +2935,15 @@
\flush@notes
\fi
\fi
- \renewcommand{\do}[1]{\ifvoid\csuse{mp##1footins}\else\csuse{mp##1footgroup}{##1}\fi}%
+ \def\do##1{\ifvoid\csuse{mp##1footins}\else\csuse{mp##1footgroup}{##1}\fi}%
\dolistloop{\@series}%
}
\newcommand*{\l@dfambeginmini}{%
- \renewcommand{\do}[1]{\csletcs{vfootnote##1}{mpvfootnote##1}}%
+ \def\do##1{\csletcs{vfootnote##1}{mpvfootnote##1}}%
\dolistloop{\@series}}
\newcommand*{\l@dfamendmini}{%
- \renewcommand{\do}[1]{\ifvoid\csuse{mpfootins##1}\else\csuse{mpfootgroup##1}{##1}\fi}%
+ \def\do##1{\ifvoid\csuse{mpfootins##1}\else\csuse{mpfootgroup##1}{##1}\fi}%
\dolistloop{\@series}}
\def\@iiiminipage#1#2[#3]#4{%
\leavevmode
@@ -3374,23 +3374,23 @@
\newcommand{\l@dmodforcritext}{%
\let\critext\relax%
- \renewcommand{\do}[1]{\global\csletcs{##1footnote}{l@dgobbledarg}}
+ \def\do##1{\global\csletcs{##1footnote}{l@dgobbledarg}}
\dolistloop{\@series}%
\let\edindex\nulledindex%
\let\linenum\@gobble}
\newcommand{\l@drestoreforcritext}{%
- \renewcommand{\do}[1]{\csdef{##1footnote}##1##2/{\csuse{##1@@footnote}{##1}{##2}}}
+ \def\do##1{\csdef{##1footnote}##1##2/{\csuse{##1@@footnote}{##1}{##2}}}
\dolistloop{\@series}%
\let\edindex\xedindex}
\newcommand{\l@dmodforedtext}{%
\let\edtext\relax
- \renewcommand{\do}[1]{\global\csletcs{##1footnote}{l@dgobblearg}}
+ \def\do##1{\global\csletcs{##1footnote}{l@dgobblearg}}
\dolistloop{\@series}%
\let\edindex\nulledindex
\let\linenum\@gobble}
\newcommand{\l@drestoreforedtext}{%
- \renewcommand{\do}[1]{\csgdef{##1footnote}##1{\csuse{##1@@footnote}{##1}}}
+ \def\do##1{\csgdef{##1footnote}##1{\csuse{##1@@footnote}{##1}}}
\dolistloop{\@series}%
\let\edindex\xedindex}
\newcommand{\l@dnullfills}{%
@@ -3405,7 +3405,7 @@
\let\critext\xcritext
\let\edtext\xedtext
\let\edindex\xedindex
- \renewcommand{\do}[1]{\global\csletcs{##1footnote}{##1@@footnote}}
+ \def\do##1{\global\csletcs{##1footnote}{##1@@footnote}}
\dolistloop{\@series}%
\let\linenum\@line@@num
\hilfsskip=\l@dcolwidth%