From 800d650236d4b0f5adadc09f10dbbfde772a77dc Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Mon, 20 Apr 2020 21:10:59 +0000
Subject: reledmac (20apr20)

git-svn-id: svn://tug.org/texlive/trunk@54813 c570f23f-e606-0410-a88d-b1316a301751
---
 .../texmf-dist/source/latex/reledmac/reledpar.dtx  | 41 ++++++++++++++--------
 1 file changed, 26 insertions(+), 15 deletions(-)

(limited to 'Master/texmf-dist/source/latex/reledmac/reledpar.dtx')

diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
index 45e86de80ef..f2f60515605 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
@@ -317,7 +317,7 @@
 % \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\cs{continuousnumberingwithcolumns} when using multiple series of continued numbering text. Now, the line number are correctly reset at each \protect\cs{beginnumbering}.}
 % \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\option{continuousnumberingwithcolumns} and inner / outer notes and line numbering.}
 % \changes{v2.20.0}{2017/08/17}{Add \protect\cs{linenumOnlyPagesForColumns} and \protect\cs{linenumOnlyPagesForColumnsR} to tell to print the line numbers associated with a column only on some specific pages (for example, only on right pages).}
-% \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\option{continuousnumberingwithcolumns} when a \protect\cs{beginnumbering} is called after an other \protect\cs{beginnumbering}\ldots\protect\cs{endnumbering}.}
+% \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\option{continuousnumberingwithcolumns} when a \protect\cs{beginnumbering} is called after another \protect\cs{beginnumbering}\ldots\protect\cs{endnumbering}.}
 % \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\option{widthliketwocolumns} when manually setting \protect\cs{beforecolumnseparator} and \protect\cs{aftercolumnseparator}.}
 % \changes{v2.20.0}{2017/08/17}{Fix compatibility between \protect\option{continuousnumberingwithcolumns} and \protect\cs{numberpstartfalse}.}
 % \changes{v2.20.1}{2017/08/23}{Fix bug with \protect\option{continuousnumberingwithcolumns} when left column and right column have not the same size.}
@@ -339,7 +339,8 @@
 % \changes{v2.22.2}{2019/01/22}{Fix bug with \protect\cs{Xonlyside} and \protect\cs{onlysideX}}
 % \changes{v2.22.3}{2019/07/21}{When using \protect\cs{parindentX} or \protect\cs{Xparindent} and stanza, use the normal indentation in the footnote, not the verse indentation.}
 % \changes{v2.23.0}{2020/03/08}{Add \protect\cs{Leftpagehook} and \protect\cs{Rightpagehook}.}
-% \changes{v2.23.0}{2020/03/08}{Add hanging symbol feature into \protect\env{astanza}.}
+% \changes{v2.23.0}{2020/03/08}{Add hanging symbol feature to \protect\env{astanza}.}
+% \changes{v2.23.1}{2020/04/19}{Fix bug when using \protect\package{polyglossia} v1.45 or later.}
 % ^^A PW added following as the definitions are at some unknown elsewhere
 %
 % \newcommand{\egstart}{%
@@ -665,9 +666,9 @@
 % \file{examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex}
 % covers all these cases.
 % \subsection{Note about \cs{AtEveryPstart*} and \cs{AtEveryPend*}}
-% The content of \cs{AtEveryPstart} / \cs{AtEveryPend} (without star) is added before every \cs{pstart} / after every \cs{pend}, making distinction between  the left and the right side.
+% The content of \cs{AtEveryPstart} / \cs{AtEveryPend} (without star) is added before every \cs{pstart} / after every \cs{pend}, distinguishing between the left and the right side.
 %
-% The content of \cs{AtEveryPstart*} / \cs{AtEveryPend*} (with star) is added before every \cs{pstart} / after every \cs{pend}, but there is no distinction between the left and the right sides: the content is inserted \enquote{for the two columns as a whole}.
+% The content of \cs{AtEveryPstart*} / \cs{AtEveryPend*} (with star) is added before every \cs{pstart} / after every \cs{pend}, but there is no distinction between the left and right sides: the content is inserted \enquote{for the two columns as a whole}.
 %
 % However, as this content is also added when we typeset pages in parallel, \reledmac must add it once for left  \cs{pstart} and once for right \cs{pstart}.
 % So if you use it to add vertical spacing, it will be problematic in parallel columns, as you will have the vertical spacing two times (vertical spacing will be twice as large as expected).
@@ -1395,7 +1396,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2020/03/08 v2.23.0 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2020/04/19 v2.23.1 reledmac extension for parallel texts]%
 
 %    \end{macrocode}
 % \subsection{Package's requirement}
@@ -1571,6 +1572,15 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{\led@err@polyglossiaTooOld}
+%    \begin{macrocode}
+\newcommand{\led@err@polyglossiaTooOld}{%
+  \reledpar@error{You use the polyglosia package.%
+  \MessageBreak However, reledpar requires version 2020/04/08 v1.49 or later of the polyglossia package.%
+  \MessageBreak Please update your reledpar version}{\@ehc}%
+}%
+%    \end{macrocode}
+% \end{macro}
 % \begin{macro}{\led@err@BadLeftRightPstarts}
 %    \begin{macrocode}
 \newcommand*{\led@err@BadLeftRightPstarts}[2]{%
@@ -3150,7 +3160,7 @@
   \unless\ifnofamiliar@%
 %    \end{macrocode}
 % \paragraph{Managing correct number}\label{familiarfootnotenumber}
-% One problem with using familiar footnotes in parallel typesetting is the fact that the order of reading notes is not the same as the order they are typset, because \LaTeX\ reads first all the notes on one side, then all the notes on the other side.
+% One problem with using familiar footnotes in parallel typesetting is the fact that the order of reading notes is not the same as the order they are typeset, because \LaTeX\ reads first all the notes on one side, then all the notes on the other side.
 % Then, however, \LaTeX\ alternates between typesetting left-side note and right-side notes.
 % Consequently, if we do nothing special, the note numbers are sorted in the reading order, not in the typesetting order.
 % So we could obtain something like 1,3,2,5,4.
@@ -5599,20 +5609,21 @@
 % If use \protect\package{polyglossia}
 % \changes{v1.8.0}{2014/08/05}{Correct left/right language setting with polyglossia.}
 % \changes{v1.9.0}{2014/09/16}{Debug left/right language switching with polyglossia. Do not write in .aux file when setting left/right lines.}
-% \changes{v2.22.4}{2019/11/04}{Provide compatibility with last version of polyglossia (v1.45).}
-% \changes{v2.23.0}{2020/03/08}{Restore compatibility with version of polyglossia prior to v1.45.}
+% \changes{v2.22.4}{2019/11/04}{Provide compatibility with the latest version of polyglossia (v1.45).}
+% \changes{v2.23.0}{2020/03/08}{Restore compatibility with versions of polyglossia prior to v1.45.}
 % \begin{macrocode}
-  {    \let\old@otherlanguage\otherlanguage%
+  {%
+    \@ifpackagelater{polyglossia}{2020/04/08}{}{\led@err@polyglossiaTooOld}%
+    \let\old@otherlanguage\otherlanguage%
        \renewcommand{\otherlanguage}[2][]{%
-        \ifdefined\xpg@set@group@aux%
-          \xpg@set@group@aux%
-        \fi%
+        \xpg@set@group@aux%
         \selectlanguage[#1]{#2}%
         \ifledRcol  \gdef\theledlanguageR{#2}%
         \else      \gdef\theledlanguageL{#2}%
         \fi}%
       \renewcommand{\l@duselanguage}[1]{%
-        \csuse{no\languagename @numbers}\select@language{#1}%
+        \csuse{no\languagename @numbers}%
+        \@select@language{#1}%
       }%
       \gdef\theledlanguageL{\xpg@main@language}%
       \gdef\theledlanguageR{\xpg@main@language}%
@@ -6288,8 +6299,8 @@
 % \begin{macro}{setnotepositionliketwocolumns@R}
 % The \protect\cs{setwidthliketwocolumns} macro is called in \protect\cs{beginnumbering} in a \textbf{non-parallel}
 % typesetting context, to fix the width of the lines to be vertically aligned with parallel columns. It is also called at the beginning of a note's group, if some options are enabled.
-% The \protect\cs{setposition\ldots} macros are called in \protect\cs{beginnumbering} in a \textbf{non- parallel} typesetting context to fix the position of the lines.
-% The \protect\cs{setnoteposition\ldots} macros are called in \protect\cs{xxxfootstart} in a \textbf{non- parallel} typesetting context to fix the position of notes block.
+% The \protect\cs{setposition\ldots} macros are called in \protect\cs{beginnumbering} in a \textbf{non-parallel} typesetting context to fix the position of the lines.
+% The \protect\cs{setnoteposition\ldots} macros are called in \protect\cs{xxxfootstart} in a \textbf{non-parallel} typesetting context to fix the position of the notes block.
 % \begin{macrocode}
 \newcommand{\setwidthliketwocolumns}{%
   \get@intercolumns@width%As \columns is not necessary called before \setwidthliketwocolumns
-- 
cgit v1.2.3

