summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2006-12-22 22:46:31 +0000
committerKarl Berry <karl@freefriends.org>2006-12-22 22:46:31 +0000
commit65cf1dc9000c3472b91acf91089dd74bc4474357 (patch)
tree9f29681c803329fee7cb244f24c04f94f1305fab /Master/texmf-dist/source
parentc8793f6e89dc7e05db9b8d75f07881dbbd5979d5 (diff)
hyperref update
git-svn-id: svn://tug.org/texlive/trunk@2846 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/hyperref/hyperref.dtx6
-rw-r--r--Master/texmf-dist/source/latex/hyperref/nameref.dtx29
2 files changed, 20 insertions, 15 deletions
diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
index d83117dc5b7..a00d005e080 100644
--- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
+++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
@@ -37,7 +37,7 @@
%<pd1enc>\ProvidesFile{pd1enc.def}
%<puenc>\ProvidesFile{puenc.def}
%<puvnenc>\ProvidesFile{puvnenc.def}
-%<!none> [2006/12/21 v6.75i
+%<!none> [2006/12/21 v6.75j
%<package> Hypertext links for LaTeX]
%<nohyperref> Dummy hyperref (SR)]
%<driver> Hyperref documentation driver file]
@@ -687,8 +687,8 @@
% Babel's switch setting commands cannot used directly,
% because they can be undefined if babel is not loaded.
% \begin{macrocode}
-\def\Hy@safe@activestrue{\csname safe@activestrue\endcsname}
-\def\Hy@safe@activesfalse{\csname safe@activesfalse\endcsname}
+\def\Hy@safe@activestrue{\csname @safe@activestrue\endcsname}
+\def\Hy@safe@activesfalse{\csname @safe@activesfalse\endcsname}
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/Master/texmf-dist/source/latex/hyperref/nameref.dtx b/Master/texmf-dist/source/latex/hyperref/nameref.dtx
index 92f6d6b2af5..212de866f7f 100644
--- a/Master/texmf-dist/source/latex/hyperref/nameref.dtx
+++ b/Master/texmf-dist/source/latex/hyperref/nameref.dtx
@@ -24,9 +24,9 @@
%<driver>\ProvidesFile{nameref.drv}
% \fi
% \ProvidesFile{nameref.dtx}
- [2006/08/15 v2.26 Cross-referencing by name of section]
+ [2006/12/21 v2.27 Cross-referencing by name of section]
%
-% \CheckSum{487}
+% \CheckSum{493}
%
% \iffalse
%<*driver>
@@ -118,14 +118,16 @@
\begingroup
\let\label\@gobble
\def\ref{\protect\ref}%
- \edef\@currentlabstr{%
- \expandafter\strip@prefix\meaning\@currentlabelname
+ \protected@edef\@currentlabelname{\@currentlabelname}%
+ \@onelevel@sanitize\@currentlabelname
+ \edef\@currentlabelname{%
+ \expandafter\strip@period\@currentlabelname\relax.\relax\@@@%
}%
\protected@write\@auxout{}{%
\string\newlabel{#1}{%
{\@currentlabel}%
{\thepage}%
- {\expandafter\strip@period\@currentlabstr\relax.\relax\@@@}%
+ {\@currentlabelname}%
{\@currentHref}{}%
}%
}%
@@ -139,14 +141,16 @@
\begingroup
\let\label\@gobble
\def\ref{\protect\ref}%
- \edef\@currentlabstr{%
- \expandafter\strip@prefix\meaning\@currentlabelname
+ \protected@edef\@currentlabelname{\@currentlabelname}%
+ \@onelevel@sanitize\@currentlabelname
+ \edef\@currentlabelname{%
+ \expandafter\strip@period\@currentlabelname\relax.\relax\@@@%
}%
\protected@write\@auxout{}{%
\string\newlabel{#1}{%
{\@currentlabel}%
{\thepage}%
- {\expandafter\strip@period\@currentlabstr\relax.\relax\@@@}%
+ {\@currentlabelname}%
{\@currentHref}{}%
}%
}%
@@ -167,8 +171,10 @@
{%
\let\label\@gobble
\def\ref{\protect\ref}%
- \edef\@currentlabstr{%
- \expandafter\strip@prefix\meaning\@currentlabelname
+ \protected@edef\@currentlabelname{\@currentlabelname}%
+ \@onelevel@sanitize\@currentlabelname
+ \edef\@currentlabelname{%
+ \expandafter\strip@period\@currentlabelname\relax.\relax\@@@%
}%
\let\thepage\relax
\def\protect{\noexpand\noexpand\noexpand}%
@@ -177,8 +183,7 @@
\string\newlabel{#1}{%
{\thesubequation}%
{\thepage}%
- {\expandafter\strip@period
- \@currentlabstr\relax.\relax\@@@}%
+ {\@currentlabelname}%
{\@currentHref}{}%
}%
}%