diff options
author | Karl Berry <karl@freefriends.org> | 2019-01-22 22:19:50 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-01-22 22:19:50 +0000 |
commit | c8e8fe4cb53b2b726916ac8c976c6f9f41b8f6ea (patch) | |
tree | c94a51435dd1ce510a300c051feb11c2992268f4 /Master/texmf-dist/tex/latex/reledmac | |
parent | 515dfa25529631975742790e3c35b272f3ea42c8 (diff) |
reledmac (22jan19)
git-svn-id: svn://tug.org/texlive/trunk@49792 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/reledmac')
-rw-r--r-- | Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 43 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/reledmac/reledpar.sty | 45 |
2 files changed, 69 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index 29a0a54bc88..691e42bc162 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}[2019/01/08 v2.29.0 typesetting critical editions]% +\ProvidesPackage{reledmac}[2019/01/22 v2.30.0 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \newif\ifsameparallelpagenumber% @@ -2330,15 +2330,25 @@ \def\Xlinenumannotationposition@side{after}% \def\Xwraplinenumannotation@ref{\textsuperscript}% \def\Xwraplinenumannotation@side{\textsuperscript}% +\newtoggle{Xnoidenticallinenumannotation@ref}% +\newtoggle{Xnoidenticallinenumannotation@side}% \newcommand{\@annot}[1]{% \store@annot@to@absline{#1}% \def\current@annot{#1}% }% \newcommand{\store@annot@to@absline}[1]{% \ifledRcol% - \csgappto{annotR@\the\absline@numR @\the\section@numR}{#1}% + \ifcsdef{annotR@\the\absline@numR @\the\section@numR}{% + \csgappto{annotR@\the\absline@numR @\the\section@numR}{\@linenumannotationsep#1}% + }{% + \csgdef{annotR@\the\absline@numR @\the\section@numR}{#1}% + }% \else% - \csgappto{annot@\the\absline@num @\the\section@num}{#1}% + \ifcsdef{annot@\the\absline@num @\the\section@num}{% + \csgappto{annot@\the\absline@num @\the\section@num}{\@linenumannotationsep#1}% + }{% + \csgdef{annot@\the\absline@num @\the\section@num}{#1}% + }% \fi% }% \let\current@annot=\empty% @@ -2351,6 +2361,8 @@ \gdef\annot@start{#1}% \gdef\annot@end{#2}% }% +\newcommand{\setlinenumannotationsep}[1]{\gdef\@linenumannotationsep{#1}}% +\def\@linenumannotationsep{, }% \newcommand*{\affixline@num}{% \ifledgroupnotesL@\else \ifnumberline @@ -3598,6 +3610,14 @@ }% }% \fi% + \iftoggle{Xnoidenticallinenumannotation@\@currentseries}{% + \ifx\annot@start\annot@end% + \let\@annot@end@print\relax% + \ifx\linenumrep\@gobble%Dont print the dash if we don't print the line number + \l@d@dashfalse% + \fi% + \fi% + }{}% }% \newif\ifistwofollowinglines@% \newcommand{\setistwofollowinglines}[4]{% @@ -4881,6 +4901,14 @@ }% }% \fi% + \iftoggle{Xendnoidenticallinenumannotation@\@currentseries}{% + \ifx\annot@start\annot@end% + \let\@annot@end@print\relax% + \ifx\linenumrep\@gobble%Dont print the dash if we don't print the line number + \l@d@dashfalse% + \fi% + \fi% + }{}% }% \def\printendlines#1|#2|#3|#4|#5|#6|#7|#8|{% \begingroup @@ -5096,6 +5124,7 @@ \csgdef{Xwidth@#1}{\hsize}% \csgdef{Xwraplinenumannotation@#1}{\textsuperscript}% \csgdef{Xlinenumannotationposition@#1}{after}% + \newtoggle{Xnoidenticallinenumannotation@#1}% \expandafter\newinsert\csname #1footins\endcsname% \unless\ifnoledgroup@% \expandafter\newinsert\csname mp#1footins\endcsname% @@ -5401,6 +5430,7 @@ \csgdef{Xendlinenumannotationposition@#1}{after}% \csgdef{Xendwraplinenumannotation@#1}{\textsuperscript}% + \newtoggle{Xendnoidenticallinenumannotation@#1}% \newtoggle{Xendpagenumberonlyfirst@#1}% \newtoggle{Xendpagenumberonlyfirstifsingle@#1}% @@ -5593,6 +5623,7 @@ \newhookcommand@series{Xlinerangeseparator}[appref,SEref] \newhookcommand@series{Xlinenumannotationposition}[side,appref,SEref]% \newhookcommand@series{Xwraplinenumannotation}[side,ref,appref,SEref]% +\newhooktoggle@series{Xnoidenticallinenumannotation}[side,ref,appref,SEref]% \unless\ifnofamiliar@ \newhookcommand@series{wrapcontentX}% \newhookcommand@series{beforeinsertingX}% @@ -5692,6 +5723,7 @@ \newhookcommand@series{Xendlinenumannotationposition}[apprefwithpage,SErefwithpage]% \newhookcommand@series{Xendwraplinenumannotation}[apprefwithpage,SErefwithpage]% +\newhooktoggle@series{Xendnoidenticallinenumannotation}[apprefwithpage,SErefwithpage]% \newcommand{\newhooktoggle@specific}[1]{% \newtoggle{#1@}% \define@key[mac]{truefootnoteoption}{#1}[]{\global\settoggle{#1@}{true}}%When enabling footnote option @@ -6275,6 +6307,8 @@ \def\Xwraplinenumannotation@appref{\textsuperscript}% \def\Xwraplinenumannotation@SEref{\textsuperscript}% +\newtoggle{Xnoidenticallinenumannotation@appref}% +\newtoggle{Xnoidenticallinenumannotation@SEref}% \def\Xendtwolines@apprefwithpage{}% \def\Xendtwolines@SErefwithpage{}% @@ -6319,6 +6353,9 @@ \def\Xendwraplinenumannotation@apprefwithpage{\textsuperscript}% \def\Xendwraplinenumannotation@SErefwithpage{\textsuperscript}% +\newtoggle{Xendnoidenticallinenumannotation@apprefwithpage}% +\newtoggle{Xendnoidenticallinenumannotation@SErefwithpage}% + \gdef\Xboxstartlinenum@appref{0pt} \gdef\Xboxstartlinenum@SEref{0pt} diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index 65b0ad8f432..e2a5ffc3ec9 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}[2019/01/08 v2.22.1 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2019/01/22 v2.22.2 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -1876,16 +1876,21 @@ \global\dimen\csuse{#1footins}=\maxdimen% }% {% - \global\count\csuse{#1footins}=\csuse{default@#1footins}% - \global\skip\csuse{#1footins}=\csuse{Xbeforenotes@#1}% - \bgroup% - \csuse{Xnotefontsize@#1}% - \global\dimen\csuse{#1footins}=\csuse{Xmaxhnotes@#1}% - \egroup% - \global\setnamebox{#1footins@kept}=\box\namebox{#1footins}% + \restore@Xnotes@settings{#1}% }% }% }% +\newcommand{\restore@Xnotes@settings}[1]{% + \unless\ifnocritical@ + \global\count\csuse{#1footins}=\csuse{default@#1footins}% + \global\skip\csuse{#1footins}=\csuse{Xbeforenotes@#1}% + \bgroup% + \csuse{Xnotefontsize@#1}% + \global\dimen\csuse{#1footins}=\csuse{Xmaxhnotes@#1}% + \egroup% + \global\setnamebox{#1footins@kept}=\box\namebox{#1footins}% + \fi +}% \newcommand\print@notesX@forpages[1]{% \ifcsempty{onlysideX@#1}{% \csuse{footstart#1}{#1}% @@ -1903,19 +1908,23 @@ \global\count\csuse{footins#1}=\z@% \global\skip\csuse{footins#1}=\z@% \global\dimen\csuse{footins#1}=\maxdimen% - }% {% - \global\count\csuse{footins#1}=\csuse{default@footins#1}% - \global\skip\csuse{footins#1}=\csuse{beforenotesX@#1}% - \bgroup% - \csuse{Xnotefontsize@#1}% - \global\dimen\csuse{footins#1}=\csuse{maxhnotesX@#1}% - \egroup% - \global\setnamebox{footins#1@kept}=\box\namebox{footins#1}% + \restore@notesX@settings{#1}% }% }% }% +\newcommand{\restore@notesX@settings}[1]{% + \unless\ifnofamiliar@ + \global\count\csuse{footins#1}=\csuse{default@footins#1}% + \global\skip\csuse{footins#1}=\csuse{beforenotesX@#1}% + \bgroup% + \csuse{Xnotefontsize@#1}% + \global\dimen\csuse{footins#1}=\csuse{maxhnotesX@#1}% + \egroup% + \global\setnamebox{footins#1@kept}=\box\namebox{footins#1}% + \fi +}% \newcommand{\insert@notes@for@onlyside}{% \def\do##1{% \unless\ifnocritical@% @@ -1925,6 +1934,7 @@ \unvnamebox{##1footins@kept}% \egroup% \fi% + \restore@Xnotes@settings{##1}% \fi% \unless\ifnofamiliar@% \ifvoid\csuse{footins##1@kept}\else% @@ -1933,6 +1943,7 @@ \unvnamebox{footins##1@kept}% \egroup% \fi% + \restore@notesX@settings{##1}% \fi% }% \dolistloop{\@series}% @@ -2918,6 +2929,8 @@ \ifnofamiliar@% \global\newnamebox{footins##1}% \fi + \restore@Xnotes@settings{##1}% + \restore@notesX@settings{##1}% \ifvoid\csuse{##1footins}% \ifvoid\csuse{footins##1}\else% \newpage\null% |