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.sty85
1 files changed, 62 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index d967308929a..3a013e823d1 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
@@ -37,7 +37,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2020/12/20 v2.35.1 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2021/01/21 v2.36.0 typesetting critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\newif\ifsameparallelpagenumber%
@@ -807,6 +807,7 @@
\newcount\line@num
\newcount\subline@num
\newif\ifsublines@
+\newif\ifsublines@R%
\newcount\absline@num
\newcount\@lock
\newcount\sub@lock
@@ -1024,16 +1025,28 @@
\newcommand*{\@lopL}[1]{}
\newcommand*{\@lopR}[1]{}
-\newcommand*{\sub@on}{\ifsublines@
+\newcommand*{\sub@on}{%
+ \ifboolexpr{%
+ bool{sublines@}%
+ or%
+ (bool{sublines@R} and bool{ledRcol})%
+ }{%
\let\sub@change=\relax
- \else
+ }{%
\def\sub@change{1}%
- \fi}
-\newcommand*{\sub@off}{\ifsublines@
+ }%
+}%
+\newcommand*{\sub@off}{%
+ \ifboolexpr{%
+ bool{sublines@}%
+ or%
+ (bool{sublines@R} and bool{ledRcol})%
+ }{%
\def\sub@change{-1}%
- \else
+ }{%
\let\sub@change=\relax
- \fi}
+ }%
+}%
\newcommand*{\@adv}[1]{%
@@ -1071,7 +1084,7 @@
\newcommand*{\@set}[1]{%
\ifledRcol
- \ifsublines@
+ \ifsublines@R%
\subline@numR=#1\relax
\else
\line@numR=#1\relax
@@ -1113,7 +1126,7 @@
\newcommand*{\set@line@action}{%
\ifledRcol
\xright@appenditem{\the\absline@numR}\to\actionlines@listR
- \ifsublines@
+ \ifsublines@R%
\@l@dtempcnta=-\subline@numR
\else
\@l@dtempcnta=-\line@numR
@@ -1134,7 +1147,7 @@
\newcommand*{\sub@action}{%
\ifledRcol
\xright@appenditem{\the\absline@numR}\to\actionlines@listR
- \ifsublines@
+ \ifsublines@R%
\xright@appenditem{-1001}\to\actions@listR
\else
\xright@appenditem{-1002}\to\actions@listR
@@ -1504,18 +1517,35 @@
\fi%
}
-\newcommand*{\startsub}{\dimen0\lastskip
- \ifdim\dimen0>0pt \unskip \fi
- \ifledRcol \write\linenum@outR{\string\sub@on}%
- \else \write\linenum@out{\string\sub@on}%
- \fi
- \ifdim\dimen0>0pt \hskip\dimen0 \fi}
-\def\endsub{\dimen0\lastskip
- \ifdim\dimen0>0pt \unskip \fi
- \ifledRcol \write\linenum@outR{\string\sub@off}%
- \else \write\linenum@out{\string\sub@off}%
- \fi
- \ifdim\dimen0>0pt \hskip\dimen0 \fi}
+\newcommand*{\startsub}{%
+ \dimen0\lastskip%
+ \ifdim\dimen0>0pt%
+ \unskip%
+ \fi%
+ \ifledRcol%
+ \write\linenum@outR{\string\sub@on}%
+ \else%
+ \write\linenum@out{\string\sub@on}%
+ \fi%
+ \ifdim\dimen0>0pt%
+ \hskip\dimen0%
+ \fi%
+}%
+
+\def\endsub{%
+ \dimen0\lastskip%
+ \ifdim\dimen0>0pt%
+ \unskip%
+ \fi%
+ \ifledRcol%
+ \write\linenum@outR{\string\sub@off}%
+ \else%
+ \write\linenum@out{\string\sub@off}%
+ \fi%
+ \ifdim\dimen0>0pt%
+ \hskip\dimen0%
+ \fi%
+}%
\newcommand*{\advanceline}[1]{\leavevmode%
\ifledRcol \write\linenum@outR{\string\@adv[#1]}%
@@ -5404,6 +5434,8 @@
\csgdef{Xsymlinenum@#1}{}%
\csgdef{Xsymlinenumannotation@#1}{}%
+ \newtoggle{Xnonote@#1}%
+
\newtoggle{Xnonumber@#1}%
\newtoggle{Xnolinenumber@#1}%
\newtoggle{Xnolinenumberifannotation@#1}%
@@ -5443,6 +5475,7 @@
\expandafter\newinsert\csname mp#1footins\endcsname%
\fi%
\global\notbool{parapparatus@}{\expandafter\newcommand\expandafter *}{\expandafter\newcommand}\csname #1footnote\endcsname[2][]{%
+ \nottoggle{Xnonote@#1}{%
\if@edtext@secondarg@%
\ifledRcol%
\ifcsstring{Xonlyside@#1}{L}{\led@error@note@called@onrightside{#1footnote}}{}%
@@ -5539,6 +5572,7 @@
\else%
\led@err@FootnoteNotInSecondArgEdtext{#1}%
\fi%
+ }{\@noneed@Footnotetrue}% End of \nottoggle{Xnonote@#1}{%
\ignorespaces%
}
\expandafter\newcount\csname #1prevpage@num\endcsname%
@@ -5568,6 +5602,7 @@
\csgdef{widthX@#1}{\hsize}%
\expandafter\csgdef{innotemarkX@#1}##1{\ledinnotemark{##1}}%
\csgdef{txtbeforenotesX@#1}{}%
+ \newtoggle{nonoteX@#1}%
\newtoggle{txtbeforesnotesX@#1@typeset}%Not directly used by user, but internal
\newtoggle{txtbeforenotesonlyonceX@#1}%
\expandafter\newinsert\csname footins#1\endcsname%
@@ -5576,6 +5611,7 @@
\fi%
\global\expandafter\newcommand\csname footnote#1\endcsname[2][]{%
+ \nottoggle{nonoteX@#1}{%
\begingroup%
\prepare@prenotesX{#1}%
\newcommand{\content}{##2}%
@@ -5618,6 +5654,7 @@
{\let\index\orig@@index}%
{}%
\endgroup%
+ }{}%End of the notoggleX@#1
}
\newcounter{footnote#1}
\global\expandafter\renewcommand\csname thefootnote#1\endcsname{\arabic{footnote#1}}
@@ -5929,6 +5966,8 @@
\newhooktoggle@series{Xstanzaonlyfirst}%
\newhookcommand@series{Xstanzaseparator}%
+ \newhooktoggle@series{Xnonote}%
+
\newhooktoggle@series{Xonlypstart}
\newhooktoggle@series{Xnonbreakableafternumber}
\newhooktoggle@series{Xlemmadisablefontselection}
@@ -5992,7 +6031,7 @@
\newhooktoggle@series{txtbeforenotesonlyonceX}%
\newhookcommand@series@reload{widthX}{familiar}%
\newhookcommand@series{innotemarkX}[][1]%
-
+ \newhooktoggle@series{nonoteX}%
\ifundef{\hsizeX}%
{%
\newcommandx{\hsizeX}[2][1,usedefault]{%