summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-07-05 19:04:54 +0000
committerKarl Berry <karl@freefriends.org>2013-07-05 19:04:54 +0000
commit94276bbc8a1b917f768647374d578af0ceaef606 (patch)
tree1e92b5b589771dba0049c093ae7cd263c557baa4 /Master/texmf-dist/tex/latex
parentdde0e3b32c9054caf6e79a9eb6a337a3c097aa47 (diff)
eledmac (4jul13)
git-svn-id: svn://tug.org/texlive/trunk@31097 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/eledmac/eledmac.sty66
-rw-r--r--Master/texmf-dist/tex/latex/eledmac/eledpar.sty26
2 files changed, 50 insertions, 42 deletions
diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
index 87bb54b8fb2..6efcc9dcee6 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/06/07 v1.4.7 LaTeX port of EDMAC]
+\ProvidesPackage{eledmac}[2013/07/03 v1.4.8 LaTeX port of EDMAC]
\newif\ifledfinal
\newif\ifparapparatus@
\newif\ifnoquotation@
@@ -156,7 +156,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}{%
@@ -244,7 +244,7 @@
\global\rightskip=\leftmargin%
}
\renewcommand{\endquotation}{\par%
- \global\leftskip=0pt%
+ \global\leftskip=0pt%
\global\rightskip=0pt%
\leavevmode%
\skipnumbering%
@@ -299,7 +299,7 @@
\else
\led@err@NumberingNotStarted
\fi
- \autoparfalse\endgroup}
+ \autoparfalse\ifl@dpairing\else\endgroup\fi}
\newcommand{\pausenumbering}{%
\endnumbering\global\numberingtrue}
\newcommand*{\resumenumbering}{%
@@ -1317,21 +1317,21 @@
\notblank{#2}{\docsvlist{#2}}{}% Parsing all options
}
\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%
-}%
+ }%
}
\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%
@@ -1341,8 +1341,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%
@@ -1352,7 +1352,7 @@
\fi
\xright@appenditem{{\csxdef{footnote@lang}{\csexpandonce{languagename}}}}\to\inserts@listR%Know the language of lemma
\global\advance\insert@countR \@ne%
-}%
+ }%
}
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalvfootnote}[2]{%
\insert\csname #1footins\endcsname\bgroup
@@ -1379,8 +1379,8 @@
\newcommand*{\ledsetnormalparstuff}{%
\ifluatex%
- \luatextextdir\footnote@luatextextdir%
-\luatexpardir\footnote@luatexpardir%
+ \luatextextdir\footnote@luatextextdir%
+ \luatexpardir\footnote@luatexpardir%
\fi%
\csuse{\csuse{footnote@dir}}%
\normal@pars%
@@ -1399,13 +1399,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}%
+ }%
}
\newcommand{\printpstart}[0]{%
@@ -2204,11 +2204,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
@@ -2216,10 +2217,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/tex/latex/eledmac/eledpar.sty b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty
index faac3e6056a..e46be8b5eae 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/12/19 v1.3.3 eledmac extension for parallel texts]
+\ProvidesPackage{eledpar}[2013/07/03 v1.3.4 eledmac extension for parallel texts]
\newif\ifshiftedpstarts
\let\shiftedversestrue\shiftedpstartstrue
@@ -1384,41 +1384,47 @@
\global\sidenote@margin=\@ne
\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}
\newcommand*{\affixside@noteR}{%
\def\sidenotecontent@{}%