diff options
author | Karl Berry <karl@freefriends.org> | 2016-09-26 20:53:10 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-09-26 20:53:10 +0000 |
commit | 1895e2b04949f111ac2f813897b0cebe52114b6e (patch) | |
tree | 0c670be37141fa0a5d0214a4d4602899abf9bfa1 /Master/texmf-dist/tex | |
parent | 0aeb54ea38eda4571b93e571228e81a29444730c (diff) |
reledmac (26sep16)
git-svn-id: svn://tug.org/texlive/trunk@42155 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 17 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/reledmac/reledpar.sty | 18 |
2 files changed, 12 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index 0e552921e63..739c82184b8 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2016/09/12 v2.15.2 typeset critical editions]% +\ProvidesPackage{reledmac}[2016/09/26 v2.15.3 typeset critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}} @@ -1614,10 +1614,12 @@ \newcommandx*{\pstart}[1][1]{% \normal@pars% \ifstrempty{#1}{\at@every@pstart}{\noindent#1}% + \ifautopar% + \autopar% + \fi% \ifluatex% \edef\l@luatextextdir@L{\the\textdir}% \fi% - \@nobreaktrue% \ifnumbering \else% \led@err@PstartNotNumbered% \beginnumbering% @@ -1628,9 +1630,14 @@ \fi% \list@clear{\inserts@list}% \global\let\next@insert=\empty% - \begingroup% + \begingroup\normal@pars% \global\advance \l@dnumpstartsL\@ne \global\setbox\raw@text=\vbox\bgroup% + \if@nobreak% + \if@afterindent\else% + \noindent% + \fi% + \fi% \ifautopar\else% \ifnumberpstart% \ifinstanza\else% @@ -1679,13 +1686,11 @@ \addtocounter{pstart}{1}% \normal@pars% \ifstrempty{#1}{\at@every@pend}{\noindent#1}% - \@nobreakfalse% \ifautopar% \autopar% \fi% } - \newcommand{\AtEveryPend}[1]{% \ifstrempty{#1}% {\xdef\at@every@pend{}}% @@ -1718,7 +1723,7 @@ \pstart \noindent \kern\wd0 \ifnumberpstart\ifinstanza\else\thepstart\fi\fi \let\par=\pend}% \ignorespaces} -\newcommand*{\normal@pars}{\ifautopar\everypar{}\fi\let\par\endgraf} +\newcommand*{\normal@pars}{\everypar{}\let\par\endgraf} \newif\ifautopar@pause \newcommand*{\l@dunhbox@line}[1]{\unhbox #1} diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index 20cc516de57..34ebcc9df1a 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/07/22 v2.13.0 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2016/09/26 v2.13.1 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -837,12 +837,6 @@ \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}% @@ -888,12 +882,6 @@ \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}% @@ -948,7 +936,6 @@ \global\par@line=0% \endgroup% \ignorespaces% - \@oldnobreak% \dump@pstartL@pc% \ifnumberpstart% \addtocounter{pstartL}{1}% @@ -969,7 +956,6 @@ \global\par@lineR=0% \endgroup% \ignorespaces% - \@oldnobreak% \dump@pstartR@pc% \ifnumberpstart% \addtocounter{pstartR}{1}% @@ -1085,7 +1071,6 @@ \ifdefstring{\@eledsectnotoc}{L}{\ledsectnotoc}{} \ifdefstring{\@eledsectmark}{L}{}{\ledsectnomark} \numdef{\temp@}{\l@dpscL-1}% - \xifinlist{\temp@}{\eled@sections@@}{\@nobreaktrue}{\@nobreakfalse}% \@eled@sectioningtrue% \bgroup% \ifluatex% @@ -1216,7 +1201,6 @@ \ifdefstring{\@eledsectnotoc}{R}{\ledsectnotoc}{}% \ifdefstring{\@eledsectmark}{R}{}{\ledsectnomark}% \numdef{\temp@}{\l@dpscR-1}% - \xifinlist{\temp@}{\eled@sectionsR@@}{\@nobreaktrue}{\@nobreakfalse}% \@eled@sectioningtrue% \bgroup% \ifluatex% |