diff options
author | Karl Berry <karl@freefriends.org> | 2015-11-30 23:02:23 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-11-30 23:02:23 +0000 |
commit | 1c66f34431d8bca21785b67e55de3088093508fb (patch) | |
tree | 16ae747d3d254912af1a1da2de3e366f9d728e6a /Master/texmf-dist/tex | |
parent | 775c98e0f724a659a785f096cab3fe88ad3e2929 (diff) |
reledmac (30nov15)
git-svn-id: svn://tug.org/texlive/trunk@38985 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 409 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/reledmac/reledpar.sty | 21 |
2 files changed, 318 insertions, 112 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index 38958fc7ea8..639b6e243c5 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty @@ -30,10 +30,11 @@ + %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2015/11/20 v2.6.0 typeset critical edition]% +\ProvidesPackage{reledmac}[2015/11/29 v2.7.0 typeset critical edition]% \RequirePackage{xkeyval} \newif\ifparledgroup \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}} @@ -114,6 +115,7 @@ \newif\ifl@dmemoir \@ifclassloaded{memoir}{\l@dmemoirtrue}{\l@dmemoirfalse} +\newif\if@ledgroup% \newif\ifl@imakeidx \@ifpackageloaded{imakeidx}{\l@imakeidxtrue}{}%False is the default value \newif\ifl@indextools% @@ -187,13 +189,18 @@ \newcommand*{\led@warn@BadAction}{% \reledmac@warning{Bad action code, value \next@action.}} \newcommand*{\led@warn@DuplicateLabel}[1]{% - \reledmac@warning{Duplicate definition of label `#1' on page \the\pageno.}} + \reledmac@warning{Duplicate definition of label `#1'\@gobble}% + \@latex@warning@no@line{Label `#1' multiply defined}% +}% \newcommand*{\led@warn@AppLabelOutEdtext}[1]{% \reledmac@warning{\string\applabel\space outside of \string\edtext\space `#1' on page \the\pageno.}}% \newcommand*{\led@warn@RefUndefined}[1]{% \G@refundefinedtrue% - \reledmac@warning{Reference `#1' on page \the\pageno\space undefined. - Using `000'.}} + \reledmac@warning{Reference `#1' on page \the\pageno\space undefined.% + Using `000'.}% + \@latex@warning{Reference `#1' on page \thepage \space% + undefined}% +}% \newcommand*{\led@warn@pairRefUndefined}[1]{% \G@refundefinedtrue% \reledmac@warning{Reference `#1:start' and/or `#1:end' on page \the\pageno\space undefined. @@ -1202,25 +1209,22 @@ \newcommand{\@tag}{} \newcount\@edtext@level% \@edtext@level=0% +\newcounter{edtext} +\renewcommand{\theedtext}{edtxt@\arabic{edtext}}% \newcommand{\edtext}[2]{\leavevmode% \ifnumberedpar@% \global\advance\@edtext@level by 1% + \stepcounter{edtext}% \global\@lemmacommand@false% \begingroup% \ifledRcol% - \ifcsundef{sw@list@edtextR@\the\@edtext@level}% + \ifcsvoid{sw@list@edtextR@\the\@edtext@level}% {\global\let\sw@inthisedtext\empty}% - {\ifcsempty{sw@list@edtextR@\the\@edtext@level}% -{\global\let\sw@inthisedtext\empty}% -{\expandafter\gl@p\csname sw@list@edtextR@\the\@edtext@level\endcsname\to\sw@inthisedtext}% - }% + {\expandafter\gl@p\csname sw@list@edtextR@\the\@edtext@level\endcsname\to\sw@inthisedtext}% \else% - \ifcsundef{sw@list@edtext@\the\@edtext@level}% + \ifcsvoid{sw@list@edtext@\the\@edtext@level}% {\global\let\sw@inthisedtext\empty}% - {\ifcsempty{sw@list@edtext@\the\@edtext@level}% -{\global\let\sw@inthisedtext\empty}% -{\expandafter\gl@p\csname sw@list@edtext@\the\@edtext@level\endcsname\to\sw@inthisedtext}% - }% + {\expandafter\gl@p\csname sw@list@edtext@\the\@edtext@level\endcsname\to\sw@inthisedtext}% \fi% \global\renewcommand{\@tag}{% \no@expands #1% @@ -1241,7 +1245,16 @@ \fi% \fi% \endgroup% - \showlemma{#1}% + \ifdef{\hypertarget}% + {% + \csedef{thisedtext@\the\@edtext@level}{\theedtext}% + \Hy@raisedlink{\hypertarget{\csuse{thisedtext@\the\@edtext@level}:start}{}}% + \showlemma{#1}% + \Hy@raisedlink{\hypertarget{\csuse{thisedtext@\the\@edtext@level}:end}{}}% + }% + {% + \showlemma{#1}% + }% \ifx\end@lemmas\empty \else% \gl@p\end@lemmas\to\x@lemma% \x@lemma% @@ -2058,6 +2071,7 @@ \notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalvfootnote}[2]{% \insert\csname #1footins\endcsname\bgroup + \hsize=\expandafter\dimexpr\csuse{Xhsize@#1}\relax% \noindent\csuse{Xbhooknote@#1}% \csuse{Xnotefontsize@#1}% \footsplitskips @@ -2083,7 +2097,10 @@ \hangindent=\csuse{Xhangindent@#4} \everypar{\hangindent=\csuse{Xhangindent@#4}}% \strut{\printlinefootnote{#1}{#4}}% - {\nottoggle{Xlemmadisablefontselection@#4}{\select@lemmafont#1|#2}{#2}}% + {\nottoggle{Xlemmadisablefontselection@#4}% + {\select@lemmafont#1|{\csuse{Xlemmafont@#4}#2}}% + {{\csuse{Xlemmafont@#4}#2}}% + }% \iftoggle{nosep@}{\hskip\csuse{Xinplaceoflemmaseparator@#4}}{\ifcsempty{Xlemmaseparator@#4}% {\hskip\csuse{Xinplaceoflemmaseparator@#4}}% {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}\relax% @@ -2165,6 +2182,9 @@ \providecommand{\footfudgefiddle}{64} \newcommand*{\para@footsetup}[1]{{\csuse{Xbhookgroup@#1}\csuse{Xnotefontsize@#1} \setXnoteswidthliketwocolumns@{#1}% + \ifcsempty{Xhsize@#1}% + {}% + {\columnwidth=\expandafter\dimexpr\csuse{Xhsize@#1}\relax}% \dimen0=\baselineskip \multiply\dimen0 by 1024 \divide \dimen0 by \columnwidth \multiply\dimen0 by \footfudgefiddle\relax @@ -2235,13 +2255,17 @@ \Xinsertparafootsep{#4}% \ledsetnormalparstuff@common% \printlinefootnote{#1}{#4}% - {\nottoggle{Xlemmadisablefontselection@#4}{\select@lemmafont#1|#2}{#2}}% + {\nottoggle{Xlemmadisablefontselection@#4}% + {\select@lemmafont#1|{\csuse{Xlemmafont@#4}#2}}% + {{\csuse{Xlemmafont@#4}#2}}% + }% \iftoggle{nosep@}{\hskip\csuse{Xinplaceoflemmaseparator@#4}}{\ifcsempty{Xlemmaseparator@#4}% {\hskip\csuse{Xinplaceoflemmaseparator@#4}}% {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}% }}% #3\penalty-10 } \newcommand*{\parafootgroup}[1]{% + \hsize=\expandafter\dimexpr\csuse{Xhsize@#1}\relax% \unvbox\csname #1footins\endcsname \ifcsstring{Xragged@#1}{L}{\RaggedLeft}{}% \ifcsstring{Xragged@#1}{R}{\RaggedRight}{}% @@ -2306,7 +2330,18 @@ \global\csname #1prevpage@num\endcsname=\page@num% } \newcount\@k \newdimen\@h -\newcommand*{\rigidbalance}[3]{\setbox0=\box#1 \@k=#2 \@h=#3 +\newcommand*{\Xrigidbalance}[3]{% + \hsize=\expandafter\dimexpr\csuse{Xhsize@\@currentseries}\relax% + \rigidbalance{#1}{#2}{#3}% +}% + +\newcommand*{\rigidbalanceX}[3]{% + \hsize=\expandafter\dimexpr\csuse{hsizeX@\@currentseries}\relax% + \rigidbalance{#1}{#2}{#3}% +}% + +\newcommand*{\rigidbalance}[3]{% + \setbox0=\box#1 \@k=#2 \@h=#3% \@@line{\splittopskip=\@h \vbadness=\@M \hfilneg \valign{##\vfil\cr\dosplits}}} @@ -2346,6 +2381,7 @@ \notbool{parapparatus@}{\newcommand*}{\newcommand}{\threecolvfootnote}[2]{% \insert\csname #1footins\endcsname\bgroup% + \hsize=\expandafter\dimexpr\csuse{Xhsize@#1}\relax% \noindent\csuse{Xbhooknote@#1}% \csuse{Xnotefontsize@#1}% \footsplitskips% @@ -2362,7 +2398,10 @@ \csuse{Xcolalign@#4}% \parindent=\@tempdima% \strut{\printlinefootnote{#1}{#4}}% - {\nottoggle{Xlemmadisablefontselection@#4}{\select@lemmafont#1|#2}{#2}}% + {\nottoggle{Xlemmadisablefontselection@#4}% + {\select@lemmafont#1|{\csuse{Xlemmafont@#4}#2}}% + {{\csuse{Xlemmafont@#4}#2}}% + }% \iftoggle{nosep@}{\hskip\csuse{Xinplaceoflemmaseparator@#4}}{\ifcsempty{Xlemmaseparator@#4}% {\hskip\csuse{Xinplaceoflemmaseparator@#4}}% {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}% @@ -2372,7 +2411,7 @@ \noindent\csuse{Xtxtbeforenotes@#1}\csuse{Xbhookgroup@#1}}\par% \splittopskip=\ht\strutbox \expandafter - \rigidbalance\csname #1footins\endcsname \thr@@ \splittopskip} + \Xrigidbalance\csname #1footins\endcsname \thr@@ \splittopskip} \newcommand*{\mpthreecolfootgroup}[1]{{% \vskip\skip\@nameuse{mp#1footins} \ifl@dpairing\ifparledgroup% @@ -2396,7 +2435,7 @@ \csuse{Xbhookgroup@#1}\par% \splittopskip=\ht\strutbox \expandafter - \rigidbalance\csname mp#1footins\endcsname \thr@@ \splittopskip}} + \Xrigidbalance\csname mp#1footins\endcsname \thr@@ \splittopskip}} \newcommand*{\Xarrangement@twocol}[1]{% \csgdef{series@display#1}{twocol} @@ -2418,10 +2457,11 @@ \newcommand*{\twocolfootsetup}[1]{% \count\csname #1footins\endcsname 500 - \csxdef{default@#1footins}{500}%Use this to confine the notes to one side only + \csxdef{default@#1footins}{500}% \multiply\dimen\csname #1footins\endcsname \tw@} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolvfootnote}[2]{% \insert\csname #1footins\endcsname\bgroup% + \hsize=\expandafter\dimexpr\csuse{Xhsize@#1}\relax% \noindent\csuse{Xbhooknote@#1}% \csuse{Xnotefontsize@#1}% \footsplitskips% @@ -2438,7 +2478,10 @@ \csuse{Xcolalign@#4}% \parindent=\@tempdima% \strut{\printlinefootnote{#1}{#4}}% - {\nottoggle{Xlemmadisablefontselection@#4}{\select@lemmafont#1|#2}{#2}}% + {\nottoggle{Xlemmadisablefontselection@#4}% + {\select@lemmafont#1|{\csuse{Xlemmafont@#4}#2}}% + {{\csuse{Xlemmafont@#4}#2}}% + }% \iftoggle{nosep@}{\hskip\csuse{Xinplaceoflemmaseparator@#4}}{\ifcsempty{Xlemmaseparator@#4}% {\hskip\csuse{Xinplaceoflemmaseparator@#4}}% {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}% @@ -2448,7 +2491,7 @@ \noindent\csuse{Xtxtbeforenotes@#1}\csuse{Xbhookgroup@#1}}\par% \splittopskip=\ht\strutbox \expandafter - \rigidbalance\csname #1footins\endcsname \tw@ \splittopskip} + \Xrigidbalance\csname #1footins\endcsname \tw@ \splittopskip} \newcommand*{\mptwocolfootsetup}[1]{% \count\csname mp#1footins\endcsname 500 @@ -2476,7 +2519,7 @@ \csuse{Xbhookgroup@#1}\par% \splittopskip=\ht\strutbox \expandafter - \rigidbalance\csname mp#1footins\endcsname \tw@ \splittopskip}} + \Xrigidbalance\csname mp#1footins\endcsname \tw@ \splittopskip}} \def\endashchar{\textnormal{--}} @@ -2716,13 +2759,17 @@ \ifdimequal{\csuse{Xboxstartlinenum@\@currentseries}}{0pt}% {\bgroup}% {\leavevmode\hbox to \csuse{Xboxstartlinenum@\@currentseries}\bgroup\hfill}% - \ifl@d@pnum #1% + \ifl@d@pnum% + \wrap@edcrossref{\@this@crossref@start}{#1}% \csuse{Xsublinesep@\@currentseries}% \fi% - \linenumrep{#2}\iftoggle{Xlineflag@\@currentseries}{#8}{}% + \wrap@edcrossref{\@this@crossref@start}{% + \linenumrep{#2}% + \iftoggle{Xlineflag@\@currentseries}{#8}{}% + }% \ifl@d@ssub% \csuse{Xsublinesep@\@currentseries}% - \sublinenumrep{#3}% + \wrap@edcrossref{\@this@crossref@start}{\sublinenumrep{#3}}% \fi \egroup% \ifdimequal{\csuse{Xboxendlinenum@\@currentseries}}{0pt}% @@ -2743,15 +2790,20 @@ \fi% \fi% \ifl@d@pnum% - #4% + \wrap@edcrossref{\@this@crossref@end}{#4}% \csuse{Xsublinesep@\@currentseries}% \fi% - \ifl@d@elin \linenumrep{#5}\iftoggle{Xlineflag@\@currentseries}{#8}{}\fi% + \ifl@d@elin% + \wrap@edcrossref{\@this@crossref@end}{% + \linenumrep{#5}% + \iftoggle{Xlineflag@\@currentseries}{#8}{}% + }% + \fi% \ifl@d@esl% \ifl@d@elin% \csuse{Xsublinesep@\@currentseries}% \fi% - \sublinenumrep{#6}% + \wrap@edcrossref{\@this@crossref@end}{\sublinenumrep{#6}}% \fi% \fi% \ifdimequal{\csuse{Xboxendlinenum@\@currentseries}}{0pt}% @@ -2825,22 +2877,32 @@ }% \newcommand{\l@dbfnote}[1]{% - \ifnumberedpar@% \get@thisfootnote% \gdef\@tag{#1\relax}% \ifledRcol% - \xright@appenditem{\noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisfootnote}}% + \xright@appenditem{% + \ifdefined\Hy@footnote@currentHref% + \noexpand\def\noexpand\Hy@footnote@currentHref{\Hy@footnote@currentHref}% + \fi% + \noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisfootnote}% + }% \to\inserts@listR \global\advance\insert@countR \@ne% \else% - \xright@appenditem{\noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisfootnote}}% + \xright@appenditem{% + \ifdefined\Hy@footnote@currentHref% + \noexpand\def\noexpand\Hy@footnote@currentHref{\Hy@footnote@currentHref}% + \fi% + \noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisfootnote}% + }% \to\inserts@list \global\advance\insert@count \@ne% \fi - \fi\ignorespaces} + \ignorespaces% +}% \newcommand{\get@fnmark}[1]{% - \ifboolexpr{bool{l@dprintingpages} or bool{l@dprintingcolumns}}% + \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}% {% \stepcounter{footnote@typeset}% \setcounter{footnote}{\c@footnote@typeset}% @@ -2883,13 +2945,14 @@ }% \newcommand*{\normal@footnotemarkX}[1]{% \prebodyfootmark - \@nameuse{bodyfootmark#1}% + \wrapped@bodyfootmarkX{#1}% \postbodyfootmark} \newcommand*{\normalbodyfootmarkX}[1]{% \hbox{\textsuperscript{\normalfont\@nameuse{@thefnmark#1}}}} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalvfootnoteX}[2]{% \insert\@nameuse{footins#1}\bgroup + \hsize=\expandafter\dimexpr\csuse{hsizeX@#1}\relax% \noindent\csuse{bhooknoteX@#1}% \csuse{notefontsizeX@#1}% \footsplitskips @@ -2903,6 +2966,7 @@ \newcommand*{\mpnormalvfootnoteX}[2]{% \get@thisfootnoteX{#1}% \get@fnmarkX{#1}{\thisfootnote}% + \edef\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% \global\setbox\@nameuse{mpfootins#1}\vbox{% \unvbox\@nameuse{mpfootins#1} \noindent\csuse{bhooknoteX@#1}% @@ -2924,7 +2988,7 @@ \ledsetnormalparstuffX{#1}% \hangindent=\csuse{hangindentX@#1}% \everypar{\hangindent=\csuse{hangindentX@#1}}% - {{\csuse{notenumfontX@#1}\@nameuse{footfootmark#1}}\strut% + {{\csuse{notenumfontX@#1}\wrapped@footfootmarkX{#1}}\strut% #2\strut\par}} \newcommand*{\normalfootfootmarkX}[1]{% @@ -2983,7 +3047,6 @@ \newcommand{\normalbfnoteX}[2]{% - \ifnumberedpar@ \get@thisfootnoteX{#1}% \ifledRcol% \ifluatex @@ -2992,7 +3055,12 @@ \@ifundefined{xpg@main@language}%if polyglossia {}% {\footnotelang@poly[R]}% - \xright@appenditem{\noexpand\vbfnoteX{#1}{#2}{\expandonce\thisfootnote}}% + \xright@appenditem{% + \noexpand\led@set@index@fornote{#1}% + \unexpanded{\def\this@footnoteX@reading}{\the\csname footnote#1@reading\endcsname}% + \noexpand\vbfnoteX{#1}{#2}{\expandonce\thisfootnote}% + \noexpand\led@reinit@index@fornote% + }% \to\inserts@listR \global\advance\insert@countR \@ne% \else% @@ -3002,11 +3070,16 @@ \@ifundefined{xpg@main@language}%if polyglossia {}% {\footnotelang@poly}% - \xright@appenditem{\noexpand\vbfnoteX{#1}{#2}{\expandonce\thisfootnote}}% + \xright@appenditem{% + \noexpand\led@set@index@fornote{#1}% + \unexpanded{\def\this@footnoteX@reading}{\the\csname footnote#1@reading\endcsname}% + \noexpand\vbfnoteX{#1}{#2}{\expandonce\thisfootnote}% + \noexpand\led@reinit@index@fornote% + }% \to\inserts@list \global\advance\insert@count \@ne% \fi - \fi\ignorespaces} + \ignorespaces} \newcommand{\get@thisfootnoteX}[1]{% \ifl@dpairing% @@ -3021,7 +3094,7 @@ }% \newcommand{\get@fnmarkX}[2]{% - \ifboolexpr{bool{l@dprintingpages} or bool{l@dprintingcolumns}}% + \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}% {% \stepcounter{footnote#1@typeset}% \setcounter{footnote#1}{\value{footnote#1@typeset}}% @@ -3038,6 +3111,7 @@ \ifnumberedpar@ \edtext{}{\normalbfnoteX{#1}{#2}}% \else + \def\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% \@nameuse{regvfootnote#1}{#1}{#2}% \fi} @@ -3096,6 +3170,7 @@ \notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolvfootnoteX}[2]{% \insert\csname footins#1\endcsname\bgroup% + \hsize=\expandafter\dimexpr\csuse{hsizeX@#1}\relax% \noindent\csuse{bhooknoteX@#1}% \csuse{notefontsizeX@#1}% \footsplitskips% @@ -3116,13 +3191,13 @@ \@tempdima=\parindent% \csuse{colalignX@#1}% \parindent=\@tempdima% - {\csuse{notenumfontX@#1}\@nameuse{footfootmark#1}\strut% + {\csuse{notenumfontX@#1}\wrapped@footfootmarkX{#1}\strut% #2\strut\par}\allowbreak} \newcommand*{\twocolfootgroupX}[1]{{\csuse{bhookgroupX@#1}\csuse{notefontsizeX@#1} \splittopskip=\ht\strutbox \expandafter - \rigidbalance\csname footins#1\endcsname \tw@ \splittopskip}} + \rigidbalanceX\csname footins#1\endcsname \tw@ \splittopskip}} \newcommand*{\mptwocolfootgroupX}[1]{{% \vskip\skip\@nameuse{mpfootins#1} @@ -3146,7 +3221,7 @@ \csuse{bhookgroupX@#1}% \splittopskip=\ht\strutbox \expandafter - \rigidbalance\csname mpfootins#1\endcsname \tw@ \splittopskip}} + \rigidbalanceX\csname mpfootins#1\endcsname \tw@ \splittopskip}} \newcommand*{\arrangementX@threecol}[1]{% \csgdef{series@displayX#1}{threecol} @@ -3176,6 +3251,7 @@ \notbool{parapparatus@}{\newcommand*}{\newcommand}{\threecolvfootnoteX}[2]{% \insert\csname footins#1\endcsname\bgroup% + \hsize=\expandafter\dimexpr\csuse{hsizeX@#1}\relax% \noindent\csuse{bhooknoteX@#1}% \csuse{notefontsizeX@#1} \footsplitskips% @@ -3195,13 +3271,13 @@ \@tempdima=\parindent% \csuse{colalignX@#1}% \parindent=\@tempdima% - {\csuse{notenumfontX@#1}\@nameuse{footfootmark#1}\strut% + {\csuse{notenumfontX@#1}\wrapped@footfootmarkX{#1}\strut% #2\strut\par}\allowbreak} \newcommand*{\threecolfootgroupX}[1]{{\csuse{bhookgroupX@#1}\csuse{notefontsizeX@#1} \splittopskip=\ht\strutbox \expandafter - \rigidbalance\csname footins#1\endcsname \thr@@ \splittopskip}} + \rigidbalanceX\csname footins#1\endcsname \thr@@ \splittopskip}} \newcommand*{\mpthreecolfootgroupX}[1]{{% \vskip\skip\@nameuse{mpfootins#1} @@ -3225,7 +3301,7 @@ \csuse{bhookgroupX@#1}% \splittopskip=\ht\strutbox \expandafter - \rigidbalance\csname mpfootins#1\endcsname \thr@@ \splittopskip}} + \rigidbalanceX\csname mpfootins#1\endcsname \thr@@ \splittopskip}} \newcommand*{\arrangementX@paragraph}[1]{% \csgdef{series@displayX#1}{paragraph}% @@ -3253,6 +3329,9 @@ \newcommand*{\para@footsetupX}[1]{{\csuse{bhookgroupX@#1}\csuse{notefontsizeX@#1} \setnoteswidthliketwocolumnsX@{#1}% + \ifcsempty{hsizeX@#1}% + {}% + {\columnwidth=\expandafter\dimexpr\csuse{hsizeX@#1}\relax}% \dimen0=\baselineskip \multiply\dimen0 by 1024 \divide\dimen0 by \columnwidth \multiply\dimen0 by \footfudgefiddle\relax% @@ -3297,6 +3376,7 @@ \newcommand*{\mppara@vfootnoteX}[2]{% \get@thisfootnoteX{#1}% \get@fnmarkX{#1}{\thisfootnote}% + \edef\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% \global\setbox\@nameuse{mpfootins#1}\vbox{% \unvbox\@nameuse{mpfootins#1} \csuse{notefontsizeX@#1} @@ -3329,11 +3409,12 @@ \ledsetnormalparstuff@common% {\csuse{notenumfontX@#1}% \csuse{notenumfontX@#1}% - \@nameuse{footfootmark#1}% + \wrapped@footfootmarkX{#1}% \strut% #2\penalty-10}} \newcommand*{\para@footgroupX}[1]{% + \hsize=\expandafter\dimexpr\csuse{hsizeX@#1}\relax% \unvbox\csname footins#1\endcsname \ifcsstring{raggedX@#1}{L}{\RaggedLeft}{}% \ifcsstring{raggedX@#1}{R}{\RaggedRight}{}% @@ -3378,6 +3459,34 @@ {\csuse{parafootsepX@#1}}% {}% } +\newcommand{\wrapped@footfootmarkX}[1]{% + \ifdefined\hypertarget% + \Hy@raisedlink{% + \hypertarget% + {@footnotemark#1@\this@footnoteX@reading}% + {}% + }% + \hyperlink% + {@bodyfootmark#1@\this@footnoteX@reading}% + {\@nameuse{footfootmark#1}}% + \else% + \@nameuse{footfootmark#1}% + \fi% +}% +\newcommand{\wrapped@bodyfootmarkX}[1]{% + \ifdefined\hypertarget% + \Hy@raisedlink{% + \hypertarget% + {@bodyfootmark#1@\expandafter\the\csname footnote#1@reading\endcsname}% + {}% + }% + \hyperlink% + {@footnotemark#1@\expandafter\the\csname footnote#1@reading\endcsname}% + {\@nameuse{bodyfootmark#1}}% + \else% + \@nameuse{bodyfootmark#1}% + \fi% +}% \newcommand*{\ledsetnormalparstuff@common}{% \ifluatex% \textdir\footnote@luatextextdir% @@ -3403,6 +3512,7 @@ \newcommand{\setXnoteswidthliketwocolumns@}[1]{% \global\let\hsize@fornote=\hsize% \global\old@hsize=\hsize% + \let\old@columwidth=\columnwidth% \iftoggle{Xnoteswidthliketwocolumns@#1}% {% \csuse{setwidthliketwocolumns@\columns@position}% @@ -3410,12 +3520,13 @@ }% {}% \let\hsize=\hsize@fornote% - \let\columnwidth=\hsize@fornote% + \let\columnwidth=\old@columwidth% }% \newcommand{\setnoteswidthliketwocolumnsX@}[1]{% \global\let\hsize@fornote=\hsize% \global\old@hsize=\hsize% + \let\old@columwidth=\columnwidth% \iftoggle{noteswidthliketwocolumnsX@#1}% {% \csuse{setwidthliketwocolumns@\columns@position}% @@ -3423,7 +3534,7 @@ }% {}% \let\hsize=\hsize@fornote% - \let\columnwidth=\hsize@fornote% + \let\columnwidth=\old@columwidth% }% \newcommand{\setXnotespositionliketwocolumns@}[1]{% @@ -3531,7 +3642,7 @@ \dolistloop{\@series}% }% -\global\notbool{parapparatus@}{}{\long}\def\endprint#1#2#3#4#5#6{{% +\global\notbool{parapparatus@}{}{\long}\def\endprint#1#2#3#4#5#6#7{{% \hangindent=\csuse{Xendhangindent@#4}% \ifXendinsertsep@% \hskip\csuse{Xendafternote@#4}% @@ -3549,11 +3660,15 @@ \csuse{Xendbhooknote@#4}% \csuse{Xendnotefontsize@#4}% \IfStrEq{#6}{R}{\ledRcol@true}{}% + \def\@this@crossref@start{#7:start}% + \def\@this@crossref@end{#7:end}% \printlineendnote{#1}{#4}% \IfStrEq{#6}{R}{\ledRcol@false}{}% + \undef\@this@crossref@start% + \undef\@this@crossref@end% \nottoggle{Xendlemmadisablefontselection@#4}% - {\select@lemmafont#1|#2}% - {#2}% + {\select@lemmafont#1|{\csuse{Xendlemmafont@#4}#2}}% + {{\csuse{Xendlemmafont@#4}#2}}% \ifboolexpr{% togl {nosep@}% or test{\ifcsempty{Xendlemmaseparator@#4}}% @@ -3721,7 +3836,7 @@ \ifdimequal{\csuse{Xendboxstartlinenum@\@currentseries}}{0pt}% {\bgroup}% {\leavevmode\hbox to \csuse{Xendboxstartlinenum@\@currentseries}\bgroup\hfill}% - \printnpnum{#1}% + \wrap@edcrossref{\@this@crossref@start}{\printnpnum{#1}}% \ifl@d@dash% \ifl@d@pnum% \csuse{Xendlineprefixsingle@\@currentseries}% @@ -3733,10 +3848,11 @@ \else% \csuse{Xendlineprefixsingle@\@currentseries}% \fi% - \linenumrep{#2}\iftoggle{Xendlineflag@\@currentseries}{\ifledRcol@\@Rlineflag\fi}{}% + \wrap@edcrossref{\@this@crossref@start}{\linenumrep{#2}}% + \iftoggle{Xendlineflag@\@currentseries}{\ifledRcol@\@Rlineflag\fi}{}% \ifl@d@ssub% \csuse{Xendsublinesep@\@currentseries}% - \sublinenumrep{#3}% + \wrap@edcrossref{\@this@crossref@start}{\sublinenumrep{#3}}% \fi% \egroup% \ifdimequal{\csuse{Xendboxendlinenum@\@currentseries}}{0pt}% @@ -3756,17 +3872,19 @@ \csuse{Xendlinerangeseparator@\@currentseries}% \fi% \fi% - \ifl@d@pnum \printnpnum{#4}\fi% + \ifl@d@pnum% + \wrap@edcrossref{\@this@crossref@end}\printnpnum{#4}% + \fi% \ifl@d@elin% \ifl@d@pnum\csuse{Xendlineprefixsingle@\@currentseries}\fi% - \linenumrep{#5}% + \wrap@edcrossref{\@this@crossref@end}{\linenumrep{#5}}% \iftoggle{Xendlineflag@\@currentseries}{\ifledRcol@\@Rlineflag\fi}{}% \fi% \ifl@d@esl% \ifl@d@elin% \csuse{Xendsublinesep@\@currentseries}% \fi% - \sublinenumrep{#6}% + \wrap@edcrossref{\@this@crossref@end}{\sublinenumrep{#6}}% \fi% \fi% \ifdimequal{\csuse{Xendboxendlinenum@\@currentseries}}{0pt}% @@ -3790,7 +3908,7 @@ \newseries@par{#1}% \fi% \unless\ifnocritical@ - \newtoggle{Xlineflag@#1} + \newtoggle{Xlineflag@#1} \newtoggle{Xparindent@#1} \newtoggle{Xlemmadisablefontselection@#1} \csgdef{Xhangindent@#1}{0pt}% @@ -3843,6 +3961,9 @@ \csgdef{Xparafootsep@#1}{}% \csgdef{Xafternote@#1}{1em plus.4em minus.4em} \csgdef{Xlinerangeseparator@#1}{\endashchar}% + + \csgdef{Xlemmafont@#1}{}% + \csgdef{Xhsize@#1}{\hsize}% \expandafter\newinsert\csname #1footins\endcsname% \unless\ifnoledgroup@% \expandafter\newinsert\csname mp#1footins\endcsname% @@ -3867,20 +3988,24 @@ \ifbool{indtl@notenumber}% {\unexpanded{\let\index\nindex}}%There is no note number… so {}% - \ifbool{indtl@notenumber}% - {\unexpanded{\let\index\orig@@index}}% - {}% \noexpand\Xnote@true% \noexpand\prepare@preXnotes{#1}% \noexpand\prepare@edindex@fornote{\l@d@nums}% \unexpanded{\def\sw@list@inedtext}{\expandafter\unexpanded\expandafter{\sw@inthisedtext}}%The value of the \sw@inthisedtext of current \edtext will be pushed to \sw@list@inedtext when the notes are expanded. \noexpand\setcounter{stanzaR}{\the\c@stanzaR}%Save stanzaR counter for footnote + \unexpanded{\def\@this@crossref@start}{\theedtext:start}% + \unexpanded{\def\@this@crossref@end}{\theedtext:end}% \noexpand\csuse{v#1footnote}{#1}% {{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}% \noexpand\Xnote@false% + \unexpanded{\undef\@this@crossref@start}% + \unexpanded{\undef\@this@crossref@end}% \ifbool{indtl@innote}% {\unexpanded{\let\index\orig@@index}}% {}% + \ifbool{indtl@notenumber}% + {\unexpanded{\let\index\orig@@index}}% + {}% }\to\inserts@listR \footnoteoptions@{R}{##1}{false}% \global\advance\insert@countR \@ne% @@ -3906,9 +4031,14 @@ \ifl@dpairing% \noexpand\setcounter{stanzaL}{\the\c@stanzaL}%Save stanzaR counter for footnote \fi% - \noexpand\csuse{v#1footnote}{#1}% - {{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}% - \noexpand\Xnote@false% + \unexpanded{\def\@this@crossref@start}{\theedtext:start}% + \unexpanded{\def\@this@crossref@end}{\theedtext:end}% + \noexpand\csuse{v#1footnote}% + {#1}% + {{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}% + \unexpanded{\undef\@this@crossref@start}% + \unexpanded{\undef\@this@crossref@end}% + \noexpand\Xnote@false% \ifbool{indtl@innote}% {\unexpanded{\let\index\orig@@index}}% {}% @@ -3948,6 +4078,7 @@ \newtoggle{noteswidthliketwocolumnsX@#1}% \csgdef{parafootsepX@#1}{}% \csgdef{afternoteX@#1}{1em plus.4em minus.4em} + \csgdef{hsizeX@#1}{\hsize}% \expandafter\newinsert\csname footins#1\endcsname% \unless\ifnoledgroup@% \expandafter\newinsert\csname mpfootins#1\endcsname% @@ -3957,8 +4088,8 @@ \begingroup% \prepare@prenotesX{#1}% \newcommand{\content}{##1}% + \global\expandafter\advance\csname footnote#1@reading\endcsname by \@ne% \ifl@dpairing% - \global\expandafter\advance\csname footnote#1@reading\endcsname by \@ne \ifcsdef{footnote#1reading\the\csname footnote#1@reading\endcsname=typeset}% {\setcounter{footnote#1}{\csuse{footnote#1reading\the\csname footnote#1@reading\endcsname=typeset}}}% {\setcounter{footnote#1}{\the\csname footnote#1@reading\endcsname}}% @@ -3973,29 +4104,21 @@ \xdef\footnote@luatextextdir{\the\textdir}% \xdef\footnote@luatexpardir{\the\pardir}% \fi% - \ifbool{indtl@innote}% - {\let\index\nindex}% - {}% - \ifbool{indtl@notenumber}% - {% - \renewcommand{\index}[2][]{% - \orig@@index[####1]{% - ####2|innotenumber{\csuse{thefootnote#1}}% - }% - }% - }% - {}% - \csuse{vfootnote#1}{#1}{\expandonce\content}\m@mmf@prepare% + \if@ledgroup% + \led@set@index@fornote{#1}% + \fi% + \csuse{vfootnote#1}{#1}{\expandonce\content}\m@mmf@prepare% \ifbool{indtl@innote}% {\let\index\orig@@index}% {}% - \ifbool{indtl@notenumber}% + \ifbool{indtl@notenumber}% {\let\index\orig@@index}% {}% \endgroup% } \newcounter{footnote#1} \global\expandafter\renewcommand\csname thefootnote#1\endcsname{\arabic{footnote#1}} + \expandafter\newcount\csname footnote#1@reading\endcsname% \arrangementX@normal{#1}% \fi \unless\ifnoend@ @@ -4007,6 +4130,7 @@ \newlinechar='40% \global\@noneed@Footnotetrue% \newcommand{\content}{##2}% + \stepcounter{labidx}% \expandafter\immediate\expandafter\write\csname l@d@#1end\endcsname{% \expandafter\string\csname #1end\endcsname% {\ifnumberedpar@\l@d@nums\fi}% @@ -4014,7 +4138,8 @@ {\expandonce\content}% {#1}% {\unexpanded{##1}}% - {\ifledRcol R\else L\fi} + {\ifledRcol R\else L\fi}% + {\theedtext}% \@percentchar% }% \egroup% @@ -4077,6 +4202,8 @@ \csgdef{Xendlineprefixmore@#1}{}% \newtoggle{Xendlineflag@#1} + + \csgdef{Xendlemmafont@#1}{}% \fi% \listxadd{\@series}{#1} } @@ -4183,6 +4310,7 @@ }% } \unless\ifnocritical@ + \newhookcommand@series{Xlemmafont}% \newhooktoggle@series{Xparindent} \newhookcommand@series{Xhangindent} \newhookcommand@series{Xragged} @@ -4232,6 +4360,8 @@ \newhookcommand@series{Xafternote}% \newhookcommand@series{Xparafootsep} + \newhookcommand@series@reload{Xhsize}{critical}% + \fi \newhooktoggle@series{Xlineflag}[appref,SEref] \newhookcommand@series{Xtwolines}[appref,SEref] @@ -4257,9 +4387,11 @@ \newhookcommand@series@reload{notefontsizeX}{familiar} \newhookcommand@series{afternoteX} \newhookcommand@series{parafootsepX} + \newhookcommand@series@reload{hsizeX}{familiar}% \fi \unless\ifnoend@ \newhookcommand@series{Xendnotenumfont} + \newhookcommand@series{Xendlemmafont}% \newhookcommand@series{Xendbhooknote} \newhookcommand@series{Xendboxlinenum}% @@ -4308,7 +4440,7 @@ \newhooktoggle@series{Xendtwolinesonlyinsamepage}[apprefwithpage,SErefwithpage] \newhookcommand@series{Xendlinerangeseparator}[apprefwithpage,SErefwithpage] \newhookcommand@series{Xendbeforepagenumber}[apprefwithpage,SErefwithpage,SErefonlypage] -\newhookcommand@series{Xendafterpagenumber}[apprefwithpage,SErefwithpagem,SErefonlypage] +\newhookcommand@series{Xendafterpagenumber}[apprefwithpage,SErefwithpagem] \newhookcommand@series{Xendlineprefixsingle}[apprefwithpage,SErefwithpage] \newhookcommand@series{Xendlineprefixmore}[apprefwithpage,SErefwithpage] \newhookcommand@series{Xendsublinesep}[apprefwithpage,SErefwithpage] @@ -4348,6 +4480,7 @@ \unvbox\@outputbox \@opXfeet}} \newcommand\print@Xnotes[1]{% + \xdef\@currentseries{#1}% \csuse{#1footstart}{#1}% \csuse{#1footgroup}{#1}%% }% @@ -4385,6 +4518,7 @@ } \newcommand\print@notesX[1]{% + \xdef\@currentseries{#1}% \csuse{footstart#1}{#1}% \csuse{footgroup#1}{#1}% }% @@ -4704,13 +4838,14 @@ \toggletrue{Xlineflag@SEref}%%Here exception \def\Xendtwolines@apprefwithpage{}% -\def\Xendtwolines@SEwithpage{}% +\def\Xendtwolines@SErefwithpage{}% \def\Xendmorethantwolines@apprefwithpage{}% \def\Xendmorethantwolines@SErefwithpage{}% \def\Xendlinerangeseparator@apprefwithpage{\endashchar} \def\Xendlinerangeseparator@SErefwithpage{\endashchar} +\def\Xendlinerangeseparator@SErefonlypage{\endashchar} \def\Xendbeforepagenumber@apprefwithpage{p.}% \def\Xendbeforepagenumber@SErefwithpage{p.}% @@ -4718,7 +4853,6 @@ \def\Xendafterpagenumber@apprefwithpage{) }% \def\Xendafterpagenumber@SErefwithpage{) }% -\def\Xendafterpagenumber@SErefonlypage{) }% \def\Xendlineprefixsingle@apprefwithpage{}% \def\Xendlineprefixsingle@SErefwithpage{}% @@ -4773,6 +4907,10 @@ \gdef\@SErefprefixmore{#1}% } +\let\setSErefonlypageprefixsingle\XendbeforepagenumberSErefonlypage% +\newcommand{\setSErefonlypageprefixmore}[1]{% + \gdef\SErefonlypage@prefixmore{#1}% +}% \newcommandx{\appref}[2][1,usedefault]{\refformated@{#1}{#2}{appref}} \newcommandx{\SEref}[2][1,usedefault]{\refformated@{#1}{#2}{SEref}} @@ -4799,7 +4937,13 @@ or test{\ifcsundef{the@label#2:end}}% }% {\led@warn@pairRefUndefined{#2}\nfss@text{\reset@font\bfseries ??}}% - {\printlines\xpageref{#2:start}|\xlineref{#2:start}|\xsublineref{#2:start}|\xpageref{#2:end}|\xlineref{#2:end}|\xsublineref{#2:end}|\relax|\xflagref{#2:start}|}% + {% + \def\@this@crossref@start{#2:start}% + \def\@this@crossref@end{#2:end}% + \printlines\xpageref{#2:start}|\xlineref{#2:start}|\xsublineref{#2:start}|\xpageref{#2:end}|\xlineref{#2:end}|\xsublineref{#2:end}|\relax|\xflagref{#2:start}|% + \undef\@this@crossref@end% + \undef\@this@crossref@start% + }% \def\do##1{% \setkeys[mac]{falsefootnoteoption}{##1}% }% @@ -4817,7 +4961,13 @@ or test{\ifcsundef{the@label#2:end}}% }% {\led@warn@pairRefUndefined{#2}\nfss@text{\reset@font\bfseries ??}}% - {\printendlines\xpageref{#2:start}|\xlineref{#2:start}|\xsublineref{#2:start}|\xpageref{#2:end}|\xlineref{#2:end}|\xsublineref{#2:end}|\relax|\xflagref{#2:start}|}% + {% + \def\@this@crossref@start{#2:start}% + \def\@this@crossref@end{#2:end}% + \printendlines\xpageref{#2:start}|\xlineref{#2:start}|\xsublineref{#2:start}|\xpageref{#2:end}|\xlineref{#2:end}|\xsublineref{#2:end}|\relax|\xflagref{#2:start}|% + \undef\@this@crossref@end% + \undef\@this@crossref@start% + }% \def\do##1{% \setkeys[mac]{falsefootnoteoption}{##1}% }% @@ -4835,23 +4985,30 @@ or test{\ifcsundef{the@label#2:end}}% }% {\led@warn@pairRefUndefined{#2}\nfss@text{\reset@font\bfseries ??}}% - {\ifnum\xpageref{#2:start}=\xpageref{#2:end}% - \printnpnum{\xpageref{#2:start}} - \else% + {\ifnumequal{\xpageref{#2:end}}{\xpageref{#2:start}}% + {% + \printnpnum{% + \wrap@edcrossref{#2:start}{\xpageref{#2:start}}% + }% + }% + {% + \ifcsvoid{#3onlypage@prefixmore}% + {}% + {\csletcs{Xendbeforepagenumber@#3onlypage}{#3onlypage@prefixmore}}% \ifdefined\linerangesep@% \printnpnum{% - \xpageref{#2:start}% + \wrap@edcrossref{#2:start}{\xpageref{#2:start}}% \linerangesep@% - \xpageref{#2:end}% + \wrap@edcrossref{#2:end}{\xpageref{#2:end}}% }% \else% \printnpnum{% - \xpageref{#2:start}% + \wrap@edcrossref{#2:start}{\xpageref{#2:start}}% \csuse{Xendlinerangeseparator@\@currentseries}% - \xpageref{#2:end}% + \wrap@edcrossref{#2:end}{\xpageref{#2:end}}% }% \fi% - \fi% + }% }% \def\do##1{% \setkeys[mac]{falsefootnoteoption}{##1}% @@ -5089,7 +5246,6 @@ \fi% \fi% } -\newif\if@ledgroup% \ifnoledgroup@\else% \newcommand*{\l@dfeetbeginmini}{\@ledgrouptrue\l@dedbeginmini\l@dfambeginmini} \newcommand*{\l@dfeetendmini}{% @@ -5201,10 +5357,6 @@ \@ledgroupfalse% } -\apptocmd{\endledgroup}{% - \l@dprintingpagesfalse% - \l@dprintingcolumnsfalse% -}{}{} \newenvironment{ledgroupsized}[2][l]{% \hsize #2\relax \let\ledllfill\hfil @@ -5251,7 +5403,8 @@ \edlabel{\edindexlab\thelabidx}% } -\newcommand{\thepageline}{% +\newcounter{pageline}% +\renewcommand{\thepageline}{% \thepage% \pagelinesep% \xlineref{\edindexlab\thelabidx}% @@ -5449,6 +5602,56 @@ \fi% }% } +\newcommand{\led@set@index@fornote}[1]{% + \ifbool{indtl@innote}% + {\let\index\nindex}% + {}% + \ifbool{indtl@notenumber}% + {% + \renewcommand{\index}[2][\indtl@jobname]{% + \orig@@index[##1]{% + ##2|innotenumber{\csuse{thefootnote#1}}% + }% + }% + }% + {}% +}% +\newcommand{\led@reinit@index@fornote}{% + \ifbool{indtl@innote}% + {\let\index\orig@@index}% + {}% + \ifbool{indtl@notenumber}% + {\let\index\orig@@index}% + {}% +}% +\DeclareRobustCommandx{\edgls}[3][1,3,usedefault]{% + \doedindexlabel% + \gls[counter=pageline,#1]{#2}[#3]% +} +\DeclareRobustCommandx{\edGls}[3][1,3,usedefault]{% + \doedindexlabel% + \Gls[counter=pageline,#1]{#2}[#3]% +} +\DeclareRobustCommandx{\edGLS}[3][1,3,usedefault]{% + \doedindexlabel% + \GLS[counter=pageline,#1]{#2}[#3]% +} +\DeclareRobustCommandx{\edglspl}[3][1,3,usedefault]{% + \doedindexlabel% + \glspl[counter=pageline,#1]{#2}[#3]% +} +\DeclareRobustCommandx{\edGlspl}[3][1,3,usedefault]{% + \doedindexlabel% + \Glspl[counter=pageline,#1]{#2}[#3]% +} +\DeclareRobustCommandx{\edGLSpl}[3][1,3,usedefault]{% + \doedindexlabel% + \GLSpl[counter=pageline,#1]{#2}[#3]% +} +\DeclareRobustCommandx{\edglsdisp}[3][1,3,usedefault]{% + \doedindexlabel% + \glsdisp[counter=pageline,#1]{#2}[#3]% +} \def\@hangingsymbol{} \newcommand*{\sethangingsymbol}[1]{% \gdef\@hangingsymbol{#1}% diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index ebbf1b6a1c7..be0291d00a9 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty @@ -29,7 +29,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2015/11/20 v2.6.1 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2015/11/29 v2.6.2 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -617,7 +617,6 @@ \csgdef{Xonlyside@#1}{}% \fi% \unless\ifnofamiliar@% - \expandafter\newcount\csname footnote#1@reading\endcsname% \newcounter{footnote#1@typeset}% \expandafter\list@create\csname footnote#1@mk\endcsname% \expandafter\newcommand\csname footnote#1nomk\endcsname[1]{% @@ -700,6 +699,9 @@ \l@dpagingfalse \initnumbering@quote \save@familiarfootnote@number% + \if@ledgroup% + \get@familiarfootnote@number% + \fi% \save@section@number% \at@begin@pairs% }{% @@ -714,6 +716,9 @@ \l@dpagingtrue \initnumbering@quote \save@familiarfootnote@number% + \if@ledgroup% + \get@familiarfootnote@number% + \fi% \save@section@number% \setlength{\Lcolwidth}{\textwidth}% \setlength{\Rcolwidth}{\textwidth}% @@ -1723,7 +1728,9 @@ \ifledRcol \gdef\theledlanguageR{#2}% \else \gdef\theledlanguageL{#2}% \fi}% - \let\l@duselanguage\select@language% + \renewcommand{\l@duselanguage}[1]{% + \csuse{no\languagename @numbers}\select@language{#1}% + }% \gdef\theledlanguageL{\xpg@main@language}% \gdef\theledlanguageR{\xpg@main@language}% }} @@ -1912,9 +1919,7 @@ \global\l@dpscR=\z@ \global\l@dnumpstartsL=\z@ \global\l@dnumpstartsR=\z@ - \if@ledgroup\else% - \global\l@dprintingcolumnsfalse% - \fi + \global\l@dprintingcolumnsfalse% \ignorespaces \global\instanzaLfalse% \global\instanzaRfalse% @@ -2282,9 +2287,7 @@ \global\l@dnumpstartsR=\z@% \global\instanzaLfalse% \global\instanzaRfalse% - \if@ledgroup\else% - \global\l@dprintingpagesfalse% - \fi% + \global\l@dprintingpagesfalse% \finish@Pages@notes%Needed to prevent final notes overlap line number \ignorespaces\fi} |