diff options
author | Karl Berry <karl@freefriends.org> | 2010-05-01 23:12:09 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-05-01 23:12:09 +0000 |
commit | 578c49451ae7c084a1f0e78893798cd090e8e8b6 (patch) | |
tree | 633721f7a3b0325f3eeda42c6af62eb7dae8a7d2 /Master/texmf-dist/source | |
parent | 8c9a52b7b8592707848504ed69b7ba02f703ca8a (diff) |
hyperref update (1may10)
git-svn-id: svn://tug.org/texlive/trunk@18073 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r-- | Master/texmf-dist/source/latex/hyperref/hyperref.dtx | 49 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/hyperref/nameref.dtx | 18 |
2 files changed, 56 insertions, 11 deletions
diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx index cb876aacf9e..e7bf90a5451 100644 --- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx @@ -44,7 +44,7 @@ %<puenc>\ProvidesFile{puenc.def} %<puvnenc>\ProvidesFile{puvnenc.def} %<puarenc>\ProvidesFile{puarenc.def} -%<!none> [2010/04/17 v6.80x +%<!none> [2010/05/01 v6.80z %<package> Hypertext links for LaTeX] %<nohyperref> Dummy hyperref (SR)] %<driver> Hyperref documentation driver file] @@ -126,7 +126,7 @@ \end{document} %</driver> % \fi -% \CheckSum{26980} +% \CheckSum{27028} % % \MakeShortVerb{|} % \StopEventually{} @@ -1690,6 +1690,7 @@ {utf16be}{ascii-print}{% \EdefEscapeString\HyPsd@temp\HyPsd@temp \global\let#1\HyPsd@temp + \HyPsd@EscapeTeX#1% \Hy@unicodefalse }{% \HyPsd@ToBigChars#1% @@ -1699,6 +1700,7 @@ {utf16be}{pdfdoc}{% \EdefEscapeString\HyPsd@temp\HyPsd@temp \global\let#1\HyPsd@temp + \HyPsd@EscapeTeX#1% \Hy@unicodefalse }{}% \fi @@ -3689,6 +3691,29 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\HyPsd@EscapeTeX} +% \begin{macrocode} +\begingroup + \lccode`\!=`\%% + \lccode`\|=`\\% + \lccode`\(=`\{% + \lccode`\)=`\}% + \lccode`0=\ltx@zero + \lccode`1=\ltx@zero + \lccode`3=\ltx@zero + \lccode`4=\ltx@zero + \lccode`5=\ltx@zero + \lccode`7=\ltx@zero +\lowercase{\endgroup + \def\HyPsd@EscapeTeX#1{% + \HyPsd@Subst!{|045}#1% + \HyPsd@Subst({|173}#1% + \HyPsd@Subst){|175}#1% + }% +} +% \end{macrocode} +% \end{macro} +% % \subsubsection{Support for package \texttt{xspace}} % \begin{macro}{\HyPsd@doxspace} % \cs{xspace} does not work, because it uses a \cs{futurelet} @@ -5231,10 +5256,10 @@ \let#1\@empty \fi \ifx#1\@undefined - \edef#1{\the\@temptokena}% + \edef#1{\the\@temptokena}% \else - \toks@\expandafter{#1}% - \edef#1{\the\toks@\the\@temptokena}% + \toks@\expandafter{#1}% + \edef#1{\the\toks@\the\@temptokena}% \fi \@temptokena{}\toks@\@temptokena } @@ -5242,6 +5267,13 @@ % % \begin{macrocode} \def\HyLang@DeclareLang#1#2#3{% + \@ifpackagewith{babel}{#1}{% + \expandafter\HyLang@addto + \csname extras#1\expandafter\endcsname + \csname HyLang@#2\endcsname + #3% + \@namedef{HyLang@#1@done}{}% + }{}% \begingroup \edef\x##1##2{% \noexpand\ifx##2\relax @@ -5249,8 +5281,11 @@ \noexpand\fi \endgroup \noexpand\define@key{Hyp}{#1}[]{% - \noexpand\HyLang@addto{\noexpand##1}{\noexpand##2}% - #3% + \noexpand\@ifundefined{HyLang@#1@done}{% + \noexpand\HyLang@addto{\noexpand##1}{\noexpand##2}% + #3% + \noexpand\@namedef{HyLang@#1@done}{}% + }{}% }% }% \expandafter\x\csname extras#1\expandafter\endcsname diff --git a/Master/texmf-dist/source/latex/hyperref/nameref.dtx b/Master/texmf-dist/source/latex/hyperref/nameref.dtx index c8e9eb72bb6..df0f7049fc6 100644 --- a/Master/texmf-dist/source/latex/hyperref/nameref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/nameref.dtx @@ -30,9 +30,9 @@ %<driver>\ProvidesFile{nameref.drv} % \fi % \ProvidesFile{nameref.dtx} - [2010/04/17 v2.39 Cross-referencing by name of section]% + [2010/04/30 v2.40 Cross-referencing by name of section]% % -% \CheckSum{691} +% \CheckSum{698} % % \iffalse %<*driver> @@ -356,11 +356,9 @@ \NR@@caption{#1}[{#2}]% }% }% -} % \end{macrocode} % % \begin{macrocode} -\AtBeginDocument{% \@ifpackageloaded{longtable}{% \let\NRorg@LT@c@ption\LT@c@ption \def\LT@c@ption#1[#2]#3{% @@ -372,6 +370,18 @@ \fi }% }{}% +% \end{macrocode} +% +% Environment `description'. +% \begin{macrocode} + \ltx@IfUndefined{descriptionlabel}{% + }{% + \let\NRorg@descriptionlabel\descriptionlabel + \def\descriptionlabel#1{% + \NR@gettitle{#1}% + \NRorg@descriptionlabel{#1}% + }% + }% } % \end{macrocode} % |