From 8e2fd6e5b54cd27c07a470078019ad68243efbc8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 19 Jun 2010 21:48:43 +0000 Subject: hyperref update (19jun10) git-svn-id: svn://tug.org/texlive/trunk@19066 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/hyperref/ChangeLog | 7 ++++ Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf | Bin 317209 -> 317512 bytes Master/texmf-dist/doc/latex/hyperref/backref.pdf | 10 ++--- Master/texmf-dist/doc/latex/hyperref/hyperref.pdf | Bin 3572623 -> 3572363 bytes Master/texmf-dist/doc/latex/hyperref/nameref.pdf | 15 ++++---- .../texmf-dist/source/latex/hyperref/hyperref.dtx | 41 ++++++++++----------- Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def | 5 +-- Master/texmf-dist/tex/latex/hyperref/hdvips.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hdvipson.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hdviwind.def | 4 +- Master/texmf-dist/tex/latex/hyperref/hpdftex.def | 7 ++-- Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg | 2 +- Master/texmf-dist/tex/latex/hyperref/htex4ht.def | 12 +++--- Master/texmf-dist/tex/latex/hyperref/htexture.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hvtex.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hxetex.def | 5 +-- Master/texmf-dist/tex/latex/hyperref/hyperref.sty | 18 ++++----- Master/texmf-dist/tex/latex/hyperref/hypertex.def | 2 +- .../texmf-dist/tex/latex/hyperref/nohyperref.sty | 2 +- Master/texmf-dist/tex/latex/hyperref/pd1enc.def | 2 +- Master/texmf-dist/tex/latex/hyperref/pdfmark.def | 7 ++-- Master/texmf-dist/tex/latex/hyperref/puarenc.def | 2 +- Master/texmf-dist/tex/latex/hyperref/puenc.def | 2 +- Master/texmf-dist/tex/latex/hyperref/puvnenc.def | 2 +- 26 files changed, 79 insertions(+), 78 deletions(-) diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog b/Master/texmf-dist/doc/latex/hyperref/ChangeLog index a7277d472c4..fe435a955a0 100644 --- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog +++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog @@ -1,3 +1,10 @@ +2010-06-18 6.81g Heiko Oberdiek + * 6.81g + * pdfmark: Disabling of \escapechar is removed during reading + the .out file. With package xkeyval the \pdfmark causes + lots of character `2' in the output. + * kvsetkeys: \setkeys is replaced by \kvsetkeys. + 2010-06-04 6.81f Heiko Oberdiek * 6.81f * Beautifying error text of utf8x.def of \utf@viii@undeferr. diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf index 08a8a9784ac..35fe04f087a 100644 Binary files a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf and b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf differ diff --git a/Master/texmf-dist/doc/latex/hyperref/backref.pdf b/Master/texmf-dist/doc/latex/hyperref/backref.pdf index f69698d1cc6..044835e6e7f 100644 --- a/Master/texmf-dist/doc/latex/hyperref/backref.pdf +++ b/Master/texmf-dist/doc/latex/hyperref/backref.pdf @@ -10,7 +10,7 @@ endobj endobj 5 0 obj<> endobj -6 0 obj<> +6 0 obj<> endobj 7 0 obj<> endobj @@ -3903,12 +3903,10 @@ endobj endobj 1477 0 obj<> endobj -1478 0 obj<>/Info 6 0 R/DecodeParms<>/Size 1479/Length 1073>>stream -xڽX[MQ^k14C^x"09/j 3ÐKr%4r>$G Eʥ9ă' ^&/yR[{5{/ _߿_g]#c`` <X ˀ=;EVwN ˝E{ow͵%A -V@e6D;.KW -a9:RS2z [[`c&} ^)X7fhny1`b,׺͏k98``}*p}"s}A}on(^!689799ܔB/jY[ ?C6ʁkY(7'O~LھBo ]L/l%7sj톼:<cT>݈}~Ōs*E9 }ג$jm0'vDJ{'Ɲ Bjw-4v Z=gr*VrZϥ7=M؅Re&>UGUto'P?~g> G{ 6)NU |@GNRuNj ^K{uSv*vzר2 ='W,}l,!#~Ԉ`|Qsmuȷ7g2^!t."9ơX[va 9O٫awR v][zkN3[Gj^:&Wdh˘$;Y} HLKs)9!ё}Qgb^IsbQYQ~rFt;Y[Ni{Mkۼ[/Y6$3 6`[*l vcqN| >R6{skݩd7'f/} bsY4+ +1478 0 obj<>/Info 6 0 R/DecodeParms<>/Size 1479/Length 1066>>stream +xڽXKlMA֣ĆF#iڍSJIKDQR{N AJB$TaaBH$"IEѕx7gs;wyZ|Ƙ`lp-o/ &n{56:r;=! ܥ9JVyYe.A_6|8X ~}0yDlX;/g@s ٜ* YUw .ȏ VgN*{<[%8v~EuvUfMZ\+ SPf!y*ʁ+(A}s/$׶}o&i]6`vJ-/iSy(yhnwjE|})ǔ"5{܈ʱkK̾5hFSܚr:/Į`wϗo3iS'޳rDa5ld>F;7,Ok:L5|Jz&F b3+,$׍D/k宫;f-ӃY`tu+샼|p0[콃zV3~L@ ~'~Oy?KP~ 6א(N."yF@j靤a{i,@czMc䕍P٨:Cf>(cag8DA vkTG|.)չZ8rB璯^ub>3s#5`>,!7鷥3:7Wm:H .'|_ߪ['| _.#k:lU֒ Fc# O2g2&12?ImdMEN1DY&WeeqL:(w.\e߳,a\SklMAh\C+I_ w*Xc`w;h3t!68yW샟$S|ܥu~\Gw06l$%S{Lqbf/mBtϤz?4 endstream endobj startxref -385177 +385161 %%EOF diff --git a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf index df91708cb7a..a2588dab78e 100644 Binary files a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf and b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf differ diff --git a/Master/texmf-dist/doc/latex/hyperref/nameref.pdf b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf index 1213c7acc36..41792cf4e10 100644 --- a/Master/texmf-dist/doc/latex/hyperref/nameref.pdf +++ b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf @@ -10,7 +10,7 @@ endobj endobj 5 0 obj<> endobj -6 0 obj<> +6 0 obj<> endobj 7 0 obj<> endobj @@ -3775,13 +3775,14 @@ endobj endobj 1411 0 obj<> endobj -1412 0 obj<>/Info 6 0 R/DecodeParms<>/Size 1413/Length 1023>>stream -xڽXKkA$j4!xk N1#(4;35E/hbū?DA=gvnllvꩮ~` Ɩ udww#;nm%; -V? -}=p@;I΢Cl\N_ZkBq1LLͷ\5oǶO{k_aN\afx$fn֭ 5&<bba.koZӦ\p#븽rk;}.ط21նWαO%+L _ޕNeu42k|P1 y/x? O?5d~w{E܍ߠ Gn/7P~ [Km[mw|;x| Q1yylf˧M!"e-| ٔe >srkc^>(oj y`S@!|cn|}7|<^ˁ}W],_mYr~zhz}(ߑw -2Kke鐍ԓz{oSt zҲ֮ jc$qg]w*և -J6W5ۊqaN9Η^N؟jT97J8 EO=V WK~Yuk}`-8 S8U&U6l@}[^g+;4Ufd9MYAg +1412 0 obj<>/Info 6 0 R/DecodeParms<>/Size 1413/Length 1029>>stream +xڽXKkT1NbV-tQ\UTбPJaZbE + +; KnD>Xۢ@ "(QML&;9999<.#0BZ@gAu.S9 'yN#i@FȎ0Oy. D怳@ޞΊ/HG +|d{ B p?#GIW@B8nj%S,E5]A'-/2Æ>Ֆn+l˜||l;n#jM]C]u[1# Of8Nw-qǨ5O93O>/OWZ 6BME_oj'mkZc֨-nEgXubI>~eq֕kًZyls=6Ũqf/`w!~Lv/U#/^a򙏿wźSyw `?,\K= :΀pU^qہ^;p; dA[]eSC}:oq /uh}@6w1BGE +[@8)OHI3-K仂l"+ȷHЧTJ6}>5S>_і2[䦈ȃȔuC[] l ދ1kwE_oy>N.N'Etv8ٯˬULyU-:Ė-͆:Nj'q,:N *}Vɩ!X (c.N:s8PSzLL1Sc~:jȏZ3FV?b4^F!zHw;i}'#8 86U6ed-x^nwTihW+)tMH endstream endobj startxref -372449 +372433 %%EOF diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx index 229d9900ef6..e34fb0073c6 100644 --- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx @@ -44,7 +44,7 @@ %\ProvidesFile{puenc.def} %\ProvidesFile{puvnenc.def} %\ProvidesFile{puarenc.def} -% [2010/06/04 v6.81f +% [2010/06/18 v6.81g % Hypertext links for LaTeX] % Dummy hyperref (SR)] % Hyperref documentation driver file] @@ -126,7 +126,7 @@ \end{document} % % \fi -% \CheckSum{27161} +% \CheckSum{27158} % % \MakeShortVerb{|} % \StopEventually{} @@ -4711,7 +4711,7 @@ % \end{macrocode} % % \begin{macrocode} -\def\hypersetup{\setkeys{Hyp}} +\def\hypersetup{\kvsetkeys{Hyp}} % \end{macrocode} % % \begin{macrocode} @@ -4743,7 +4743,7 @@ \define@key{Hyp}{hyperref}[true]{} \define@key{Hyp}{tex4ht}[true]{% \Hy@texhttrue - \setkeys{Hyp}{colorlinks=true}% + \kvsetkeys{Hyp}{colorlinks=true}% \def\BeforeTeXIVht{\usepackage{color}}% \def\Hy@driver{htex4ht}% \def\MaybeStopEarly{% @@ -4834,7 +4834,7 @@ } \define@key{Hyp}{dviwindo}[true]{% \def\Hy@driver{hdviwind}% - \setkeys{Hyp}{colorlinks}% + \kvsetkeys{Hyp}{colorlinks}% \ifpdf \else \ifxetex @@ -5728,7 +5728,7 @@ XeTeX driver only supports unicode.\MessageBreak Enabling option `unicode'% }% - \setkeys{Hyp}{unicode}% + \kvsetkeys{Hyp}{unicode}% \fi \else \let\HyXeTeX@CheckUnicode\relax @@ -6143,7 +6143,7 @@ % % \begin{macrocode} \ifHy@pdfa - \setkeys{Hyp}{pdfversion=1.4}% + \kvsetkeys{Hyp}{pdfversion=1.4}% \def\Hy@Acrobatmenu#1#2{% \leavevmode \begingroup @@ -6380,7 +6380,7 @@ \ifx\Hy@driver\Hy@defaultdriver \def\Hy@temp{hdviwind}% \ifx\Hy@temp\Hy@driver - \setkeys{Hyp}{colorlinks}% + \kvsetkeys{Hyp}{colorlinks}% \PassOptionsToPackage{dviwindo}{color}% \fi \fi @@ -6519,7 +6519,7 @@ % \begin{macrocode} \Hy@AtBeginDocument{% \ifHy@ocgcolorlinks - \setkeys{Hyp}{colorlinks}% + \kvsetkeys{Hyp}{colorlinks}% \ifHy@pdfa \Hy@Warning{% PDF/A: Optional Content Groups are prohibited,\MessageBreak @@ -7768,7 +7768,7 @@ % \begin{macro}{\HyField@SetKeys} % \begin{macrocode} \def\HyField@SetKeys{% - \setkeys{Field}% + \kvsetkeys{Field}% } % \end{macrocode} % \end{macro} @@ -11614,7 +11614,7 @@ }{% \ifHy@ocgcolorlinks \ifnum\Hy@pdfminorversion<5 % - \setkeys{Hyp}{pdfversion=1.5}% + \kvsetkeys{Hyp}{pdfversion=1.5}% \fi \fi \ifHy@setpdfversion @@ -14439,7 +14439,7 @@ \edef\@processme{\noexpand\pdf@toks={\the\pdf@defaulttoks}}% \@processme \let\pdf@type\relax - \setkeys{PDF}{#2}% + \kvsetkeys{PDF}{#2}% \ifHy@pdfmarkerror \else \ifx\pdf@type\relax @@ -15848,7 +15848,7 @@ /type/array% /OBJ pdfmark% dps }}% - \setkeys{Form}{#1}% + \kvsetkeys{Form}{#1}% } \def\@endForm{} \def\@Gauge[#1]#2#3#4{% parameters, label, minimum, maximum @@ -16095,7 +16095,7 @@ % \begin{macrocode} %<*tex4ht> \def\@Form[#1]{% - \setkeys{Form}{#1}% + \kvsetkeys{Form}{#1}% \HCode{
}% } \def\@endForm{\HCode{
}} @@ -16108,7 +16108,7 @@ \def\Fld@default{}% \bgroup \Field@toks={ }% - \setkeys{Field}{#1}% + \kvsetkeys{Field}{#1}% \HCode{}% \ifFld@password \@@PasswordField @@ -16157,7 +16157,7 @@ \begingroup \expandafter\Fld@findlength#3\\% \Field@toks={ }% - \setkeys{Field}{#1}% + \kvsetkeys{Field}{#1}% #2% \ifFld@radio \expandafter\@@Radio#3\\% @@ -16200,7 +16200,7 @@ \def\Fld@name{#2}% \bgroup \Field@toks={ }% - \setkeys{Field}{#1}% + \kvsetkeys{Field}{#1}% \HCode{13 % \pdfrefobj\OBJ@pdfdocencoding @@ -16664,7 +16664,7 @@ % \begin{macrocode} \def\@Form[#1]{% \@ifundefined{textcolor}{\let\textcolor\@gobble}{}% - \setkeys{Form}{#1}% + \kvsetkeys{Form}{#1}% \Hy@FormObjects \@pdfm@mark{obj @afields []}% \@pdfm@mark{obj @corder []}% @@ -17889,7 +17889,6 @@ \dospecials \Hy@safe@activestrue \escapechar=`\\% - \let\escapechar\@gobble % \def\@@BOOKMARK[##1][##2]##3##4##5{% \calc@bm@number{##5}% }% diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def index 1de73a2493a..9683f9293fa 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} - [2010/06/04 v6.81f + [2010/06/18 v6.81g Hyperref driver for dvipdfm] \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}} \ifHy@pagelabels @@ -569,7 +569,7 @@ } \def\@Form[#1]{% \@ifundefined{textcolor}{\let\textcolor\@gobble}{}% - \setkeys{Form}{#1}% + \kvsetkeys{Form}{#1}% \Hy@FormObjects \@pdfm@mark{obj @afields []}% \@pdfm@mark{obj @corder []}% @@ -1430,7 +1430,6 @@ \dospecials \Hy@safe@activestrue \escapechar=`\\% - \let\escapechar\@gobble % \def\@@BOOKMARK[##1][##2]##3##4##5{% \calc@bm@number{##5}% }% diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def index c4fd6f9dbdb..fd48afc6b17 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} - [2010/06/04 v6.81f + [2010/06/18 v6.81g Hyperref driver for dvips] \providecommand*{\XR@ext}{pdf} \def\Hy@raisedlink{} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def index 37bf569c711..45f7013ccc0 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} - [2010/06/04 v6.81f + [2010/06/18 v6.81g Hyperref driver for dvipsone] \providecommand*{\XR@ext}{pdf} \def\Hy@raisedlink{} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def index 4978ff79772..899b9c77bea 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} - [2010/06/04 v6.81f + [2010/06/18 v6.81g Hyperref driver for dviwindo] \begingroup \@ifundefined{headerps@out}{}{% @@ -414,7 +414,7 @@ \edef\@processme{\noexpand\pdf@toks={\the\pdf@defaulttoks}}% \@processme \let\pdf@type\relax - \setkeys{PDF}{#2}% + \kvsetkeys{PDF}{#2}% \ifHy@pdfmarkerror \else \ifx\pdf@type\relax diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def index 70cf4601358..40c42faa8de 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} - [2010/06/04 v6.81f + [2010/06/18 v6.81g Hyperref driver for pdfTeX] \let\Hy@PutCatalog\pdfcatalog \ifHy@pagelabels @@ -123,7 +123,7 @@ }{% \ifHy@ocgcolorlinks \ifnum\Hy@pdfminorversion<5 % - \setkeys{Hyp}{pdfversion=1.5}% + \kvsetkeys{Hyp}{pdfversion=1.5}% \fi \fi \ifHy@setpdfversion @@ -817,7 +817,7 @@ \fi \def\@Form[#1]{% \@ifundefined{textcolor}{\let\textcolor\@gobble}{}% - \setkeys{Form}{#1}% + \kvsetkeys{Form}{#1}% \Hy@FormObjects \ifnum\pdftexversion>13 % \pdfrefobj\OBJ@pdfdocencoding @@ -1647,7 +1647,6 @@ \dospecials \Hy@safe@activestrue \escapechar=`\\% - \let\escapechar\@gobble % \def\@@BOOKMARK[##1][##2]##3##4##5{% \calc@bm@number{##5}% }% diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg index 5d766b38db7..1f54cb91452 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} - [2010/06/04 v6.81f + [2010/06/18 v6.81g 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 68b476016ea..ec044058cfc 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} - [2010/06/04 v6.81f + [2010/06/18 v6.81g Hyperref driver for TeX4ht] \providecommand*{\XR@ext}{html} \def\Hy@raisedlink{} @@ -138,7 +138,7 @@ \fi \def\backref#1{} \def\@Form[#1]{% - \setkeys{Form}{#1}% + \kvsetkeys{Form}{#1}% \HCode{
}% } \def\@endForm{\HCode{
}} @@ -151,7 +151,7 @@ \def\Fld@default{}% \bgroup \Field@toks={ }% - \setkeys{Field}{#1}% + \kvsetkeys{Field}{#1}% \HCode{}% \ifFld@password \@@PasswordField @@ -200,7 +200,7 @@ \begingroup \expandafter\Fld@findlength#3\\% \Field@toks={ }% - \setkeys{Field}{#1}% + \kvsetkeys{Field}{#1}% #2% \ifFld@radio \expandafter\@@Radio#3\\% @@ -243,7 +243,7 @@ \def\Fld@name{#2}% \bgroup \Field@toks={ }% - \setkeys{Field}{#1}% + \kvsetkeys{Field}{#1}% \HCode{