reledmac (22feb17)

git-svn-id: svn://tug.org/texlive/trunk@43319 c570f23f-e606-0410-a88d-b1316a301751

52 files changed, 318 insertions, 178 deletions

diff --git a/Master/texmf-dist/doc/latex/reledmac/README b/Master/texmf-dist/doc/latex/reledmac/README
index 3260f4169f6..01dfc1be949 100644
--- a/Master/texmf-dist/doc/latex/reledmac/README
+++ b/Master/texmf-dist/doc/latex/reledmac/README
@@ -102,8 +102,8 @@ please follow these rules:
 
 -   Go to the [issues page](https://github.com/maieul/ledmac/issues).
 -   Open *one issue for each problem*, even if problems are similar.
--   You can write or in English, or better, in French if it is your
-    native language.
+-   You can write in English, or better in French if it is your native
+    language.
 -   Add a [minimal working
     example](http://www.tex.ac.uk/cgi-bin/texfaq2html?label=minxampl).
 -   If your report is really a bug, Maïeul Rouquette will open a
@@ -123,3 +123,13 @@ please follow these rules:
     -   Look on file issueXXX.tex get a MWE of the new feature.
     -   Make your report.
 
+Bibliography
+============
+
+We maintain two collaborative bibliographies:
+
+-   [Critical Editions Typeset with EDMAC, LEDMAC and
+    eLEDMAC](https://www.zotero.org/groups/critical_editions_typeset_with_edmac_ledmac_and_eledmac/items)
+-   [Articles and books about
+    (r)(e)(l)edmac](https://www.zotero.org/groups/articles_and_books_about_reledmac/items)
+
diff --git a/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx b/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx
index 8f833dfe954..67029384292 100644
--- a/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx
+++ b/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx
@@ -182,7 +182,7 @@
 % We do not see any reason to print them in the other sections. However, if you want to print the pstart numbers in all of the footnotes, whatever the section, without having to use \cs{numberpstarttrue}, you can use 
 % \cs{Xpstarteverytime}.
 % \subsection{Migration to eledmac 1.21.0}
-% \subsubsection{\cs{Xledsetnormalparstuff} and \cs{ledsetnormalparstuffX}}
+% \subsubsection{\cs{Xledsetnormalparstuff}\ and \cs{ledsetnormalparstuffX}}
 % The \cs{ledsetnormalparstuff} has been split into two different commands:
 % \begin{itemize}
 %  \item \cs{Xledsetnormalparstuff} for critical notes;
@@ -255,7 +255,7 @@
 % The \verb+oldprintnpnumspace+ option has been removed too, because it was related to a historical bug.
 % The \cs{usingedtext} and \cs{usingcritext} commands are also deprecated. 
 % 
-% \subsubsection{\cs{renewcommand} replaced by command}
+% \subsubsection{\cs{renewcommand}\ replaced by command}
 % Many uses of \cs{renewcommand} have been replaced with uses of specific commands. Please read handbook about specific commands.
 % 
 % \begin{longtable}{p{0.45\textwidth}p{0.45\textwidth}}
@@ -403,3 +403,5 @@
 % 
 % Version 2.13.1 solves this issue. Please use \cs{Xlineflag} if you want to add the right flag.
 %
+% \subsection{Migration to \reledmac~2.18.0}
+% After updating reledmac, and before any new compilation, you need to clean your \verb|.aux| files, if you use \cs{edlabel} or related.
diff --git a/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-par.dtx b/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-par.dtx
index d140f0ca5a9..bb4f81e7631 100644
--- a/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-par.dtx
+++ b/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-par.dtx
@@ -33,7 +33,7 @@
 % 
 % The \verb+shiftedverses+ option has been removed.
 % Use the general \verb+shiftedpstart+ option instead.
-% \subsubsection{\cs{renewcommand} replaced with command}
+% \subsubsection{\cs{renewcommand}\ replaced with command}
 % Many uses of \cs{renewcommand} have been replaced with uses of specific commands. Please read the handbook about these particular commands.
 % 
 % \begin{longtable}{p{0.45\textwidth}p{0.45\textwidth}}
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
index 865bdfce2f3..8f7c7abae65 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
index edc060aae40..7c8327cc39f 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
index 623386b25d3..d6c29483d26 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
index 2c81cb8cb11..c362808e222 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf
index c77aaa02862..27664288326 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
index df74a336928..a0f356e2a06 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf
index 0b89f7c9a93..b5f6fd3f2b6 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
index c1c6395f986..a8cb5484bb8 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf
index 06413314fc9..3220c6c630d 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf
index 98c72a8600b..02b930eb140 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf
index a42b75459cb..7ca7aacde85 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf
index c8967f8dc84..c39ac865dee 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf
index 9124cee5046..0e92ea97e16 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf
index b31e43166b0..08618f2b709 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
index 06796060c21..b0dc20549a2 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf
index 1496e610746..8ed0e49ecb4 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.tex b/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.tex
index 81e03b449f2..964645a664c 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.tex
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.tex
@@ -46,8 +46,10 @@ In this file, we provide an example of an edition with right-to-left text and le
 \edtext{בְּרֵאשִׁ֖ית בָּרָ֣א}{\Afootnote{Some comment}} 
 אֱלֹהִ֑ים אֵ֥ת הַשָּׁמַ֖יִם וְאֵ֥ת הָאָֽרֶץ׃
 \edtext{וְהָאָ֗רֶץ הָיְתָ֥ה}{\Afootnote{Some comment}}
+\edtext{
  תֹ֨הוּ֙ וָבֹ֔הוּ וְחֹ֖שֶׁךְ עַל־פְּנֵ֣י תְהֹ֑ום וְר֣וּחַ אֱלֹהִ֔ים מְרַחֶ֖פֶת עַל־פְּנֵ֥י הַמָּֽיִם׃
 וַיֹּ֥אמֶר אֱלֹהִ֖ים יְהִ֣י אֹ֑ור וַֽיְהִי־אֹֽור׃
+}{\Afootnote{Some comment on a long lemma}}
 וַיַּ֧רְא אֱלֹהִ֛ים אֶת־הָאֹ֖ור כִּי־טֹ֑וב וַיַּבְדֵּ֣ל אֱלֹהִ֔ים בֵּ֥ין הָאֹ֖ור וּבֵ֥ין הַחֹֽשֶׁךְ׃
 \edtext{וַיִּקְרָ֨א אֱלֹהִ֤ים׀}{\Afootnote{Some comment}}
  לָאֹור֙ יֹ֔ום וְלַחֹ֖שֶׁךְ קָ֣רָא לָ֑יְלָה וַֽיְהִי־עֶ֥רֶב וַֽיְהִי־בֹ֖קֶר יֹ֥ום אֶחָֽד׃ פ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
index de9ec172118..6bd6868491f 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf
index 3d6cff7d483..53f0cf0dc7f 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf
index d7d5550ac69..a934cab0244 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf
index 6974165029f..e4a93ac946e 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
index b598f38e116..901cab70ffa 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
index 8393c2cfeb9..8463db7a7b0 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
index b693e2d01f9..a6fc603a6f4 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
index 5ef1f9aeffd..fea9057f943 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf
index d3044b36c59..e3222367449 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
index 3ffe121ea0f..3acfe2e3209 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
index fec1124a6de..b2c034d1195 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
index 4f184a3bd8f..48d8af36a3c 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
index 9310c41486c..1af2e7428d7 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
index ed06fca88a8..24b8a46b818 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
index aec2593b43b..e9334098142 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf
index 2e858b756d3..f582b5f0382 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
index 7933587a623..0f9a95d78eb 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf
index 948fac99315..eab8add40c9 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
index a6b7aeebcf9..a99f86e697d 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf
index 6b704bc4c28..186e4797460 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
index f719baad056..392244faf14 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
index a0e23fdafda..fcdae5422ae 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
index 7072f0b0381..9621665e854 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
index de9d7eb20c8..0d88406ec0e 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf
index 179cbe84104..0c88e009cd9 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/migration.pdf b/Master/texmf-dist/doc/latex/reledmac/migration.pdf
index 27fbf703b73..122f13ccc22 100644
--- a/Master/texmf-dist/doc/latex/reledmac/migration.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/migration.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
index cfccd1642a7..f38b3cf29c8 100644
--- a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
diff --git a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
index cc26c1510cb..455f3e9efca 100644
--- a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
index c94169cc627..7920718c8da 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
@@ -449,16 +449,18 @@
 % \changes{v2.16.5}{2016/10/20}{Fix potential spurious spaces in endnotes.}
 % \changes{v2.16.6}{2016/11/14}{Take into account \protect\cs{linenumberstyle} when using \protect\cs{edlineref}.}
 % \changes{v2.16.6}{2016/11/14}{Fix bug with the line number style in \protect\cs{doennotes} when referring to right side line in parallel typesetting.}
-% \changes{v2.16.7}{2016/12/12}{Fix bug with \protect\cs{numberpstarttrue} when using multiple \protect\cs{beginnumbering}…\protect\cs{endnumbering}}
-% \changes{v2.16.7}{2016/12/12}{Fix bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}…\protect\cs{endnumbering}}
-% \changes{v2.16.8}{2016/12/16}{Fix bug with \protect\cs{edindex} in footnote in parallel typesetting}
+% \changes{v2.16.7}{2016/12/12}{Fix bug with \protect\cs{numberpstarttrue} when using multiple \protect\cs{beginnumbering}…\protect\cs{endnumbering}.}
+% \changes{v2.16.7}{2016/12/12}{Fix bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}…\protect\cs{endnumbering}.}
+% \changes{v2.16.8}{2016/12/16}{Fix bug with \protect\cs{edindex} in footnotes in parallel typesetting.}
 % \changes{v2.17.0}{2016/12/23}{Add \protect\cs{edglsadd} command.}
 % \changes{v2.17.0}{2016/12/23}{Add \protect\cs{setmsdataposition} setting.}
 % \changes{v2.17.1}{2017/01/22}{Fix spurious space in paragraphed footnotes when using \protect\LuaLaTeX without using Right-To-Left text.}
-% \changes{v2.17.2}{2017/01/25}{Change log message when numbered files don't still exist, in order to improve compatibility with \protect\emph{latexmk}.}
+% \changes{v2.17.2}{2017/01/25}{Change log message when numbered files still don't exist, in order to improve compatibility with \protect\emph{latexmk}.}
 % \changes{v2.17.3}{2017/01/31}{Fix bug with \protect\cs{doendnotesbysection} and \protect\cs{doendnotes}.}
 % \changes{v2.17.4}{2017/02/10}{Fix bug with \protect\cs{setSErefonlypageprefixsingle} and \protect\cs{setSErefonlypageprefixmore}.}
-% \changes{v2.17.5}{2017/02/12}{Fix bug with \protect\cs{pstartref} when refering to the left side of a parallel typesetting.}
+% \changes{v2.17.5}{2017/02/12}{Fix bug with \protect\cs{pstartref} when refering to the left side in parallel typesetting.}
+% \changes{v2.18.0}{2017/02/22}{Fix bug when using both \protect\cs{Xnumberonlyfirstintwolines} or \protect\cs{Xnumberonlyfirstinline} and \protect\cs{Xparafootsep} and \protect\cs{Xsymlinenum}.}
+% \changes{v2.18.0}{2017/02/22}{Fix bug when using a \protect\cs{edtext} in two lines or more in right-to-left typesetting with \protect\XeLaTeX.}
 % \title{\Macpackage \\
 %      Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
 % has version number \fileversion, last revised \filedate.}}
@@ -689,17 +691,19 @@
 % A new name was selected: \reledmac (extended renewed \eledmac). 
 % To migrate from \eledmac to \reledmac, please read \reff{migratereledmac}.
 % 
-% \subsection{List of works edited with (r)(e)ledmac}
-% A collaborative list of works edited with (r)(e)ledmac is available at
+% \subsection{Bibliography}
+% A collaborative list of works edited with (r)(e)(ledmac is available at
 % \url{https://www.zotero.org/groups/critical_editions_typeset_with_edmac_ledmac_and_eledmac/items}.
 % Please add your own edition made with (r)(e)ledmac.
 %
-% \section{How the package works}\label{howto}
+% If you write book or article about (r)(e)ledmac, please add it on the collaborative bibliography on \url{https://www.zotero.org/groups/articles_and_books_about_reledmac/items}.
+% \section{How the package works --- the problem of the number of \LaTeX\ runs}\label{howto}
 % The \macpackage package is a three-pass package like \LaTeX\ itself. 
 % Although your textual apparatus and line
 % numbers will be printed on the first run, it takes two more
-% passes through \LaTeX\ to be sure that everything is correctly
-% placed. If you make any subsequent changes altering the number
+% compilations by \LaTeX\ to be sure that everything is correctly
+% placed, and one more if you typeset right-to-left text with \XeLaTeX. 
+% If you make any subsequent changes altering the number
 % of lines or notes, the input file may similarly
 % require three passes to get everything to the right place.
 % \Macpackage will tell you that you need to make more runs when it detects changes,
@@ -707,9 +711,10 @@
 % problems with a line or two misnumbered at the top of a page, try
 % running \LaTeX\ once or twice more.
 %
+% \textbf{However, the best way to be sure that one has made the right number of runs 
+% is to use some of \LaTeX's run scripts like \emph{latexmk}}.
+%
 % \section{Compatibility warning}
-% However, the best way to be sure that one has made the right number of runs 
-% is to use some of \LaTeX's run scripts like \emph{latexmk}.
 %
 % If you use other classes than \cs{article} or \cs{book}, or modify the layout with \package{geometry}, some settings should be made to have correct height for the blocks of notes.
 %
@@ -1371,8 +1376,8 @@
 %
 % Remember that the endnotes are temporarily stored in an auxiliary file. That means in general you want to write the \meta{content} in the auxiliary file \emph{without expanding it}, that is without interpreting \TeX\ content.
 % 
-% However, in some case, you may want to write 
-% once-expanded\footnote{The expansion mechanism' of \TeX is a quite complex problem, but fundamental. We have no place to explain it fully here. Read introduction to \TeX to understand well.}
+% However, in some cases, you may want to write a 
+% once-expanded\footnote{The expansion mechanism of \TeX\ is a quite complex problem, but fundamental. We have no place to explain it fully here. Read introduction to \TeX\ to understand well.}
 % version of the \meta{content}, that is the version where the commands are expanded on the first level.
 % This can be, for example, to get a counter value.
 % Use the starred version in this case.
@@ -1433,7 +1438,7 @@
 % for the lemma. As the argument to \protect\cs{linenum}, you specify
 % those seven parameters in that order, separated by vertical bars
 % (the \verb"|" character). I.e.\\
-% .\verb+\linenum{+\meta{start page}\verb+|+\meta{s. line}\verb+|+\meta{s. sub-l.}\verb+|+\meta{end p.}\verb+|+\meta{e. l.}\verb+|+\meta{e. sub-l.}\verb+|+\meta{font}\verb+|+\verb+}+\\
+% \verb+\linenum{+\meta{start page}\verb+|+\meta{s. line}\verb+|+\meta{s. sub-l.}\verb+|+\meta{end p.}\verb+|+\meta{e. l.}\verb+|+\meta{e. sub-l.}\verb+|+\meta{font}\verb+|+\verb+}+\\
 % However, you can retain the value
 % computed by \macpackage for any number by simply omitting it; and
 % you can omit a sequence of vertical bars at the end of the
@@ -1706,10 +1711,10 @@
 % You can change it using \cs{setmsdatalabel}\marg{txt}.
 %
 % \DescribeMacro{\setmsdataposition}
-% If you tel that the manuscript apparatus will be on the same level of critical footnotes than other apparatus, for each line, reledmac will first insert manuscript apparatus, then other footnotes.
+% If you want the manuscript apparatus to be on the same level of critical footnotes as the other apparatuses, for each line, reledmac will first insert the manuscript apparatus, then the other footnotes.
 % You can change it using:\\
 % \cs{msdataposition}\arg{regular-msdata}\\
-% And restore the default behavior using
+% And restore the default behaviour using
 % \cs{msdataposition}\arg{msdata-regular}
 % \subsection{Familiar notes} \label{sec:desc:familiar}
 % 
@@ -2834,7 +2839,7 @@
 % \subsection{Cross-referencing to a critical note}
 % If you want to refer to a word which is a lemma word, the \cs{edlabel} command should be in the first argument of \cs{edtext} command.
 %
-% If you want to refer to the content of a a \cs{Xfootnote}, the line and subline number printed will be the start line.
+% If you want to refer to the content of a \cs{Xfootnote}, the line and subline number printed will be the start line.
 %
 % If you want to refer to starting and ending lines, you should use \cs{appref} and related tools (\reff{appref}).
 % \subsection{Cross-referencing which return a number in any case}
@@ -2970,7 +2975,7 @@
 %  \setapprefprefixmore{lines~}
 % \end{verbatim}
 %
-% Note that if you do not use \protect\cs{setapprefprefixmore}, argument of \protect\cs{setapprefprefixsingle} will be used in any case.
+% Note that if you do not use \protect\cs{setapprefprefixmore}, the argument of \protect\cs{setapprefprefixsingle} will be used in any case.
 %
 %
 % \DescribeMacro{\setSErefprefixsingle}\DescribeMacro{\setSErefprefixmore} 
@@ -3143,7 +3148,7 @@
 % \protect\cs{edtext}\marg{lemma}\marg{app} command, \protect\cs{edindex} should be defined inside
 % the first argument, e.g.,
 % \begin{verbatim}
-%   The \edtext{creature\edlabel{elephant} was quite
+%   The \edtext{creature\edindex{elephant} was quite
 %    unafraid}{\Afootnote{Of the mouse, that is.}}
 % \end{verbatim}
 %
@@ -3163,12 +3168,16 @@
 % renew |\pagelinesep| to get a different separator.
 % 
 % |-| is the default
-% separator used by the \textsc{MakeIndex} program.
+% separator used by the \textsc{MakeIndex} program. 
+% 
+% You can reconfigure it, this example defines a colon as separator:
+% \begin{verbatim}
+% \renewcommand{\pagelinesep}{:}
+% \end{verbatim}
 % 
-% Consequently, if you want to use an other \protect\cs{pagelinesep}, you have to configure your \verb+.ist+ index style file. For example if you use \verb+:+ as separator\footnote{For further detail, you can read \url{http://tex.stackexchange.com/a/32783/7712}.}.
+% However, you also have to configure your \verb+.ist+ index style file. For example if you use \verb+:+ as separator\footnote{For further detail, you can read \url{http://tex.stackexchange.com/a/32783/7712}.}.
 % \begin{verbatim}
 % page_compositor ":"
-% delim_r ":"
 % \end{verbatim}
 %
 % Read the \textsc{MakeIndex} program's handbook about the \verb+.ist+ file. 
@@ -3214,8 +3223,8 @@
 %
 % \section{Glossary}
 % \Macpackage provides mechanism to make glossaries with the \package{glossaries} package, refering not to the page, but to the page and line.
-% \subsection{Prealable setting}
-% The standard compositor between page and line number in \macpackage  is a dash, while \package{glossaries} use, in standard, a dot.
+% \subsection{Preamble setting}
+% The standard compositor between page and line number in \macpackage  is a dash, while \package{glossaries} uses, by default, a dot.
 % Consequently, you must:
 % \begin{itemize}
 % \item Or set .
@@ -3768,7 +3777,7 @@
 % you must load this package \emph{before} the \macpackage package.
 % 
 
-% \subsubsection{Parallel typesetting}\label{eledpar}
+% \subsection{Parallel typesetting}\label{eledpar}
 %
 %
 % Peter Wilson has developed the \ledpar package
@@ -3861,7 +3870,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2017/02/12 v2.17.5 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2017/02/23 v2.18.0a typesetting critical editions]%
 %    \end{macrocode}
 %
 % \subsection{Package options}
@@ -6591,7 +6600,7 @@
 % It is written in the file list.
 % If we process a line-list file which used a older version, that means the commands used inside are deprecated, and we can't use them. 
 %    \begin{macrocode}
-\newcommand{\this@line@list@version}{5}%
+\newcommand{\this@line@list@version}{6}%
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\line@list@stuff}
@@ -6728,6 +6737,49 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
+% \begin{macro}{\flag@start@RTL}
+% \begin{macro}{\flag@end@RTL}
+% With \XeLaTeX, there is a problem when using RTL: the writing of a command in the numbered auxiliary files (\verb+.1+, \verb+.2+ etc) is reversed when the first argument of \cs{edtext} is typset in one line, but it is \textbf{not} reversed when this first argument is typset in two lines or more.\footnote{This problem is caused by the way \XeTeX\ manages right-to-left typsetting. David Carlisle explains it on \url{http://tex.stackexchange.com/a/333373/7712} and provides a potential solution, using \cs{vadjust}. However in some cases this adds spurious vertical spaces in reledmac. That is why we are using the solution explained below.}
+% 
+% To solve this problem, we use a crossref mechanism. At the first run, we put a label, but we do not write any \cs{@ref} command. When the value of the label can be tested, that is after three runs, we're doing:
+% \begin{itemize}
+%  \item If the first argument of \cs{edtext} is typeset on only one line, we first call \cs{flag@end}, at the point we normally call \cs{flag@start}, at the beginning of the content of the first argument, and we call \cs{flag@end} at the point we normally call \cs{flag@start}, at the end of the content of the first argument.
+%  \item If the first argument of \cs{edtext} is typeset on only two lines, we use the normal order.
+% \end{itemize}
+% This system is a workaround for the problem of order when writing in auxiliary files.
+%
+% The \cs{flag@start@RTL} and \cs{flag@end@RTL} macro put the label, do the test and call the right commands.
+%    \begin{macrocode}
+\newcommand{\flag@start@RTL}{%
+  \edlabel{edtext:start:\csuse{thisedtext@\the\@edtext@level}}%
+  \IfStrEq{\xabslineref{edtext:start:\csuse{thisedtext@\the\@edtext@level}}}%
+    {000}%
+    {}%
+    {%
+    \ifnumequal%
+      {\xabslineref{edtext:start:\csuse{thisedtext@\the\@edtext@level}}}%
+      {\xabslineref{edtext:end:\csuse{thisedtext@\the\@edtext@level}}}%
+      {\flag@end}%
+      {\flag@start}%
+  }%
+}%
+
+\newcommand{\flag@end@RTL}{%
+  \edlabel{edtext:end:\csuse{thisedtext@\the\@edtext@level}}%
+  \IfStrEq{\xabslineref{edtext:start:\csuse{thisedtext@\the\@edtext@level}}}%
+      {000}%
+      {}%
+      {%
+      \ifnumequal%
+        {\xabslineref{edtext:start:\csuse{thisedtext@\the\@edtext@level}}}%
+        {\xabslineref{edtext:end:\csuse{thisedtext@\the\@edtext@level}}}%
+        {\flag@start}%
+        {\flag@end}%
+    }%
+}%
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
 % \begin{macro}{\flag@start@later}
 % \begin{macro}{\flag@end@later}
 % \protect\cs{flag@start@later} and \protect\cs{flag@end@later}: these send the\cs{@ref@later} to the line-list file
@@ -7166,9 +7218,12 @@
 %    \begin{macrocode}
       \global\advance\@edtext@level by 1%
 %    \end{macrocode}
-% We also increase the \verb+edtext+ \LaTeX\ counter to insert hypertarget if the \package{hyperref} package is loaded.
+% We also increase the \verb+edtext+ \LaTeX\ counter to insert a hypertarget if the \package{hyperref} package is loaded, and also works with \cs{edtext} on right-to-left typesetting with \XeLaTeX.
+% 
+% We store the value for the current level in a global macro. So we have one macro by level of \cs{edtext}. That is required, because \cs{edtext} can contain \cs{edtext}.
 %    \begin{macrocode}
       \stepcounter{edtext}%
+      \csxdef{thisedtext@\the\@edtext@level}{\theedtext}%
 %    \end{macrocode}
 % By default, we do not use \protect\cs{lemma}
 %    \begin{macrocode}
@@ -7236,12 +7291,13 @@
         \ignorespaces #2\relax%
         \@edtext@secondarg@false%
 %    \end{macrocode}
-% With \protect\package{polyglossia}, you must track whether the language reads left to right (English) or right to left (Arabic).
+% With \XeLaTeX, you must track whether the language reads left to right (English) or right to left (Arabic). \reledmac defines an \cs{if@RTL} boolean test is not already defined.
 %    \begin{macrocode}
-        \@ifundefined{xpg@main@language}{%if not polyglossia
-           \flag@start}%
-           {\if@RTL\flag@end\else\flag@start\fi%
-           }%
+        \if@RTL%
+          \flag@start@RTL%
+        \else%
+          \flag@start%
+        \fi%
 %    \end{macrocode}
 % We write in the numbered file wether the current \protect\cs{edtext} has a \protect\cs{lemma} in the the second argument.
 %    \begin{macrocode}
@@ -7266,7 +7322,6 @@
       \endgroup%
       \ifdef{\hypertarget}%
         {%
-        \csedef{thisedtext@\the\@edtext@level}{\theedtext}%We need one macro by level, as #1 can contain new \edtext
         \Hy@raisedlink@left{\hypertarget{\csuse{thisedtext@\the\@edtext@level}:start}{}}%
         \showlemma{#1}%
         \Hy@raisedlink{\hypertarget{\csuse{thisedtext@\the\@edtext@level}:end}{}}%
@@ -7288,16 +7343,17 @@
         \x@lemma%
         \global\let\x@lemma=\relax%
       \fi%
-      \@ifundefined{xpg@main@language}{%if not polyglossia
-           \flag@end}%
-           {\if@RTL\flag@start\else\flag@end\fi% With polyglossia, you must track whether the language reads left to right (English) or right to left (Arabic).
-           }%
+      \if@RTL%
+        \flag@end@RTL%
+      \else%
+        \flag@end%
+      \fi%
 %    \end{macrocode}
 % We switch some flags to false.
 % \begin{itemize}
 %    \item The one that checks having footnotes inside a \protect\cs{edtext}.
 %    \item The one that says we are inside a \protect\cs{edtext}. In fact, it is not a flag, but a counter which is increased to 1 in each leavel of \protect\cs{edtext}.
-%    \item The one that says we are inside à \protect\cs{@lemma}.
+%    \item The one that says we are inside a \protect\cs{@lemma}.
 % \end{itemize}
 %    \begin{macrocode}
       \global\@noneed@Footnotefalse%
@@ -9440,9 +9496,8 @@
 % followed by a square bracket, the lemma, and the note text.
 % 
 %    \begin{macrocode}
-
-
 \notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalfootfmt}[4]{%
+  \Xstorelineinfo{#1}{#4}%
   \nottoggle{Xgroupbyline@#4}{\Xledsetnormalparstuff{#4}}{}%
   \hangindent=\csuse{Xhangindent@#4}%
   \everypar{\hangindent=\csuse{Xhangindent@#4}}%
@@ -9869,6 +9924,7 @@
 % text of the footnote, and the fourth is the series (optional, for backward compatibility).
 %    \begin{macrocode}
 \newcommand*{\parafootfmt}[4]{%
+  \Xstorelineinfo{#1}{#4}%
   \Xinsertparafootsep{#4}%
   \ledsetnormalparstuff@common%
   \printlinefootnote{#1}{#4}%
@@ -9975,22 +10031,22 @@
 \newcommand{\Xinsertparafootsep}[1]{%
    \ifledRcol@%
      \ifnumequal{\csuse{#1prevpage@numR}}{\page@numR}%
-          {\ifcsdef{prevline#1}% Be sur \prevline#1 exists.
-        {\ifnumequal{\csuse{prevline#1}}{\line@numR}%
-           {\ifcsempty{Xsymlinenum@#1}{\csuse{Xparafootsep@#1}}{}}%
-           {\csuse{Xparafootsep@#1}}%
-        }%
-        {\csuse{Xparafootsep@#1}}%
+        {\ifcsdef{prevline#1}% Be sur \prevline#1 exists.
+          {\ifcsequal{prevline#1}{lineinfo@}%
+             {\ifcsempty{Xsymlinenum@#1}{\csuse{Xparafootsep@#1}}{}}%
+             {\csuse{Xparafootsep@#1}}%
+          }%
+          {\csuse{Xparafootsep@#1}}%
      }%
      {}%
      \global\csname #1prevpage@numR\endcsname=\page@numR%
    \else%
      \ifnumequal{\csuse{#1prevpage@num}}{\page@num}%
-          {\ifcsdef{prevline#1}% Be sur \prevline#1 exists.
-        {\ifnumequal{\csuse{prevline#1}}{\line@num}%
-           {\ifcsempty{Xsymlinenum@#1}{\csuse{Xparafootsep@#1}}{}}%
-           {\csuse{Xparafootsep@#1}}%
-        }%
+        {\ifcsdef{prevline#1}% Be sur \prevline#1 exists.
+          {\ifcsequal{prevline#1}{lineinfo@}%
+             {\ifcsempty{Xsymlinenum@#1}{\csuse{Xparafootsep@#1}}{}}%
+             {\csuse{Xparafootsep@#1}}%
+          }%
         {\csuse{Xparafootsep@#1}}%
      }%
      {}%
@@ -10505,6 +10561,23 @@
 %    \end{macrocode}
 % \end{macro}
 % \subsubsection{Line number printing}
+% \begin{macro}{\Xstorelineinfo}
+% The \cs{Xstorelineinfo} macro is used to store some data about line number of the current critical footnote, data which will be reused later for the \cs{Xnumberonlyfirstinline} and related setting.
+%
+% \#1 footnote specification for the current footnote ; 
+% \#2 footnote series.
+%    \begin{macrocode}
+\newcommand{\Xstorelineinfo}[2]{%
+   \l@dp@rsefootspec#1|%
+   \iftoggle{Xnumberonlyfirstintwolines@#2}{%
+       \xdef\lineinfo@{\l@dparsedstartline - \l@dparsedstartsub - \l@dparsedendline - \l@dparsedendsub}%
+       }%
+       {%
+       \xdef\lineinfo@{\l@dparsedstartline - \l@dparsedstartsub}%
+       }%
+}%
+%    \end{macrocode}
+% \end{macro}
 % \begin{macro}{\printlinefootnote}
 % The \protect\cs{printlinefootnote} macro is called in each \protect\cs{<type>footfmt} command. 
 % It controls whether the line number is printed or not, according to the series options. Its first argument is the information about lines; its second is the series of the footnote.
@@ -10513,13 +10586,6 @@
 % \changes{v1.18.0}{2015/02/23}{Code refactoring in \protect\cs{printlinefootnote}: the printing of the numbers are factorized in  \protect\cs{printlinefootnotearea}}
 %  \begin{macrocode}
 \newcommand{\printlinefootnote}[2]{%
-   \l@dp@rsefootspec#1|%
-   \iftoggle{Xnumberonlyfirstintwolines@#2}{%
-       \edef\lineinfo@{\l@dparsedstartline - \l@dparsedstartsub - \l@dparsedendline - \l@dparsedendsub}%
-       }%
-       {%
-       \edef\lineinfo@{\l@dparsedstartline - \l@dparsedstartsub}%
-       }%
    \iftoggle{nonum@}{%Try if the line number must printed for this specific not (by default, yes)
    \hspace{\csuse{Xinplaceofnumber@#2}}% 
    }%
@@ -12519,10 +12585,10 @@
 \newcommand{\printlineendnote}[2]{%
   \l@dp@rsefootspec#1|%
   \iftoggle{Xendnumberonlyfirstintwolines@#2}{%
-       \edef\lineinfo@{\l@dparsedstartpage - \l@dparsedstartline - \l@dparsedstartsub - \l@dparsedendpage - \l@dparsedendline - \l@dparsedendsub}%
+       \xdef\lineinfo@{\l@dparsedstartpage - \l@dparsedstartline - \l@dparsedstartsub - \l@dparsedendpage - \l@dparsedendline - \l@dparsedendsub}%
        }%
        {%
-       \edef\lineinfo@{\l@dparsedstartpage - \l@dparsedstartline - \l@dparsedstartsub}%
+       \xdef\lineinfo@{\l@dparsedstartpage - \l@dparsedstartline - \l@dparsedstartsub}%
        }%
   \ifboolexpr{%
     togl {nonum@}%
@@ -12592,12 +12658,12 @@
 % \end{macro}
 % \subsection{User level commands}
 % \subsubsection{Inserting contents to endnotes}
-% The \cs{Xendnotes} commands are defined upper, when defining apparatus commands by series.
-% Here, we define.
+% The \cs{Xendnotes} commands are defined above, when defining apparatus commands by series.
+% Here, we define
 % only \cs{toendnotes} command not specific to a series, in order to insert arbitrary code.
 % The regular version writes an unexpanded argument, while the regular version writes  a once-expanded argument.
 %
-% \begin{macro}{\toendnotes*}
+% \begin{macro}{\toendnotes}
 % \begin{macro}{\toendnotes*}
 %    \begin{macrocode}
 \newcommandx{\toendnotes}[2][1,usedefault]{%
@@ -13360,7 +13426,7 @@
 %    \end{macrocode}
 % \subsubsection{Tools}
 % The \cs{Xtoendnotes} command inserts any arbitrary content into the endnote file.
-% It is an alias of the more generalist \cs{addtoennotes}
+% It is an alias of the more generalist \cs{addtoendnotes}
 %    \begin{macrocode}
 
      \global\expandafter\newcommand\csname #1toendnotes\endcsname[1]{%
@@ -14292,10 +14358,10 @@
 %
 %
 % \begin{macro}{\zz@@@}
-% A convenience macro to zero two labeling counters in one go.
+% A convenience macro to zero three labeling counters in one go.
 % \changes{v0.2.1}{2003/08/26}{Minor change to \protect\cs{zz@@@}}
 %    \begin{macrocode}
-\newcommand*{\zz@@@}{000|000} % set two counters to zero in one go
+\newcommand*{\zz@@@}{000|000|000}% Set three counters to zero in one go
 
 %    \end{macrocode}
 % \end{macro}
@@ -14334,7 +14400,7 @@
   \ifboolexpr{bool{ledRcol} or bool{ledRcol@}}{%
     \ifXnote@%
      \protected@write\@auxout{}%
-      {\string\l@dmake@labelsR\space\thepage|\l@dparsedstartline|\l@dparsedstartsub|\the\c@pstartR|{#1}}%
+      {\string\l@dmake@labelsR\space\thepage|\l@dparsedstartline|\l@dparsedstartsub||\the\c@pstartR|{#1}}%
       \ifdef{\hypertarget}%
         {\Hy@raisedlink{\hypertarget{#1}{}}}%
         {}%
@@ -14363,13 +14429,13 @@
     \ifXnote@%
        \ifl@dpairing%pstart or pstartL?
          \protected@write\@auxout{}%
-          {\string\l@dmake@labels\space\thepage|\l@dparsedstartline|\l@dparsedstartsub|\the\c@pstartL|{#1}}%
+          {\string\l@dmake@labels\space\thepage|\l@dparsedstartline|\l@dparsedstartsub||\the\c@pstartL|{#1}}%
           \ifdef{\hypertarget}%
             {\Hy@raisedlink{\hypertarget{#1}{}}}%
             {}%
         \else%
           \protected@write\@auxout{}%
-          {\string\l@dmake@labels\space\thepage|\l@dparsedstartline|\l@dparsedstartsub|\the\c@pstart|{#1}}%
+          {\string\l@dmake@labels\space\thepage|\l@dparsedstartline|\l@dparsedstartsub||\the\c@pstart|{#1}}%
           \ifdef{\hypertarget}%
             {\Hy@raisedlink{\hypertarget{#1}{}}}%
             {}%
@@ -14415,19 +14481,23 @@
 %    \begin{macrocode}
 \newcounter{line}%
 \newcounter{subline}%
+\newcounter{absline}%
 \newcommand{\advancelabel@refs}{%
     \setcounter{line}{\expandafter\labelrefsparseline\label@refs}%
     \stepcounter{line}%
+    \setcounter{absline}{\expandafter\labelrefsparseabsline\label@refs}%
+    \stepcounter{absline}%
     \ifsublines@%
         \setcounter{subline}{\expandafter\labelrefsparsesubline\label@refs}%
         \stepcounter{subline}{1}%
-        \def\label@refs{\theline|\thesubline}%
+        \def\label@refs{\theline|\thesubline|\theabsline}%
     \else%
-        \def\label@refs{\theline|0}%
+        \def\label@refs{\theline|0|\theabsline}%
     \fi%
 }
-\def\labelrefsparseline#1|#2{#1}
-\def\labelrefsparsesubline#1|#2{#2}
+\def\labelrefsparseline#1|#2|#3{#1}%
+\def\labelrefsparsesubline#1|#2|#3{#2}%
+\def\labelrefsparseabsline#1|#2|#3{#3}%
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -14442,16 +14512,18 @@
 % The initial use of \protect\cs{newcommand} is to catch if \protect\cs{l@dmake@labels}
 % has been previously defined (by a class or package).
 %
-% \verb+#1+ page number, \verb+#2+ line number, \verb-#3- sub-line number, \verb+#4+ pstart number, \verb+#5+ label.
+% \verb+#1+ page number, \verb+#2+ line number, \verb-#3- sub-line number, \verb+#4+ absolute line number, \verb+#5+ pstart number, \verb+#6+ label.
 %
 %    \begin{macrocode}
 \newcommand*{\l@dmake@labels}{}
-\def\l@dmake@labels#1|#2|#3|#4|#5{%
-  \expandafter\ifx\csname the@label\csuse{XR@prefix}#5\endcsname \relax\else
-    \led@warn@DuplicateLabel{\csuse{XR@prefix}#5}%
+\def\l@dmake@labels#1|#2|#3|#4|#5|#6{%
+  \expandafter\ifx\csname the@label\csuse{XR@prefix}#6\endcsname%
+    \relax%
+  \else%
+    \led@warn@DuplicateLabel{\csuse{XR@prefix}#6}%
   \fi
-  \global\providetoggle{label@#5@ledRcol}%False is the default value of this toggle, which tell us if a label is linked to a right or a left side
-  \expandafter\gdef\csname the@label\csuse{XR@prefix}#5\endcsname{#1|#2|#3|#4|\relax}%
+  \global\providetoggle{label@#6@ledRcol}%False is the default value of this toggle, which tell us if a label is linked to a right or a left side
+  \expandafter\gdef\csname the@label\csuse{XR@prefix}#6\endcsname{#1|#2|#3|#4|#5|\relax}%
   \ignorespaces}
 
 %    \end{macrocode}
@@ -14463,15 +14535,16 @@
 %
 %    \begin{macrocode}
 \AtBeginDocument{%
-  \def\l@dmake@labels#1|#2|#3|#4|#5{}%
+  \def\l@dmake@labels#1|#2|#3|#4|#5|#6{}%
 }
 
 %    \end{macrocode}
 %
 % \begin{macro}{\@lab}
 % The \protect\cs{@lab} command, which appears in the \protect\cs{linenum@out} file,
-% appends the current values of page, line and sub-line to the
-% \protect\cs{labelref@list}. These values are defined by the earlier
+% appends the current value of page, line, sub-line, and absolute line to the
+% \protect\cs{labelref@list}. 
+% These values are defined by the earlier
 % \protect\cs{@page}, \protect\cs{@nl}, and the \protect\cs{sub@on} and \protect\cs{sub@off} commands
 % appearing in the \protect\cs{linenum@out} file.
 %
@@ -14489,11 +14562,11 @@
 \newcommand*{\@lab}{%
   \ifledRcol
     \xright@appenditem{\linenumr@p{\line@numR}|%
-      \ifsublines@ \sublinenumr@p{\subline@numR}\else 0\fi}%
+      \ifsublines@ \sublinenumr@p{\subline@numR}\else 0\fi|\the\absline@numR}%
       \to\labelref@listR
   \else
     \xright@appenditem{\linenumr@p{\line@num}|%
-      \ifsublines@ \sublinenumr@p{\subline@num}\else 0\fi}%
+      \ifsublines@ \sublinenumr@p{\subline@num}\else 0\fi|\the\absline@num}%
       \to\labelref@list
   \fi}
 %    \end{macrocode}
@@ -14525,29 +14598,29 @@
 %    \begin{macrocode}
       \ifledRcol%
         \protected@write\@auxout{}%
-          {\string\l@dmake@labelsR\space\l@dparsedstartpage|\l@dparsedstartline|\l@dparsedstartsub|\the\c@pstartR|{#1:start}}%
+          {\string\l@dmake@labelsR\space\l@dparsedstartpage|\l@dparsedstartline|\l@dparsedstartsub||\the\c@pstartR|{#1:start}}%
         \ifdef{\hypertarget}%
           {\Hy@raisedlink{\hypertarget{#1:start}{}}}%
           {}%
         \protected@write\@auxout{}%
-          {\string\l@dmake@labelsR\space\l@dparsedendpage|\l@dparsedendline|\l@dparsedendsub|\the\c@pstartR|{#1:end}}%
+          {\string\l@dmake@labelsR\space\l@dparsedendpage|\l@dparsedendline||\l@dparsedendsub|\the\c@pstartR|{#1:end}}%
       \else%
         \ifl@dpairing%pstart or pstartL?
           \protected@write\@auxout{}%
-            {\string\l@dmake@labels\space\l@dparsedstartpage|\l@dparsedstartline|\l@dparsedstartsub|\the\c@pstartL|{#1:start}}%
+            {\string\l@dmake@labels\space\l@dparsedstartpage|\l@dparsedstartline|\l@dparsedstartsub||\the\c@pstartL|{#1:start}}%
           \ifdef{\hypertarget}%
             {\Hy@raisedlink{\hypertarget{#1:start}{}}}%
             {}%
           \protected@write\@auxout{}%
-            {\string\l@dmake@labels\space\l@dparsedendpage|\l@dparsedendline|\l@dparsedendsub|\the\c@pstartL|{#1:end}}%
+            {\string\l@dmake@labels\space\l@dparsedendpage|\l@dparsedendline|\l@dparsedendsub||\the\c@pstartL|{#1:end}}%
          \else%
             \protected@write\@auxout{}%
-              {\string\l@dmake@labels\space\l@dparsedstartpage|\l@dparsedstartline|\l@dparsedstartsub|\the\c@pstart|{#1:start}}%
+              {\string\l@dmake@labels\space\l@dparsedstartpage|\l@dparsedstartline|\l@dparsedstartsub||\the\c@pstart|{#1:start}}%
             \ifdef{\hypertarget}%
               {\Hy@raisedlink{\hypertarget{#1:start}{}}}%
               {}%
             \protected@write\@auxout{}%
-              {\string\l@dmake@labels\space\l@dparsedendpage|\l@dparsedendline|\l@dparsedendsub|\the\c@pstart|{#1:end}}%
+              {\string\l@dmake@labels\space\l@dparsedendpage|\l@dparsedendline|\l@dparsedendsub||\the\c@pstart|{#1:end}}%
          \fi%
       \fi%
 %    \end{macrocode}
@@ -14662,12 +14735,19 @@
 % \end{macro}
 % \end{macro}
 %
+% \begin{macro}{\xabslineref}
+% If the specified label exists, \cs{xabslineref} gives its absolute line number.
+% That is used usually only by some \reledmac\ internal macros.
+%    \begin{macrocode}
+\newcommand*{\xabslineref}[1]{\l@dgetref@num{4}{#1}}%
+%    \end{macrocode}
+% \end{macro}
 % \begin{macro}{\pstarteref}
 % \begin{macro}{\xpstartref}
 % If the specified label exists, \protect\cs{pstartref} gives its pstart number.
 %    \begin{macrocode}
-\newcommand*{\pstartref}[1]{\l@dref@undefined{#1}\wrap@edcrossref{#1}{\l@dgetref@num{4}{#1}}}
-\newcommand*{\xpstartref}[1]{\l@dgetref@num{4}{#1}}
+\newcommand*{\pstartref}[1]{\l@dref@undefined{#1}\wrap@edcrossref{#1}{\l@dgetref@num{5}{#1}}}%
+\newcommand*{\xpstartref}[1]{\l@dgetref@num{5}{#1}}%
 
 %    \end{macrocode}
 % \end{macro}
@@ -14675,7 +14755,7 @@
 % \begin{macro}{\xflagref}
 % \cs{xflagref} finds the side flag of any ref defined with \cs{edlabel}.
 %    \begin{macrocode}
-\newcommand*{\xflagref}[1]{\l@dgetref@num{5}{#1}}
+\newcommand*{\xflagref}[1]{\l@dgetref@num{6}{#1}}%
 %    \end{macrocode}
 % \end{macro}
 % The next three macros are used by the referencing commands above,
@@ -14724,18 +14804,19 @@
 % which extracts the appropriate number from its first arguments.
 % The \verb"|"-delimited arguments consist of the expanded label-macro
 % (three reference numbers), followed by the switch-number (1,
-% 2, 3 or 4) which defines which of the earlier fiver numbers to
+% 2, 3, 4 or 5) which defines which of the earlier six numbers to
 % pick out. (It was earlier given as the first argument of
 % \protect\cs{l@dgetref@num}.)
 %    \begin{macrocode}
 \newcommand*{\l@dlabel@parse}{}
-\def\l@dlabel@parse#1|#2|#3|#4|#5|#6{%
-  \ifcase #6%
+\def\l@dlabel@parse#1|#2|#3|#4|#5|#6|#7{%
+  \ifcase #7%
   \or #1%
   \or #2%
   \or #3%
   \or #4%
   \or #5%
+  \or #6%
   \fi}
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
index db08d8e7864..5b678850de1 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
@@ -296,9 +296,10 @@
 % \changes{v2.15.0}{2016/12/12}{Fix bug about space before sectioning commands after a pairs environment (bug added in v.~2.14.4).}
 % \changes{v2.15.0}{2016/12/12}{Fix bug with page break when using \protect\cs{columns} (bug added in v.~2.14.1).}
 % \changes{v2.16.0}{2016/12/23}{Compatibility with \protect\cs{setmsdataposition}}
-% \changes{v2.16.1}{2017/01/03}{Restore sidenotes on left side, deleted by mistake on v2.16.0}
-% \changes{v2.16.2}{2017/01/25}{Change log message when numbered files don't still exist, in order to improve compatibility with \protect\emph{latexmk}.}
+% \changes{v2.16.1}{2017/01/03}{Restore sidenotes on left side, deleted by mistake in v2.16.0}
+% \changes{v2.16.2}{2017/01/25}{Change log message when numbered files still don't exist, in order to improve compatibility with \protect\emph{latexmk}.}
 % \changes{v2.16.3}{2017/02/10}{Fix bug when setting \protect\cs{aftercolumnseparator}.}
+% \changes{v2.17.0}{2017/02/22}{Change code for compatibility with \protect\reledmac 2.18.0}
 % ^^A PW added following as the definitions are at some unknown elsewhere
 %
 % \newcommand{\egstart}{%
@@ -1254,7 +1255,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2017/02/10 v2.16.3 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2017/02/23 v2.17.0a reledmac extension for parallel texts]%
 
 %    \end{macrocode}
 % \subsection{Package's requirement}
@@ -4739,16 +4740,18 @@
 % \changes{v2.6.0}{2015/11/13}{\protect\cs{@Rlineflag} is not stored directly after the line number, but as a fith argument of \protect\cs{the@labelX}. Can be retrieved by \protect\cs{xflagref}.}
 %
 %    \begin{macrocode}
-\def\l@dmake@labelsR#1|#2|#3|#4|#5{%
-  \expandafter\ifx\csname the@label\csuse{XR@prefix}#5\endcsname \relax\else
-    \led@warn@DuplicateLabel{\csuse{XR@prefix}#5}%
-  \fi
-  \expandafter\gdef\csname the@label\csuse{XR@prefix}#5\endcsname{#1|#2|#3|#4|\@Rlineflag}%
-  \global\providetoggle{label@#5@ledRcol}%False is the default value of this toggle, which tell us if a label is linked to a right or a left side
-  \global\toggletrue{label@#5@ledRcol}%
+\def\l@dmake@labelsR#1|#2|#3|#4|#5|#6{%
+  \expandafter\ifx\csname the@label\csuse{XR@prefix}#6\endcsname%
+    \relax%
+  \else%
+    \led@warn@DuplicateLabel{\csuse{XR@prefix}#6}%
+  \fi%
+  \expandafter\gdef\csname the@label\csuse{XR@prefix}#6\endcsname{#1|#2|#3|#4|#5|\@Rlineflag}%
+  \global\providetoggle{label@#6@ledRcol}%False is the default value of this toggle, which tell us if a label is linked to a right or a left side
+  \global\toggletrue{label@#6@ledRcol}%
   \ignorespaces}
 \AtBeginDocument{%
-  \def\l@dmake@labelsR#1|#2|#3|#4|#5{}%
+  \def\l@dmake@labelsR#1|#2|#3|#4|#5|#6{}%
 }
 
 %    \end{macrocode}
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index 0f15d28a7e2..3f0354187fb 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
@@ -35,7 +35,7 @@
 %%
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2017/02/12 v2.17.5 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2017/02/23 v2.18.0a typesetting critical editions]%
 \RequirePackage{xkeyval}
 \newif\ifparledgroup
 \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}}
@@ -1201,7 +1201,7 @@
 \newwrite\linenum@out
 \newif\iffirst@linenum@out@
   \first@linenum@out@true
-\newcommand{\this@line@list@version}{5}%
+\newcommand{\this@line@list@version}{6}%
 \newcommand*{\line@list@stuff}[1]{%
   \read@linelist{#1}%
 
@@ -1281,6 +1281,33 @@
     \write\linenum@out{]}%
   \fi}%
 
+\newcommand{\flag@start@RTL}{%
+  \edlabel{edtext:start:\csuse{thisedtext@\the\@edtext@level}}%
+  \IfStrEq{\xabslineref{edtext:start:\csuse{thisedtext@\the\@edtext@level}}}%
+    {000}%
+    {}%
+    {%
+    \ifnumequal%
+      {\xabslineref{edtext:start:\csuse{thisedtext@\the\@edtext@level}}}%
+      {\xabslineref{edtext:end:\csuse{thisedtext@\the\@edtext@level}}}%
+      {\flag@end}%
+      {\flag@start}%
+  }%
+}%
+
+\newcommand{\flag@end@RTL}{%
+  \edlabel{edtext:end:\csuse{thisedtext@\the\@edtext@level}}%
+  \IfStrEq{\xabslineref{edtext:start:\csuse{thisedtext@\the\@edtext@level}}}%
+      {000}%
+      {}%
+      {%
+      \ifnumequal%
+        {\xabslineref{edtext:start:\csuse{thisedtext@\the\@edtext@level}}}%
+        {\xabslineref{edtext:end:\csuse{thisedtext@\the\@edtext@level}}}%
+        {\flag@start}%
+        {\flag@end}%
+    }%
+}%
 \newcommand*{\flag@start@later}{%
   \ifledRcol%
     \write\linenum@outR{\string\@ref@later[}%
@@ -1389,6 +1416,7 @@
   \ifnumberedpar@%
       \global\advance\@edtext@level by 1%
       \stepcounter{edtext}%
+      \csxdef{thisedtext@\the\@edtext@level}{\theedtext}%
       \global\@lemmacommand@false%
       \begingroup%
       \ifledRcol%
@@ -1409,10 +1437,11 @@
         \@edtext@secondarg@true%
         \ignorespaces #2\relax%
         \@edtext@secondarg@false%
-        \@ifundefined{xpg@main@language}{%if not polyglossia
-           \flag@start}%
-           {\if@RTL\flag@end\else\flag@start\fi%
-           }%
+        \if@RTL%
+          \flag@start@RTL%
+        \else%
+          \flag@start%
+        \fi%
        \if@lemmacommand@%
          \ifledRcol%
            \write\linenum@outR{\string\@lemma}%
@@ -1423,7 +1452,6 @@
       \endgroup%
       \ifdef{\hypertarget}%
         {%
-        \csedef{thisedtext@\the\@edtext@level}{\theedtext}%We need one macro by level, as #1 can contain new \edtext
         \Hy@raisedlink@left{\hypertarget{\csuse{thisedtext@\the\@edtext@level}:start}{}}%
         \showlemma{#1}%
         \Hy@raisedlink{\hypertarget{\csuse{thisedtext@\the\@edtext@level}:end}{}}%
@@ -1436,10 +1464,11 @@
         \x@lemma%
         \global\let\x@lemma=\relax%
       \fi%
-      \@ifundefined{xpg@main@language}{%if not polyglossia
-           \flag@end}%
-           {\if@RTL\flag@start\else\flag@end\fi% With polyglossia, you must track whether the language reads left to right (English) or right to left (Arabic).
-           }%
+      \if@RTL%
+        \flag@end@RTL%
+      \else%
+        \flag@end%
+      \fi%
       \global\@noneed@Footnotefalse%
       \global\advance\@edtext@level by -1%
       \global\@lemmacommand@false%
@@ -2389,8 +2418,8 @@
     \color@begingroup%
     \csname #1footfmt\endcsname #2{#1}\color@endgroup%
 }%
-
 \notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalfootfmt}[4]{%
+  \Xstorelineinfo{#1}{#4}%
   \nottoggle{Xgroupbyline@#4}{\Xledsetnormalparstuff{#4}}{}%
   \hangindent=\csuse{Xhangindent@#4}%
   \everypar{\hangindent=\csuse{Xhangindent@#4}}%
@@ -2546,6 +2575,7 @@
   \hskip\csuse{Xafternote@#2}\relax}% add the glue to go between the notes
 
 \newcommand*{\parafootfmt}[4]{%
+  \Xstorelineinfo{#1}{#4}%
   \Xinsertparafootsep{#4}%
   \ledsetnormalparstuff@common%
   \printlinefootnote{#1}{#4}%
@@ -2609,22 +2639,22 @@
 \newcommand{\Xinsertparafootsep}[1]{%
    \ifledRcol@%
      \ifnumequal{\csuse{#1prevpage@numR}}{\page@numR}%
-          {\ifcsdef{prevline#1}% Be sur \prevline#1 exists.
-        {\ifnumequal{\csuse{prevline#1}}{\line@numR}%
-           {\ifcsempty{Xsymlinenum@#1}{\csuse{Xparafootsep@#1}}{}}%
-           {\csuse{Xparafootsep@#1}}%
-        }%
-        {\csuse{Xparafootsep@#1}}%
+        {\ifcsdef{prevline#1}% Be sur \prevline#1 exists.
+          {\ifcsequal{prevline#1}{lineinfo@}%
+             {\ifcsempty{Xsymlinenum@#1}{\csuse{Xparafootsep@#1}}{}}%
+             {\csuse{Xparafootsep@#1}}%
+          }%
+          {\csuse{Xparafootsep@#1}}%
      }%
      {}%
      \global\csname #1prevpage@numR\endcsname=\page@numR%
    \else%
      \ifnumequal{\csuse{#1prevpage@num}}{\page@num}%
-          {\ifcsdef{prevline#1}% Be sur \prevline#1 exists.
-        {\ifnumequal{\csuse{prevline#1}}{\line@num}%
-           {\ifcsempty{Xsymlinenum@#1}{\csuse{Xparafootsep@#1}}{}}%
-           {\csuse{Xparafootsep@#1}}%
-        }%
+        {\ifcsdef{prevline#1}% Be sur \prevline#1 exists.
+          {\ifcsequal{prevline#1}{lineinfo@}%
+             {\ifcsempty{Xsymlinenum@#1}{\csuse{Xparafootsep@#1}}{}}%
+             {\csuse{Xparafootsep@#1}}%
+          }%
         {\csuse{Xparafootsep@#1}}%
      }%
      {}%
@@ -2902,14 +2932,16 @@
       }%
   }%
 }%
-\newcommand{\printlinefootnote}[2]{%
+\newcommand{\Xstorelineinfo}[2]{%
    \l@dp@rsefootspec#1|%
    \iftoggle{Xnumberonlyfirstintwolines@#2}{%
-       \edef\lineinfo@{\l@dparsedstartline - \l@dparsedstartsub - \l@dparsedendline - \l@dparsedendsub}%
+       \xdef\lineinfo@{\l@dparsedstartline - \l@dparsedstartsub - \l@dparsedendline - \l@dparsedendsub}%
        }%
        {%
-       \edef\lineinfo@{\l@dparsedstartline - \l@dparsedstartsub}%
+       \xdef\lineinfo@{\l@dparsedstartline - \l@dparsedstartsub}%
        }%
+}%
+\newcommand{\printlinefootnote}[2]{%
    \iftoggle{nonum@}{%Try if the line number must printed for this specific not (by default, yes)
    \hspace{\csuse{Xinplaceofnumber@#2}}%
    }%
@@ -4129,10 +4161,10 @@
 \newcommand{\printlineendnote}[2]{%
   \l@dp@rsefootspec#1|%
   \iftoggle{Xendnumberonlyfirstintwolines@#2}{%
-       \edef\lineinfo@{\l@dparsedstartpage - \l@dparsedstartline - \l@dparsedstartsub - \l@dparsedendpage - \l@dparsedendline - \l@dparsedendsub}%
+       \xdef\lineinfo@{\l@dparsedstartpage - \l@dparsedstartline - \l@dparsedstartsub - \l@dparsedendpage - \l@dparsedendline - \l@dparsedendsub}%
        }%
        {%
-       \edef\lineinfo@{\l@dparsedstartpage - \l@dparsedstartline - \l@dparsedstartsub}%
+       \xdef\lineinfo@{\l@dparsedstartpage - \l@dparsedstartline - \l@dparsedstartsub}%
        }%
   \ifboolexpr{%
     togl {nonum@}%
@@ -5255,7 +5287,7 @@
 }
 
 \list@create{\labelref@list}
-\newcommand*{\zz@@@}{000|000} % set two counters to zero in one go
+\newcommand*{\zz@@@}{000|000|000}% Set three counters to zero in one go
 
 \newcommand*{\edlabel}[1]{%
   \ifl@dpairing\ifautopar%
@@ -5265,7 +5297,7 @@
   \ifboolexpr{bool{ledRcol} or bool{ledRcol@}}{%
     \ifXnote@%
      \protected@write\@auxout{}%
-      {\string\l@dmake@labelsR\space\thepage|\l@dparsedstartline|\l@dparsedstartsub|\the\c@pstartR|{#1}}%
+      {\string\l@dmake@labelsR\space\thepage|\l@dparsedstartline|\l@dparsedstartsub||\the\c@pstartR|{#1}}%
       \ifdef{\hypertarget}%
         {\Hy@raisedlink{\hypertarget{#1}{}}}%
         {}%
@@ -5289,13 +5321,13 @@
     \ifXnote@%
        \ifl@dpairing%pstart or pstartL?
          \protected@write\@auxout{}%
-          {\string\l@dmake@labels\space\thepage|\l@dparsedstartline|\l@dparsedstartsub|\the\c@pstartL|{#1}}%
+          {\string\l@dmake@labels\space\thepage|\l@dparsedstartline|\l@dparsedstartsub||\the\c@pstartL|{#1}}%
           \ifdef{\hypertarget}%
             {\Hy@raisedlink{\hypertarget{#1}{}}}%
             {}%
         \else%
           \protected@write\@auxout{}%
-          {\string\l@dmake@labels\space\thepage|\l@dparsedstartline|\l@dparsedstartsub|\the\c@pstart|{#1}}%
+          {\string\l@dmake@labels\space\thepage|\l@dparsedstartline|\l@dparsedstartsub||\the\c@pstart|{#1}}%
           \ifdef{\hypertarget}%
             {\Hy@raisedlink{\hypertarget{#1}{}}}%
             {}%
@@ -5329,41 +5361,47 @@
 
 \newcounter{line}%
 \newcounter{subline}%
+\newcounter{absline}%
 \newcommand{\advancelabel@refs}{%
     \setcounter{line}{\expandafter\labelrefsparseline\label@refs}%
     \stepcounter{line}%
+    \setcounter{absline}{\expandafter\labelrefsparseabsline\label@refs}%
+    \stepcounter{absline}%
     \ifsublines@%
         \setcounter{subline}{\expandafter\labelrefsparsesubline\label@refs}%
         \stepcounter{subline}{1}%
-        \def\label@refs{\theline|\thesubline}%
+        \def\label@refs{\theline|\thesubline|\theabsline}%
     \else%
-        \def\label@refs{\theline|0}%
+        \def\label@refs{\theline|0|\theabsline}%
     \fi%
 }
-\def\labelrefsparseline#1|#2{#1}
-\def\labelrefsparsesubline#1|#2{#2}
+\def\labelrefsparseline#1|#2|#3{#1}%
+\def\labelrefsparsesubline#1|#2|#3{#2}%
+\def\labelrefsparseabsline#1|#2|#3{#3}%
 \newcommand*{\l@dmake@labels}{}
-\def\l@dmake@labels#1|#2|#3|#4|#5{%
-  \expandafter\ifx\csname the@label\csuse{XR@prefix}#5\endcsname \relax\else
-    \led@warn@DuplicateLabel{\csuse{XR@prefix}#5}%
+\def\l@dmake@labels#1|#2|#3|#4|#5|#6{%
+  \expandafter\ifx\csname the@label\csuse{XR@prefix}#6\endcsname%
+    \relax%
+  \else%
+    \led@warn@DuplicateLabel{\csuse{XR@prefix}#6}%
   \fi
-  \global\providetoggle{label@#5@ledRcol}%False is the default value of this toggle, which tell us if a label is linked to a right or a left side
-  \expandafter\gdef\csname the@label\csuse{XR@prefix}#5\endcsname{#1|#2|#3|#4|\relax}%
+  \global\providetoggle{label@#6@ledRcol}%False is the default value of this toggle, which tell us if a label is linked to a right or a left side
+  \expandafter\gdef\csname the@label\csuse{XR@prefix}#6\endcsname{#1|#2|#3|#4|#5|\relax}%
   \ignorespaces}
 
 \AtBeginDocument{%
-  \def\l@dmake@labels#1|#2|#3|#4|#5{}%
+  \def\l@dmake@labels#1|#2|#3|#4|#5|#6{}%
 }
 
 
 \newcommand*{\@lab}{%
   \ifledRcol
     \xright@appenditem{\linenumr@p{\line@numR}|%
-      \ifsublines@ \sublinenumr@p{\subline@numR}\else 0\fi}%
+      \ifsublines@ \sublinenumr@p{\subline@numR}\else 0\fi|\the\absline@numR}%
       \to\labelref@listR
   \else
     \xright@appenditem{\linenumr@p{\line@num}|%
-      \ifsublines@ \sublinenumr@p{\subline@num}\else 0\fi}%
+      \ifsublines@ \sublinenumr@p{\subline@num}\else 0\fi|\the\absline@num}%
       \to\labelref@list
   \fi}
 \newcommand*{\applabel}[1]{%
@@ -5378,29 +5416,29 @@
      \@bsphack%
       \ifledRcol%
         \protected@write\@auxout{}%
-          {\string\l@dmake@labelsR\space\l@dparsedstartpage|\l@dparsedstartline|\l@dparsedstartsub|\the\c@pstartR|{#1:start}}%
+          {\string\l@dmake@labelsR\space\l@dparsedstartpage|\l@dparsedstartline|\l@dparsedstartsub||\the\c@pstartR|{#1:start}}%
         \ifdef{\hypertarget}%
           {\Hy@raisedlink{\hypertarget{#1:start}{}}}%
           {}%
         \protected@write\@auxout{}%
-          {\string\l@dmake@labelsR\space\l@dparsedendpage|\l@dparsedendline|\l@dparsedendsub|\the\c@pstartR|{#1:end}}%
+          {\string\l@dmake@labelsR\space\l@dparsedendpage|\l@dparsedendline||\l@dparsedendsub|\the\c@pstartR|{#1:end}}%
       \else%
         \ifl@dpairing%pstart or pstartL?
           \protected@write\@auxout{}%
-            {\string\l@dmake@labels\space\l@dparsedstartpage|\l@dparsedstartline|\l@dparsedstartsub|\the\c@pstartL|{#1:start}}%
+            {\string\l@dmake@labels\space\l@dparsedstartpage|\l@dparsedstartline|\l@dparsedstartsub||\the\c@pstartL|{#1:start}}%
           \ifdef{\hypertarget}%
             {\Hy@raisedlink{\hypertarget{#1:start}{}}}%
             {}%
           \protected@write\@auxout{}%
-            {\string\l@dmake@labels\space\l@dparsedendpage|\l@dparsedendline|\l@dparsedendsub|\the\c@pstartL|{#1:end}}%
+            {\string\l@dmake@labels\space\l@dparsedendpage|\l@dparsedendline|\l@dparsedendsub||\the\c@pstartL|{#1:end}}%
          \else%
             \protected@write\@auxout{}%
-              {\string\l@dmake@labels\space\l@dparsedstartpage|\l@dparsedstartline|\l@dparsedstartsub|\the\c@pstart|{#1:start}}%
+              {\string\l@dmake@labels\space\l@dparsedstartpage|\l@dparsedstartline|\l@dparsedstartsub||\the\c@pstart|{#1:start}}%
             \ifdef{\hypertarget}%
               {\Hy@raisedlink{\hypertarget{#1:start}{}}}%
               {}%
             \protected@write\@auxout{}%
-              {\string\l@dmake@labels\space\l@dparsedendpage|\l@dparsedendline|\l@dparsedendsub|\the\c@pstart|{#1:end}}%
+              {\string\l@dmake@labels\space\l@dparsedendpage|\l@dparsedendline|\l@dparsedendsub||\the\c@pstart|{#1:end}}%
          \fi%
       \fi%
       \@esphack%
@@ -5449,10 +5487,11 @@
 }%
 \newcommand*{\xsublineref}[1]{\l@dgetref@num{3}{#1}}
 
-\newcommand*{\pstartref}[1]{\l@dref@undefined{#1}\wrap@edcrossref{#1}{\l@dgetref@num{4}{#1}}}
-\newcommand*{\xpstartref}[1]{\l@dgetref@num{4}{#1}}
+\newcommand*{\xabslineref}[1]{\l@dgetref@num{4}{#1}}%
+\newcommand*{\pstartref}[1]{\l@dref@undefined{#1}\wrap@edcrossref{#1}{\l@dgetref@num{5}{#1}}}%
+\newcommand*{\xpstartref}[1]{\l@dgetref@num{5}{#1}}%
 
-\newcommand*{\xflagref}[1]{\l@dgetref@num{5}{#1}}
+\newcommand*{\xflagref}[1]{\l@dgetref@num{6}{#1}}%
 \newcommand*{\l@dref@undefined}[1]{%
   \expandafter\ifx\csname the@label#1\endcsname\relax
     \led@warn@RefUndefined{#1}%
@@ -5468,13 +5507,14 @@
   \fi}
 
 \newcommand*{\l@dlabel@parse}{}
-\def\l@dlabel@parse#1|#2|#3|#4|#5|#6{%
-  \ifcase #6%
+\def\l@dlabel@parse#1|#2|#3|#4|#5|#6|#7{%
+  \ifcase #7%
   \or #1%
   \or #2%
   \or #3%
   \or #4%
   \or #5%
+  \or #6%
   \fi}
 \newcommand*{\xxref}[2]{%
   {%
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
index 994c9338753..725d2385f60 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
@@ -29,7 +29,7 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2017/02/10 v2.16.3 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2017/02/23 v2.17.0a reledmac extension for parallel texts]%
 
 \RequirePackage{xspace}%
 \RequirePackage{xkeyval}
@@ -1791,16 +1791,18 @@
 }%
 \list@create{\labelref@listR}
 
-\def\l@dmake@labelsR#1|#2|#3|#4|#5{%
-  \expandafter\ifx\csname the@label\csuse{XR@prefix}#5\endcsname \relax\else
-    \led@warn@DuplicateLabel{\csuse{XR@prefix}#5}%
-  \fi
-  \expandafter\gdef\csname the@label\csuse{XR@prefix}#5\endcsname{#1|#2|#3|#4|\@Rlineflag}%
-  \global\providetoggle{label@#5@ledRcol}%False is the default value of this toggle, which tell us if a label is linked to a right or a left side
-  \global\toggletrue{label@#5@ledRcol}%
+\def\l@dmake@labelsR#1|#2|#3|#4|#5|#6{%
+  \expandafter\ifx\csname the@label\csuse{XR@prefix}#6\endcsname%
+    \relax%
+  \else%
+    \led@warn@DuplicateLabel{\csuse{XR@prefix}#6}%
+  \fi%
+  \expandafter\gdef\csname the@label\csuse{XR@prefix}#6\endcsname{#1|#2|#3|#4|#5|\@Rlineflag}%
+  \global\providetoggle{label@#6@ledRcol}%False is the default value of this toggle, which tell us if a label is linked to a right or a left side
+  \global\toggletrue{label@#6@ledRcol}%
   \ignorespaces}
 \AtBeginDocument{%
-  \def\l@dmake@labelsR#1|#2|#3|#4|#5{}%
+  \def\l@dmake@labelsR#1|#2|#3|#4|#5|#6{}%
 }
 
 \WithSuffix\newcommand\sidenotemargin*[1]{%