diff options
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 50 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/reledmac/reledpar.sty | 24 |
2 files changed, 43 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index 01b2706dfbf..c9aa1e66add 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/18 v2.26.4 typesetting critical editions]% +\ProvidesPackage{reledmac}[2018/01/28 v2.26.5 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}} @@ -1792,6 +1792,8 @@ \newcount\num@lines \newbox\one@line \newcount\par@line +\newcount\pstarts@typeset@L% +\newcount\pstarts@read@L% \newcommand{\AtStartEveryPstart}[1]{% \ifstrempty{#1}% @@ -1851,6 +1853,8 @@ \global\let\next@insert=\empty% \begingroup\normal@pars% \global\advance \l@dnumpstartsL\@ne + \global\advance \pstarts@typeset@L\@ne% + \global\advance \pstarts@read@L\@ne% \global\setbox\raw@text=\vbox\bgroup% \if@nobreak% \if@afterindent\else% @@ -2009,7 +2013,7 @@ \else% \affixline@num% \fi% - \xifinlist{\the\l@dnumpstartsL}{\eled@sections@@}% + \xifinlist{\the\pstarts@typeset@L}{\eled@sections@@}% {\print@eledsection}% {\print@line}% \IfStrEq{\led@pb@setting}{after}{\led@check@pb\led@check@nopb}{} @@ -2037,14 +2041,7 @@ \l@dlsn@te {\ledllfill\hb@xt@ \wd\one@line{% \new@line% - \ifcontinuousnumberingwithcolumns% - \unless\ifafterendnumberingR% - \new@lineR% - \xappto\next@line@list@stuffR{% - \unexpanded{\global\line@numR=}\the\line@num% - }% - \fi% - \fi% + \continuousnumberingwithcolumns@sync@linenumber@singletext% \ifluatex% \textdir\l@luatextextdir@L% \fi% @@ -2071,12 +2068,12 @@ \insert@msdata% }% \affixside@note% - \numdef{\temp@}{\l@dnumpstartsL-1}% + \numdef{\temp@}{\pstarts@typeset@L-1}% \xifinlist{\temp@}{\eled@sections@@}{\@nobreaktrue}{\@nobreakfalse}% \@eled@sectioningtrue% - \csuse{eled@sectioning@\the\l@dnumpstartsL}% + \csuse{eled@sectioning@\the\pstarts@typeset@L}% \@eled@sectioningfalse% - \global\csundef{eled@sectioning@\the\l@dnumpstartsL}% + \global\csundef{eled@sectioning@\the\pstarts@typeset@L}% \if@RTL% \hspace{-3\paperwidth}% {\hbox{\l@dunhbox@line{\one@line}} \new@line}% @@ -2085,6 +2082,7 @@ {\new@line \hbox{\l@dunhbox@line{\one@line}}}% \fi% \vskip-\baselineskip% + \continuousnumberingwithcolumns@sync@linenumber@singletext% } \newcommand*{\do@linehook}{} \newcommand*{\do@insidelinehook}{} @@ -2237,6 +2235,16 @@ \led@warn@BadAction \fi} +\newcommand{\continuousnumberingwithcolumns@sync@linenumber@singletext}{% + \ifcontinuousnumberingwithcolumns% + \unless\ifafterendnumberingR% + \new@lineR% + \xappto\next@line@list@stuffR{% + \unexpanded{\global\line@numR=}\the\line@num% + }% + \fi% + \fi% +}% \newcommand{\linenumannotation}[1]{% \leavevmode%In case it begins with a \pstart, ensure the \@annot is written after \@nl \ifledRcol% @@ -8645,7 +8653,7 @@ }% \else% \immediate\write\eled@sectioning@out{% - \string\eled@chapter{#1}{\unexpanded{#2}}{\the\l@dnumpstartsL}{}{} + \string\eled@chapter{#1}{\unexpanded{#2}}{\the\pstarts@read@L}{}{}% }% \fi% } @@ -8660,7 +8668,7 @@ }% \else% \immediate\write\eled@sectioning@out{% - \string\eled@section{#1}{\unexpanded{#2}}{\the\l@dnumpstartsL}{}{} + \string\eled@section{#1}{\unexpanded{#2}}{\the\pstarts@read@L}{}{}% }% \fi% } @@ -8675,7 +8683,7 @@ }% \else% \immediate\write\eled@sectioning@out{% - \string\eled@subsection{#1}{\unexpanded{#2}}{\the\l@dnumpstartsL}{}{} + \string\eled@subsection{#1}{\unexpanded{#2}}{\the\pstarts@read@L}{}{}% }% \fi% } @@ -8689,7 +8697,7 @@ }% \else% \immediate\write\eled@sectioning@out{% - \string\eled@subsubsection{#1}{\unexpanded{#2}}{\the\l@dnumpstartsL}{}{} + \string\eled@subsubsection{#1}{\unexpanded{#2}}{\the\pstarts@read@L}{}{}% }% \fi% } @@ -8704,7 +8712,7 @@ }% \else% \immediate\write\eled@sectioning@out{% - \string\eled@chapter{#1}{\unexpanded{#2}}{\the\l@dnumpstartsL}{*}{} + \string\eled@chapter{#1}{\unexpanded{#2}}{\the\pstarts@read@L}{*}{}% }% \fi% } @@ -8719,7 +8727,7 @@ }% \else% \immediate\write\eled@sectioning@out{% - \string\eled@section{#1}{\unexpanded{#2}}{\the\l@dnumpstartsL}{*}{} + \string\eled@section{#1}{\unexpanded{#2}}{\the\pstarts@read@L}{*}{}% }% \fi% } @@ -8734,7 +8742,7 @@ }% \else% \immediate\write\eled@sectioning@out{% - \string\eled@subsection{#1}{\unexpanded{#2}}{\the\l@dnumpstartsL}{*}{} + \string\eled@subsection{#1}{\unexpanded{#2}}{\the\pstarts@read@L}{*}{}% }% \fi% } @@ -8749,7 +8757,7 @@ }% \else% \immediate\write\eled@sectioning@out{% - \string\eled@subsubsection{#1}{\unexpanded{#2}}{\the\l@dnumpstartsL}{*}{} + \string\eled@subsubsection{#1}{\unexpanded{#2}}{\the\pstarts@read@L}{*}{}% }% \fi% } diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index efdf5ef5bdc..c9e83f816ff 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/18 v2.21.3 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2018/01/28 v2.21.4 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -978,6 +978,7 @@ \fi% \begingroup\everypar{}% \global\advance\l@dnumpstartsL \@ne% + \global\advance\pstarts@read@L \@ne% \ifnum\l@dnumpstartsL>\l@dc@maxchunks% \led@err@TooManyPstarts% \global\l@dnumpstartsL=\l@dc@maxchunks% @@ -1242,7 +1243,7 @@ \else% \affixline@num% \fi% - \xifinlist{\the\l@dpscL}{\eled@sections@@}% + \xifinlist{\the\pstarts@typeset@L}{\eled@sections@@}% {\unless\ifshiftedpstarts% \add@apparatusL% \fi% @@ -1295,7 +1296,7 @@ \addtocounter{pstartL}{-1}% \ifdefstring{\@eledsectnotoc}{L}{\ledsectnotoc}{} \ifdefstring{\@eledsectmark}{L}{}{\ledsectnomark} - \numdef{\temp@}{\l@dpscL-1}% + \numdef{\temp@}{\pstarts@typeset@L-1}% \xifinlist{\temp@}{\eled@sections@@}{\@nobreaktrue}{\@nobreakfalse}% \@eled@sectioningtrue% \bgroup% @@ -1305,10 +1306,10 @@ \bodydir\l@luatexbodydir@L% \ifdefstring{\l@luatextextdir@L}{TRT}{\@RTLtrue}{}% \fi% - \csuse{eled@sectioning@\the\l@dpscL}% + \csuse{eled@sectioning@\the\pstarts@typeset@L}% \egroup% \@eled@sectioningfalse% - \global\csundef{eled@sectioning@\the\l@dpscL}% + \global\csundef{eled@sectioning@\the\pstarts@typeset@L}% \if@RTL% \hspace{-3\paperwidth}% {\hbox{\l@dunhbox@line{\one@line}} \new@line}% @@ -2330,6 +2331,7 @@ \global\pstartnumRtrue \global\advance\l@dpscL \@ne \global\advance\l@dpscR \@ne + \global\advance\pstarts@typeset@L\@ne% \restore@pstartL@pc% \restore@pstartR@pc% \Columns@print@before@pstart% @@ -2337,12 +2339,12 @@ { \loop\ifaraw@text \l@duselanguage{\theledlanguageL}% \do@lineL - \xifinlist{\the\l@dpscL}{\eled@sections@@} + \xifinlist{\the\pstarts@typeset@L}{\eled@sections@@}% {% \ifdefstring{\@eledsectmark}{L}% - {\csuse{eled@sectmark@\the\l@dpscL}% + {\csuse{eled@sectmark@\the\pstarts@typeset@L}% }{}% - \global\csundef{eled@sectmark@\the\l@dpscL}% + \global\csundef{eled@sectmark@\the\pstarts@typeset@L}% \savebox{\@eledsectionL}{\parbox[t][][t]{\Lcolwidth}{\vbox{}\print@eledsectionL}}%\vbox{}-> prevent alignment troubles with RTL language }% {}% @@ -2735,6 +2737,7 @@ \if@pstarts% \global\advance\l@dpscL \@ne% \global\advance\l@dpscR \@ne% + \global\advance\pstarts@typeset@L\@ne% \restore@pstartL@pc% \restore@pstartR@pc% \global\@donereallinesL=\z@% @@ -2750,7 +2753,7 @@ \csuse{before@pstartL@\the\l@dpscL}% \global\csundef{before@pstartL@\the\l@dpscL}% \do@lineL% - \xifinlist{\the\l@dpscL}{\eled@sections@@} + \xifinlist{\the\pstarts@typeset@L}{\eled@sections@@}% {\print@eledsectionL}% {}% \advance\numpagelinesL \@ne% @@ -2759,7 +2762,7 @@ \parledgroup@correction@notespacing{L}% \hb@xt@ \hsize{\ledstrutL\unhbox\l@dleftbox}% \else% - \xifinlist{\the\l@dpscL}{\eled@sections@@}% + \xifinlist{\the\pstarts@typeset@L}{\eled@sections@@}% {\add@apparatusL}% {}% \unless\ifadvancedshiftedpstarts% @@ -3180,6 +3183,7 @@ {\usenamecount{l@dmaxlinesinpar\the\l@dpscL}}% \global\@donetotallinesL \z@ \global\advance\l@dpscL \@ne + \global\advance\pstarts@typeset@L\@ne% \global\pstartnumtrue% \restore@pstartL@pc% \parledgroup@notes@endL |