summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-10-19 22:36:04 +0000
committerKarl Berry <karl@freefriends.org>2015-10-19 22:36:04 +0000
commit90eab0f6fae15d48f312525a7613f63546292087 (patch)
tree24465222b5d973267bb3751416822db039c821f7 /Master/texmf-dist/tex/latex
parentdd668ea645b653e663abe0e53f9364f3b8f28ddf (diff)
reledmac (19oct15)
git-svn-id: svn://tug.org/texlive/trunk@38673 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledmac.sty142
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledpar.sty4
2 files changed, 90 insertions, 56 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index 9c57ae558e9..8b1dbd5ee68 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
@@ -32,7 +32,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2015/10/14 v2.3.0 typeset critical edition]%
+\ProvidesPackage{reledmac}[2015/10/19 v2.4.0 typeset critical edition]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}}
@@ -1322,8 +1322,8 @@
\csnumgdef{sw@\sw@txt}{\csuse{sw@\sw@txt}+1}%
\protected@write\linenum@out{}{\string\@sw{\sw@txt}{\csuse{sw@\sw@txt}}{#1}}%
\else%
- \csnumgdef{sw@\sw@txt@R}{\csuse{sw@\sw@txt@R}+1}%
- \protected@write\linenum@outR{}{\string\@sw{\sw@txt}{\csuse{sw@\sw@txt@R}}{#1}}%
+ \csnumgdef{sw@\sw@txt}{\csuse{sw@\sw@txt}+1}%
+ \protected@write\linenum@outR{}{\string\@sw{\sw@txt}{\csuse{sw@\sw@txt}}{#1}}%
\fi%
#2%
}%
@@ -1948,14 +1948,14 @@
{\fontencoding{#1}\fontfamily{#2}\fontseries{#3}\fontshape{#4}%
\selectfont}
-\newcommandx*{\footnoteoptions@}[3][1=L,usedefault]{%
+\newcommand*{\footnoteoptions@}[3]{%
\def\do##1{%
\ifstrequal{#1}{L}{% In Leftside
- \xright@appenditem{\global\noexpand\settoggle{##1@}{#3}}\to\inserts@list% Switch toogle, in all case
+ \xright@appenditem{\noexpand\setkeys[mac]{#3footnoteoption}{\unexpanded{##1}}}\to\inserts@list%
\global\advance\insert@count \@ne% Increment the left insert counter.
}%
{%
- \xright@appenditem{\global\noexpand\settoggle{##1@}{#3}}\to\inserts@listR% Switch toogle, in all case
+ \xright@appenditem{\noexpand\setkeys[mac]{#3footnoteoption}{\unexpanded{##1}}}\to\inserts@listR%
\global\advance\insert@countR \@ne% Increment the right insert counter insert.
}%
}%
@@ -2330,17 +2330,18 @@
\multiply\dimen\csname mp#1footins\endcsname \thr@@}
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\threecolvfootnote}[2]{%
- \insert\csname #1footins\endcsname\bgroup
- \csuse{Xnotefontsize@#1}
- \footsplitskips
+ \insert\csname #1footins\endcsname\bgroup%
+ \noindent\csuse{Xbhooknote@#1}%
+ \csuse{Xnotefontsize@#1}%
+ \footsplitskips%
\csname #1footfmt\endcsname #2{#1}\egroup}
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\threecolfootfmt}[4]{%
- \normal@pars
- \hsize \csuse{Xhsizethreecol@#4}
- \nottoggle{Xparindent@#4}{\parindent=\z@}{}
- \tolerance=5000
- \hangindent=\csuse{Xhangindent@#4}
- \leavevmode
+ \normal@pars%
+ \hsize \csuse{Xhsizethreecol@#4}%
+ \nottoggle{Xparindent@#4}{\parindent=\z@}{}%
+ \tolerance=5000%
+ \hangindent=\csuse{Xhangindent@#4}%
+ \par%
\everypar{\hangindent=\csuse{Xhangindent@#4}}%
\@tempdima=\parindent%
\csuse{Xcolalign@#4}%
@@ -2403,17 +2404,19 @@
\count\csname #1footins\endcsname 500
\csxdef{default@#1footins}{500}%Use this to confine the notes to one side only
\multiply\dimen\csname #1footins\endcsname \tw@}
-\notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolvfootnote}[2]{\insert\csname #1footins\endcsname\bgroup
- \csuse{Xnotefontsize@#1}
- \footsplitskips
+\notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolvfootnote}[2]{%
+ \insert\csname #1footins\endcsname\bgroup%
+ \noindent\csuse{Xbhooknote@#1}%
+ \csuse{Xnotefontsize@#1}%
+ \footsplitskips%
\csname #1footfmt\endcsname #2{#1}\egroup}
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolfootfmt}[4]{% 4th arg is optional, for backward compatibility
- \normal@pars
- \hsize \csuse{Xhsizetwocol@#4}
- \nottoggle{Xparindent@#4}{\parindent=\z@}{}
- \tolerance=5000
- \hangindent=\csuse{Xhangindent@#4}
- \leavevmode
+ \normal@pars%
+ \hsize \csuse{Xhsizetwocol@#4}%
+ \nottoggle{Xparindent@#4}{\parindent=\z@}{}%
+ \tolerance=5000%
+ \hangindent=\csuse{Xhangindent@#4}%
+ \par%
\everypar{\hangindent=\csuse{Xhangindent@#4}}%
\@tempdima=\parindent%
\csuse{Xcolalign@#4}%
@@ -2709,7 +2712,13 @@
\csuse{Xtwolines@\@currentseries}%
\fi%
\else%
- \ifl@d@dash \endashchar\fi%
+ \ifl@d@dash%
+ \ifdefined\linerangesep@%
+ \linerangesep@%
+ \else%
+ \csuse{Xlinerangeseparator@\@currentseries}%
+ \fi%
+ \fi%
\ifl@d@pnum #4\fullstop\fi%
\ifl@d@elin \linenumrep{#5}\fi%
\ifl@d@esl \ifl@d@elin \fullstop\fi \sublinenumrep{#6}\fi%
@@ -2988,23 +2997,24 @@
\multiply\dimen\csname mpfootins#1\endcsname by \tw@}
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolvfootnoteX}[2]{%
- \insert\csname footins#1\endcsname\bgroup
- \csuse{notefontsizeX@#1}
- \footsplitskips
- \spaceskip=\z@skip \xspaceskip=\z@skip
+ \insert\csname footins#1\endcsname\bgroup%
+ \noindent\csuse{bhooknoteX@#1}%
+ \csuse{notefontsizeX@#1}%
+ \footsplitskips%
+ \spaceskip=\z@skip \xspaceskip=\z@skip%
\@nameuse{footfmt#1}{#1}{#2}\egroup}
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolfootfmtX}[2]{%
\protected@edef\@currentlabel{%
\@nameuse{@thefnmark#1}%
}%
- \normal@pars
+ \normal@pars%
\hangindent=\csuse{hangindentX@#1}%
\everypar{\hangindent=\csuse{hangindentX@#1}}%
- \hsize \csuse{hsizetwocolX@#1}
- \nottoggle{parindentX@#1}{\parindent=\z@}{}
- \tolerance=5000\relax
- \leavevmode
+ \hsize \csuse{hsizetwocolX@#1}%
+ \nottoggle{parindentX@#1}{\parindent=\z@}{}%
+ \tolerance=5000\relax%
+ \par%
\@tempdima=\parindent%
\csuse{colalignX@#1}%
\parindent=\@tempdima%
@@ -3065,9 +3075,10 @@
\multiply\dimen\csname mpfootins#1\endcsname by \thr@@}
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\threecolvfootnoteX}[2]{%
- \insert\csname footins#1\endcsname\bgroup
+ \insert\csname footins#1\endcsname\bgroup%
+ \noindent\csuse{bhooknoteX@#1}%
\csuse{notefontsizeX@#1}
- \footsplitskips
+ \footsplitskips%
\@nameuse{footfmt#1}{#1}{#2}\egroup}
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\threecolfootfmtX}[2]{%
@@ -3076,11 +3087,11 @@
}%
\hangindent=\csuse{hangindentX@#1}%
\everypar{\hangindent=\csuse{hangindentX@#1}}%
- \normal@pars
- \hsize \csuse{hsizethreecolX@#1}
- \nottoggle{parindentX@#1}{\parindent=\z@}{} %
- \tolerance=5000\relax
- \leavevmode
+ \normal@pars%
+ \hsize \csuse{hsizethreecolX@#1}%
+ \nottoggle{parindentX@#1}{\parindent=\z@}{}%
+ \tolerance=5000\relax%
+ \par%
\@tempdima=\parindent%
\csuse{colalignX@#1}%
\parindent=\@tempdima%
@@ -3425,7 +3436,7 @@
\fi%
\xdef\@currentseries{#4}%
\def\do##1{%
- \toggletrue{##1@}%
+ \setkeys[mac]{truefootnoteoption}{##1}%
}%
\notblank{#5}{\docsvlist{#5}}{}%
\csuse{Xendbhooknote@#4}%
@@ -3446,8 +3457,8 @@
}%
#3%
\nottoggle{Xendparagraph@#4}{\par}{}%
- \def\do##1{%
- \togglefalse{##1@}%
+ \def\do##1{%
+ \setkeys[mac]{falsefootnoteoption}{##1}%
}%
\notblank{#5}{\docsvlist{#5}}{}%
}}%
@@ -3591,7 +3602,13 @@
\csuse{Xendtwolines@\@currentseries}%
\fi%
\else%
- \ifl@d@dash \endashchar\fi%
+ \ifl@d@dash%
+ \ifdefined\linerangesep@%
+ \linerangesep@%
+ \else%
+ \csuse{Xendlinerangeseparator@\@currentseries}%
+ \fi%
+ \fi%
\ifl@d@pnum \printnpnum{#4}\fi%
\ifl@d@elin \linenumrep{#5}\fi%
\ifl@d@esl \ifl@d@elin \fullstop\fi \sublinenumrep{#6}\fi%
@@ -3689,6 +3706,7 @@
\newtoggle{Xnoteswidthliketwocolumns@#1}%
\csgdef{Xparafootsep@#1}{}%
\csgdef{Xafternote@#1}{1em plus.4em minus.4em}
+ \csgdef{Xlinerangeseparator@#1}{\endashchar}%
\expandafter\newinsert\csname #1footins\endcsname%
\unless\ifnoledgroup@%
\expandafter\newinsert\csname mp#1footins\endcsname%
@@ -3705,7 +3723,7 @@
\@ifundefined{xpg@main@language}%if polyglossia
{}%
{\footnotelang@poly[R]}%
- \footnoteoptions@[R]{##1}{true}%
+ \footnoteoptions@{R}{##1}{true}%
\xright@appenditem{%
\noexpand\prepare@preXnotes{#1}%
\noexpand\prepare@edindex@fornote{\l@d@nums}%
@@ -3714,7 +3732,7 @@
\noexpand\csuse{v#1footnote}{#1}%
{{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}%
}\to\inserts@listR
- \footnoteoptions@[R]{##1}{false}%
+ \footnoteoptions@{R}{##1}{false}%
\global\advance\insert@countR \@ne%
\else%
\ifluatex%
@@ -3723,7 +3741,7 @@
\@ifundefined{xpg@main@language}%if polyglossia
{}%
{\footnotelang@poly}%
- \footnoteoptions@{##1}{true}%
+ \footnoteoptions@{L}{##1}{true}%
\xright@appenditem{%
\noexpand\prepare@preXnotes{#1}%
\noexpand\prepare@edindex@fornote{\l@d@nums}%
@@ -3735,7 +3753,7 @@
{{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}%
}\to\inserts@list
\global\advance\insert@count \@ne%
- \footnoteoptions@{##1}{false}%
+ \footnoteoptions@{L}{##1}{false}%
\fi
\else
\csuse{v#1footnote}{#1}{{0|0|0|0|0|0|0}{}{##1}}%
@@ -3805,7 +3823,7 @@
{\ifnumberedpar@\expandonce\@tag\fi}%
{\expandonce\content}%
{#1}%
- {##1}%
+ {\unexpanded{##1}}%
\@percentchar%
}%
\egroup%
@@ -3857,6 +3875,8 @@
\csgdef{Xendehooklinenumber@#1}{}%
\csgdef{Xendbhookinplaceofnumber@#1}{}%
\csgdef{Xendehookinplaceofnumber@#1}{}%
+
+ \csgdef{Xendlinerangeseparator@#1}{\endashchar}%
\fi%
\listxadd{\@series}{#1}
}
@@ -4014,6 +4034,8 @@
\newhookcommand@series{Xafternote}%
\newhookcommand@series{Xparafootsep}
+ \newhookcommand@series{Xlinerangeseparator}
+
\fi
\unless\ifnofamiliar@
\newhooktoggle@series{parindentX}
@@ -4077,10 +4099,22 @@
\newhookcommand@series{Xendahookinplaceofnumber}%
\newhookcommand@series{Xendhangindent}%
+
+ \newhookcommand@series{Xendlinerangeseparator}
\fi
-\newtoggle{fulllines@}%
-\newtoggle{nonum@}
-\newtoggle{nosep@}
+\newcommand{\newhooktoggle@specific}[1]{%
+ \newtoggle{#1@}%
+ \define@key[mac]{truefootnoteoption}{#1}[]{\global\settoggle{#1@}{true}}%When enabling footnote option
+ \define@key[mac]{falsefootnoteoption}{#1}[]{\global\settoggle{#1@}{false}}
+}
+\newcommand{\newhookarg@specific}[1]{%
+ \define@key[mac]{truefootnoteoption}{#1}{\global\def\linerangesep@{##1}}%When enabling footnote option
+ \define@key[mac]{falsefootnoteoption}{#1}{\global\undef\linerangesep@}%When
+}
+\newhooktoggle@specific{fulllines}%
+\newhooktoggle@specific{nonum}
+\newhooktoggle@specific{nosep}
+\newhookarg@specific{linerangesep}
\newtoggle{nomk@}%
\newcommandx*{\Xnolemmaseparator}[1][1]{\Xlemmaseparator[#1]{}}
\countdef\pageno=0 \pageno=1
@@ -5194,7 +5228,7 @@
\def\noexpand\&{\noexpand\@stopstanza}%
\noexpand\@advancestanzanumber%
\noexpand\stanza@line[#1]\noexpand\@insertstanzanumber%
- \let\par\relax%No paragraph in verses
+ \let\par\relax\ignorespaces%No paragraph in verses
}
\newcommandx{\stanza}[1][1,usedefault]{\@startstanza[#1]}
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
index c6eb2776207..bdf0ddb54a9 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}[2015/10/14 v2.5.0 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2015/10/19 v2.5.1 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -1594,7 +1594,7 @@
\def\&{\@stopastanza}%
\pstart[#1]%
\@astanza@line
- \let\par\relax%No paragraph in verses
+ \let\par\relax\ignorespaces%No paragraph in verses
}{}
\newcommandx{\@stopastanza}[1][1,usedefault]{%