diff options
author | Karl Berry <karl@freefriends.org> | 2016-04-10 21:01:44 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-04-10 21:01:44 +0000 |
commit | 93ce4959f15b3a5e4790597cded9ca47050e6d91 (patch) | |
tree | 0edd73b3db004f36fedc6189b8ad75232c334b80 /Master/texmf-dist/tex/latex | |
parent | 6754a8cd4357c6c60e9fcca86b1804be59f50eb4 (diff) |
reledmac (10apr16)
git-svn-id: svn://tug.org/texlive/trunk@40388 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r-- | Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 53 |
1 files changed, 37 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index 533987befdd..cbc159c2b9e 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}[2016/03/23 v2.9.0 typeset critical edition]% +\ProvidesPackage{reledmac}[2016/04/09 v2.9.1 typeset critical edition]% \RequirePackage{xkeyval} \newif\ifparledgroup \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}} @@ -2118,9 +2118,14 @@ {\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% + \iftoggle{nosep@}{% + \hskip\csuse{Xinplaceoflemmaseparator@#4}% + \relax% + }% + {\ifcsempty{Xlemmaseparator@#4}% + {\hskip\csuse{Xinplaceoflemmaseparator@#4}\relax}% + {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}% + \relax% }}% #3\strut\par} \newcommand*{\normalfootstart}[1]{% @@ -2266,7 +2271,7 @@ \unskip % remove \rightskip, \unskip % remove \parfillskip, \unpenalty % remove \penalty of 10000, - \hskip\csuse{Xafternote@#2}} % but add the glue to go between the notes + \hskip\csuse{Xafternote@#2}\relax}% but add the glue to go between the notes \newcommand*{\parafootfmt}[4]{% \Xinsertparafootsep{#4}% @@ -2276,9 +2281,15 @@ {\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}% + \iftoggle{nosep@}{% + \hskip\csuse{Xinplaceoflemmaseparator@#4}\relax% + }% + {\ifcsempty{Xlemmaseparator@#4}% + {% + \hskip\csuse{Xinplaceoflemmaseparator@#4}\relax% + }% + {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}% + \relax% }}% #3\penalty-10 } \newcommand*{\parafootgroup}[1]{% @@ -2422,9 +2433,13 @@ {\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}% + \iftoggle{nosep@}{% + \hskip\csuse{Xinplaceoflemmaseparator@#4}\relax% + }{% + \ifcsempty{Xlemmaseparator@#4}% + {\hskip\csuse{Xinplaceoflemmaseparator@#4}\relax}% + {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}% + \relax% }}% #3\strut\par\allowbreak} \newcommand*{\threecolfootgroup}[1]{{\csuse{Xnotefontsize@#1}% @@ -2505,9 +2520,13 @@ {\select@lemmafont#1|{\csuse{Xlemmafont@#4}#2}}% {{\csuse{Xlemmafont@#4}#2}}% }% - \iftoggle{nosep@}{\hskip\csuse{Xinplaceoflemmaseparator@#4}}{\ifcsempty{Xlemmaseparator@#4}% - {\hskip\csuse{Xinplaceoflemmaseparator@#4}}% + \iftoggle{nosep@}{% + \hskip\csuse{Xinplaceoflemmaseparator@#4}% + \relax% + }{\ifcsempty{Xlemmaseparator@#4}% + {\hskip\csuse{Xinplaceoflemmaseparator@#4}\relax}% {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}% + \relax% }}% #3\strut\par\allowbreak} \newcommand*{\twocolfootgroup}[1]{{\csuse{Xnotefontsize@#1} @@ -3426,7 +3445,8 @@ \unskip % remove \rightskip, \unskip % remove \parfillskip, \unpenalty % remove \penalty of 10000, - \hskip\csuse{afternoteX@#2}} % but add the glue to go between the notes + \hskip\csuse{afternoteX@#2}% + \relax}% but add the glue to go between the notes \newcommand*{\parafootfmtX}[2]{% \protected@edef\@currentlabel{% @@ -3675,7 +3695,7 @@ \csuse{Xendnotefontsize@#4}% \hangindent=\csuse{Xendhangindent@#4}% \ifXendinsertsep@% - \hskip\csuse{Xendafternote@#4}% + \hskip\csuse{Xendafternote@#4}\relax% \csuse{Xendsep@#4}% \else% \iftoggle{Xendparagraph@#4}% @@ -3701,11 +3721,12 @@ togl {nosep@}% or test{\ifcsempty{Xendlemmaseparator@#4}}% }% - {\hskip\csuse{Xendinplaceoflemmaseparator@#4}}% + {\hskip\csuse{Xendinplaceoflemmaseparator@#4}\relax}% {\nobreak% \hskip\csuse{Xendbeforelemmaseparator@#4}% \csuse{Xendlemmaseparator@#4}% \hskip\csuse{Xendafterlemmaseparator@#4}% + \relax% }% #3% \nottoggle{Xendparagraph@#4}{\par}{}% |