diff options
author | Karl Berry <karl@freefriends.org> | 2017-09-02 21:44:34 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-09-02 21:44:34 +0000 |
commit | a7f7f3b04a2de49df22e775296655dc13bfe53bc (patch) | |
tree | 138cb34a518ba5fc6d2a6b7fcd02e9037d7fb71d /Master/texmf-dist/tex/latex/reledmac/reledpar.sty | |
parent | 61fbab0a750d1a8e32eacd11f3421b7c84820fe7 (diff) |
reledmac (1sep17)
git-svn-id: svn://tug.org/texlive/trunk@45201 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/reledmac/reledpar.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/reledmac/reledpar.sty | 97 |
1 files changed, 45 insertions, 52 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index 482b50f5f48..0e7a22478e9 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty @@ -27,9 +27,8 @@ - \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2017/08/23 v2.20.1 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2017/08/31 v2.20.2 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -149,7 +148,7 @@ Use instead #1R or #1* in your preamble.}% } \newcommand{\led@error@missing@numbering}[1]{% - \reledpar@error{Missing \string\pstart…\string\pend\space inside `#1` environment}{\@ehc}% + \reledpar@error{Missing \string\pstart\space …\space\string\pend\space inside `#1` environment}{\@ehc}% }% \providecommand*{\newnamebox}[1]{% \expandafter\newbox\csname #1\endcsname} @@ -193,6 +192,7 @@ \global\l@dnumpstartsR \z@ \global\pst@rtedRfalse \global\numberingRtrue + \global\afterendnumberingRfalse% \global\advance\section@numR \@ne \global\absline@numR \z@ \gdef\normal@page@breakR{} @@ -209,6 +209,9 @@ \global\let\@msdata@list\relax% \global\csundef{@msdata@\add@msd@cR @dataR}% \ifcontinuousnumberingwithcolumns% + \ifnumbering% + \global\resumenumberingR@starttrue% + \fi% \ifnumberpstart% \addtocounter{pstartR}{1}% \fi% @@ -216,7 +219,6 @@ \setcounter{pstartR}{1}% \fi% \message{Section \the\section@numR R }% - \set@continuousnumberingforR% \line@list@stuffR{\jobname.\extensionchars\the\section@numR R}% \l@dend@stuff \begingroup @@ -235,6 +237,7 @@ \def\endnumberingR{% \ifnumberingR \global\numberingRfalse + \global\afterendnumberingRtrue% \normal@pars \ifnum\l@dnumpstartsR=0% \led@err@NumberingWithoutPstart% @@ -300,7 +303,10 @@ \else% \global\pausenumbering@page@numR=\next@page@numR% \fi% - \endnumberingR\global\numberingRtrue} + \endnumberingR% + \global\numberingRtrue% + \global\afterendnumberingRfalse% +}% \newif\ifresumenumberingR@start% \newcommand*{\resumenumberingR}{% \ifnumberingR @@ -308,7 +314,6 @@ \global\advance\section@numR \@ne \global\resumenumberingR@starttrue% \led@mess@SectionContinued{\the\section@numR R}% - \set@continuousnumberingforR% \line@list@stuffR{\jobname.\extensionchars\the\section@numR R}% \l@dend@stuff \begingroup% @@ -372,18 +377,6 @@ \fi \fi \fi}} -\newcommand{\set@continuousnumberingforR}{% - \ifcontinuousnumberingwithcolumns% - \ifnum\line@numR<\line@num% - \global\appto\next@line@list@stuffR{% - \expandafter\setlinenum\expandafter{\the\line@num}% - }% - \fi% - \ifnum\last@page@num>\last@page@numR% - \global\last@page@numR=\last@page@num% - \fi% - \fi% -} \WithSuffix\newcommand\lineation*[1]{% \lineation{#1}% \lineationR{#1}% @@ -734,6 +727,8 @@ \IfFileExists{\l@auxdir#1}% {\global\toggletrue{notfirstrun@#1}}% {\global\togglefalse{notfirstrun@#1}}% + \next@line@list@stuffR% + \global\let\next@line@list@stuffR\relax% \read@linelist{#1}% \iffirst@linenum@out@R \global\first@linenum@out@Rfalse @@ -749,8 +744,6 @@ \closeout\linenum@outR% \openout\linenum@outR=\l@auxdir#1% \fi% - \next@line@list@stuffR% - \global\let\next@line@list@stuffR\relax% }% \newcommand*{\new@lineL}{% @@ -1232,21 +1225,23 @@ \global\advance\@donetotallinesL\@ne% \else% \iflinenumberLevenifblank - \new@lineL% - \l@demptyd@ta% - \getline@numL% - \affixline@num% \setbox\l@dleftbox \hb@xt@ \Lcolwidth{% + \new@lineL% + \l@demptyd@ta% + \getline@numL% + \affixline@num% \l@dld@ta% \hspace*{\Lcolwidth}% \ledrlfill\l@drd@ta% }% \else% - \ifcontinuousnumberingwithcolumns% - \new@lineL% - \getline@numL% - \fi% - \setbox\l@dleftbox \hb@xt@ \Lcolwidth{\hspace*{\Lcolwidth}}% + \setbox\l@dleftbox \hb@xt@ \Lcolwidth{% + \ifcontinuousnumberingwithcolumns% + \new@lineL% + \getline@numL% + \fi% + \hspace*{\Lcolwidth}% + }% \fi% \global\advance\@donetotallinesL\@ne% \fi% @@ -1366,21 +1361,23 @@ \global\advance\@donetotallinesR\@ne% \else% \iflinenumberRevenifblank% - \new@lineR - \l@demptyd@ta% - \getline@numR% \setbox\l@drightbox \hb@xt@ \Rcolwidth{% + \new@lineR% + \l@demptyd@ta% + \getline@numR% \affixline@numR% \l@dld@ta% \hspace*{\Rcolwidth}% \ledrlfill\l@drd@ta% }% \else% - \ifcontinuousnumberingwithcolumns% - \new@lineR% - \getline@numR% - \fi% - \setbox\l@drightbox \hb@xt@ \Rcolwidth{\hspace*{\Rcolwidth}}% + \setbox\l@drightbox \hb@xt@ \Rcolwidth{% + \ifcontinuousnumberingwithcolumns% + \new@lineR% + \getline@numR% + \fi% + \hspace*{\Rcolwidth}% + }% \fi% \global\advance\@donetotallinesR\@ne% \fi% @@ -1541,22 +1538,18 @@ \@l@dtempcntb=\absline@numR \ifnum\@l@dtempcntb<\next@actionlineR\else \ifnum\next@actionR>-1001\relax - \unless\ifresumenumberingR@start% - \@firstlineofpageRtrue% - \fi% + \ifboolexpr{% + bool{resumenumberingR@start}% + and test {\ifdimgreater{\pagedepth}{\z@}}% + }% + {}% + {\@firstlineofpageRtrue}% \global\page@numR=\next@actionR - \ifbypage@R - \ifcsdef{l@dchset@num@R\the\absline@numR}% - {% - \global\csundef{l@dchset@num@R\the\absline@numR}% - }% - {% - \unless\ifresumenumberingR@start% - \global\line@numR \z@% - \global\subline@numR \z@% - \fi% - }% - \fi + \ifcsdef{reset@lineR\the\absline@numR @\the\section@numR}% + {% + \global\line@numR=\z@ \global\subline@numR=\z@% + }% + {}% \global\resumenumberingR@startfalse% \add@msdata@firstlineofpage% \else |