summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-12-31 01:34:57 +0000
committerKarl Berry <karl@freefriends.org>2009-12-31 01:34:57 +0000
commit281c80135e585c4c2209f61daa7fc7f056671e0b (patch)
treeb2608b988f6ebd5533ce1e49151231e4a1ef15cc /Master
parent0136e7def8e31b9fe05c5d8142ca3cd629c13e2c (diff)
tocbibind update (28dec09)
git-svn-id: svn://tug.org/texlive/trunk@16543 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/tocbibind/README9
-rw-r--r--Master/texmf-dist/doc/latex/tocbibind/tocbibind.pdfbin190249 -> 333187 bytes
-rw-r--r--Master/texmf-dist/source/latex/tocbibind/tocbibind.dtx32
-rw-r--r--Master/texmf-dist/tex/latex/tocbibind/tocbibind.sty14
4 files changed, 15 insertions, 40 deletions
diff --git a/Master/texmf-dist/doc/latex/tocbibind/README b/Master/texmf-dist/doc/latex/tocbibind/README
index 2fe255c19c5..c1cb6c23239 100644
--- a/Master/texmf-dist/doc/latex/tocbibind/README
+++ b/Master/texmf-dist/doc/latex/tocbibind/README
@@ -4,7 +4,14 @@ The TOCBIBIND package
The tocbibind package can be used to add the ToC and/or bibliography
and/or the index etc., to the Table of Contents listing.
-Changes in version 1.5i (2009/09/04)
+______________
+Change History
+
+Version 1.5j (2009/12/28)
+- Internal changes: \phantomsection is no longer needed
+ for hyperref support
+
+Version 1.5i (2009/09/04)
- New maintainer (Will Robertson)
Changes in version 1.5h (2004/05/10)
diff --git a/Master/texmf-dist/doc/latex/tocbibind/tocbibind.pdf b/Master/texmf-dist/doc/latex/tocbibind/tocbibind.pdf
index 807c510ab00..1cda766da0b 100644
--- a/Master/texmf-dist/doc/latex/tocbibind/tocbibind.pdf
+++ b/Master/texmf-dist/doc/latex/tocbibind/tocbibind.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/tocbibind/tocbibind.dtx b/Master/texmf-dist/source/latex/tocbibind/tocbibind.dtx
index 02a44a7456a..70865ce926a 100644
--- a/Master/texmf-dist/source/latex/tocbibind/tocbibind.dtx
+++ b/Master/texmf-dist/source/latex/tocbibind/tocbibind.dtx
@@ -27,7 +27,7 @@
%
% \fi
%
-% \CheckSum{471}
+% \CheckSum{464}
%
% \DoNotIndex{\',\.,\@M,\@@input,\@addtoreset,\@arabic,\@badmath}
% \DoNotIndex{\@centercr,\@cite}
@@ -113,6 +113,8 @@
% \def\filedate{2004/05/10}
% \def\fileversion{v1.5i}
% \def\filedate{2009/09/04}
+% \def\fileversion{v1.5j}
+% \def\filedate{2009/12/28}
% \newcommand*{\Lpack}[1]{\textsf {#1}} ^^A typeset a package
% \newcommand*{\Lopt}[1]{\textsf {#1}} ^^A typeset an option
% \newcommand*{\file}[1]{\texttt {#1}} ^^A typeset a file
@@ -149,7 +151,7 @@
%
%
% \section{Introduction}
-%n
+%
% Questions about adding the bibliography to the Table of Contents
% seem to pop up fairly regularly on the
% \texttt{comp.text.tex} newsgroup.
@@ -648,17 +650,6 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\phantomsection}
-% |\phantomsection| is needed if the \Lpack{hyperref} package is used to
-% give some sort of mark for |\addcontentsline|. Read the \Lpack{hyperref}
-% documentation to see if you can work out why.
-% \changes{v1.5}{2001/04/17}{Provided \cs{phantomsection} for use with hyperref package}
-% \begin{macrocode}
-\providecommand{\phantomsection}{}
-
-% \end{macrocode}
-% \end{macro}
-%
% \begin{macro}{\tocetcmark}
% \begin{macro}{\prw@mkboth}
% \begin{macro}{\toc@section}
@@ -682,7 +673,6 @@
% \cs{tocetcmark}}
% \begin{macrocode}
\newcommand{\prw@mkboth}[1]{\tocetcmark{#1}}
-
% \end{macrocode}
%
% |\toc@section{|\meta{sec}|}{|\meta{text}|}| is a generalised version
@@ -692,15 +682,13 @@
% that it makes no entry into the ToC.
% \changes{v1.5}{2001/04/17}{Added \cs{phantomsection} to \cs{toc@section}
% and \cs{toc@chapter}}
+% \changes{v1.5j}{2009/12/28}{Removed \cs{phantomsection}}
% \begin{macrocode}
\newcommand{\toc@section}[2]{%
\@nameuse{#1}*{#2\prw@mkboth{#2}}
- \phantomsection
\addcontentsline{toc}{#1}{#2}}
-
\newcommand{\toc@headstar}[2]{%
\@nameuse{#1}*{{#2}}}
-
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -723,12 +711,11 @@
% well.
%
% \changes{v1.5g}{2003/03/13}{Minor, but vital, change to \cs{toc@chapter}}
+% \changes{v1.5j}{2009/12/28}{Removed \cs{phantomsection}}
% \begin{macrocode}
\newcommand{\toc@chapter}[1]{%
\chapter*{#1}\prw@mkboth{#1}
- \phantomsection
\addcontentsline{toc}{chapter}{#1}}
-
% \end{macrocode}
% \end{macro}
%
@@ -745,7 +732,6 @@
\else
\newcommand{\tocbibname}{\bibname}
\fi
-
% \end{macrocode}
% \end{macro}
%
@@ -769,7 +755,6 @@
\providecommand{\listfigurename}{List of Figures}
\newcommand{\setlofname}[1]{\renewcommand{\listfigurename}{#1}}
\newcommand{\settocbibname}[1]{\renewcommand{\tocbibname}{#1}}
-
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -962,13 +947,13 @@
% \changes{v1.3}{1999/08/22}{Assorted changes for the index}
% \changes{v1.5}{2001/04/17}{Added \cs{phantomsection} to the theindex environment}
% \changes{v1.5f}{2003/02/04}{Replaced \cs{MakeUppercase} code from theindex environment}
+% \changes{v1.5j}{2009/12/28}{Removed \cs{phantomsection}}
% \begin{macrocode}
\if@bibchapter
\if@donumindex
\refstepcounter{chapter}
\twocolumn[\vspace*{2\topskip}%
\@makechapterhead{\indexname}]%
- \phantomsection
\addcontentsline{toc}{chapter}{\protect\numberline{\thechapter}\indexname}
\chaptermark{\indexname}
\else
@@ -976,7 +961,6 @@
\twocolumn[\vspace*{2\topskip}%
\@makeschapterhead{\indexname}]%
\prw@mkboth{\indexname}
- \phantomsection
\addcontentsline{toc}{chapter}{\indexname}
\else
\twocolumn[\vspace*{2\topskip}%
@@ -994,7 +978,6 @@
\twocolumn[\vspace*{-1.5\topskip}%
\toc@headstar{\@tocextra}{\indexname}]%
\prw@mkboth{\indexname}
- \phantomsection
\addcontentsline{toc}{\@tocextra}{\indexname}
\else
\twocolumn[\vspace*{-1.5\topskip}%
@@ -1033,7 +1016,6 @@
\if@bibchapter
\if@restonecol\twocolumn\fi
\fi}
-
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/Master/texmf-dist/tex/latex/tocbibind/tocbibind.sty b/Master/texmf-dist/tex/latex/tocbibind/tocbibind.sty
index ce9626016fd..5ab474379f1 100644
--- a/Master/texmf-dist/tex/latex/tocbibind/tocbibind.sty
+++ b/Master/texmf-dist/tex/latex/tocbibind/tocbibind.sty
@@ -102,25 +102,17 @@
\newcommand{\@tocextra}{section}
\newcommand{\tocotherhead}[1]{\renewcommand{\@tocextra}{#1}}
-\providecommand{\phantomsection}{}
-
\newcommand{\tocetcmark}[1]{%
\@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
\newcommand{\prw@mkboth}[1]{\tocetcmark{#1}}
-
\newcommand{\toc@section}[2]{%
\@nameuse{#1}*{#2\prw@mkboth{#2}}
- \phantomsection
\addcontentsline{toc}{#1}{#2}}
-
\newcommand{\toc@headstar}[2]{%
\@nameuse{#1}*{{#2}}}
-
\newcommand{\toc@chapter}[1]{%
\chapter*{#1}\prw@mkboth{#1}
- \phantomsection
\addcontentsline{toc}{chapter}{#1}}
-
\ifx\bibname\undefined
\ifx\refname\undefined
\newcommand{\tocbibname}{References}
@@ -130,7 +122,6 @@
\else
\newcommand{\tocbibname}{\bibname}
\fi
-
\providecommand{\indexname}{Index}
\newcommand{\setindexname}[1]{\renewcommand{\indexname}{#1}}
\providecommand{\contentsname}{Contents}
@@ -140,7 +131,6 @@
\providecommand{\listfigurename}{List of Figures}
\newcommand{\setlofname}[1]{\renewcommand{\listfigurename}{#1}}
\newcommand{\settocbibname}[1]{\renewcommand{\tocbibname}{#1}}
-
\newcommand{\t@cb@bchapsec}{%
\if@bibchapter
\if@donumbib
@@ -220,7 +210,6 @@
\refstepcounter{chapter}
\twocolumn[\vspace*{2\topskip}%
\@makechapterhead{\indexname}]%
- \phantomsection
\addcontentsline{toc}{chapter}{\protect\numberline{\thechapter}\indexname}
\chaptermark{\indexname}
\else
@@ -228,7 +217,6 @@
\twocolumn[\vspace*{2\topskip}%
\@makeschapterhead{\indexname}]%
\prw@mkboth{\indexname}
- \phantomsection
\addcontentsline{toc}{chapter}{\indexname}
\else
\twocolumn[\vspace*{2\topskip}%
@@ -246,7 +234,6 @@
\twocolumn[\vspace*{-1.5\topskip}%
\toc@headstar{\@tocextra}{\indexname}]%
\prw@mkboth{\indexname}
- \phantomsection
\addcontentsline{toc}{\@tocextra}{\indexname}
\else
\twocolumn[\vspace*{-1.5\topskip}%
@@ -274,7 +261,6 @@
\if@bibchapter
\if@restonecol\twocolumn\fi
\fi}
-
\newcommand{\tocfile}[2]{%
\toc@start
\if@bibchapter