summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/eledmac.pdfbin849906 -> 850236 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/eledpar.pdfbin471691 -> 471961 bytes
-rw-r--r--Master/texmf-dist/source/latex/eledmac/eledmac.dtx63
-rw-r--r--Master/texmf-dist/source/latex/eledmac/eledpar.dtx10
-rw-r--r--Master/texmf-dist/tex/latex/eledmac/eledmac.sty48
-rw-r--r--Master/texmf-dist/tex/latex/eledmac/eledpar.sty7
6 files changed, 73 insertions, 55 deletions
diff --git a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
index 7a8f066b4bc..430ddf93a64 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/doc/latex/eledmac/eledpar.pdf b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf
index abb2fd40f02..9baa0e1dce9 100644
--- a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/eledpar.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 fe879f3293a..5aee1d6971a 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{8188}
+% \CheckSum{8205}
%
% \makeatletter
% \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -2277,6 +2277,9 @@
% The typographical consequences will resemble the outside numbered sections, based on the styles of the \emph{book} class.
% However, if you use a package that redefines these environments, these redefinitions won't be available inside the numbering section.
% You must open the quotation environments inside a \cs{start}-\cs{pend} block, not outside.
+%
+% In some case, you don't want these environments be redefined in numbered section.
+% You can load the package with the option \verb+noquotation+ to prevent this redefinition.
% \section{Miscellaneous}
%
%
@@ -2647,7 +2650,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2012/11/16 v1.4 LaTeX port of EDMAC]
+\ProvidesPackage{eledmac}[2012/11/16 v1.4.1 LaTeX port of EDMAC]
% \end{macrocode}
%
% In general there is the following modifications to the original
@@ -2673,7 +2676,9 @@
% \begin{macrocode}
\newif\ifledfinal
\newif\ifparapparatus@
+\newif\ifnoquotation@
\parapparatus@false
+\DeclareOption{noquotation}{\noquotation@true}
\DeclareOption{final}{\ledfinaltrue}
\DeclareOption{draft}{\ledfinalfalse}
\DeclareOption{parapparatus}{\parapparatus@true}
@@ -3124,6 +3129,7 @@
% \begin{macro}{\endquote}
% \changes{v1.2}{2012/10/08}{Compatibility of \cs{ledchapter} with the \emph{memoir} class.}
% \changes{v1.3}{2012/11/01}{\emph{Quotation} and {quote} environment inside the numbering sections.}
+% \changes{v1.4.1}{2012/11/16}{New option \emph{noquotation}.}
% \cs{initnumbering@sectcmd} defines sectioning commands inside numbered section.
% It also defines quotation environment.
% Note that it's suppose user didn't change \cs{chapter}.
@@ -3187,6 +3193,7 @@
\newcommand\beforeledchapter{\pend\cleardoublepage\pstart}
\patchcmd{\chapter}{\cleardoublepage}{\relax}{}{}
\patchcmd{\chapter}{\clearpage}{\relax}{}{}
+ \ifnoquotation@\else
\renewcommand{\quotation}{\par\leavevmode%
\parindent=1.5em%
\skipnumbering%
@@ -3231,6 +3238,7 @@
\vskip\topsep%
\fi%
}
+ \fi
}
% \end{macrocode}
% \end{macro}
@@ -7800,18 +7808,19 @@
% \verb?\vl@dbfnote? calls the original \verb?\@footnotetext?.
% \changes{v0.6}{2004/11/23}{Changed \cs{l@dbfnote} and \cs{vl@dbfnote} as
% originals could give incorrect markers in the footnotes}
+% \changes{v1.4.1}{2012/11/16}{Compatibility of standard footnotes with eledmac when theses footnotes contain any commands.}
% \begin{macrocode}
\newcommand{\l@dbfnote}[1]{%
\ifnumberedpar@
- \xright@appenditem{\noexpand\vl@dbfnote{{#1}}{\@thefnmark}}%
+ \gdef\@tag{#1}
+ \xright@appenditem{\noexpand\vl@dbfnote{{\csexpandonce{@tag}}}{\@thefnmark}}%
\to\inserts@list
\global\advance\insert@count \@ne
\fi\ignorespaces}
\newcommand{\vl@dbfnote}[2]{%
\def\@thefnmark{#2}%
\l@doldold@footnotetext{#1}}
-
-% \end{macrocode}
+% \end{macrocode}
% \end{macro}
% \end{macro}
%
@@ -9385,22 +9394,23 @@
%\begin{macro}{\advancelabel@refs}
%\begin{macro}{\labelrefsparseline}
%\begin{macro}{\labelrefsparsesubline}
-% \begin{macrocode}
+% \changes{v1.4.1}{2012/11/16}{Fix bug with \cs{edlabel}.}
%In cases where \cs{edlabel} is the first element in a paragraph, we have a problem with line counts, because line counts change only at the first horizontal box of the paragraph.
%Hence, we need to test \cs{edlabel} if it occurs at the start of a paragraph. To do so, we use \cs{ifvmode}. If the test is true, we must advance by one unit the amount of text we write into the \verb].aux] file.
-%We do so using \cs[advancelabel@refs} command.
+% We do so using \cs{advancelabel@refs} command.
+% \begin{macrocode}
+\newcounter{line}%
+\newcounter{subline}%
\newcommand{\advancelabel@refs}{%
- \newcounter{line}%
\setcounter{line}{\expandafter\labelrefsparseline\label@refs}%
\stepcounter{line}%
\ifsublines@%
- \newcounter{subline}%
\setcounter{subline}{\expandafter\labelrefsparsesubline\label@refs}%
\stepcounter{subline}{1}%
- \def\label@refs{\theline|\thesubline}%
+ \def\label@refs{\theline|\thesubline}%
\else%
\def\label@refs{\theline|0}%
-\fi%
+ \fi%
}
\def\labelrefsparseline#1|#2{#1}
\def\labelrefsparsesubline#1|#2{#2}
@@ -10038,6 +10048,7 @@
%
% Before do it, we concatenate all moveable sidenotes of the line, using \cs{sidenotesep} as separator.
% It's the result that we put on the sidenote.
+% \changes{v1.4.1}{2012/11/16}{Remove spurious spaces.}
% \begin{macrocode}
\newcommand*{\affixside@note}{%
\def\sidenotecontent@{}%
@@ -10051,29 +10062,29 @@
\numdef{\itemcount@}{\itemcount@+1}%
}%
\dolistloop{\l@dcsnotetext}%
- \ifnumgreater{\itemcount@}{1}{\eledmac@warning{\itemcount@\space sidenotes on line \the\line@num\space p. \the\page@num,}}{}
+ \ifnumgreater{\itemcount@}{1}{\eledmac@warning{\itemcount@\space sidenotes on line \the\line@num\space p. \the\page@num,}}{}%
% \end{macrocode}
% And now, the main part of the macro
% \begin{macrocode}
\gdef\@templ@d{}%
- \ifx\@templ@d\l@dcsnotetext \else
- \if@twocolumn
- \if@firstcolumn
+ \ifx\@templ@d\l@dcsnotetext \else%
+ \if@twocolumn%
+ \if@firstcolumn%
\setl@dlp@rbox{##1}{\sidenotecontent@}%
- \else
+ \else%
\setl@drp@rbox{\sidenotecontent@}%
- \fi
- \else
- \@l@dtempcntb=\sidenote@margin
- \ifnum\@l@dtempcntb>\@ne
- \advance\@l@dtempcntb by\page@num
- \fi
- \ifodd\@l@dtempcntb
+ \fi%
+ \else%
+ \@l@dtempcntb=\sidenote@margin%
+ \ifnum\@l@dtempcntb>\@ne%
+ \advance\@l@dtempcntb by\page@num%
+ \fi%
+ \ifodd\@l@dtempcntb%
\setl@drp@rbox{\sidenotecontent@}%
- \else
+ \else%
\setl@dlp@rbox{\sidenotecontent@}%
- \fi
- \fi
+ \fi%
+ \fi%
\fi}
% \end{macrocode}
% \end{macro}
diff --git a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
index 83fa97d288c..08ce347b042 100644
--- a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
+++ b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
@@ -51,7 +51,7 @@
%
% \fi
%
-% \CheckSum{3928}
+% \CheckSum{3932}
%
% \makeatletter
% \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -718,7 +718,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledpar}[2012/11/16 v1.3 eledmac extension for parallel texts]
+\ProvidesPackage{eledpar}[2012/11/16 v1.3.1 eledmac extension for parallel texts]
% \end{macrocode}
% With the option `shiftedpstarts' a long pstart one the left side (or in the right side) don't make a blank on the corresponding pstart, but the blank is put on the bottom of the page. Consequently, the pstarts on the parallel pages are shifted, but the shifted stop at every end of pages.
@@ -3380,15 +3380,17 @@
% \begin{macro}{\l@dbfnote}
% \verb?\l@dbfnote? adds the footnote to the insert list, and
% \verb?\vl@dbfnote? calls the original \verb?\@footnotetext?.
+% \changes{v1.3.1}{2012/11/16}{Compatibility of standard footnotes with eledmac when theses footnotes contain any commands.}
% \begin{macrocode}
\renewcommand{\l@dbfnote}[1]{%
\ifnumberedpar@
+ \gdef\@tag{#1}
\ifledRcol%
- \xright@appenditem{\noexpand\vl@dbfnote{{#1}}{\@thefnmark}}%
+ \xright@appenditem{\noexpand\vl@dbfnote{{\csexpandonce{@tag}}}{\@thefnmark}}%
\to\inserts@listR
\global\advance\insert@countR \@ne%
\else%
- \xright@appenditem{\noexpand\vl@dbfnote{{#1}}{\@thefnmark}}%
+ \xright@appenditem{\noexpand\vl@dbfnote{{\csexpandonce{@tag}}}{\@thefnmark}}%
\to\inserts@list
\global\advance\insert@count \@ne%
\fi
diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
index bbea3d69724..08d33c61c5b 100644
--- a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
+++ b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
@@ -24,10 +24,12 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2012/11/16 v1.4 LaTeX port of EDMAC]
+\ProvidesPackage{eledmac}[2012/11/16 v1.4.1 LaTeX port of EDMAC]
\newif\ifledfinal
\newif\ifparapparatus@
+\newif\ifnoquotation@
\parapparatus@false
+\DeclareOption{noquotation}{\noquotation@true}
\DeclareOption{final}{\ledfinaltrue}
\DeclareOption{draft}{\ledfinalfalse}
\DeclareOption{parapparatus}{\parapparatus@true}
@@ -228,6 +230,7 @@
\newcommand\beforeledchapter{\pend\cleardoublepage\pstart}
\patchcmd{\chapter}{\cleardoublepage}{\relax}{}{}
\patchcmd{\chapter}{\clearpage}{\relax}{}{}
+ \ifnoquotation@\else
\renewcommand{\quotation}{\par\leavevmode%
\parindent=1.5em%
\skipnumbering%
@@ -272,6 +275,7 @@
\vskip\topsep%
\fi%
}
+ \fi
}
\newcommand{\ledsectnotoc}{\let\addcontentsline\@gobblethree}
\def\endnumbering{%
@@ -1803,14 +1807,14 @@
\fi}
\newcommand{\l@dbfnote}[1]{%
\ifnumberedpar@
- \xright@appenditem{\noexpand\vl@dbfnote{{#1}}{\@thefnmark}}%
+ \gdef\@tag{#1}
+ \xright@appenditem{\noexpand\vl@dbfnote{{\csexpandonce{@tag}}}{\@thefnmark}}%
\to\inserts@list
\global\advance\insert@count \@ne
\fi\ignorespaces}
\newcommand{\vl@dbfnote}[2]{%
\def\@thefnmark{#2}%
\l@doldold@footnotetext{#1}}
-
\newcommand*{\prebodyfootmark}{%
\leavevmode
\ifhmode
@@ -2634,18 +2638,18 @@
{\string\l@dmake@labels\space\thepage|\label@refs|{#1}}%
\@esphack}
+\newcounter{line}%
+\newcounter{subline}%
\newcommand{\advancelabel@refs}{%
- \newcounter{line}%
\setcounter{line}{\expandafter\labelrefsparseline\label@refs}%
\stepcounter{line}%
\ifsublines@%
- \newcounter{subline}%
\setcounter{subline}{\expandafter\labelrefsparsesubline\label@refs}%
\stepcounter{subline}{1}%
- \def\label@refs{\theline|\thesubline}%
+ \def\label@refs{\theline|\thesubline}%
\else%
\def\label@refs{\theline|0}%
-\fi%
+ \fi%
}
\def\labelrefsparseline#1|#2{#1}
\def\labelrefsparsesubline#1|#2{#2}
@@ -2882,26 +2886,26 @@
\numdef{\itemcount@}{\itemcount@+1}%
}%
\dolistloop{\l@dcsnotetext}%
- \ifnumgreater{\itemcount@}{1}{\eledmac@warning{\itemcount@\space sidenotes on line \the\line@num\space p. \the\page@num,}}{}
+ \ifnumgreater{\itemcount@}{1}{\eledmac@warning{\itemcount@\space sidenotes on line \the\line@num\space p. \the\page@num,}}{}%
\gdef\@templ@d{}%
- \ifx\@templ@d\l@dcsnotetext \else
- \if@twocolumn
- \if@firstcolumn
+ \ifx\@templ@d\l@dcsnotetext \else%
+ \if@twocolumn%
+ \if@firstcolumn%
\setl@dlp@rbox{##1}{\sidenotecontent@}%
- \else
+ \else%
\setl@drp@rbox{\sidenotecontent@}%
- \fi
- \else
- \@l@dtempcntb=\sidenote@margin
- \ifnum\@l@dtempcntb>\@ne
- \advance\@l@dtempcntb by\page@num
- \fi
- \ifodd\@l@dtempcntb
+ \fi%
+ \else%
+ \@l@dtempcntb=\sidenote@margin%
+ \ifnum\@l@dtempcntb>\@ne%
+ \advance\@l@dtempcntb by\page@num%
+ \fi%
+ \ifodd\@l@dtempcntb%
\setl@drp@rbox{\sidenotecontent@}%
- \else
+ \else%
\setl@dlp@rbox{\sidenotecontent@}%
- \fi
- \fi
+ \fi%
+ \fi%
\fi}
\newcommand*{\l@dfeetbeginmini}{\l@dedbeginmini\l@dfambeginmini}
\newcommand*{\l@dfeetendmini}{\l@dedendmini\l@dfamendmini}
diff --git a/Master/texmf-dist/tex/latex/eledmac/eledpar.sty b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty
index c7f4ac9b085..9104b44b5cf 100644
--- a/Master/texmf-dist/tex/latex/eledmac/eledpar.sty
+++ b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty
@@ -24,7 +24,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledpar}[2012/11/16 v1.3 eledmac extension for parallel texts]
+\ProvidesPackage{eledpar}[2012/11/16 v1.3.1 eledmac extension for parallel texts]
\newif\ifshiftedpstarts
\let\shiftedversestrue\shiftedpstartstrue
@@ -1455,12 +1455,13 @@
\renewcommand{\l@dbfnote}[1]{%
\ifnumberedpar@
+ \gdef\@tag{#1}
\ifledRcol%
- \xright@appenditem{\noexpand\vl@dbfnote{{#1}}{\@thefnmark}}%
+ \xright@appenditem{\noexpand\vl@dbfnote{{\csexpandonce{@tag}}}{\@thefnmark}}%
\to\inserts@listR
\global\advance\insert@countR \@ne%
\else%
- \xright@appenditem{\noexpand\vl@dbfnote{{#1}}{\@thefnmark}}%
+ \xright@appenditem{\noexpand\vl@dbfnote{{\csexpandonce{@tag}}}{\@thefnmark}}%
\to\inserts@list
\global\advance\insert@count \@ne%
\fi