diff options
| author | Karl Berry <karl@freefriends.org> | 2012-08-19 22:19:14 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2012-08-19 22:19:14 +0000 |
| commit | fc31e4178a0deb96c5f9c78ef8b269e4210473b6 (patch) | |
| tree | a6a78f526b852fc78a521fa2355bf113f4271b81 | |
| parent | 193b74d3d594d824d23f6413dd0d784fd4a756fc (diff) | |
hyperref (19aug12)
git-svn-id: svn://tug.org/texlive/trunk@27461 c570f23f-e606-0410-a88d-b1316a301751
34 files changed, 203 insertions, 49 deletions
diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog b/Master/texmf-dist/doc/latex/hyperref/ChangeLog index 6f3fcceb9bc..fdeebd3b5d8 100644 --- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog +++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog @@ -1,3 +1,12 @@ +2012-08-18 6.83b Heiko Oberdiek + * 6.83b + * pd1enc.def: \ij and \IJ fixed, now they expand to `ij' and `IJ' + (these glyphs are not available in PDFDocEncoding). + * Shorthands of babel deactivated in \hyper@makecurrent (destination names) + and the destination name of \contentsline. + * \XeTeXLinkBox with \XeTeXLinkMargin added for XeTeX if the link + does not contain character glyphs. + 2012-08-13 6.83a Heiko Oberdiek * 6.83a * Syntax fixes in additions for puenc.def. diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf Binary files differindex de92469f752..9daa86f557e 100644 --- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf +++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf diff --git a/Master/texmf-dist/doc/latex/hyperref/README b/Master/texmf-dist/doc/latex/hyperref/README index ac0d8eb8f66..6c05f2b3082 100644 --- a/Master/texmf-dist/doc/latex/hyperref/README +++ b/Master/texmf-dist/doc/latex/hyperref/README @@ -1,4 +1,4 @@ -README for hyperref bundle, 2012/07/28 +README for hyperref bundle, 2012/08/18 TABLE OF CONTENTS @@ -198,6 +198,31 @@ Option `psdextra that the short names are available. Then \geq can directly be used instead of \textgeq. +\XeTeXLinkBox +------------- + When XeTeX generates a link annotation, it does not look + at the boxes (as the other drivers), but only at the character + glyphs. If there are no glyphs (images, rules, ...), then + it does not generate a link annotation. Macro \XeTeXLinkBox + puts its argument in a box and adds spaces at the lower left + and upper right corners. An additional margin can be specified + by setting it to the dimen register \XeTeXLinkMargin. The default + is 2pt. + + Example: + % xelatex + \documentclass{article} + \usepackage{hyperref} + \setlength{\XeTeXLinkMargin}{1pt} + \begin{document} + \section{Hello World} + \newpage + \label{sec:hello} + \hyperref[sec:hello]{% + \XeTeXLinkBox{\rule{10mm}{10mm}}% + } + \end{document} + \IfHyperBooleanExists and \IfHyperBoolean ----------------------------------------- \IfHyperBooleanExists{OPTION}{YES}{NO} diff --git a/Master/texmf-dist/doc/latex/hyperref/README.pdf b/Master/texmf-dist/doc/latex/hyperref/README.pdf Binary files differindex 695f0b9faf3..2af52e0da00 100644 --- a/Master/texmf-dist/doc/latex/hyperref/README.pdf +++ b/Master/texmf-dist/doc/latex/hyperref/README.pdf diff --git a/Master/texmf-dist/doc/latex/hyperref/backref.pdf b/Master/texmf-dist/doc/latex/hyperref/backref.pdf Binary files differindex 9aed78ef1cd..8b224cf337e 100644 --- a/Master/texmf-dist/doc/latex/hyperref/backref.pdf +++ b/Master/texmf-dist/doc/latex/hyperref/backref.pdf diff --git a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf Binary files differindex 54978bfdbc0..50fdd3a5281 100644 --- a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf +++ b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf diff --git a/Master/texmf-dist/doc/latex/hyperref/manual.html b/Master/texmf-dist/doc/latex/hyperref/manual.html index a48f64d15b1..9a32c97c2dd 100644 --- a/Master/texmf-dist/doc/latex/hyperref/manual.html +++ b/Master/texmf-dist/doc/latex/hyperref/manual.html @@ -7,7 +7,7 @@ <meta name="originator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)"> <!-- html --> <meta name="src" content="manual.tex"> -<meta name="date" content="2012-07-28 19:33:00"> +<meta name="date" content="2012-08-18 23:33:00"> <link rel="stylesheet" type="text/css" href="manual.css"> </head><body > @@ -1210,9 +1210,8 @@ class="td11"> type of link. At present the only types of link distinguished are citations, page references, URLs, local file references, - and other links. In spite of colored - boxes, the colored text remains when - printing. </td> + and other links. Unlike colored boxes, + the colored text remains when printing. </td> </tr><tr style="vertical-align:baseline;" id="TBL-6-12-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-12-1" class="td11"> <span @@ -1342,8 +1341,6 @@ id="TBL-7-1"><col id="TBL-7-2"><col id="TBL-7-3"><col id="TBL-7-4"></colgroup> - - <tr style="vertical-align:baseline;" id="TBL-7-1-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-1-1" class="td01"><span @@ -1367,6 +1364,8 @@ class="ec-lmvtt-10">.out </span>file is not rewritten class="E">E</span>X</span></span> if it is edited to contain a line <span class="obeylines-h"><span class="verb"><span class="ec-lmvtt-10">\let\WriteBookmarks\relax</span></span></span> </td> + + </tr><tr style="vertical-align:baseline;" id="TBL-7-2-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-2-1" class="td01"><span @@ -1499,8 +1498,6 @@ class="td11"> <span class="ec-lmri-10">0 .7 .7 </span></td><td style="white-space:wrap; text-align:left;" id="TBL-7-13-4" class="td10"> <!--l. 687--><p class="noindent" >Color of border around ‘run’ links </td> - - </tr><tr style="vertical-align:baseline;" id="TBL-7-14-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-14-1" class="td01"><span @@ -1536,6 +1533,8 @@ class="td11"> </td><td style="white-space:nowrap; text-align:left;" i class="td11"> </td><td style="white-space:wrap; text-align:left;" id="TBL-7-19-4" class="td10"></td></tr> </table></div> + + <!--l. 693--><p class="indent" > Note that the color of link borders can be specified <span class="ec-lmri-10">only </span>as 3 numbers in the range 0..1, giving an RGB color. You cannot use colors defined in <span class="TEX">T<span diff --git a/Master/texmf-dist/doc/latex/hyperref/manual.pdf b/Master/texmf-dist/doc/latex/hyperref/manual.pdf Binary files differindex 1951b0a54f0..8e629da618f 100644 --- a/Master/texmf-dist/doc/latex/hyperref/manual.pdf +++ b/Master/texmf-dist/doc/latex/hyperref/manual.pdf diff --git a/Master/texmf-dist/doc/latex/hyperref/manual2.html b/Master/texmf-dist/doc/latex/hyperref/manual2.html index f66a98c8c1a..ce991186265 100644 --- a/Master/texmf-dist/doc/latex/hyperref/manual2.html +++ b/Master/texmf-dist/doc/latex/hyperref/manual2.html @@ -7,7 +7,7 @@ <meta name="originator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)"> <!-- html --> <meta name="src" content="manual.tex"> -<meta name="date" content="2012-07-28 19:33:00"> +<meta name="date" content="2012-08-18 23:33:00"> <link rel="stylesheet" type="text/css" href="manual.css"> </head><body > diff --git a/Master/texmf-dist/doc/latex/hyperref/manual3.html b/Master/texmf-dist/doc/latex/hyperref/manual3.html index 8e1be79b083..2d16ffd93b8 100644 --- a/Master/texmf-dist/doc/latex/hyperref/manual3.html +++ b/Master/texmf-dist/doc/latex/hyperref/manual3.html @@ -7,7 +7,7 @@ <meta name="originator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)"> <!-- html --> <meta name="src" content="manual.tex"> -<meta name="date" content="2012-07-28 19:33:00"> +<meta name="date" content="2012-08-18 23:33:00"> <link rel="stylesheet" type="text/css" href="manual.css"> </head><body > diff --git a/Master/texmf-dist/doc/latex/hyperref/nameref.pdf b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf Binary files differindex f88bad25af0..9f0b6f21b37 100644 --- a/Master/texmf-dist/doc/latex/hyperref/nameref.pdf +++ b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf diff --git a/Master/texmf-dist/source/latex/hyperref/doc/manual.tex b/Master/texmf-dist/source/latex/hyperref/doc/manual.tex index bea7ed948c6..788a17e3e70 100644 --- a/Master/texmf-dist/source/latex/hyperref/doc/manual.tex +++ b/Master/texmf-dist/source/latex/hyperref/doc/manual.tex @@ -630,7 +630,7 @@ breaklinks & boolean & false & allow links to break over lines by making l colorlinks & boolean & false & Colors the text of links and anchors. The colors chosen depend on the the type of link. At present the only types of link distinguished are citations, page references, URLs, local file references, and other links. - In spite of colored boxes, the colored + Unlike colored boxes, the colored text remains when printing.\\ linkcolor & color & red & Color for normal internal links. \\ anchorcolor & color & black & Color for anchor text. \\ diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx index a57d98ec554..abbd9b2287c 100644 --- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx @@ -45,7 +45,7 @@ %<puvnenc>\ProvidesFile{puvnenc.def} %<puarenc>\ProvidesFile{puarenc.def} %<psdextra>\ProvidesFile{psdextra.def} -%<!none> [2012/08/13 v6.83a % +%<!none> [2012/08/18 v6.83b % %<package> Hypertext links for LaTeX] %<nohyperref> Dummy hyperref (SR)] %<driver> Hyperref documentation driver file] @@ -147,7 +147,7 @@ \end{document} %</driver> % \fi -% \CheckSum{39107} +% \CheckSum{39205} % % \MakeShortVerb{|} % \StopEventually{} @@ -7431,6 +7431,7 @@ % \end{macrocode} % % \section{User hypertext macros}\label{usermacros} +% % We need to normalise all user commands taking a URL argument; % Within the argument the following special definitions apply: % |\#|, |\%|, |~| produce |#|, |%|, |~| respectively. @@ -7792,7 +7793,64 @@ \fi } % \end{macrocode} +% +% \subsection{Link box support for XeTeX} +% +% \begin{macrocode} +\newdimen\XeTeXLinkMargin +\setlength{\XeTeXLinkMargin}{2pt} +\ifxetex + \font\XeTeXLink@font=pzdr at 1sp\relax + \newcommand*{\XeTeXLink@space}{% + \begingroup + \XeTeXLink@font + \@xxxii + \endgroup + }% + \newcommand{\XeTeXLinkBox}[1]{% + \begingroup + \leavevmode + \sbox\z@{#1}% + \begingroup + \dimen@=\dp\z@ + \advance\dimen@\XeTeXLinkMargin + \setbox\tw@=\llap{% + \hb@xt@\XeTeXLinkMargin{% + \lower\dimen@\hbox{\XeTeXLink@space}% + \hss + }% + }% + \dp\tw@=\dp\z@ + \ht\tw@=\ht\z@ + \copy\tw@ + \endgroup + \copy\z@ + \dimen@=\ht\z@ + \advance\dimen@\XeTeXLinkMargin + \setbox\tw@=\rlap{% + \hb@xt@\XeTeXLinkMargin{% + \hss + \raise\dimen@\hbox{\XeTeXLink@space}% + }% + }% + \dp\tw@=\dp\z@ + \ht\tw@=\ht\z@ + \copy\tw@ + \endgroup + }% +\else + \newcommand*{\XeTeXLinkBox}[1]{% + \begingroup + \leavevmode + \sbox\z@{#1}% + \copy\z@ + \endgroup + }% +\fi +% \end{macrocode} +% % \section{Underlying basic hypertext macros}\label{coremacros} +% % Links have an optional type, a filename (possibly a URL), % an internal name, and some marked text. (Caution: the internal % name may contain babel shorthand characters.) @@ -8182,6 +8240,7 @@ % \end{macrocode} % % \section{Compatibility with the \emph{\LaTeX{}2html} package}\label{latex2html} +% % Map our macro names on to Nikos', so that documents prepared % for that system will work without change. % @@ -10517,6 +10576,7 @@ % \begin{macrocode} \def\hyper@makecurrent#1{% \begingroup + \Hy@safe@activestrue \edef\Hy@param{#1}% \ifx\Hy@param\Hy@chapterstring \let\Hy@param\Hy@chapapp @@ -12110,24 +12170,29 @@ \endgroup } \def\contentsline#1#2#3#4{% - \ifx\\#4\\% + \begingroup + \Hy@safe@activestrue + \edef\x{\endgroup + \def\noexpand\Hy@tocdestname{#4}% + }\x + \ifx\Hy@tocdestname\ltx@empty \csname l@#1\endcsname{#2}{#3}% \else \ifcase\Hy@linktoc % none \csname l@#1\endcsname{#2}{#3}% \or % section \csname l@#1\endcsname{% - \hyper@linkstart{link}{#4}{#2}\hyper@linkend + \hyper@linkstart{link}{\Hy@tocdestname}{#2}\hyper@linkend }{#3}% \or % page \csname l@#1\endcsname{{#2}}{% - \hyper@linkstart{link}{#4}{#3}\hyper@linkend + \hyper@linkstart{link}{\Hy@tocdestname}{#3}\hyper@linkend }% \else % all \csname l@#1\endcsname{% - \hyper@linkstart{link}{#4}{#2}\hyper@linkend + \hyper@linkstart{link}{\Hy@tocdestname}{#2}\hyper@linkend }{% - \hyper@linkstart{link}{#4}{#3}\hyper@linkend + \hyper@linkstart{link}{\Hy@tocdestname}{#3}\hyper@linkend }% \fi \fi @@ -20306,7 +20371,7 @@ \DeclareTextCompositeCommand{\v}{PD1}{S}{\227}% U+0160 % U+0178 LATIN CAPITAL LETTER Y WITH DIAERESIS; Ydieresis \DeclareTextCompositeCommand{\"}{PD1}{Y}{\230}% U+0178 -\DeclareTextCommand{\IJ}{PD1}{\230} +\DeclareTextCommand{\IJ}{PD1}{IJ}% ligature U+0049 U+004A % U+017D LATIN CAPITAL LETTER Z WITH CARON; Zcaron \DeclareTextCompositeCommand{\v}{PD1}{Z}{\231}% U+017D % U+0131 LATIN SMALL LETTER DOTLESS I; dotlessi @@ -20525,7 +20590,7 @@ \DeclareTextCommand{\textthorn}{PD1}{\376}%* U+00FE % U+00FF LATIN SMALL LETTER Y WITH DIAERESIS; ydieresis \DeclareTextCompositeCommand{\"}{PD1}{y}{\377}% U+00FF -\DeclareTextCommand{\ij}{PD1}{\377}% U+00FF +\DeclareTextCommand{\ij}{PD1}{ij}% ligature U+0069 U+006A % \end{macrocode} % Glyphs that consist of several characters. % \begin{macrocode} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def index fdf85c81016..ed9dc0194bd 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipdfm.def} - [2012/08/13 v6.83a % + [2012/08/18 v6.83b % Hyperref driver for dvipdfm] \Hy@VersionCheck{hdvipdfm.def} \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def index 46d45bce076..a3aec4555ec 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvips.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvips.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvips.def} - [2012/08/13 v6.83a % + [2012/08/18 v6.83b % Hyperref driver for dvips] \Hy@VersionCheck{hdvips.def} \providecommand*{\XR@ext}{pdf} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def index c46c13a77ae..f6a7f763ac7 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipson.def} - [2012/08/13 v6.83a % + [2012/08/18 v6.83b % Hyperref driver for dvipsone] \Hy@VersionCheck{hdvipson.def} \providecommand*{\XR@ext}{pdf} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def index 19821664d22..d09a5a72cc3 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdviwind.def} - [2012/08/13 v6.83a % + [2012/08/18 v6.83b % Hyperref driver for dviwindo] \Hy@VersionCheck{hdviwind.def} \begingroup diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def index 053c520a579..9470923ad4d 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hpdftex.def} - [2012/08/13 v6.83a % + [2012/08/18 v6.83b % Hyperref driver for pdfTeX] \Hy@VersionCheck{hpdftex.def} \pdf@ifdraftmode{% diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg index a8f4c85d86f..614e18a8226 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.cfg} - [2012/08/13 v6.83a % + [2012/08/18 v6.83b % Hyperref configuration file for TeX4ht] \IfFileExists{\jobname.cfg}{\endinput}{} \Preamble{html} diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def index c2fde91003e..ce12e8a20f7 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.def} - [2012/08/13 v6.83a % + [2012/08/18 v6.83b % Hyperref driver for TeX4ht] \Hy@VersionCheck{htex4ht.def} \providecommand*{\XR@ext}{html} diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def index 27f74b605b4..2df1c217e4d 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htexture.def +++ b/Master/texmf-dist/tex/latex/hyperref/htexture.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htexture.def} - [2012/08/13 v6.83a % + [2012/08/18 v6.83b % Hyperref driver for Textures] \Hy@VersionCheck{htexture.def} \providecommand*{\XR@ext}{pdf} diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def index daf67e75df0..c02d81aff22 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtex.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtex.def} - [2012/08/13 v6.83a % + [2012/08/18 v6.83b % Hyperref driver for VTeX in PDF/PS mode] \Hy@VersionCheck{hvtex.def} \providecommand*{\XR@ext}{pdf} diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def index 4e9a893cb77..ff5e3f4ac4b 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexhtml.def} - [2012/08/13 v6.83a % + [2012/08/18 v6.83b % Hyperref driver for VTeX in HTML mode] \Hy@VersionCheck{hvtexhtm.def} \providecommand*{\XR@ext}{htm} diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def index f80b26cd4a9..23ee561b0cc 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexmrk.def} - [2012/08/13 v6.83a % + [2012/08/18 v6.83b % Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)] \Hy@VersionCheck{hvtexmrk.def} \providecommand*{\XR@ext}{pdf} diff --git a/Master/texmf-dist/tex/latex/hyperref/hxetex.def b/Master/texmf-dist/tex/latex/hyperref/hxetex.def index 94cba8fee17..92fcede83d9 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hxetex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hxetex.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hxetex.def} - [2012/08/13 v6.83a % + [2012/08/18 v6.83b % Hyperref driver for XeTeX] \Hy@VersionCheck{hxetex.def} \HyPsd@LoadUnicode diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index bd1ae8568a3..72f4d947935 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty @@ -30,7 +30,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{hyperref} - [2012/08/13 v6.83a % + [2012/08/18 v6.83b % Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -4931,6 +4931,56 @@ \expandafter\hyper@@anchor\expandafter{\Hy@AnchorName}{\relax}#4% \fi } +\newdimen\XeTeXLinkMargin +\setlength{\XeTeXLinkMargin}{2pt} +\ifxetex + \font\XeTeXLink@font=pzdr at 1sp\relax + \newcommand*{\XeTeXLink@space}{% + \begingroup + \XeTeXLink@font + \@xxxii + \endgroup + }% + \newcommand{\XeTeXLinkBox}[1]{% + \begingroup + \leavevmode + \sbox\z@{#1}% + \begingroup + \dimen@=\dp\z@ + \advance\dimen@\XeTeXLinkMargin + \setbox\tw@=\llap{% + \hb@xt@\XeTeXLinkMargin{% + \lower\dimen@\hbox{\XeTeXLink@space}% + \hss + }% + }% + \dp\tw@=\dp\z@ + \ht\tw@=\ht\z@ + \copy\tw@ + \endgroup + \copy\z@ + \dimen@=\ht\z@ + \advance\dimen@\XeTeXLinkMargin + \setbox\tw@=\rlap{% + \hb@xt@\XeTeXLinkMargin{% + \hss + \raise\dimen@\hbox{\XeTeXLink@space}% + }% + }% + \dp\tw@=\dp\z@ + \ht\tw@=\ht\z@ + \copy\tw@ + \endgroup + }% +\else + \newcommand*{\XeTeXLinkBox}[1]{% + \begingroup + \leavevmode + \sbox\z@{#1}% + \copy\z@ + \endgroup + }% +\fi \def\hyper@@link{\let\Hy@reserved@a\relax \@ifnextchar[{\hyper@link@}{\hyper@link@[link]}% } @@ -6662,6 +6712,7 @@ } \def\hyper@makecurrent#1{% \begingroup + \Hy@safe@activestrue \edef\Hy@param{#1}% \ifx\Hy@param\Hy@chapterstring \let\Hy@param\Hy@chapapp @@ -7805,24 +7856,29 @@ \endgroup } \def\contentsline#1#2#3#4{% - \ifx\\#4\\% + \begingroup + \Hy@safe@activestrue + \edef\x{\endgroup + \def\noexpand\Hy@tocdestname{#4}% + }\x + \ifx\Hy@tocdestname\ltx@empty \csname l@#1\endcsname{#2}{#3}% \else \ifcase\Hy@linktoc % none \csname l@#1\endcsname{#2}{#3}% \or % section \csname l@#1\endcsname{% - \hyper@linkstart{link}{#4}{#2}\hyper@linkend + \hyper@linkstart{link}{\Hy@tocdestname}{#2}\hyper@linkend }{#3}% \or % page \csname l@#1\endcsname{{#2}}{% - \hyper@linkstart{link}{#4}{#3}\hyper@linkend + \hyper@linkstart{link}{\Hy@tocdestname}{#3}\hyper@linkend }% \else % all \csname l@#1\endcsname{% - \hyper@linkstart{link}{#4}{#2}\hyper@linkend + \hyper@linkstart{link}{\Hy@tocdestname}{#2}\hyper@linkend }{% - \hyper@linkstart{link}{#4}{#3}\hyper@linkend + \hyper@linkstart{link}{\Hy@tocdestname}{#3}\hyper@linkend }% \fi \fi diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def index 4263d5d36b8..00669c95f7d 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hypertex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hypertex.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hypertex.def} - [2012/08/13 v6.83a % + [2012/08/18 v6.83b % Hyperref driver for HyperTeX specials] \Hy@VersionCheck{hypertex.def} \providecommand*{\XR@ext}{dvi} diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty index c495c7ae943..842c70fd9bd 100644 --- a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty @@ -30,7 +30,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{nohyperref} - [2012/08/13 v6.83a % + [2012/08/18 v6.83b % Dummy hyperref (SR)] \RequirePackage{letltxmacro}[2008/06/13] \let\hyper@@anchor\@gobble diff --git a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def index b63353c66b2..02e4e48083f 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def +++ b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{pd1enc.def} - [2012/08/13 v6.83a % + [2012/08/18 v6.83b % Hyperref: PDFDocEncoding definition (HO)] \DeclareFontEncoding{PD1}{}{} \DeclareTextAccent{\`}{PD1}{\textasciigrave} @@ -131,7 +131,7 @@ \DeclareTextCommand{\OE}{PD1}{\226}% U+0152 \DeclareTextCompositeCommand{\v}{PD1}{S}{\227}% U+0160 \DeclareTextCompositeCommand{\"}{PD1}{Y}{\230}% U+0178 -\DeclareTextCommand{\IJ}{PD1}{\230} +\DeclareTextCommand{\IJ}{PD1}{IJ}% ligature U+0049 U+004A \DeclareTextCompositeCommand{\v}{PD1}{Z}{\231}% U+017D \DeclareTextCommand{\i}{PD1}{\232}% U+0131 \DeclareTextCommand{\l}{PD1}{\233}% U+0142 @@ -241,7 +241,7 @@ \DeclareTextCommand{\th}{PD1}{\376}% U+00FE \DeclareTextCommand{\textthorn}{PD1}{\376}%* U+00FE \DeclareTextCompositeCommand{\"}{PD1}{y}{\377}% U+00FF -\DeclareTextCommand{\ij}{PD1}{\377}% U+00FF +\DeclareTextCommand{\ij}{PD1}{ij}% ligature U+0069 U+006A \DeclareTextCommand{\SS}{PD1}{SS}% \DeclareTextCommand{\textcelsius}{PD1}{\textdegree C}% \DeclareTextCommand{\textglqq}{PD1}{\quotedblbase}% diff --git a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def index d0821022914..f0b61b70793 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def +++ b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{pdfmark.def} - [2012/08/13 v6.83a % + [2012/08/18 v6.83b % Hyperref definitions for pdfmark specials] \Hy@VersionCheck{pdfmark.def} \begingroup diff --git a/Master/texmf-dist/tex/latex/hyperref/psdextra.def b/Master/texmf-dist/tex/latex/hyperref/psdextra.def index aa08cc0a746..e31f5c32c97 100644 --- a/Master/texmf-dist/tex/latex/hyperref/psdextra.def +++ b/Master/texmf-dist/tex/latex/hyperref/psdextra.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{psdextra.def} - [2012/08/13 v6.83a % + [2012/08/18 v6.83b % Hyperref: Additions to PDF string support] \Hy@VersionCheck{psdextra.def} \newcommand*{\psdmapshortnames}{% diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def index 1d4789885d7..e69382abae4 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puarenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puarenc.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puarenc.def} - [2012/08/13 v6.83a % + [2012/08/18 v6.83b % Hyperref: Additions to puenc.def for Arabi] \DeclareTextCommand{\hamza}{PU}{\86\041}% U+0621 \DeclareTextCommand{\alefmadda}{PU}{\86\042}% U+0622 diff --git a/Master/texmf-dist/tex/latex/hyperref/puenc.def b/Master/texmf-dist/tex/latex/hyperref/puenc.def index 678ce3af704..52846bc85dd 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puenc.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puenc.def} - [2012/08/13 v6.83a % + [2012/08/18 v6.83b % Hyperref: PDF Unicode definition (HO)] \DeclareFontEncoding{PU}{}{} \DeclareTextCommand{\`}{PU}[1]{#1\83\000}% U+0300 diff --git a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def index f3de9ed8104..e39e27cf8d9 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puvnenc.def} - [2012/08/13 v6.83a % + [2012/08/18 v6.83b % Hyperref: Additions to puenc.def for VnTeX] \DeclareTextCommand{\abreve}{PU}{\81\003}% U+0103 \DeclareTextCommand{\acircumflex}{PU}{\80\342}% U+00E2 |