diff options
| author | Karl Berry <karl@freefriends.org> | 2015-09-02 23:59:01 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2015-09-02 23:59:01 +0000 |
| commit | 3f1f1cefd70c2c51b5ebf053549cea2c2709d2d7 (patch) | |
| tree | 5d14c05970b8a2a44fd37eb287dce2bb9046cab4 | |
| parent | 32ce884fb7b6d27ce7461e149762f2c71a2a878a (diff) | |
eledmac (2sep15)
git-svn-id: svn://tug.org/texlive/trunk@38276 c570f23f-e606-0410-a88d-b1316a301751
46 files changed, 78 insertions, 65 deletions
diff --git a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf Binary files differindex 20eb972f9a5..796587777b4 100644 --- a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf Binary files differindex 366ff7a6fbf..92599fb8224 100644 --- a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/1-criticalnotes.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/1-criticalnotes.pdf Binary files differindex 36acafb2997..5033bbf4ad0 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/1-criticalnotes.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/1-criticalnotes.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/1-sidenotes.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/1-sidenotes.pdf Binary files differindex 47b8ab702ab..ca1f9d5c1a6 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/1-sidenotes.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/1-sidenotes.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/1-tabular.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/1-tabular.pdf Binary files differindex 52463cfb540..32dc0b3b7b8 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/1-tabular.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/1-tabular.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/1-verses.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/1-verses.pdf Binary files differindex c158e597e1d..f0ff3fd6431 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/1-verses.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/1-verses.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/2-cross_referencing.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/2-cross_referencing.pdf Binary files differindex 98fcfb65638..26eccf0aaa2 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/2-cross_referencing.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/2-cross_referencing.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/2-footnote_spacing.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/2-footnote_spacing.pdf Binary files differindex a09c699279f..bb95bcb6423 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/2-footnote_spacing.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/2-footnote_spacing.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/2-indexing.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/2-indexing.pdf Binary files differindex 4d82160b9ba..b06c536d624 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/2-indexing.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/2-indexing.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/2-lemma_disambigution.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/2-lemma_disambigution.pdf Binary files differindex 25014720dbd..581aabc9e20 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/2-lemma_disambigution.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/2-lemma_disambigution.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/2-line_numbers_in_header.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/2-line_numbers_in_header.pdf Binary files differindex f172ac4aec2..adb94a4bfd9 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/2-line_numbers_in_header.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/2-line_numbers_in_header.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/2-one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/2-one_series_per_pstart.pdf Binary files differindex c9d04b29049..c27350904c0 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/2-one_series_per_pstart.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/2-one_series_per_pstart.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/2-performances.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/2-performances.pdf Binary files differindex dd8ba44e148..07f92d41a7e 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/2-performances.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/2-performances.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/2-titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/2-titles_in_line_numbering_with_notes.pdf Binary files differindex a0deef912b2..7c3e3fcab80 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/2-titles_in_line_numbering_with_notes.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/2-titles_in_line_numbering_with_notes.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/2-titles_not_in_line_numbering.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/2-titles_not_in_line_numbering.pdf Binary files differindex e496c912deb..7ce7aeecb74 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/2-titles_not_in_line_numbering.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/2-titles_not_in_line_numbering.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/3-eledpar_columns_different_languages.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/3-eledpar_columns_different_languages.pdf Binary files differindex 6ae8f0f50ac..232239bbae7 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/3-eledpar_columns_different_languages.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/3-eledpar_columns_different_languages.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/3-eledpar_mwe.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/3-eledpar_mwe.pdf Binary files differindex 4d508779e2c..3f0e3374efa 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/3-eledpar_mwe.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/3-eledpar_mwe.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/3-eledpar_pages_different_languages_lualatex.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/3-eledpar_pages_different_languages_lualatex.pdf Binary files differindex 430dd4596f4..a53650873f7 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/3-eledpar_pages_different_languages_lualatex.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/3-eledpar_pages_different_languages_lualatex.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/3-reledpar_columns_different_languages.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/3-reledpar_columns_different_languages.pdf Binary files differdeleted file mode 100644 index 2ddc3cfa12d..00000000000 --- a/Master/texmf-dist/doc/latex/eledmac/examples/3-reledpar_columns_different_languages.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/3-reledpar_mwe.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/3-reledpar_mwe.pdf Binary files differdeleted file mode 100644 index 354ec9b0282..00000000000 --- a/Master/texmf-dist/doc/latex/eledmac/examples/3-reledpar_mwe.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf Binary files differdeleted file mode 100644 index 2a8ea5544b3..00000000000 --- a/Master/texmf-dist/doc/latex/eledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/3-reledpar_same_page_number_in_both_side.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/3-reledpar_same_page_number_in_both_side.pdf Binary files differdeleted file mode 100644 index 266662b8159..00000000000 --- a/Master/texmf-dist/doc/latex/eledmac/examples/3-reledpar_same_page_number_in_both_side.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_column_mix_with_not_column.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_column_mix_with_not_column.pdf Binary files differindex 4da030f6291..ac163bd1c82 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_column_mix_with_not_column.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_column_mix_with_not_column.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_columns_alignment.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_columns_alignment.pdf Binary files differindex 1c29e54f07a..e0204162c3d 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_columns_alignment.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_columns_alignment.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_columns_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_columns_titles_in_line_numbering_with_notes.pdf Binary files differindex 38cc265aa98..64494a91f4a 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_columns_titles_in_line_numbering_with_notes.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_columns_titles_in_line_numbering_with_notes.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_one_series_per_pstart.pdf Binary files differindex dafce8d6720..91e06657b04 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_one_series_per_pstart.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_one_series_per_pstart.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_page_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_page_titles_in_line_numbering_with_notes.pdf Binary files differindex 6c8253b47b4..be44b0458e5 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_page_titles_in_line_numbering_with_notes.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_page_titles_in_line_numbering_with_notes.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_pages_long_notes.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_pages_long_notes.pdf Binary files differindex 9e66f3bf0fa..66273f2fc22 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_pages_long_notes.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_pages_long_notes.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_pages_notes_leftpage.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_pages_notes_leftpage.pdf Binary files differindex b1eaed1c528..2b0e3fcfcc4 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_pages_notes_leftpage.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_pages_notes_leftpage.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_pages_paragraph_separator_between.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_pages_paragraph_separator_between.pdf Binary files differindex ae7a5ac5f88..2d258f40a6b 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_pages_paragraph_separator_between.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_pages_paragraph_separator_between.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_titles_not_in_line_numbering.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_titles_not_in_line_numbering.pdf Binary files differindex 2db5fb25725..23d466a1f9f 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_titles_not_in_line_numbering.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_titles_not_in_line_numbering.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_verse_text_between.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_verse_text_between.pdf Binary files differindex 21475d0b782..49011ddd008 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_verse_text_between.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_verse_text_between.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_column_mix_with_not_column.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_column_mix_with_not_column.pdf Binary files differdeleted file mode 100644 index 3eb5c8c7fcf..00000000000 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_column_mix_with_not_column.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_columns_alignment.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_columns_alignment.pdf Binary files differdeleted file mode 100644 index 27538ca738f..00000000000 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_columns_alignment.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf Binary files differdeleted file mode 100644 index f2fcdf18c34..00000000000 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_one_series_per_pstart.pdf Binary files differdeleted file mode 100644 index 36bca2c23f6..00000000000 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_one_series_per_pstart.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.pdf Binary files differdeleted file mode 100644 index ddd5ec9f192..00000000000 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_pages_long_notes.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_pages_long_notes.pdf Binary files differdeleted file mode 100644 index 95bf8bd87c9..00000000000 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_pages_long_notes.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_pages_notes_leftpage.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_pages_notes_leftpage.pdf Binary files differdeleted file mode 100644 index 823855f4c64..00000000000 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_pages_notes_leftpage.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf Binary files differdeleted file mode 100644 index 1388a46e87a..00000000000 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf Binary files differdeleted file mode 100644 index 970637a39c1..00000000000 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_verse_text_between.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_verse_text_between.pdf Binary files differdeleted file mode 100644 index ce85b4d927b..00000000000 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-reledpar_verse_text_between.pdf +++ /dev/null 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}% diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty index 3bdb8930a01..5609a973dd4 100644 --- a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty +++ b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty @@ -27,7 +27,7 @@ \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]% \newif\ifledfinal \newif\ifoldprintnpnumspace@ \newif\ifnocritical@% @@ -92,6 +92,9 @@ \RequirePackage{ragged2e} \RequirePackage{ragged2e} \RequirePackage{ifxetex}% +\ifx\directlua\undefined\else% + \directlua{tex.enableprimitives("",{"textdir","pardir","bodydir"})} +\fi \newif\ifl@dmemoir \@ifclassloaded{memoir}{\l@dmemoirtrue}{\l@dmemoirfalse} @@ -509,7 +512,7 @@ \newcommand*{\ledlinenum}{% \bgroup% \ifluatex% - \luatextextdir TLT% + \textdir TLT% \fi% \numlabfont\linenumrep{\line@num}% \ifsublines@ @@ -1248,7 +1251,7 @@ \autopar% \fi% \ifluatex% - \edef\l@luatextextdir@L{\the\luatextextdir}% + \edef\l@luatextextdir@L{\the\textdir}% \fi% \if@nobreak% \let\@oldnobreak\@nobreaktrue% @@ -1389,7 +1392,7 @@ \l@dlsn@te {\ledllfill\hb@xt@ \wd\one@line{\new@line% \ifluatex% - \luatextextdir\l@luatextextdir@L% + \textdir\l@luatextextdir@L% \fi% \inserthangingsymbol %Space keept for backward compatibility \l@dunhbox@line{\one@line}}% @@ -1762,15 +1765,15 @@ } \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% }% } @@ -1830,8 +1833,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% @@ -1839,8 +1842,8 @@ \newcommand*{\ledsetnormalparstuff@common}{% \ifluatex% - \luatextextdir\footnote@luatextextdir% - \luatexpardir\footnote@luatexpardir% + \textdir\footnote@luatextextdir% + \pardir\footnote@luatexpardir% \fi% \csuse{\csuse{footnote@dir}}% \normal@pars% @@ -1995,7 +1998,7 @@ \def\printlines#1|#2|#3|#4|#5|#6|#7|{% \begingroup% \ifluatex% - \luatextextdir TLT% + \textdir TLT% \fi% \setprintlines{#1}{#2}{#3}{#4}{#5}{#6}% \ifdimequal{\csuse{boxstartlinenum@\@currentseries}}{0pt}% @@ -2516,8 +2519,8 @@ \notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalfootfmtX}[2]{% \ifluatex% - \luatextextdir\footnote@luatextextdir% - \luatexpardir\footnote@luatexpardir% + \textdir\footnote@luatextextdir% + \pardir\footnote@luatexpardir% \par% \fi% \protected@edef\@currentlabel{% @@ -3379,8 +3382,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/tex/latex/eledmac/eledpar.sty b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty index bab9a36ffbf..e5616bd33cf 100644 --- a/Master/texmf-dist/tex/latex/eledmac/eledpar.sty +++ b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty @@ -23,7 +23,7 @@ %% This work consists of the files listed in the README file. %% \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]% \RequirePackage{xspace}% \newif\ifshiftedpstarts @@ -877,9 +877,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% @@ -927,9 +927,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% @@ -1073,7 +1073,7 @@ {\ledllfill\hb@xt@ \Lcolwidth{% \do@insidelineLhook% \ifluatex% - \luatextextdir\l@luatextextdir@L% + \textdir\l@luatextextdir@L% \fi% \new@lineL% \inserthangingsymbolL% @@ -1089,9 +1089,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}% @@ -1169,7 +1169,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% @@ -1185,9 +1185,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}% |