From 94c804f3e14cfc7bc3db28eeda8ea83737497a11 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 5 Mar 2015 23:24:10 +0000 Subject: etoc (5mar15) git-svn-id: svn://tug.org/texlive/trunk@36442 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/etoc/etoc.sty | 34 ++++++++++++++++++------------- 1 file changed, 20 insertions(+), 14 deletions(-) (limited to 'Master/texmf-dist/tex/latex/etoc') diff --git a/Master/texmf-dist/tex/latex/etoc/etoc.sty b/Master/texmf-dist/tex/latex/etoc/etoc.sty index ee4347bfd00..22acc4278c8 100644 --- a/Master/texmf-dist/tex/latex/etoc/etoc.sty +++ b/Master/texmf-dist/tex/latex/etoc/etoc.sty @@ -23,10 +23,10 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{etoc} - [2015/01/23 v1.07m Completely customisable TOCs (jfB)] + [2015/03/05 v1.07n Completely customisable TOCs (jfB)] %% %% Package: etoc -%% Version: 1.07m (2015/01/23) +%% Version: 1.07n (2015/03/05) %% License: LPPL 1.3c or later (see etoc.dtx) %% Copyright (C) 2012-2015 Jean-Francois Burnol %% Copyright (C) 2014-2015 Christine Roemer @@ -329,8 +329,9 @@ \@namedef{etoclink }##1{\leavevmode #1{#2}{#3}{##1}#5}% \edef\etocthelink ##1{\noexpand\hyperlink {#3}{##1}}% \def\etocthepage {#4}% - \toks@ {#4}% - \edef\etocthelinkedpage {\noexpand\hyperlink {#3}{\the\toks@}}% + \edef\Etoc@tmp {{#3}}% + \expandafter\def\expandafter\etocthelinkedpage\expandafter + {\expandafter\hyperlink \Etoc@tmp{#4}}% } \def\Etoc@getnb #1{% \let\Etoc@next\Etoc@getnb@nohyp @@ -369,15 +370,17 @@ \def\Etoc@getname ##1\relax\relax\etoc@ {% \@namedef {etocname }{\leavevmode #1{#2}{#3}{##1}#5}% \def\etocthename {##1}% - \toks@ {##1}% - \edef\etocthelinkedname {\noexpand\hyperlink {#3}{\the\toks@}}% + \edef\Etoc@tmp {{#3}}% + \expandafter\def\expandafter\etocthelinkedname\expandafter + {\expandafter\hyperlink \Etoc@tmp{##1}}% }% \def\Etoc@getnbr ##1##2##3\etoc@ {% \ifx ##1\numberline \@namedef {etocnumber }{\leavevmode #1{#2}{#3}{##2}#5}% \def\etocthenumber {##2}% - \toks@ {##2}% - \edef\etocthelinkednumber {\noexpand\hyperlink {#3}{\the\toks@}}% + \edef\Etoc@tmp {{#3}}% + \expandafter\def\expandafter\etocthelinkednumber\expandafter + {\expandafter\hyperlink \Etoc@tmp{##2}}% \Etoc@numbertrue \Etoc@getname ##3\etoc@ \else @@ -386,8 +389,9 @@ \let\etocthelinkednumber \@empty \Etoc@numberfalse \def\etocthename {#4}% - \toks@ {#4}% - \edef\etocthelinkedname {\noexpand\hyperlink {#3}{\the\toks@}}% + \edef\Etoc@tmp {{#3}}% + \expandafter\def\expandafter\etocthelinkedname\expandafter + {\expandafter\hyperlink \Etoc@tmp{#4}}% \fi }% \@namedef {etoclink }##1{\leavevmode #1{#2}{#3}{##1}#5}% @@ -412,15 +416,17 @@ \def\Etoc@getname ##1\hspace\relax\etoc@ {% \@namedef {etocname }{\leavevmode #1{#2}{#3}{##1}#5}% \def\etocthename {##1}% - \toks@ {##1}% - \edef\etocthelinkedname {\noexpand\hyperlink {#3}{\the\toks@}}% + \edef\Etoc@tmp {{#3}}% + \expandafter\def\expandafter\etocthelinkedname\expandafter + {\expandafter\hyperlink \Etoc@tmp{##1}}% }% \def\Etoc@getnbr ##1\hspace##2##3\etoc@ {% \ifx\relax##2\else \@namedef {etocnumber }{\leavevmode #1{#2}{#3}{##1}#5}% \def\etocthenumber {##1}% - \toks@ {##1}% - \edef\etocthelinkednumber {\noexpand\hyperlink {#3}{\the\toks@}}% + \edef\Etoc@tmp {{#3}}% + \expandafter\def\expandafter\etocthelinkednumber\expandafter + {\expandafter\hyperlink \Etoc@tmp{##1}}% \Etoc@numbertrue \Etoc@getname ##3\etoc@ \fi -- cgit v1.2.3