diff options
author | Karl Berry <karl@freefriends.org> | 2015-03-14 23:02:20 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-03-14 23:02:20 +0000 |
commit | 1b0fc82b597aca3a7eefc79b4b1079629acbce5e (patch) | |
tree | 8193d5afad178169d56187475ecd965cee97a15a /Master/texmf-dist/tex | |
parent | f8c8d56f3bc874b6b3b0c381a195755dc2db5dad (diff) |
etoc (14mar15)
git-svn-id: svn://tug.org/texlive/trunk@36516 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/etoc/etoc.sty (renamed from Master/texmf-dist/tex/generic/etoc/etoc.sty) | 43 |
1 files changed, 17 insertions, 26 deletions
diff --git a/Master/texmf-dist/tex/generic/etoc/etoc.sty b/Master/texmf-dist/tex/latex/etoc/etoc.sty index 172af134d4e..867aa9278fd 100644 --- a/Master/texmf-dist/tex/generic/etoc/etoc.sty +++ b/Master/texmf-dist/tex/latex/etoc/etoc.sty @@ -23,10 +23,10 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{etoc} - [2015/03/10 v1.08 Completely customisable TOCs (jfB)] + [2015/03/13 v1.08a Completely customisable TOCs (jfB)] %% %% Package: etoc -%% Version: 1.08 (2015/03/10) +%% Version: 1.08a (2015/03/13) %% License: LPPL 1.3c or later (see etoc.dtx) %% Copyright (C) 2012-2015 Jean-Francois Burnol <jfbu at free dot fr> %% Copyright (C) 2014-2015 Christine Roemer <Christine_Roemer at t-online dot de> @@ -296,19 +296,21 @@ \Etoc@et@hop{\Etoc@prefix\Etoc@contents}{\Etoc@savedcontentsline{#1}}% } \def\Etoc@lxyz #1#2{% - \Etoc@global\@namedef {etoclink }{\leavevmode}% fall-back - \Etoc@global\let\etocthelink \@empty % fall-back - \Etoc@global\@namedef {etocname }{\leavevmode #1}% fall-back (perhaps linked) - \Etoc@global\def\etocthename {#1}% (if link, will be removed later) - \Etoc@global\def\etocthelinkedname {#1}% will probably get redefined - \Etoc@global\@namedef {etocpage }{\leavevmode #2}% (perhaps linked) - \Etoc@getthepage #2\etoc@ % defines also \etocthelinkedpage (and \etoclink) - \Etoc@getnb #1\relax\relax\etoc@ % gets number *and* name, and \etoclink - \ifEtoc@number\else + \Etoc@global\@namedef {etoclink }{\leavevmode}% fall-back + \Etoc@global\let\etocthelink \@empty % fall-back + \Etoc@global\def\etocthename {#1}% (if link, will be removed later) + \Etoc@global\def\etocthelinkedname {#1}% will probably get redefined + \Etoc@getthepage #2\etoc@ % defines \etocthelinkedpage (and \etoclink) + \Etoc@getnb #1\relax\relax\etoc@ % gets number *and* name, and \etoclink + \ifEtoc@number\else \ifnum\Etoc@level=\m@ne \Etoc@getit #1\hspace\relax\etoc@ % additional job for parts \fi - \fi} + \fi + \Etoc@global\expandafter\let\csname etocname \endcsname\etocthelinkedname + \Etoc@global\expandafter\let\csname etocnumber \endcsname\etocthelinkednumber + \Etoc@global\expandafter\let\csname etocpage \endcsname\etocthelinkedpage + } \def\Etoc@getthepage #1{% \let\Etoc@next\Etoc@getthepage@nohyp \ifEtoc@hyperref\ifx #1\hyper@linkstart @@ -322,9 +324,8 @@ } \def\Etoc@getthepage@hyp #1#2#3#4#5\etoc@ {% \Etoc@global\@namedef{etoclink }##1{\leavevmode #1{#2}{#3}{##1}#5}% - \Etoc@global\edef\etocthelink ##1{\noexpand\hyperlink {#3}{##1}}% \Etoc@global\def\etocthepage {#4}% - \edef\Etoc@tmp {{#3}}% + \edef\Etoc@tmp {{#3}}% \Etoc@global\expandafter\def\expandafter\etocthelinkedpage\expandafter {\expandafter\hyperlink \Etoc@tmp{#4}}% } @@ -344,26 +345,22 @@ } \def\Etoc@getnb@nohyp #1#2#3\etoc@ {% \def\Etoc@getname ##1\relax\relax\etoc@ {% - \Etoc@global\@namedef {etocname }{\leavevmode ##1}% \Etoc@global\def\etocthename {##1}% \Etoc@global\def\etocthelinkedname {##1}% }% \ifx #1\numberline - \Etoc@global\@namedef {etocnumber }{\leavevmode #2}% \Etoc@global\def\etocthenumber {#2}% \Etoc@global\def\etocthelinkednumber {#2}% \Etoc@global\Etoc@numbertrue \Etoc@getname #3\etoc@ \else % then \etocthename and \etocthelinkedname already defined - \Etoc@global\@namedef {etocnumber }{\leavevmode}% \Etoc@global\let\etocthenumber \@empty \Etoc@global\let\etocthelinkednumber \@empty \Etoc@global\Etoc@numberfalse \fi } \def\Etoc@getnb@hyp #1#2#3#4#5#6\etoc@ {% - \Etoc@global\def\Etoc@getname ##1\relax\relax\etoc@ {% - \Etoc@global\@namedef {etocname }{\leavevmode #1{#2}{#3}{##1}#5}% + \def\Etoc@getname ##1\relax\relax\etoc@ {% \Etoc@global\def\etocthename {##1}% \edef\Etoc@tmp {{#3}}% \Etoc@global\expandafter\def\expandafter\etocthelinkedname\expandafter @@ -371,7 +368,6 @@ }% \def\Etoc@getnbr ##1##2##3\etoc@ {% \ifx ##1\numberline - \Etoc@global\@namedef {etocnumber }{\leavevmode #1{#2}{#3}{##2}#5}% \Etoc@global\def\etocthenumber {##2}% \edef\Etoc@tmp {{#3}}% \Etoc@global\expandafter\def\expandafter\etocthelinkednumber @@ -379,7 +375,6 @@ \Etoc@global\Etoc@numbertrue \Etoc@getname ##3\etoc@ \else - \Etoc@global\@namedef {etocnumber }{\leavevmode}% \Etoc@global\let\etocthenumber \@empty \Etoc@global\let\etocthelinkednumber \@empty \Etoc@global\Etoc@numberfalse @@ -395,12 +390,10 @@ } \def\Etoc@getit@nohyp #1\hspace#2#3\etoc@ {% \def\Etoc@getname ##1\hspace\relax\etoc@ {% - \Etoc@global\@namedef {etocname }{\leavevmode ##1}% \Etoc@global\def\etocthename {##1}% \Etoc@global\def\etocthelinkedname {##1}% }% \ifx\relax#2\else - \Etoc@global\@namedef {etocnumber }{\leavevmode #1}% \Etoc@global\def\etocthenumber {#1}% \Etoc@global\def\etocthelinkednumber {#1}% \Etoc@global\Etoc@numbertrue @@ -409,7 +402,6 @@ } \def\Etoc@getit@hyp #1#2#3#4#5#6\etoc@ {% \def\Etoc@getname ##1\hspace\relax\etoc@ {% - \Etoc@global\@namedef {etocname }{\leavevmode #1{#2}{#3}{##1}#5}% \Etoc@global\def\etocthename {##1}% \edef\Etoc@tmp {{#3}}% \Etoc@global\expandafter\def\expandafter\etocthelinkedname @@ -417,7 +409,6 @@ }% \def\Etoc@getnbr ##1\hspace##2##3\etoc@ {% \ifx\relax##2\else - \Etoc@global\@namedef {etocnumber }{\leavevmode #1{#2}{#3}{##1}#5}% \Etoc@global\def\etocthenumber {##1}% \edef\Etoc@tmp {{#3}}% \Etoc@global\expandafter\def\expandafter\etocthelinkednumber @@ -456,7 +447,7 @@ } \Etoc@toctoks {}% (superfluous, but for clarity) \AtBeginDocument{\IfFileExists{\jobname.toc} - {{\endlinechar=-1 + {{\endlinechar=\m@ne \makeatletter \newread\Etoc@tf \openin\Etoc@tf\@filef@und |