From 7b667f52b756628ce968c7b2b40dae41107fa215 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 24 Jun 2020 21:03:37 +0000 Subject: reledmac (24jun20) git-svn-id: svn://tug.org/texlive/trunk@55653 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 71 ++++++++++++++++++++--- 1 file changed, 63 insertions(+), 8 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index 71fbb3aac79..6654a9185e6 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}[2020/06/06 v2.33.1 typesetting critical editions]% +\ProvidesPackage{reledmac}[2020/06/24 v2.34.0 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \newif\ifsameparallelpagenumber% @@ -3529,20 +3529,63 @@ }% }% \newcommand{\printlinefootnotenumbers}[2]{% + \get@pstartcounter% \ifboolexpr{% (togl{Xpstart@#2} and bool{numberpstart})% - or togl{Xpstarteverytime@#2}}% - {\printpstart}{}% - \iftoggle{Xstanza@#2}{% - \ifnumberstanza% - \printstanza% - \csuse{Xstanzaseparator@#2}% - \fi% + or togl{Xpstarteverytime@#2}% + and not (% + togl{Xpstartonlyfirst@#2}% + and test {\ifnumequal{\csuse{Xprevpstart@#2}}{\current@pstart}}% + )% + }% + {% + \printpstart% + \csuse{Xpstartseparator@#2}% + }{}% + \global\cslet{Xprevpstart@#2}{\current@pstart}% + \get@stanzacounter% + \ifboolexpr{% + togl{Xstanza@#2}% + and bool {numberstanza}% + and not (% + togl{Xpstartonlyfirst@#2}% + and test {\ifnumequal{\csuse{Xprevstanza@#2}}{\current@stanza}}% + )% + }{% + \printstanza% + \csuse{Xstanzaseparator@#2}% }{}% + \global\cslet{Xprevstanza@#2}{\current@stanza}% \iftoggle{Xonlypstart@#2}{}{% \csuse{Xtxtbeforenumber@#2}% \printlines#1|\ifledRcol@\@Rlineflag\fi|}% }% +\newcommand{\get@pstartcounter}[0]{% + \ifboolexpr{bool{l@dprintingpages} or bool{l@dprintingcolumns}}% + {% + \ifledRcol% + \global\numdef\current@pstart{\the\c@pstartR}% + \else% + \global\numdef\current@pstart{\the\c@pstartL}% + \fi% + }% + {% + \global\numdef\current@pstart{\the\c@pstart}% + }% +}% +\newcommand{\get@stanzacounter}[0]{% + \ifboolexpr{bool{l@dprintingpages} or bool{l@dprintingcolumns}}% + {% + \ifledRcol% + \global\numdef\current@stanza{\the\c@stanzaR}% + \else% + \global\numdef\current@stanza{\the\c@stanzaL}% + \fi% + }% + {% + \global\numdef\current@stanza{\the\c@stanza}% + }% +}% \newcommand{\printXbeforenumber}[1]{% \hspace{\csuse{Xbeforenumber@#1}}% }% @@ -5221,8 +5264,16 @@ \newtoggle{Xtwolinesonlyinsamepage@#1}% \newtoggle{Xonlypstart@#1}% \newtoggle{Xpstarteverytime@#1}% + \newtoggle{Xpstart@#1}% + \newtoggle{Xpstartonlyfirst@#1}% + \csdef{Xprevpstart@#1}{0}%Not a hook, but a tool for the hook Xpstartonlyfirst + \csgdef{Xpstartseparator@#1}{}% + \newtoggle{Xstanza@#1}% + \newtoggle{Xstanzaonlyfirst@#1}% + \csdef{Xprevstanza@#1}{0}%Not a hook, but a tool for the hook Xstanzaonlyfirst + \csgdef{Xstanzaseparator@#1}{}% \csgdef{Xsymlinenum@#1}{}% @@ -5736,10 +5787,14 @@ \newhooktoggle@series{Xgroupbyline}% \newhooktoggle@series{Xgroupbylineseparetwolines}% \newhooktoggle@series{Xnonumber} + \newhooktoggle@series{Xpstart} + \newhooktoggle@series{Xpstartonlyfirst}% \newhooktoggle@series{Xpstarteverytime}% + \newhookcommand@series{Xpstartseparator}% \newhooktoggle@series{Xstanza}% + \newhooktoggle@series{Xstanzaonlyfirst}% \newhookcommand@series{Xstanzaseparator}% \newhooktoggle@series{Xonlypstart} -- cgit v1.2.3