summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/reledmac
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-01-19 21:58:25 +0000
committerKarl Berry <karl@freefriends.org>2018-01-19 21:58:25 +0000
commit36ec4fc27c45112231d3d8be99b25185b8936bfb (patch)
treeca57ae4407632919d86e9fd1972de4cf63d22531 /Master/texmf-dist/tex/latex/reledmac
parent2b9d7a5ed4879107431c98e60c2709facd832efc (diff)
reledmac (19jan18)
git-svn-id: svn://tug.org/texlive/trunk@46387 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/reledmac')
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledmac.sty32
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledpar.sty28
2 files changed, 42 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index b6f0454eeda..01b2706dfbf 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}[2018/01/06 v2.26.3 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2018/01/18 v2.26.4 typesetting critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}}
@@ -1858,21 +1858,27 @@
\global\@afterindenttrue%
\fi%
\fi%
- \ifautopar\else%
- \ifnumberpstart%
- \ifinstanza\else%
- \ifsidepstartnum\else%
- \thepstart%
+ \ifboolexpr{%
+ bool{autopar}%
+ and bool{by@autopar}%
+ }%
+ {}%
+ {%
+ \ifnumberpstart%
+ \ifinstanza\else%
+ \ifsidepstartnum\else%
+ \thepstart%
+ \fi%
\fi%
- \fi%
\fi%
- \fi%
+ }%
\numberedpar@true%
\iflabelpstart%
\protected@edef\@currentlabel{\p@pstart\thepstart}%
\fi%
\l@dzeropenalties%
\@at@start@every@pstart%
+ \global\by@autoparfalse%
\ignorespaces%because not automatically ignored if an optional argument is used (classical TeX behavior for space after commands)
}
\newcommandx*{\pend}[2][1,2,usedefault]{\ifnumbering \else%
@@ -1953,7 +1959,7 @@
\postdisplaypenalty \z@ \widowpenalty \z@}
\newif\ifautopar
-\autoparfalse
+\newif\ifby@autopar%
\newcommand*{\autopar}{
\ifledRcol
\ifnumberingR \else
@@ -1969,7 +1975,13 @@
\autopartrue
\everypar{\setbox0=\lastbox
\endgraf \vskip-\parskip
- \pstart \noindent \kern\wd0 \ifnumberpstart\ifinstanza\else\thepstart\fi\fi
+ \global\by@autopartrue%
+ \pstart \noindent \kern\wd0%
+ \ifnumberpstart%
+ \ifinstanza\else%
+ \thepstart%
+ \fi%
+ \fi%
\let\par=\pend}%
\ignorespaces}
\newcommand*{\normal@pars}{\everypar{}\let\par\endgraf}
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
index 119ef1246a7..efdf5ef5bdc 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
@@ -28,7 +28,7 @@
\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]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -984,14 +984,19 @@
\fi%
\global\setnamebox{l@dLcolrawbox\the\l@dnumpstartsL}=\vbox\bgroup%
\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%
@@ -1023,6 +1028,7 @@
}%
}%
\at@every@pstart@call%
+ \global\by@autoparfalse%
\ignorespaces%
}
\newcommandx*{\pstartR}[2][1,2,usedefault]{%
@@ -1058,13 +1064,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%
@@ -1096,6 +1107,7 @@
}%
}%
\at@every@pstart@call%
+ \global\by@autoparfalse%
\ignorespaces%
}
\newcommandx*{\pendL}[2][1,2,usedefault]{%