summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-11-19 22:41:35 +0000
committerKarl Berry <karl@freefriends.org>2015-11-19 22:41:35 +0000
commit8bc177aa284756939eeec5497c1799fbfae775ae (patch)
tree96ceb4277b4a1bd972fb505b7773656d9134c182 /Master/texmf-dist/tex
parent2f872d852a052b88a4c3c7e3442b63c3185d3770 (diff)
reledmac (19nov15)
git-svn-id: svn://tug.org/texlive/trunk@38896 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledmac.sty126
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledpar.sty23
2 files changed, 113 insertions, 36 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index 7381db48cee..38958fc7ea8 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
@@ -33,7 +33,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2015/11/13 v2.5.0 typeset critical edition]%
+\ProvidesPackage{reledmac}[2015/11/20 v2.6.0 typeset critical edition]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}}
@@ -278,6 +278,7 @@
\let\linenumberlist=\empty
\newcount\@l@dtempcnta \newcount\@l@dtempcntb
+
\newif\ifl@dpairing
\newif\ifl@dpaging%
\newif\ifl@dprintingpages%
@@ -288,6 +289,9 @@
\newif\ifledRcol@
\newif\ifnumberingR
\newif\ifXnote@%
+\providebool{indtl@innote}%
+\providebool{indtl@notenumber}%
+
\newcount\section@num
\section@num=0
\let\extensionchars=\empty
@@ -2799,7 +2803,9 @@
{\stepcounter\@mpfn}%
{%
\ifl@dpairing%
- \global\advance\footnote@reading by \@ne%
+ \global\advance\footnote@reading by \@ne%
+ \get@thisfootnote%
+ \get@fnmark{\thisfootnote}%
\ifcsdef{footnotereading\the\footnote@reading=typeset}%
{\setcounter{\@mpfn}{\csuse{footnotereading\the\footnote@reading=typeset}}}%
{\setcounter{\@mpfn}{\footnote@reading}}%
@@ -2809,13 +2815,18 @@
}%
{}
{}
-\newcommand{\l@dbfnote}[1]{%
- \ifnumberedpar@
+
+\newcommand{\get@thisfootnote}{%
\ifl@dpairing
\protected@xdef\thisfootnote{\the\footnote@reading}%
\else%
\protected@xdef\thisfootnote{\thefootnote}%
\fi%
+}%
+
+\newcommand{\l@dbfnote}[1]{%
+ \ifnumberedpar@%
+ \get@thisfootnote%
\gdef\@tag{#1\relax}%
\ifledRcol%
\xright@appenditem{\noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisfootnote}}%
@@ -2828,21 +2839,25 @@
\fi
\fi\ignorespaces}
-\newcommand{\vl@dbfnote}[2]{%
+\newcommand{\get@fnmark}[1]{%
\ifboolexpr{bool{l@dprintingpages} or bool{l@dprintingcolumns}}%
{%
- \global\advance\footnote@typeset by \@ne%
- \setcounter{footnote}{\footnote@typeset}%
+ \stepcounter{footnote@typeset}%
+ \setcounter{footnote}{\c@footnote@typeset}%
\immediate\write\@mainaux{%
- \global\csdef{footnotereading#2=typeset}{\the\footnote@typeset}%
+ \global\csdef{footnotereading#1=typeset}{\the\c@footnote@typeset}%
}%
- \def\@thefnmark{\the\footnote@typeset}%
+ \def\@thefnmark{\thefootnote}%
}%
{%
- \@namedef{@thefnmark}{#2}%
+ \@namedef{@thefnmark}{#1}%
}%
- \@footnotetext{#1}%
- }%
+}%
+
+\newcommand{\vl@dbfnote}[2]{%
+ \get@fnmark{#2}%
+ \@footnotetext{#1}%
+}%
\newcommand*{\prebodyfootmark}{%
\leavevmode
\ifhmode
@@ -2886,6 +2901,8 @@
\csuse{\csuse{footnote@dir}}\@nameuse{footfmt#1}{#1}{#2}\egroup}
\newcommand*{\mpnormalvfootnoteX}[2]{%
+ \get@thisfootnoteX{#1}%
+ \get@fnmarkX{#1}{\thisfootnote}%
\global\setbox\@nameuse{mpfootins#1}\vbox{%
\unvbox\@nameuse{mpfootins#1}
\noindent\csuse{bhooknoteX@#1}%
@@ -2967,11 +2984,7 @@
\newcommand{\normalbfnoteX}[2]{%
\ifnumberedpar@
- \ifl@dpairing
- \protected@xdef\thisfootnote{\the\csname footnote#1@reading\endcsname}%
- \else%
- \protected@xdef\thisfootnote{\csuse{thefootnote#1}}%
- \fi%
+ \get@thisfootnoteX{#1}%
\ifledRcol%
\ifluatex
\footnotelang@lua[R]%
@@ -2995,22 +3008,32 @@
\fi
\fi\ignorespaces}
+\newcommand{\get@thisfootnoteX}[1]{%
+ \ifl@dpairing%
+ \protected@xdef\thisfootnote{\the\csname footnote#1@reading\endcsname}%
+ \else%
+ \protected@xdef\thisfootnote{\csuse{thefootnote#1}}%
+ \fi%
+}%
\newcommand{\vbfnoteX}[3]{%
+ \get@fnmarkX{#1}{#3}%
+ \@nameuse{regvfootnote#1}{#1}{#2}%
+}%
+
+\newcommand{\get@fnmarkX}[2]{%
\ifboolexpr{bool{l@dprintingpages} or bool{l@dprintingcolumns}}%
{%
- \global\expandafter\advance\csname footnote#1@typeset\endcsname by \@ne%
- \setcounter{footnote#1}{\csuse{footnote#1@typeset}}%
+ \stepcounter{footnote#1@typeset}%
+ \setcounter{footnote#1}{\value{footnote#1@typeset}}%
\@namedef{@thefnmark#1}{\csuse{thefootnote#1}}%
\immediate\write\@mainaux{%
- \global\csdef{footnote#1reading#3=typeset}{\the\csname footnote#1@typeset\endcsname}%
+ \global\csdef{footnote#1reading#2=typeset}{\the\csname c@footnote#1@typeset\endcsname}%
}%
}%
{%
- \@namedef{@thefnmark#1}{#3}%
+ \@namedef{@thefnmark#1}{#2}%
}%
- \@nameuse{regvfootnote#1}{#1}{#2}%
}
-
\newcommand{\vnumfootnoteX}[2]{%
\ifnumberedpar@
\edtext{}{\normalbfnoteX{#1}{#2}}%
@@ -3257,7 +3280,7 @@
}
\newcommand*{\para@vfootnoteX}[2]{%
- \insert\csname footins#1\endcsname
+ \insert\csname footins#1\endcsname%
\bgroup
\csuse{notefontsizeX@#1}
\footsplitskips
@@ -3272,6 +3295,8 @@
\penalty0
\egroup}
\newcommand*{\mppara@vfootnoteX}[2]{%
+ \get@thisfootnoteX{#1}%
+ \get@fnmarkX{#1}{\thisfootnote}%
\global\setbox\@nameuse{mpfootins#1}\vbox{%
\unvbox\@nameuse{mpfootins#1}
\csuse{notefontsizeX@#1}
@@ -3836,6 +3861,15 @@
{\footnotelang@poly[R]}%
\footnoteoptions@{R}{##1}{true}%
\xright@appenditem{%
+ \ifbool{indtl@innote}%
+ {\unexpanded{\let\index\nindex}}%
+ {}%
+ \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}%
@@ -3844,6 +3878,9 @@
\noexpand\csuse{v#1footnote}{#1}%
{{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}%
\noexpand\Xnote@false%
+ \ifbool{indtl@innote}%
+ {\unexpanded{\let\index\orig@@index}}%
+ {}%
}\to\inserts@listR
\footnoteoptions@{R}{##1}{false}%
\global\advance\insert@countR \@ne%
@@ -3856,6 +3893,12 @@
{\footnotelang@poly}%
\footnoteoptions@{L}{##1}{true}%
\xright@appenditem{%
+ \ifbool{indtl@innote}%
+ {\unexpanded{\let\index\nindex}}%
+ {}%
+ \ifbool{indtl@notenumber}%
+ {\unexpanded{\let\index\nindex}}%There is no note number… so
+ {}%
\noexpand\Xnote@true%
\noexpand\prepare@preXnotes{#1}%
\noexpand\prepare@edindex@fornote{\l@d@nums}%
@@ -3866,6 +3909,12 @@
\noexpand\csuse{v#1footnote}{#1}%
{{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}%
\noexpand\Xnote@false%
+ \ifbool{indtl@innote}%
+ {\unexpanded{\let\index\orig@@index}}%
+ {}%
+ \ifbool{indtl@notenumber}%
+ {\unexpanded{\let\index\orig@@index}}%
+ {}%
}\to\inserts@list
\global\advance\insert@count \@ne%
\footnoteoptions@{L}{##1}{false}%
@@ -3924,7 +3973,25 @@
\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%
+ \ifbool{indtl@innote}%
+ {\let\index\orig@@index}%
+ {}%
+ \ifbool{indtl@notenumber}%
+ {\let\index\orig@@index}%
+ {}%
\endgroup%
}
\newcounter{footnote#1}
@@ -5022,8 +5089,9 @@
\fi%
\fi%
}
+\newif\if@ledgroup%
\ifnoledgroup@\else%
-\newcommand*{\l@dfeetbeginmini}{\l@dedbeginmini\l@dfambeginmini}
+\newcommand*{\l@dfeetbeginmini}{\@ledgrouptrue\l@dedbeginmini\l@dfambeginmini}
\newcommand*{\l@dfeetendmini}{%
\IfStrEq{critical-familiar}{\@mpfnpos}%
{\l@dedendmini\l@dfamendmini}%
@@ -5117,6 +5185,7 @@
\fi
\fi
}
+
\newenvironment{ledgroup}{%
\resetprevpage@num%
\def\@mpfn{mpfootnote}\def\thempfn{\thempfootnote}\c@mpfootnote\z@%
@@ -5129,12 +5198,15 @@
\l@dunboxmpfoot
\fi
\l@dfeetendmini%
+ \@ledgroupfalse%
}
+\apptocmd{\endledgroup}{%
+ \l@dprintingpagesfalse%
+ \l@dprintingcolumnsfalse%
+}{}{}
\newenvironment{ledgroupsized}[2][l]{%
\hsize #2\relax
-%% \textwidth #2\relax
-%% \columnwidth #2\relax
\let\ledllfill\hfil
\let\ledrlfill\hfil
\def\@tempa{#1}\def\@tempb{l}%
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
index 8c75f2dd8a2..ebbf1b6a1c7 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
@@ -27,8 +27,9 @@
+
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2015/11/13 v2.6.0 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2015/11/20 v2.6.1 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -617,7 +618,7 @@
\fi%
\unless\ifnofamiliar@%
\expandafter\newcount\csname footnote#1@reading\endcsname%
- \expandafter\newcount\csname footnote#1@typeset\endcsname%
+ \newcounter{footnote#1@typeset}%
\expandafter\list@create\csname footnote#1@mk\endcsname%
\expandafter\newcommand\csname footnote#1nomk\endcsname[1]{%
\toggletrue{nomk@}%
@@ -650,10 +651,10 @@
}
\newcommand{\get@familiarfootnote@number}{%
\unless\ifnofamiliar@%
- \def\do##1{\global\expandafter\csname footnote##1@typeset\endcsname=\csuse{saved@footnote##1}}%
+ \def\do##1{\setcounter{footnote##1@typeset}{\csuse{saved@footnote##1}}}%
\dolistloop{\@series}%
\fi%
- \global\footnote@typeset=\saved@footnote%
+ \setcounter{footnote@typeset}{\saved@footnote}%
}
\unless\ifnocritical@%
\newhookcommand@series{Xonlyside}%
@@ -668,7 +669,7 @@
}%
\init@series@par%
\newcount\footnote@reading%
-\newcount\footnote@typeset%
+\newcounter{footnote@typeset}%
\list@create{\list@pstartL@pc}%
\list@create{\list@pstartR@pc}%
@@ -1827,7 +1828,7 @@
\expandafter\ifvoid\csname l@dRcolrawbox1\endcsname%
\led@err@Columns@WithoutEnv%
\else%
- \l@dprintingcolumnstrue%
+ \global\l@dprintingcolumnstrue%
\eledsection@correcting@skip=-\baselineskip% Correction for sections' titles
\ifnum\l@dnumpstartsL=\l@dnumpstartsR\else
\led@err@BadLeftRightPstarts{\the\l@dnumpstartsL}{\the\l@dnumpstartsR}%
@@ -1911,7 +1912,9 @@
\global\l@dpscR=\z@
\global\l@dnumpstartsL=\z@
\global\l@dnumpstartsR=\z@
- \l@dprintingcolumnsfalse%
+ \if@ledgroup\else%
+ \global\l@dprintingcolumnsfalse%
+ \fi
\ignorespaces
\global\instanzaLfalse%
\global\instanzaRfalse%
@@ -2104,7 +2107,7 @@
\led@err@BadLeftRightPstarts{\the\l@dnumpstartsL}{\the\l@dnumpstartsR}%
\fi%
\cleartol@devenpage%
- \l@dprintingpagestrue%
+ \global\l@dprintingpagestrue%
\begingroup%
\setlength{\Lcolwidth}{\textwidth}%
\setlength{\Rcolwidth}{\textwidth}%
@@ -2279,7 +2282,9 @@
\global\l@dnumpstartsR=\z@%
\global\instanzaLfalse%
\global\instanzaRfalse%
- \l@dprintingpagesfalse%
+ \if@ledgroup\else%
+ \global\l@dprintingpagesfalse%
+ \fi%
\finish@Pages@notes%Needed to prevent final notes overlap line number
\ignorespaces\fi}