reledmac (16oct16)

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

8 files changed, 65 insertions, 12 deletions

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 a72e1cf56d1..c439dd126a5 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
@@ -76,3 +76,9 @@
 % If you use \package{perpage} package to control footnote numbering, please read the handbook on \reff{perpage}.
 % \subsection{Migration to \reledpar~2.14.0}
 % The \cs{linenumberlist} command is reserved for the left side. For the equivalent feature on the right side, define \cs{linenumberlistR}.
+% \subsection{Migration to \reledpar~2.14.1}
+% The execution of the code sent to \cs{doinsidelineLhook} and \cs{doinsidelineRhook} have been moved to a position where \cs{markboth} could work.
+%
+% Normally, it should do not have impact on your previous use of \cs{doinsidelineLhook} and \cs{doinsidelineRhook}.
+%
+% Please contact us if that cause problem.
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 4492bd01bb9..9da68ef8044 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/reledmac.pdf b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
index e7a35bcb9ca..5cd5778a12b 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 8f7d9d7fa92..53ccf1d81c2 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 c6814791337..42d8036f685 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
@@ -445,6 +445,7 @@
 % \changes{v2.16.2}{2016/10/07}{Error message if \protect\package{footmisc} is loaded after \protect\package{reledmac}.}
 % \changes{v2.16.2}{2016/10/07}{Fix bug introduced by v2.16.1 when using  not expandable control sequence, like \protect\cs{normalfont}, in the footnote number style.}
 % \changes{v2.16.3}{2016/10/12}{Fix bug with \protect\cs{SEref} (bug added in v2.7.0).}
+% \changes{v2.16.4}{2016/10/16}{Fix bug with vertical space before sectioning command in optional argument of \protect\cs{pstart} (bug added in v2.15.3).}
 % \title{\Macpackage \\
 %      Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
 % has version number \fileversion, last revised \filedate.}}
@@ -1148,12 +1149,12 @@
 % \DescribeMacro{\hidenumberingonleftpage}
 % \cs{hidenumberingonleftpage} is like \protect{hidenumbering}, but is applied only on left page. \cs{hidenumberingonrightpage} is applied on right page.
 % They can be useful  if the position of the line number is depending of the position of the page, but the position of marginal note is fixed.
-% \subsubsection{Execute code at each line}
+% \subsection{Executing code at each line}\label{linehook}
 % \Macpackage provides an advanced feature for users.
 % \DescribeMacro{\dolinehook}\DescribeMacro{\doinsidelinehook}
 % The argument passed to \protect\cs{dolinehook}\marg{arg} will be executed 
 % before slicing a new line in the paragraph.
-% The argument passed to \protect\cs{doinsidelinehook}\marg{arg} will be executed before printing a new line.
+% The argument passed to \protect\cs{doinsidelinehook}\marg{arg} will be executed before printing a new line, when the line number have already been fixed.
 % In many cases, the latter is more useful than the former.
 % The file \href{examples/2-line_numbers_in_header.tex}{examples/2-line\_numbers\_in\_header.tex} provides
 % an example for printing the first and last line numbers of a page in the header.
@@ -3840,7 +3841,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2016/10/12 v2.16.3 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2016/10/16 v2.16.4 typesetting critical editions]%
 %    \end{macrocode}
 %
 % \subsection{Package options}
@@ -7811,6 +7812,7 @@
   \ifluatex%
     \edef\l@luatextextdir@L{\the\textdir}%
   \fi%
+  \@nobreaktrue%
   \ifnumbering \else%
     \led@err@PstartNotNumbered%
     \beginnumbering%
@@ -7916,8 +7918,10 @@
   \normal@pars%
   \ifstrempty{#1}{\at@every@pend}{\noindent#1}%
 %    \end{macrocode}
-% Restore autopar setting. 
+% Restore standard nobreak setting and autopar setting. 
+% Normally, \cs{if@nobreak} is equal to true only immediately after a sectioning command (read latex.ltx file). As a \cs{pstart}…\cs{pend} structure can't contain any sectioning command, we set \cs{if@nobreak} to false. 
 %    \begin{macrocode}
+  \@nobreakfalse%
   \ifautopar%
     \autopar%
   \fi%
diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
index 0d11dfbdd5c..e8a963456f2 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
@@ -285,6 +285,8 @@
 % \changes{v2.14.0}{2016/10/02}{When indexing texts in sidenotes with \protect\cs{edtext}, referring to the line number where the sidenote is called.}
 % \changes{v2.14.0}{2016/10/02}{More explicit error message when missing to define stanza indent.}
 % \changes{v2.14.0}{2016/10/02}{Error message when missing to define left / right side.}
+% \changes{v2.14.1}{2016/10/16}{Fix bug with vertical space before sectioning command in optional argument of \protect\cs{pstart} (bug added in v2.13.1).}
+% \changes{v2.14.1}{2016/10/16}{Fix bug when using \protect\cs{markboth} on \protect\cs{doinsidelineLhook} and \protect\cs{doinsidelineRhook}.}
 % ^^A PW added following as the definitions are at some unknown elsewhere
 %
 % \newcommand{\egstart}{%
@@ -1048,6 +1050,17 @@
 % selection for the side. The right side language is also
 % applied to the right side line numbers.
 %
+% \subsection{Executing code at each line}
+% \DescribeMacro{\dolineLhook}
+% \DescribeMacro{\dolineRhook}
+% \cs{dolineLhook} and \cs{dolineRhook} are the equivalent to the \macpackage \cs{dolinehook}, respectively for left and right side.
+%
+% \DescribeMacro{\doinsidelineLhook}
+% \DescribeMacro{\doinsidelineRhook}
+% \cs{doinsidelineLhook} and \cs{doinsidelineRhook} are the equivalent to the \macpackage \cs{doinsidelinehook}, respectively for left and right side.
+% 
+% About these two hooks, read \macpackage's handbook (\reff{reledmac-linehook}).
+%
 % \section{Verse}
 %
 % If you are typesetting verses with \macpackage you can use the \protect\cs{stanza}
@@ -1218,7 +1231,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2016/10/02 v2.14.0 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2016/10/16 v2.14.1 reledmac extension for parallel texts]%
 
 %    \end{macrocode}
 % \subsection{Package's requirement}
@@ -3290,6 +3303,12 @@
 \renewcommand{\thepstartR}{{\bfseries\@arabic\c@pstartR}. }
 
 \newcommandx*{\pstartL}[1][1]{%
+  \if@nobreak%
+    \let\@oldnobreak\@nobreaktrue%
+  \else%
+    \let\@oldnobreak\@nobreakfalse%
+  \fi%
+    \@nobreaktrue%
   \ifluatex%
     \xdef\l@luatextextdir@L{\the\textdir}%
     \xdef\l@luatexpardir@L{\the\pardir}%
@@ -3362,6 +3381,12 @@
 % 
 %    \begin{macrocode}
 \newcommandx*{\pstartR}[1][1]{%
+  \if@nobreak%
+    \let\@oldnobreak\@nobreaktrue%
+  \else%
+    \let\@oldnobreak\@nobreakfalse%
+  \fi%
+    \@nobreaktrue%
   \ifluatex%
     \xdef\l@luatextextdir@R{\the\textdir}%
     \xdef\l@luatexpardir@R{\the\pardir}%
@@ -3643,8 +3668,8 @@
     \add@Xgroupbyline%
     \affixside@note%
     \l@dlsn@te%
+    \do@insidelineLhook%
     \hb@xt@ \Lcolwidth{\ledllfill\hb@xt@ \wd\one@line{%
-            \do@insidelineLhook%
             \ifluatex%
               \textdir\l@luatextextdir@L%
             \fi%
@@ -3665,6 +3690,7 @@
     \ifdefstring{\@eledsectnotoc}{L}{\ledsectnotoc}{}
     \ifdefstring{\@eledsectmark}{L}{}{\ledsectnomark}
     \numdef{\temp@}{\l@dpscL-1}%
+    \xifinlist{\temp@}{\eled@sections@@}{\@nobreaktrue}{\@nobreakfalse}%
     \@eled@sectioningtrue%
     \bgroup%
       \ifluatex%
@@ -3695,7 +3721,7 @@
 % \begin{macro}{\doinsidelineRhook}
 % \changes{v1.8.3}{2014/08/31}{Added \protect\cs{dolineLhook}, \protect\cs{dolineRhook}, \protect\cs{doinsidelineLhook} and \protect\cs{doinsidelineRhook}}
 % These high-level commands just redefine the low-level commands. 
-% They have to be used be user, without \protect\cs{makeatletter}.
+% They have to be used by user, without \protect\cs{makeatletter}.
 %    \begin{macrocode}
 \newcommand*{\dolineLhook}[1]{\gdef\do@lineLhook{#1}}%
 \newcommand*{\dolineRhook}[1]{\gdef\do@lineRhook{#1}}%
@@ -3819,8 +3845,8 @@
     \add@Xgroupbyline%
     \affixside@noteR%
     \l@dlsn@te%
+    \do@insidelineRhook%
     \hb@xt@ \Rcolwidth{\ledllfill\hb@xt@ \wd\one@lineR{%
-       \do@insidelineRhook%
        \new@lineR%
        \inserthangingsymbolR%
        \ifluatex%
@@ -3836,6 +3862,7 @@
     \ifdefstring{\@eledsectnotoc}{R}{\ledsectnotoc}{}%
     \ifdefstring{\@eledsectmark}{R}{}{\ledsectnomark}%
     \numdef{\temp@}{\l@dpscR-1}%
+    \xifinlist{\temp@}{\eled@sectionsR@@}{\@nobreaktrue}{\@nobreakfalse}%
     \@eled@sectioningtrue%
     \bgroup%
       \ifluatex%
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index d5fcd9c9448..c350e76eb21 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}[2016/10/12 v2.16.3 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2016/10/16 v2.16.4 typesetting critical editions]%
 \RequirePackage{xkeyval}
 \newif\ifparledgroup
 \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}}
@@ -1635,6 +1635,7 @@
   \ifluatex%
     \edef\l@luatextextdir@L{\the\textdir}%
   \fi%
+  \@nobreaktrue%
   \ifnumbering \else%
     \led@err@PstartNotNumbered%
     \beginnumbering%
@@ -1701,6 +1702,7 @@
   \addtocounter{pstart}{1}%
   \normal@pars%
   \ifstrempty{#1}{\at@every@pend}{\noindent#1}%
+  \@nobreakfalse%
   \ifautopar%
     \autopar%
   \fi%
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
index a959fc1da9c..b5732dd2f80 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}[2016/10/02 v2.14.0 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2016/10/16 v2.14.1 reledmac extension for parallel texts]%
 
 \RequirePackage{xspace}%
 \RequirePackage{xkeyval}
@@ -883,6 +883,12 @@
 \renewcommand{\thepstartR}{{\bfseries\@arabic\c@pstartR}. }
 
 \newcommandx*{\pstartL}[1][1]{%
+  \if@nobreak%
+    \let\@oldnobreak\@nobreaktrue%
+  \else%
+    \let\@oldnobreak\@nobreakfalse%
+  \fi%
+    \@nobreaktrue%
   \ifluatex%
     \xdef\l@luatextextdir@L{\the\textdir}%
     \xdef\l@luatexpardir@L{\the\pardir}%
@@ -928,6 +934,12 @@
   \ignorespaces%
   }
 \newcommandx*{\pstartR}[1][1]{%
+  \if@nobreak%
+    \let\@oldnobreak\@nobreaktrue%
+  \else%
+    \let\@oldnobreak\@nobreakfalse%
+  \fi%
+    \@nobreaktrue%
   \ifluatex%
     \xdef\l@luatextextdir@R{\the\textdir}%
     \xdef\l@luatexpardir@R{\the\pardir}%
@@ -1102,8 +1114,8 @@
     \add@Xgroupbyline%
     \affixside@note%
     \l@dlsn@te%
+    \do@insidelineLhook%
     \hb@xt@ \Lcolwidth{\ledllfill\hb@xt@ \wd\one@line{%
-            \do@insidelineLhook%
             \ifluatex%
               \textdir\l@luatextextdir@L%
             \fi%
@@ -1117,6 +1129,7 @@
     \ifdefstring{\@eledsectnotoc}{L}{\ledsectnotoc}{}
     \ifdefstring{\@eledsectmark}{L}{}{\ledsectnomark}
     \numdef{\temp@}{\l@dpscL-1}%
+    \xifinlist{\temp@}{\eled@sections@@}{\@nobreaktrue}{\@nobreakfalse}%
     \@eled@sectioningtrue%
     \bgroup%
       \ifluatex%
@@ -1230,8 +1243,8 @@
     \add@Xgroupbyline%
     \affixside@noteR%
     \l@dlsn@te%
+    \do@insidelineRhook%
     \hb@xt@ \Rcolwidth{\ledllfill\hb@xt@ \wd\one@lineR{%
-       \do@insidelineRhook%
        \new@lineR%
        \inserthangingsymbolR%
        \ifluatex%
@@ -1247,6 +1260,7 @@
     \ifdefstring{\@eledsectnotoc}{R}{\ledsectnotoc}{}%
     \ifdefstring{\@eledsectmark}{R}{}{\ledsectnomark}%
     \numdef{\temp@}{\l@dpscR-1}%
+    \xifinlist{\temp@}{\eled@sectionsR@@}{\@nobreaktrue}{\@nobreakfalse}%
     \@eled@sectioningtrue%
     \bgroup%
       \ifluatex%