summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/eledmac/eledmac.dtx78
-rw-r--r--Master/texmf-dist/source/latex/eledmac/eledpar.dtx29
2 files changed, 59 insertions, 48 deletions
diff --git a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
index 65950688829..0053faba7cf 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{8244}
+% \CheckSum{8215}
%
% \makeatletter
% \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -175,6 +175,7 @@
% \changes{v1.4.4}{2013/02/18}{Label inside familiar footnotes.}
% \changes{v1.4.5}{2013/03/02}{Bug with komasscript + eledpar + chapter.}
% \changes{v1.4.6}{2013/04/15}{Bug with memoir class introduced by 1.4.5.}
+% \changes{v1.4.8}{2013/07/02}{Correct a bug whith parallel texts introduced by 1.1}
% \hyphenation{man-u-script man-u-scripts}
%
% \newcommand{\Lpack}[1]{\textsf{#1}}
@@ -287,6 +288,7 @@
% You can subscribe to the eledmac mail list in:\\ \url{https://lists.berlios.de/pipermail/ledmac-users/}
% \end{abstract}
%
+% \renewcommand{\numberline}[1]{#1~}
% \tableofcontents
%
% \listoffigures
@@ -2664,7 +2666,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2013/06/07 v1.4.7 LaTeX port of EDMAC]
+\ProvidesPackage{eledmac}[2013/07/03 v1.4.8 LaTeX port of EDMAC]
% \end{macrocode}
%
% In general there is the following modifications to the original
@@ -3108,7 +3110,7 @@
\line@list@stuff{\jobname.\extensionchars\the\section@num}%
\l@dend@stuff
\setcounter{pstart}{1}
- \begingroup
+ \ifl@dpairing\else\begingroup\fi
\initnumbering@sectcmd
}
\newcommand*{\initnumbering@reg}{%
@@ -3222,7 +3224,7 @@
\global\rightskip=\leftmargin%
}
\renewcommand{\endquotation}{\par%
- \global\leftskip=0pt%
+ \global\leftskip=0pt%
\global\rightskip=0pt%
\leavevmode%
\skipnumbering%
@@ -3303,7 +3305,7 @@
\else
\led@err@NumberingNotStarted
\fi
- \autoparfalse\endgroup}
+ \autoparfalse\ifl@dpairing\else\endgroup\fi}
% \end{macrocode}
% \end{macro}
%
@@ -6454,28 +6456,28 @@
%
% \begin{macro}{\footnotelang@lua}
% \cs{footnotelang@lua} is called to remember the information about the language of a lemma when LuaLaTeX is used.
-% \begin{macrocode}
+% \begin{macrocode}
\newcommandx*{\footnotelang@lua}[1][1=L,usedefault]{%
- \ifstrequal{#1}{L}{%
- \xright@appenditem{{\csxdef{footnote@luatextextdir}{\the\luatextextdir}}}\to\inserts@list%Know the dir of lemma
+ \ifstrequal{#1}{L}{%
+ \xright@appenditem{{\csxdef{footnote@luatextextdir}{\the\luatextextdir}}}\to\inserts@list%Know the dir of lemma
\global\advance\insert@count \@ne%
\xright@appenditem{{\csxdef{footnote@luatexpardir}{\the\luatexpardir}}}\to\inserts@list%Know the dir of lemma
\global\advance\insert@count \@ne%
- }%
- {%
- \xright@appenditem{{\csxdef{footnote@luatextextdir}{\the\luatextextdir}}}\to\inserts@listR%Know the dir of lemma
+ }%
+ {%
+ \xright@appenditem{{\csxdef{footnote@luatextextdir}{\the\luatextextdir}}}\to\inserts@listR%Know the dir of lemma
\global\advance\insert@countR \@ne%
\xright@appenditem{{\csxdef{footnote@luatexpardir}{\the\luatexpardir}}}\to\inserts@listR%Know the dir of lemma
\global\advance\insert@countR \@ne%
- }%
+ }%
}
-% \end{macrocode}
+% \end{macrocode}
% \end{macro}
% \begin{macro}{\footnotelang@poly}
-% \begin{macrocode}
% \cs{footnotelang@poly} is called to remember the information about the language of a lemma when Polyglossia is used.
+% \begin{macrocode}
\newcommandx*{\footnotelang@poly}[1][1=L,usedefault]{%
- \ifstrequal{#1}{L}{%
+ \ifstrequal{#1}{L}{%
\if@RTL%
\xright@appenditem{{\csxdef{footnote@dir}{@RTLtrue}}}\to\inserts@list%Know the language of lemma
\global\advance\insert@count \@ne%
@@ -6485,8 +6487,8 @@
\fi%
\xright@appenditem{{\csxdef{footnote@lang}{\csexpandonce{languagename}}}}\to\inserts@list%Know the language of lemma
\global\advance\insert@count \@ne%
- }%
- {%
+ }%
+ {%
\if@RTL
\xright@appenditem{{\csxdef{footnote@dir}{@RTLtrue}}}\to\inserts@listR%Know the language of lemma
\global\advance\insert@countR \@ne%
@@ -6496,9 +6498,9 @@
\fi
\xright@appenditem{{\csxdef{footnote@lang}{\csexpandonce{languagename}}}}\to\inserts@listR%Know the language of lemma
\global\advance\insert@countR \@ne%
- }%
+ }%
}
-% \end{macrocode}
+% \end{macrocode}
% \end{macro}
% \subsection{Normal footnote formatting} \label{sec:nfootformat}
%
@@ -6601,8 +6603,8 @@
% \begin{macrocode}
\newcommand*{\ledsetnormalparstuff}{%
\ifluatex%
- \luatextextdir\footnote@luatextextdir%
- \luatexpardir\footnote@luatexpardir%
+ \luatextextdir\footnote@luatextextdir%
+ \luatexpardir\footnote@luatexpardir%
\fi%
\csuse{\csuse{footnote@dir}}%
\normal@pars%
@@ -6646,13 +6648,13 @@
\def\endashchar{\textnormal{--}}
\newcommand*{\fullstop}{\textnormal{.}}
\newcommand*{\rbracket}{\textnormal{%
- \csuse{text\csuse{footnote@lang}}{%
- \ifluatex%
- \ifdefstring{\footnote@luatextextdir}{TRT}{\thinspace[}{\thinspace]}%
- \else%
- \thinspace]%
- \fi}%
- }%
+ \csuse{text\csuse{footnote@lang}}{%
+ \ifluatex%
+ \ifdefstring{\footnote@luatextextdir}{TRT}{\thinspace[}{\thinspace]}%
+ \else%
+ \thinspace]%
+ \fi}%
+ }%
}
% \end{macrocode}
@@ -8526,11 +8528,12 @@
\newcommand{\content}{##2}%
\ifnumberedpar@
\ifledRcol%
- \ifluatex%
- \footnotelang@lua[R]%
- \fi%
- \@ifundefined{xpg@main@language}{}%if polyglossia
- {\footnotelang@poly[R]}%
+ \ifluatex%
+ \footnotelang@lua[R]%
+ \fi%
+ \@ifundefined{xpg@main@language}%if polyglossia
+ {}%
+ {\footnotelang@poly[R]}%
\footnoteoptions@[R]{##1}{true}%
\xright@appenditem{\noexpand\csuse{v#1footnote}{#1}%
{{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@listR
@@ -8538,10 +8541,11 @@
\global\advance\insert@countR \@ne%
\else%
\ifluatex%
- \footnotelang@lua%
- \fi%
- \@ifundefined{xpg@main@language}{}%if polyglossia
- {\footnotelang@poly}%
+ \footnotelang@lua%
+ \fi%
+ \@ifundefined{xpg@main@language}%if polyglossia
+ {}%
+ {\footnotelang@poly}%
\footnoteoptions@{##1}{true}%
\xright@appenditem{\noexpand\csuse{v#1footnote}{#1}%
{{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list
diff --git a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
index d7a312d24db..b6b2d47be6e 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{3936}
+% \CheckSum{3954}
%
% \makeatletter
% \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -719,7 +719,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledpar}[2012/12/19 v1.3.3 eledmac extension for parallel texts]
+\ProvidesPackage{eledpar}[2013/07/03 v1.3.4 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.
@@ -3292,43 +3292,50 @@
% The `footnotes' for left, right, and moveable sidenotes. The whole
% scheme is reminiscent of the critical footnotes code.
% \changes{v1.3.3}{2012/12/19}{Debug on the left notes of the right column.}
+% \changes{v1.3.4}{2013/07/03}{Allow to use commands in sidenotes, like it was introduced by eledmac 1.0.}
% \begin{macrocode}
\renewcommand*{\l@dlsnote}[1]{%
+ \begingroup%
+ \newcommand{\content}{#1}%
\ifnumberedpar@
\ifledRcol%
- \xright@appenditem{\noexpand\vl@dlsnote{#1}}%
+ \xright@appenditem{\noexpand\vl@dlsnote{\csexpandonce{content}}}%
\to\inserts@listR
\global\advance\insert@countR \@ne%
\else%
- \xright@appenditem{\noexpand\vl@dlsnote{#1}}%
+ \xright@appenditem{\noexpand\vl@dlsnote{\csexpandonce{content}}}%
\to\inserts@list
\global\advance\insert@count \@ne%
\fi
- \fi\ignorespaces}
+ \fi\ignorespaces\endgroup}
\renewcommand*{\l@drsnote}[1]{%
+ \begingroup%
+ \newcommand{\content}{#1}%
\ifnumberedpar@
\ifledRcol%
- \xright@appenditem{\noexpand\vl@drsnote{#1}}%
+ \xright@appenditem{\noexpand\vl@drsnote{\csexpandonce{content}}}%
\to\inserts@listR
\global\advance\insert@countR \@ne%
\else%
- \xright@appenditem{\noexpand\vl@drsnote{#1}}%
+ \xright@appenditem{\noexpand\vl@drsnote{\csexpandonce{content}}}%
\to\inserts@list
\global\advance\insert@count \@ne%
\fi
- \fi\ignorespaces}
+ \fi\ignorespaces\endgroup}
\renewcommand*{\l@dcsnote}[1]{%
+ \begingroup%
+ \newcommand{\content}{#1}%
\ifnumberedpar@
\ifledRcol%
- \xright@appenditem{\noexpand\vl@dcsnote{#1}}%
+ \xright@appenditem{\noexpand\vl@dcsnote{\csexpandonce{content}}}%
\to\inserts@listR
\global\advance\insert@countR \@ne%
\else%
- \xright@appenditem{\noexpand\vl@dcsnote{#1}}%
+ \xright@appenditem{\noexpand\vl@dcsnote{\csexpandonce{content}}}%
\to\inserts@list
\global\advance\insert@count \@ne%
\fi
- \fi\ignorespaces}
+ \fi\ignorespaces\endgroup}
% \end{macrocode}
% \end{macro}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-17 23:39:19 +0000