summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/reledmac/reledmac.sty')
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledmac.sty50
1 files changed, 29 insertions, 21 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%
}