1 files changed, 24 insertions, 10 deletions
diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
index 0984d5eff88..6d764788fc0 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
@@ -325,6 +325,7 @@
 % \changes{v2.21.0}{2017/11/11}{Add compatibility with new features of \protect\reledmac 2.26.0}
 % \changes{v2.21.1}{2017/11/22}{Fix bug with \protect\cs{linenumberannotation}}
 % \changes{v2.21.2}{2018/01/08}{Fix bug with \protect\cs{Xpstart} and \protect\cs{edtextlater}}
+% \changes{v2.21.3}{2018/01/18}{Fix bug when using \protect\cs{numberpstarttrue} and alterning between manual \protect\cs{pstart} and automatic produced by \protect\cs{autopar}}
 % ^^A PW added following as the definitions are at some unknown elsewhere
 %
 % \newcommand{\egstart}{%
@@ -1370,7 +1371,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2018/01/08 v2.21.2 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2018/01/18 v2.21.3 reledmac extension for parallel texts]%
 
 %    \end{macrocode}
 % \subsection{Package's requirement}
@@ -3586,14 +3587,19 @@
 % that you set when the group for the \protect\cs{vbox} ends. 
 %    \begin{macrocode}
   \l@dzeropenalties%
-  \ifautopar\else%
+  \ifboolexpr{%
+    bool{autopar}%
+    and  bool{by@autopar}%
+  }%
+  {}%
+  {%
     \ifnumberpstart%
       \ifsidepstartnum%
         \else%
-         \thepstartL%
-        \fi%
-       \fi%
+        \thepstartL%
       \fi%
+    \fi%
+  }%m
   \@at@start@every@pstart%
   \hsize=\Lcolwidth%
   \numberedpar@true%
@@ -3629,11 +3635,13 @@
     }%
    \at@every@pstart@call%
 %    \end{macrocode}
-% Gobble following space (automatically done if there is no optional argument)
+% Let \cs{by@autopar} to FALSE.
 %    \begin{macrocode}
-  \ignorespaces%
+  \global\by@autoparfalse%
 %    \end{macrocode}
+% Gobble following space (automatically done if there is no optional argument)
 %    \begin{macrocode}
+  \ignorespaces%
   }
 %    \end{macrocode}
 % The same for right side.
@@ -3672,13 +3680,18 @@
   \fi%
   \global\setnamebox{l@dRcolrawbox\the\l@dnumpstartsR}=\vbox\bgroup%
     \l@dzeropenalties%
-    \ifautopar\else%
+    \ifboolexpr{%
+      bool{autopar}%
+      and  bool{by@autopar}%
+    }%
+    {}%
+    {%
       \ifnumberpstart%
         \ifsidepstartnum\else%
           \thepstartR%
-         \fi%
         \fi%
-       \fi%
+      \fi%
+    }%
   \@at@start@every@pstart%
   \hsize=\Rcolwidth%
   \numberedpar@true%
@@ -3710,6 +3723,7 @@
       }%
     }%
    \at@every@pstart@call%
+   \global\by@autoparfalse%
    \ignorespaces%
   }
 %    \end{macrocode}