summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/eledmac
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-09-02 23:59:01 +0000
committerKarl Berry <karl@freefriends.org>2015-09-02 23:59:01 +0000
commit3f1f1cefd70c2c51b5ebf053549cea2c2709d2d7 (patch)
tree5d14c05970b8a2a44fd37eb287dce2bb9046cab4 /Master/texmf-dist/source/latex/eledmac
parent32ce884fb7b6d27ce7461e149762f2c71a2a878a (diff)
eledmac (2sep15)
git-svn-id: svn://tug.org/texlive/trunk@38276 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/eledmac')
-rw-r--r--Master/texmf-dist/source/latex/eledmac/eledmac.dtx45
-rw-r--r--Master/texmf-dist/source/latex/eledmac/eledpar.dtx31
2 files changed, 43 insertions, 33 deletions
diff --git a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
index 5c7b2fc477a..c03f7b60ee2 100644
--- a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
+++ b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
@@ -64,7 +64,7 @@
% \fi
%
% \newcommand{\reff}[1]{\ref{#1} p.~\pageref{#1}}
-% \CheckSum{12008}
+% \CheckSum{12014}
%
% \makeatletter
% \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -276,6 +276,8 @@
% \changes{v1.24.4}{2015/07/14}{Fix spurious space with \cs{edindex} when using xindy+hyperref option.}
% \changes{v1.24.5}{2015/07/16}{Fix bug of indent, when a added in 1.1.0, when a \cs{beginnumbering} immediately follow a sectioning command.}
% \changes{v1.24.6}{2015/07/19}{Eledmac support ends. Migrate to reledmac.}
+% \changes{v1.24.7}{2015/09/01}{Change some internal code in order to provide compatibility with \LaTeX\ release of october 2015}
+% \changes{v1.24.8}{2015/09/02}{Fix one bug of v1.24.7 in parallel typesetting with \LuaTeX}
% \hyphenation{man-u-script man-u-scripts}
%
%
@@ -3237,7 +3239,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2015/07/19 v1.24.6 LaTeX port of EDMAC]%
+\ProvidesPackage{eledmac}[2015/09/02 v1.24.8 LaTeX port of EDMAC]%
% \end{macrocode}
%
% Generally, these are the modifications to the original.
@@ -3374,6 +3376,13 @@
\RequirePackage{ifxetex}%
% \end{macrocode}
%
+% \subsection{Compatibility with \LuaTeX}
+%Here, we enable some primitives for \LuaTeX.
+% \begin{macrocode}
+\ifx\directlua\undefined\else%
+ \directlua{tex.enableprimitives("",{"textdir","pardir","bodydir"})}
+\fi
+% \end{macrocode}
% \subsection{Boolean flags}
% \begin{macro}{\ifl@dmemoir}
% Define a flag for if the \Lpack{memoir} class has been used.
@@ -4429,7 +4438,7 @@
\newcommand*{\ledlinenum}{%
\bgroup%
\ifluatex%
- \luatextextdir TLT%
+ \textdir TLT%
\fi%
\numlabfont\linenumrep{\line@num}%
\ifsublines@
@@ -6769,7 +6778,7 @@
\autopar%
\fi%
\ifluatex%
- \edef\l@luatextextdir@L{\the\luatextextdir}%
+ \edef\l@luatextextdir@L{\the\textdir}%
\fi%
\if@nobreak%
\let\@oldnobreak\@nobreaktrue%
@@ -7058,7 +7067,7 @@
% If we use \LuaLaTeX\, then restore the direction.
% \begin{macrocode}
\ifluatex%
- \luatextextdir\l@luatextextdir@L%
+ \textdir\l@luatextextdir@L%
\fi%
% \end{macrocode}
% Insert, if needed, the hanging symbol.
@@ -7942,15 +7951,15 @@
% \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
+ \xright@appenditem{{\csxdef{footnote@luatextextdir}{\the\textdir}}}\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
+ \xright@appenditem{{\csxdef{footnote@luatexpardir}{\the\pardir}}}\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\textdir}}}\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
+ \xright@appenditem{{\csxdef{footnote@luatexpardir}{\the\pardir}}}\to\inserts@listR%Know the dir of lemma
\global\advance\insert@countR \@ne%
}%
}
@@ -8107,8 +8116,8 @@
\newcommand*{\ledsetnormalparstuff}{%
\led@war@ledsetnormalparstuffDeprecated%
\ifluatex%
- \luatextextdir\footnote@luatextextdir%
- \luatexpardir\footnote@luatexpardir%
+ \textdir\footnote@luatextextdir%
+ \pardir\footnote@luatexpardir%
\fi%
\csuse{\csuse{footnote@dir}}%
\normal@pars%
@@ -8116,8 +8125,8 @@
\newcommand*{\ledsetnormalparstuff@common}{%
\ifluatex%
- \luatextextdir\footnote@luatextextdir%
- \luatexpardir\footnote@luatexpardir%
+ \textdir\footnote@luatextextdir%
+ \pardir\footnote@luatexpardir%
\fi%
\csuse{\csuse{footnote@dir}}%
\normal@pars%
@@ -8450,7 +8459,7 @@
\def\printlines#1|#2|#3|#4|#5|#6|#7|{%
\begingroup%
\ifluatex%
- \luatextextdir TLT%
+ \textdir TLT%
\fi%
\setprintlines{#1}{#2}{#3}{#4}{#5}{#6}%
% \end{macrocode}
@@ -9692,8 +9701,8 @@
% \begin{macrocode}
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalfootfmtX}[2]{%
\ifluatex%
- \luatextextdir\footnote@luatextextdir%
- \luatexpardir\footnote@luatexpardir%
+ \textdir\footnote@luatextextdir%
+ \pardir\footnote@luatexpardir%
\par%
\fi%
\protected@edef\@currentlabel{%
@@ -11084,8 +11093,8 @@
{\csuse{@footnotemark#1}}%
{}%
\ifluatex%
- \xdef\footnote@luatextextdir{\the\luatextextdir}%
- \xdef\footnote@luatexpardir{\the\luatexpardir}%
+ \xdef\footnote@luatextextdir{\the\textdir}%
+ \xdef\footnote@luatexpardir{\the\pardir}%
\fi%
\csuse{vfootnote#1}{#1}{\expandonce\content}\m@mmf@prepare%
\endgroup%
diff --git a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
index e5d47d16ae7..69103fa6e94 100644
--- a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
+++ b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
@@ -213,6 +213,7 @@
% \changes{v1.16.2}{2015/05/29}{Fix bug when adding empty lines before a \cs{pend} in combination with some specific penalties setting.}
% \changes{v1.17.0}{2015/06/02}{Add compatibility of optional argument of \cs{pstart}/\cs{pend} and \cs{AtEveryPstart}/\cs{AtEveryPend} with two columns mode.}
% \changes{v1.17.0a}{2015/07/19}{Eledpar support ends. Migrate to reledpar.}
+% \changes{v1.17.1}{2015/09/01}{Changes some internal code in order to provide compatibility with \LaTeX\ release of october 2015}
% \hyphenation{man-u-script man-u-scripts}
%
%
@@ -979,7 +980,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledpar}[2015/07/19 v1.17.0a eledmac extension for parallel texts]%
+\ProvidesPackage{eledpar}[2015/09/01 v1.17.1 eledmac extension for parallel texts]%
% \end{macrocode}
% Few commands use \cs{xspace} command.
@@ -2830,9 +2831,9 @@
\fi%
\@nobreaktrue%
\ifluatex%
- \xdef\l@luatextextdir@L{\the\luatextextdir}%
- \xdef\l@luatexpardir@L{\the\luatexpardir}%
- \xdef\l@luatexbodydir@L{\the\luatexbodydir}%
+ \xdef\l@luatextextdir@L{\the\textdir}%
+ \xdef\l@luatexpardir@L{\the\pardir}%
+ \xdef\l@luatexbodydir@L{\the\bodydir}%
\fi%
\ifnumbering \else%
\led@err@PstartNotNumbered%
@@ -2901,9 +2902,9 @@
\fi%
\@nobreaktrue%
\ifluatex%
- \xdef\l@luatextextdir@R{\the\luatextextdir}%
- \xdef\l@luatexpardir@R{\the\luatexpardir}%
- \xdef\l@luatexbodydir@R{\the\luatexbodydir}%
+ \xdef\l@luatextextdir@R{\the\textdir}%
+ \xdef\l@luatexpardir@R{\the\pardir}%
+ \xdef\l@luatexbodydir@R{\the\bodydir}%
\fi%
\ifnumberingR \else%
\led@err@PstartNotNumbered%
@@ -3154,7 +3155,7 @@
{\ledllfill\hb@xt@ \Lcolwidth{%
\do@insidelineLhook%
\ifluatex%
- \luatextextdir\l@luatextextdir@L%
+ \textdir\l@luatextextdir@L%
\fi%
\new@lineL%
\inserthangingsymbolL%
@@ -3177,9 +3178,9 @@
\@eled@sectioningtrue%
\bgroup%
\ifluatex%
- \luatextextdir\l@luatextextdir@L%
- \luatexpardir\l@luatexpardir@L%
- \luatexbodydir\l@luatexbodydir@L%
+ \textdir\l@luatextextdir@L%
+ \pardir\l@luatexpardir@L%
+ \bodydir\l@luatexbodydir@L%
\ifdefstring{\l@luatextextdir@L}{TRT}{\@RTLtrue}{}%
\fi%
\csuse{eled@sectioning@\the\l@dpscL}%
@@ -3298,7 +3299,7 @@
\new@lineR%
\inserthangingsymbolR%
\ifluatex%
- \luatextextdir\l@luatextextdir@R%
+ \textdir\l@luatextextdir@R%
\fi%
\l@dunhbox@line{\one@lineR}}\ledrlfill\l@drd@ta%
\l@drsn@te%
@@ -3314,9 +3315,9 @@
\@eled@sectioningtrue%
\bgroup%
\ifluatex%
- \luatextextdir\l@luatextextdir@R%
- \luatexpardir\l@luatexpardir@R%
- \luatexbodydir\l@luatexbodydir@R%
+ \textdir\l@luatextextdir@R%
+ \pardir\l@luatexpardir@R%
+ \bodydir\l@luatexbodydir@R%
\ifdefstring{\l@luatextextdir@L}{TRT}{\@RTLtrue}{}%
\fi%
\csuse{eled@sectioning@\the\l@dpscR R}%