From eb1e0a22fee869ae52e26bf9cd370da5a15358f3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 11 Sep 2010 22:56:04 +0000 Subject: hyperref update (11sep10) git-svn-id: svn://tug.org/texlive/trunk@19658 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/hyperref/ChangeLog | 40 + Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf | Bin 317512 -> 320446 bytes Master/texmf-dist/doc/latex/hyperref/README | 51 +- Master/texmf-dist/doc/latex/hyperref/README.pdf | Bin 298642 -> 291952 bytes Master/texmf-dist/doc/latex/hyperref/backref.pdf | 231 ++--- Master/texmf-dist/doc/latex/hyperref/hyperref.pdf | Bin 3572363 -> 3641375 bytes Master/texmf-dist/doc/latex/hyperref/manual.css | 20 + Master/texmf-dist/doc/latex/hyperref/manual.html | 1066 ++++++++++---------- Master/texmf-dist/doc/latex/hyperref/manual.pdf | Bin 571873 -> 568261 bytes Master/texmf-dist/doc/latex/hyperref/manual2.html | 2 +- Master/texmf-dist/doc/latex/hyperref/manual3.html | 2 +- Master/texmf-dist/doc/latex/hyperref/nameref.pdf | 32 +- Master/texmf-dist/doc/latex/hyperref/options.pdf | Bin 41689 -> 41393 bytes .../texmf-dist/source/latex/hyperref/backref.dtx | 4 +- .../source/latex/hyperref/doc/manual.tex | 26 +- .../source/latex/hyperref/doc/options.tex | 3 +- .../texmf-dist/source/latex/hyperref/hyperref.dtx | 744 +++++++++++--- Master/texmf-dist/tex/latex/hyperref/backref.sty | 4 +- Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def | 140 +-- 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 | 54 +- Master/texmf-dist/tex/latex/hyperref/hpdftex.def | 144 +-- Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg | 2 +- Master/texmf-dist/tex/latex/hyperref/htex4ht.def | 30 +- Master/texmf-dist/tex/latex/hyperref/htexture.def | 19 +- Master/texmf-dist/tex/latex/hyperref/hvtex.def | 23 +- 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 | 140 +-- Master/texmf-dist/tex/latex/hyperref/hyperref.sty | 331 +++++- Master/texmf-dist/tex/latex/hyperref/hypertex.def | 13 +- .../texmf-dist/tex/latex/hyperref/nohyperref.sty | 4 +- Master/texmf-dist/tex/latex/hyperref/pd1enc.def | 2 +- Master/texmf-dist/tex/latex/hyperref/pdfmark.def | 160 +-- 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 +- 38 files changed, 2141 insertions(+), 1160 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog b/Master/texmf-dist/doc/latex/hyperref/ChangeLog index fe435a955a0..dfdef4c099d 100644 --- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog +++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog @@ -1,3 +1,43 @@ +2010-09-11 6.81m Heiko Oberdiek + * 6.81m + * New option `pdfremotestartview'. + * \href with new optional argument with + keys `page' and `pdfremotestartview', `pdfnewwindow', `ismap', + `nextactionraw'. + * Fix for urls in \href: Prefix 'file:' is not added. + +2010-09-11 6.81l Heiko Oberdiek + * 6.81l + * Fix spacefactor corrections of 6.81i for math mode. + * Fixing GoToR actions if \href contains `file:///' or + `file://localhost/'. + +2010-09-10 6.81k Heiko Oberdiek + * 6.81k + * PDF forms: Missing JavaScript actions added for check boxes, + push, submit and reset buttons. + * PDF forms: Warnings are given, if HTML field options are used. + +2010-09-04 6.81j Heiko Oberdiek + * 6.81j + * \Hy@EveryPageAnchor fixed to avoid Overfull \hbox warnings + with some drivers. + +2010-09-04 6.81i Heiko Oberdiek + * 6.81i + * Various drivers: Destinations made transparent for \spacefactor. + * Various drivers: Links made transparent for \spacefactor. + * Various drivers: Fixes for option `raiselinks' without color. + +2010-09-01 6.81h Heiko Oberdiek + * 6.81h + * Fix for clash with package `varioref', that redefines + \refstepcounter with loss of hyperref's additions. + * Additions for README. + +2010-08-30 Heiko Oberdiek + * backref 1.36: Typo in warning fixed. + 2010-06-18 6.81g Heiko Oberdiek * 6.81g * pdfmark: Disabling of \escapechar is removed during reading diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf index 35fe04f087a..c2a93cd8719 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/README b/Master/texmf-dist/doc/latex/hyperref/README index 06ca6f8200d..4ec59e9b1c6 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, 2010/03/01 +README for hyperref bundle, 2010/09/01 TABLE OF CONTENTS @@ -299,7 +299,7 @@ Expert feature \HyperDestNameFilter easier to merge them with 'dviconcat' or other merge utilities. Experimental option `ocgcolorlinks' ---------------------`-------------' +----------------------------------- The idea are colored links, when viewed, but printed without colors. This new experimental option `ocgcolorlinks' uses Optional Content Groups, a feature introduced in PDF 1.5. @@ -319,7 +319,7 @@ Experimental option `ocgcolorlinks' line: dvipdfmx -V 5 Option `pdfa' --------`----' +------------- The new option `pdfa' tries to avoid violations of PDF/A in code generated by hyperref. However, the result is usually not in PDF/A, because many features aren't controlled by hyperref (XMP metadata, @@ -350,7 +350,7 @@ Option `pdfa' the PDF file to PDF/A. Option `linktoc' added --------`-------'------ +---------------------- The new option `linktoc' allows more control which part of an entry in the table of contents is made into a link: * `linktoc=none' (no links) @@ -359,7 +359,7 @@ Option `linktoc' added * `linktoc=all' (both the section and page part are links) Option `pdfnewwindow' changed --------`------------'-------- +----------------------------- Before 6.77b: * pdfnewwindow=true --> /NewWindow true * pdfnewwindow=false --> (absent) @@ -441,7 +441,7 @@ Flag options for PDF forms * PDF (not supported by Acrobat Reader) Option `pdfversion' --------`----------' +------------------- This is an experimental option. It notifies `hyperref' about the intended PDF version. Currently this is used in code for PDF forms (implementation notes 116 and 122 of PDF spec 1.7). @@ -470,7 +470,7 @@ Option `pdfversion' features. Field option `name' --------------`----' +------------------- Many form objects uses the label argument for several purposes: * Layouted label. @@ -482,7 +482,7 @@ Field option `name' the value should consist of letters only. Option `pdfencoding' --------`-----------' +-------------------- The PDF format allows two encodings for bookmarks and entries in the information dictionary: PDFDocEncoding and Unicode as UTF-16BE. Option "pdfencoding" selects between these encodings: @@ -1190,6 +1190,14 @@ Wrapped/broken link support \url. (See thread "hyperref.sty, breaklinks and url.sty 3.2" in comp.text.tex 2005-09). +Links across pages +------------------ + In general they have problems: + * Some driver doesn't support them at all (see above). + * The driver allows it, but the link result might include + the footer and/or header, or an error message can + occur sometimes. + 8 HINTS ======= @@ -1378,6 +1386,33 @@ C% \end{document} +Subordinate counters +-------------------- + Some counters do not have unique values and require the value + of other counters to be unique. For example, sections or figures + might be numbered within chapters or \newtheorem is used with + an optional counter argument. Internally LaTeX uses \@addtoreset + to reset a counter in dependency to another counter. Package + hyperref hooks into \@addtoreset to catch this situation. + Also \numberwithin of package amsmath is catched by hyperref. + + However, if the definition of subordinate counters take place + before hyperref is loaded, the old meaning of \@addtoreset is + called without hyperref's additions. Then the companion counter + macro \theH can be redefined accordingly. Or move the + definition of subordinate counters after hyperref is loaded. + + Example for \newtheorem, problematic case: + \newtheorem{corA}{CorollaryA}[section] + \usepackage{hyperref} + Solution a) + \usepackage{hyperref} + \newtheorem{corA}{CorollaryA}[section} + Solution b) + \newtheorem{corA}{CorollaryA}[section] + \usepackage{hyperref} + \newcommand*{\theHcorA}{\theHsection.\number\value{corA}} + 9 AUTHORS/MAINTAINERS ===================== diff --git a/Master/texmf-dist/doc/latex/hyperref/README.pdf b/Master/texmf-dist/doc/latex/hyperref/README.pdf index 0add86560a0..5d72eabe7fe 100644 Binary files a/Master/texmf-dist/doc/latex/hyperref/README.pdf and b/Master/texmf-dist/doc/latex/hyperref/README.pdf differ diff --git a/Master/texmf-dist/doc/latex/hyperref/backref.pdf b/Master/texmf-dist/doc/latex/hyperref/backref.pdf index 044835e6e7f..82c49eb4f0f 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 @@ -72,37 +72,37 @@ endobj endobj 36 0 obj<> endobj -37 0 obj<>stream +37 0 obj<>stream xX[o6~[!IbW[Ҧd {m&,K$'~y(YnۺvSyxwnxt:9z gJEh1eILuxG< -W<̍L1ϊ[5f#f1sJ7ld5iE=m#yIx "el߭n'&X(DzNG<JlL !I#į3Td .@#F04ҝm58Z05Bw  3Hps<6wlL !I#į3Td .@#F04ҝm58Z05Bw  3Hps<6wD.;(e3` *4$>*",6 *t䵀سV ?فy6A.侍Wm;}c-9'. xD$|T'Cmvhdsr$I 8$ϔW%RqI9az`ea1HfSaXl]tARBҁAQE[[h֖]EK#5ǝ) EIw?k<-z|Ξ!! +ʬ ;_\[zp#7}pWG|=Bxm[аDiHQFW; -TpfW\5]Wz+Ʋ{+Nf]f!DQo5&v:tV5len͒>c44AB #0L#`R=\gYL!(40 .>FP$!!#4^2JGDI^0"#<Z>:]s(x1R$RvvP is4O3^L:֫>(e/Gހ/3{Oque,-"W*!§ iB ^f +TpfW\5]Wz+Ʋ{+Nf]f!DQo5&v:tV5len͒>c44AB #0L#`R=\gYL!(40 .>FP$!!#4^2JGDI^0"#<Z>:]s(x1R$RvvP is4O3^L:֫>(e/Gހ/3{O8OGjwY[2DTBOA!ҎٳVf endstream endobj 38 0 obj<>>> endobj -39 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> +39 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> endobj -40 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> +40 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> endobj -41 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> +41 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> endobj -42 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> +42 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> endobj -43 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> +43 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> endobj -44 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> +44 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> endobj -45 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> +45 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> endobj -46 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> +46 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> endobj -47 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> +47 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> endobj 48 0 obj<> endobj @@ -273,20 +273,12 @@ zL! endstream endobj 93 0 obj<>stream -x\K#|YD o"03 i:ٖʸ,gz$=DA$wbb"=o߾oLݮg Lϴ`Zݮffvw7˙!V)rN33ڍϿ cg1sJfSٜ<#X|x(Vewwm+}{w׮.uLNxTQmb1A(a1Y ڇW7sdh7r-M?ޗݶ)ESTb>aR\ -@iM+%0;eSsFckiD0@c#>[1_~a67E؉8NR,⨇/UAvPfժx -N1~@ ~7dhBr ٧lۢ?6ߖ}[* dE+t<0 YMS;u*MiA^*9[q#-2^f.ɺBSH - *F-b?~C:xeͺ*SbC݇/VϪ-‰MH7MD~Ƚ}3&EoS7GGɮz0Đΐu+V$8 0y 1~pYGz;sÃN#wH~pV}{ |Y!顁Κ\q e gRE5 -8{Mqw6?MH薆j̸փXY #`{_"h,8ї30NdE.˶XmI1*,7W6@E'(\q,wajH p -9as; j/m .4,SӸ)1 142[ {s9Qz#Ð Jb:!؉!i]6^U>p_qُ3Ie}\WSϛ DJ`+QϰyHWFG%? si?;b2ֵ.r/g`@xkOz-%F8:h+e>0b`FCۏ`Gи4̀4eDŐ4gK"FzL0Tbjj _-JBo$#R l &0̤PlⶊgW9)ʾRy3`=H:ES6Ț$1$x -SFl:^5D;1'?Ud`Νs1*i`fo -Cxs̫!PˉkXܶxS5GVz/[HOc&D -C5gJu}ݠIUW̫e1)tty̠Ycy"$;DŦWG T;Tó)) p47b0>β`pQ3p^jCpbn7yX&{Є"ǾD|eSEGEy$zI(myYkf\/§ FsXfs X3WuW9hk"G6ߵ1 -j+\h";Ei*QL TbDDFѡUvH0>Xhπvx:R8⫎sa:[=glD;B}"ZD hMgF5p -1YҾ!@ 6\ -s7ڪ 6Ar$4W]lj_ERER;)*,r$JERERq_7gtlgra$zÆo~x:txq@CGĽ'vwy(p|QAF(Th -b.XG+ b_^IjGuxvFwDUvOOSnAv #)Y9'Ɛcc E $r@aphu^8TF0A  m?|J`|&gV\. 3|0W=W>VLlzw{2:3ђ.ݤ h b9 骔-^v5\t)a"߾};+X@[ccu -vUbCsGo^ ΄zh˚˖as|?׏mIQj^vH6D>D:eBəԺq,jW]u̯{ gw@;.v\l:'6]pw6D.ZZ"yK5*#wq/9rL_+ӨfW]{,w7)8fX_w$ zcM3$HCGhH:opFS֞E\6>M&EH s:.|}}Ĕ+h G. j8H6mT]n{ j &Xnc^mMD1gc5-'Jc;s@C ʑ6 P1ZD)T-͠,& ƶ GKCO`U=[6U2F١{  YH R/73(Xk'4(A(eESƤEK$Ir +x\K#|YD o"03 i:ٖʸ,gz$=DA$wbb"=o߾oLݮg Lϴ`Zݮffvw7˙!V)rN33ڍϿ cg1sJfSٜ<#X|x(Vewwm+}{w׮.uLNxTQmb1A(a1Y ڇW7sdh7r-M?ޗ|)e }n0BAA)Xd ϦFd沩#̱54" u E/?0"XDDwqΪ w;G~Zq3pkjU=PO{aKMgfä́ ̲_tp3F]l馸{\J&$`tKC5Bf\A,G㽏/ f˙ +R "e[6BTD$Ę A+G؋J  Eg[tNމ޻Zsq$[ib + K09̝6JkC{gli\P SFf px-=G c9ꋜ(}n=aBU؆q%zD1~dĐ.][몈nF8/۸GU$|ֲ>[]sF"%0Yܨg?-k"|C]g38,bWjhi_\.s9e}m V@ 9ZAX[6z/""II9I%""ꏯכ3IE:6D3h a9g =_JHa7?<Ti % 0>3Q+h usə >f+JEPV+&6MOs}M;=[ZhIznR4FR~tUE/;0sDx|uo߾zb, Lԭ鋱:j;*9Z܂b/ YgE=e zQeKǰKB9t ԟ6o(5vJ$t "g"2lgqhjj8qj|j뫮:WXzܽS3e[ 򻋎 u\A;.6.mlZMS--Qb#5D$6*.7PCGsr5 Ggj~[,yS16&V]³zʱŚ舱9 H-M*MfPic[HIJ㣥vuT*-pw*нMXv,] ${WUKPܲ)c"%UK_FNv6rm endstream endobj 94 0 obj<>>> @@ -1815,7 +1807,7 @@ endobj endobj 847 0 obj<> endobj -848 0 obj<> +848 0 obj<> endobj 849 0 obj<> endobj @@ -1833,7 +1825,7 @@ endobj endobj 856 0 obj<> endobj -857 0 obj<> +857 0 obj<> endobj 858 0 obj<> endobj @@ -2027,7 +2019,7 @@ endobj endobj 953 0 obj<> endobj -954 0 obj<> +954 0 obj<> endobj 955 0 obj<> endobj @@ -2045,7 +2037,7 @@ endobj endobj 962 0 obj<> endobj -963 0 obj<> +963 0 obj<> endobj 964 0 obj<> endobj @@ -2999,49 +2991,43 @@ A3d$ YefܣF&;Ne@qvPFL/ZXkH1lk{dGY`v{ +g{ݖxIc;4.YujkFShdx{vE*20~ܱer{O1P(bxf?i endstream endobj -1405 0 obj<>stream -xڍP-=qr @^J|_FOeyG9td^gS>ii;q|oUl*A,?%<d5m +AF`g 98͟p?)c6{ y;?܌?n=㯀Iv=m*i7 &,.UC -be5 0Oqqrim^=C-~7?@|/n>>ӂZl; -{J<XB~w_!'pZ H)z3a/ 8'* o+xz_~r|r'v@pOvCt07~ -<9=ANW[]?g ;mnj.dSzS)EƶMlnu*לSJSŇ+rT^M( -?MƶZf~<@%gӑ~pEhkWqtûqQp-]ܮ~_:i_4Ik9EF{j7{J90K;vss ->1%n2ьWqpaȚ}".疚֍ޙ1=ݨ0# 1ȕfx"xd̓Ew3&3gVx𣺝@ V]v. -#AP-k*H7_(\v =VXU}Ѳa~]ESߺՇj7%ESe0׽ f; h_=1\]]]nesR,: {šL -+&2$(9MzNdd~zA :AcڏFKFdycKπKe٪ 91!>'fF;F =75v8 (0)j٨aʧsS* q"7d¡Wi{)]==L)>k0 * d?zÙ:Ԙ~˲?jd$?)oU?*3l(5E"Lc'F~QFr^=~룵3jտ%lNԈ!I%ʍwc܅Bg_$R 6.h>7_J{yC9+F*)[jYA*r't -n$(bKēFl3<~bdՌjA1ң;p>32NgG~vQsƸwuzF|$ -d$ fd\*|2DSHd>ǜR (:?M||%oknw-:{n{v,%E]7^#ILY&.}+mrtsj Epu|GV@^OmPtJ5)?Q@*w -C ?1UR]>/c!qypd)Scr'cxOfݣ@91&[T2v>lBc+eTɪ_(9 nN B+Y-("I )Z-|_>O!Oo̰ʓ{0/F!}Rm9cic|7KK=umO/6j[|%*$kS: RlMA 7+ -_"ȍvCP&ݵKTtou.."ImƟeC(TK!>*bX$6 ܙȞ"xF0][$~x-pRU*׊PI3\tY9姫?ʤܦ$,MH`gJF7IC>\BpveR p''%t`I[0'8gH&9γhjˬQX^bՍϧ5f(PJY ,?t@ιVm,Ҿ{);­8FhWqP&~&OH*V{XLqk@~p( -s ~5,0wlt΃L>Mʑ먲E]uˋdM$]rg_.ڃVrJF^/?}aXQt}JiM%fP]2PlϪLhPKcϷ~Z/>⹇zSbqXVl?~%0+W{;+ Pqgd3> 1fu9TX*];%;v2&IaZ,ÌѨS?ǫ;eLr93{>be؋RNGg KH9DGq" +nQ|y6bZ|Y=.~u - P<)$ Jb Jq_IRuxo+].7B:oK nrliV$:jG`u &\։ j{ քq3#lϦK֡nyHrV)=2JCҾϱT+Fqi7N:u6R8q}{J@_E%0?r[\b0((=l?$4S4% -p=kXXoEPgj¾z'Z5d^d]g#388(6kOx߹o6M:N%_cMc, T"V|Vu]A٧' wQNJb1ja NNBLXK-aUJhm h-du_bw4$w̴ᛝ{Q5|Ie NZ͂SRSXh2BPpf mwKv8'1 EIۇK|<>x=PLwF!*.n)ef/Q2}Z+I5kˊͥ@ʏ]i\1:<<G_BlM j˔usxY&bsZ)xa[D*q7U8-w.4{Xj5W%"Jt+NUKR< Qn*# M@R<rWZ/VSGuϊYt)hkBc ;|Ik'N"|BC'f(V?Y8yL`qN*3~uy6Q靡3\QaɼE2lS>o,AoĕͭyK{6&<+@/*,mCy@UTFg !}׊&m:zf?m_0>|Pjʇ Ua^2>cǣ}%! -RK^SRYr;vaW#]~RVZ5S^blnu)9ҵXFpi/(SHA_2'p((,P]RV#PѡBrI˨Zb>A=?m[YsѰ\iEMZ$Wu)A$IPs_#!6ΎM԰k J|L0ÏD2grW:U7rQ ; 8|W)-Pn⼼¹zwo/Uc O~cK҈.FӴAlg*e+>8VGS/f2PTr~ ی_ezO\"XmIZt+)^9ˮXdsP-sm]*gSku/dhy}Z kA9r40蘡)z\71=I8+_a,' 539^lcdR<4FE*R7=Rfڵ}sqU6H -m;nwg~o.UvgֹGI+4;9C H_ 7v1o\Л(͸UA1™A337+`7MR)rm$C-\5l.@2{!.c" #14ת;b 2%qیی_=QAQQ=S7TR򙳶fծJKۃ ˸pU?moM㲁Q%l4Cű^%Ien֝^!.ŕwFX\>o }5Iw-dnR2Fze]!`G'~g),/6K#/Iꢸ泯#bT 9Dzu;hG"uT8 -  ̑&rKeoѓW/hyY%3XH-%0IkXVlGNPcwNmϢ+SU1WqhWt 0XYfQ 8xLU2;ۄZ,F51Ad7ɫq|&YPBYx[<$ 2KO0xKؚx'2)<1t$ͻRKOՉՂ&̭D9ꈑݔ ֑fJ|:{Uڲ`C<@Z~4[MeJ_s!n]n.j7X#2';>)v9 -Vr~9vv6;q2@$Ig3fԑiz%:Oma32.f 2&'Q뀲+$|ZyN5yQ,Y.p:2BA/8{M/LR\ZT2Dͭ;Y?JZt|)Zi/3U7z 63*oĦ}h=ʰc#lC/>l(-l|Iϔ/@ǻ2Tb4*yLt}@ )A_oL ʅ"=ԈJu!ܸ۽[4gIjs槡¢oqďDӥ]E+yh2!~ KDMn$'M$GR4M*?edZ169wt@Aꋘ7tts**Rls -E%Khn`RhH%ANu%Lq`-ȶ4pזRe'A4Et_1TvGnlziǿxwZ_[ؽ<p #D -wJS=2IH:/BUŨeءsn @EX "=p"#rE[prFtT @H8ETOtrB\!oJS"vSb+ą؇^4庎t~@ry4 bJi]$U'cEL];I͒\kwh -R]}._IUZVN48=فBRcnq%X 5 -zJDqX$NE!ZeW;leO^+>bH;eITLhbN}֌kP|+W~/Jݚ(JIf`{7U p~,"ˇyOQKK;/<%AjX9Z8.`iхyѱy#m3Dפt'~1w}Csdq`#eW ~u3勮Dy}ԤZ(oLݪZrrGY55'AM}l=WՆG`t#̇<ժ糤d\MfW,e3NX[[k]$@K@<8+f+iNj5y/(9`YۖԲF%ٱb>nYh 5#iiM.h|Q>:;[ω^If*AJ?TCf~  ll:ngFV, HB*#˔t]XxD$MMaS9.'_7Pnw4U@giU# *~qOfۊ^E>͏#@#Gi -ɬwv^}1cQ8玕:SAa( `1!PfB_N&LwUUaI@rzu `jO3)&Ą{rtq|,@ћ_tCLƵb}XdOh|k\X%m:dAI"CJWAn<ɏTiQgԻ1BpC)fr|B^#6NV:~p^^;:ťТ9/3.p0'w@o?'&̓2W0u !˨&{9$vBP7]E_ -lbVeŬ/WVdgIEx@bw -L 6Q =IK o<i - ->i:kY̦8p9/x%Xj^)]HlHnRso4֐ $#+!CxƜ6J>"}/G AA+ h3ezi((WRpc{HE'w59@gL|V&GsZ̑>$`"8ם˃LMt}̐-@#.C?pÑ#|Vd)dV|Й%sJLR轒J5|l7; qMeQ,v1{ju}=5d2#Rs -F7*qajE:+ 2~c_y9cM/ -ܡtHUڲ#@O4Q:,{l;E9y -wkrt} -9P]Crg)0335D t6%.FqEW':Ӽ ڦ-QV3c{uYsE),ĝc<,*8sֺR|2qPxڢߟ,FcB>C2AfY):$5`|+#IWY!pХ6aT/X͍O cRo\Ml7_%HxQ)uWJvl.w+Պ%Z%6S^;}a A7Y4 4icV?vZ8gs7Goz}y3_ =l9 ӉVVPJ{eÈ? 7Ԏ  -PMk[M/of\'BClPO7łgLl;K4 N](3? c 5FYqի,Xn3EOQ}f b " -=FTEۦlӫ|xzrc/ӕ?#\ -ˆx,G/,gI*t>e"b6^URCz[1{e^1OIbՔP%l۰lv_+p +1405 0 obj<>stream +xڍTz7N#HH#9-ݢĀ1`nnDi.i%/{{9>|̠-glVvsy +z@~?.3 +KlAa2PA2E3 @aq8O?pq"b;n +.p}Ybb"\p5ۃ3Z}gkBIڻ"3N n`'0@ .3\( sـ}5 Ɵ\z@ kkg'B`;m9xw{@*jjro[@/DoT6lbRhxl] ;3h9߯2⳾?.k;m e(5zepW|55yɚ`jA!F2 lqs3P ||7k~V)`6_HA޸|/$ ]p*D#Q~?H7Fy }6A/x / +rW2}9rpʽOp}9@&^i_?N~`waZ"̡.F,5Ō4`]wx\`W焬/҆?"WO?(5]珿Yyg)%-9+u95H yS*һ0=E'U{֪TƐ%}Y}KDʍK;r {(ίf#3Գ'K +EҢ׳D#o(V_ Z|\!ml#Tmڴ˩C0 /{ MLFyoq@IYg;t팺8=6GMcnl ګiMW|I>B*1-'EQ᠅YC꽶~eTiaŝ\uehQ *vBUZƨ*qzT-[Dѩq#bn>I +;}yB<-h*ivTaXC/xVLoʸ!awрȠY%y?](;ӽe5y7,tXܽc\v~eoT0({tjg7(5Ï::,Nh = +U( J}PlivI Jph(t/ϻ÷$Ss-EyrxTa^GJ}LQƨmt[)iRaQӻja+.%O|'^[ ,¾.?naA0~j{ѦV(|k2͚SLt2,قh}}%TN}$bj"XE Q$bzYWc6+fH'e@^Mo7UXb%g C8Cc;1{wǎ "d> fp2k~3lEJg*=]mxD0=Řb -z|o#`#͢5}G)tNY/G _{k9Ib+7u$ijwr^#L vz蔪A(4o%zP0@_i.#[! 7I~K diA/UxVȊT|1;͹;k|\TS8% ~ӽtQ%w֣UkE{I,a8 kt랆gYv?fvfsosiXA{2,hG31|B>˧'8 OU")cƻː|({Bv ȖL# 0Jo7inr+s?Nʬ"xz©DcyW͆ ܞ0QXb$I57_|*&:[őm}]ЌX鐱mI:aWKU 7 -R uVNa" 渔iF9CcIŀ.ZxX*1IiL~3?Ѥ :k6=kjb<>Ҟ!Thn%ڔb5/C?:RK18=P}LU,va%yHY׸MD"};bC6tw**IB6,V LgU2@;>r5ǧX?=$ +cO,l˺ǹDJo 'QT2װљy}6BU?] +B.%zYJ#άZhҙ0)_-9 ޳U1%қ~æTy( & +:X.4RrkКuj8YƋ5u#BjЫ +eAP^cj̽+T5#ÅjZwN,# _pBɀp?"ZӦ̣9EKfC"Kvm\%GL3zV5I0KaDɇ.?jaTg5<iQ#)XE"}jsUĺGST^=*!3e0'D(lk' 7AryY2/П.}@vնS̪o6/#̟JfUsrob#GdEhiP.2zPp>j=0Br5176vzt3U-zsE'5e;!EQAܯt )楃<ڳaNyxgs۫`ZcE7lV8.l,4ub#a%IfP;)pyz%++! m%DZC+P.6j vԫ#L. +Y_hq5k̴/4zRqZu`/;.JT39~(zCvxo ^Wʤ%Bs/>ޡaUX.}jTE@ cČu߻Oo{i]((F(MՉj(>id{YEybT +P>6 + b< ,{\x;jnBu2`x'huhE2t3KBߍKnją48j0dh2 ˨;EI -?X#JKR+?3 '!c'Xnm5q4u_yǠuP>O QH#U\W;|r0 N%[ip?ltpFd 3,,OBd'P'DUoQ~ehyQ"F:,fGWWvؘPg_1DOt} QP=$ԅT/>6,Dz:nS0_OQY_vuNJeVEd.TelmokNOkGy`M?qDYCbǴMVeKz +4kf6l~:t~鞂׀sW)D+6詬lFҌ}+W5% B f"QR_E?5} *r UDE& @D\O x[/RWҍDn#ˮgsg/)EЫ8 #Sݴ@mCK^{d,`N߁Xd81S4 +m kxXԤkiQ8bty~4ԩ WSYPk?<~sgϾE$k:싧eyp) Ap94ܱ'B䣩OTE K?׭h ՍTSL~zMܖxo$w4{N~<xT<9/aMQeB)M=aA.g6&PEzҢ<-tVhJ|d4xnr d%"'N{GVU4A=C(؍H' ^~oƒ/gX3FW&1FB:}}<ǵ7sI/W<;k|kSm0ZCB]U\TӟngY'԰80TE4 K6C4'd2s#_XIzcqA'(6$n:^'xW#61{H&cs>In&]l0TL>_|TY}ߠnt0["w~,Wqt11/5ޔB-zdv,y@0΀cR#\4&Լneﱞτ-Q+K;VH+yRx)BCuZɪZ^:hR#b&ϗ69BmdgaqQȲv$0ε2^+d(Z-uY ~KMh&ڦp\5DCGR(I{#ƍ䢾tIN +MM[ϫbL* +(HQ8o#8˳Hgq:cjq_nߊrJVF%jL#m'$1ހ&f [ )hy70oOEIiLjrD`l]<)#=*}3z2qOIj}Z?T<ύσ`ɆV0XjZE z$0DdXr9k/lXK> #w8[RqH57Uza&hȈ$4R9{+0 Gٳ]Q^s~FamƧ%eT%5$"@3irb1f# v(N"uANSy GRnGO'v$U e/q9t{3yhJoLG)UKwwM.6OuF}IɅ[h)^KTs""ޜ +2cuSSu؛O3ϲ_ ~]Aho-N&%A7 +1Fe7hQk8ZMA,{szipOtE OwjN m +)"P +RQ] `4}z`OC@ +t+-租Zce;:˛cGTt%En|e7uя1kVliW`$@eCQ\˰sZ7^.Ǐ21d[s!f LMj,80ٷP"ʜ'Ʊb0.qf [!!_܋@{5dAꏂ Ax͠B-PT37C2^:"g Bڥ^~D_S+RϔGc i NAoKAa} +b̌hа1 dq3vYԶ|GX),T)v9~qH"j^1ȌcS[h8ѤVo] D#ܽDz yYbVZ;bŏ°`?4D3ੴ4p&g0ݒۆf6) &Nf:PLvV'Rw;&syc?77UK<->۬U/>C(5jm8լG8y}~D)|6t̠8}HZ[N{~I s HA"d2O+a,ʜ.4'N^_}rAߪ&Sip}HF )&9h(HPN䨧~80$I i>js>B)J1%3kS zTr1}kuF?>xu]UzΛqqVBXՔѼJXfNvxRi(Ԫ ~;5lKMkOjyaˠ8K'똾! מvx&P!wi]د}Ή ~}BV DȤMyO;]\ XQ/)AIwmĺ xP~oƲE%ܞG[)S9o:VzWKUwdE8p}㸫`O͘@R˭y 1/GE.̌?꣑"ad(tF)߆z ]/I3[Ϸޱ}|jDC)Ϣ˯I=-siY4 S ։%YobM¹J١m+ # ׉>kRP8Nd}:ܾ,Z}MX?Nss4`|`"ťUtu ̉ѡݡA['+\N.+5Op\Ŏڬҁy oI@|?#K6|N)G tV.9=g1FO2IAިO IHvJ<% $?^2ʝjUVvuRޜy%ƭ){JE(wׯ^Q<ʽ]#.O\9mR6Qm7ί{};:)w} $l;=Ԧa3Y.wrdHaHPԟ|Hu&JrG3OɰUl㩞(xk\\ž})p1s͉M]eFuݾg,$zQѷ&U[LAHh,Wo'i^Oj,E)4`_6Ie=I[=X[TOf\y~Ehy"P,:h^vͼJͤq0:PDBR\1}to7S!íg0%h8X#V_Nj=e__?f :䑈)qleAT-wk:f9ycxjpqZ5LbJDys1 ܀6 }qS \CZ150vQ͗P.f&(gh8?Ђ*' +,{_o"zh#0-yIkնyvg26_Ny쌚zYd1e@tqz%0"̹?D)PcP=n-yeތrpM)RnX a{ #g >O*ef*R;%TbS':cI"jE%d%![_6 {#ZT*zUُ,eQ _Hj}V\r5-HaT#?3]wx?د |xɝu;d^ =#S}֒?< +PQ͈穅'1!Z.%@?H#WtzC8i:T(m̆ĉC$ҷqJP_o4"MOr`X{R4ܶjvZ2NR0y>T6NL@|IEN`z-ꗯbAQ>stream @@ -3417,44 +3403,54 @@ e #>J>|~#@ x93l0N RR8YɌra)MBIrFvmvɼ"o͔4s?pZ1=:_ʢ'10iqo9|sllLxT*գs&P8ԡV endstream endobj -1414 0 obj<>stream -xڍP[-C:7{kK;.A& ]ܙwޫkU 1sS=PRqhB࿤4`g=?`Ll`w8 n~?߆I79@ `vApptXZA7cx3{ -l`C=+ع:8[ -30!P+:6 P6!ƊJд%p8[ x АS82VˀXA /߁ MM=! -" -2Lغ8<@lML nS<;3g#ԅb!wK7pC]P' q=ߺ'O[m:[@-~S0wujC\rx-C\lll<| 0#~`L ?zPgW?PA 9 -0[BQ,[; =l;zm@Y-euiU?wxppXع 66@U-|QxpLk]Ay^?.3;eiW[?Zb/B7By/ %VC\W+5y 1{K\"E6W@ͬ9-X@ll{53STURfw`lg=/9\g3=_3~rEh7M8-Woz 7d- \?l@?sr@>ozlJm17q;3;e_4suv~~s<` unLu*1RwI7) ,sέI V/Œa-nH_S 0[w=fk\ݥXgh[|s(2v2Vmkfy$>>&fSF7q栣mXN=ȵ\x֦ۯH(#`]W$Hz?eu*/r[]ijҤ _6 o%MeHXа.Էת GÍ`BEw 6J8{oo&J^}+PFaD., Є:wM/(Ǫ4U` PĆүˑ&/b(="'\_5NֿJ#t͒&[a )l둛fOCc8ȹo*L^X^oLRZ;å|-]{+dc_G}pEB 6g(̛n|.-g#>XҦ}oz[NnƚvKS&9BmJ]4 † tGiow.JY1 EZbfT2k+Edd{'qUϸ 0 iK`K7ѭe_]޾vb}Iw;B |EN#?!;GȚg#CjM)5!OX%F$gd뚀7#! -gn֋5epkv4._Mfr弴N$zb.tt 6LFJ[@?Nrda{OY)N &=qƿU" p<'M (Z\|Nd*YnxK'Dpy{ f2qNMՂ.% -,KzSg''bWX2Yrs0D<9ysjb-G!:I?l}Ǿ]kxMoh(c^~!R=-e؎Hϥ>05ȼ}Zvt(46طϸ61&RjKBn.ًJ:x  -ݒyO=i/f8 :|iOo}9jhF<uɴKڀbfMc0%bʓuHOG\sBX_e:*ݑ:HgSoJha=I ǐ 0f7G_̉q_JJ2QFRn0[C+ #E.o"Rz4HclGPV :X]w$+ ۞ /mOg A3𝾧v"˟g~qb***(>l]l|cJQe=kma;hHя[gzǔ -b{Y[gN>`9jl -t> -Ng@ceNuyhYz'-)+KlsіtP%D3j ^$~cUӍzA u")'I{5tڙ⦾&u"3ɖ94N3z}V>#\+C|__]LLU`Lod[$4B%s_kkQGT(c('1Y - -,G;~+>ePC@E6acr*Rv]ՀW4MZ; }75RF3rObʃb9?CEw ]uVĞ;b? ,e.ې'4y_#B"MILaHr1}`"m,q 4@8 aCd67ͯq%*;VW;),mw3tfmu_;Q@Go,EgJE|iL48B"9q=Fbotyj%n-KA(2#M4 0ó..o,Zw({ȾFI#>4TӣY{mz^GT[wRc 1yB=(Xc&D!A,hr2ؼ$p'|R{U`( Xz;"3+} NYRV1>%լΩ, mQ`_eOхBqiՠq<2D -},CV#l}А0Ot`u-hWVxVHJ?*c1G/{~P)בק#:"F򈘱&p<@ߖg.;짅6jk)^fԉ7;iDtHI&`d$:[(Vض+!(J-D +K2 CCE*Cf!{\94VkB#-?xQ*o|4 kYF5w{6ضcJrƋbx/x L^~ʁm LBJWW\wkQ+ebirt,b5V?*^qQr0RH^NbGNŻ 1kjm\ -l?f<YŰk]{w[n0>*ՎC nra eB%E2YĜ|ȶszSuټ=jfv瓨ck$g5.2"8DJ&N*5cQUp6EqtD-AƵӟ#[qwZ%࢞{cm3UKY]"V\ERrtEꎙ:ӊ)CrG^_8t0*.FHw@^67^Y]|h^ƠE?yu6ֹ1廽m:p`q}Nb"tMI︥2R]c#|ygd'b8 &;K꾘+F.6ՠ"dN{U*ȿ[7">U%΃[TXq:ITZnuzR ϸSN4-"Ib')Yl 4Q`![ŽM9 bWn^U&/NB7X;JB";~V<&2O%3C -SLyu&tÊEXM -H(}\^hEpE?7[o'U3-wE-'NjU2U4*JhNFD[;n OioKγaMע/k3'{W? /PIЩ>ʟ:R?Gb:;^nvs5eR^Ք~D^#F/5,V}c?gA/[b[?lo֧H>׳3`câ?۹KѢ ZE3>Uk:43ge~%ToN.R;P}"TAJF -r6"9)oh%y'ӯldu7*eO -w{k|#]+֊A bm~VHpvp4k;ݔ뤉vySu8,xfpWTQNM.W Ï 0IJEUxzlـ_ʮ,'Q oa=jyzPCpd 5Y (oB6/>f"S.uuլ2lsa桄}KDB7&Rֲ]7AI?'8q}{ ƾnKE^Pn3"#q*{J}byO8ZQs0r*͡TA=]򩹺Cp?c6i7 #+&ȜPkq4h$Nx:O:nARaǼ9? -n>h[eS0 ^IF*pzXmM8#aPC|!"֑Mtїc(1]U/vm [wy"7ɿfC#$6d_M\#Pyi} -C nDPV?Dj:uPMӜP0T4M%ґmʳn0vP1%0hčU)dΖfsWXNw\b,+υS :m P[*NDyHjgņ '˅AG^(V2dS],8>;h<6N%K{_\;o5' )ͷ Ubӥ4-d? Hߵ7۟wcyT$6Q^x Ёfhot4G{ 5`GРf#]U{(42nUNoyi0uR'GOl&*w7Rn4λ.D@0DD,P<d\hFn.<]ēL,^^[w'-i Txps>:2G`w7/?*gdF, -0Gv(̆١boqX|Fh]E|(}+KEWP%'fopWLʌR+ZSoP5c郂4[>4 &HAw2(iW >7;0AL$*^h,bfMؾ5J&Le<@z+U 9IifYͮ&|jDmfg~&9`4BRTI|ȁ~܌9!Ar C:~O!C܃VP \"jG>=$DWAi^ N*Y)DţM#gk5%E -f [#f.D!kANx(fk05\ׁ"8ျx]osocO;Az-o)4\A%AԊ9B k/Dd@<Ԕ9 ɚ\aGHݍDhoT˰*U]jLzDQQ#Y -[ǰO.Bo\nʱӍMߎWA;>kPC' ۖI+g I4 1G~a0*93W,Mz\_g|eQ8Z[ӱvAblF1]&f 8cQ2YmLUr4 {FRq\0=[ Iz#-=uif%(j9'@ޤDbK!.ͪ亡زT;{oF8m-p.& ҍ541 v=@,0]~N&jJ}MW52} LR>(o>no0o-̖S(uvF y.HXio\]Ter'ӯF|Y޹PʍF7Do㾄"5u0.F%N -\cD<<*[HsRa/0e=A Me㿶C"毑!Km8N\ -9wW#1mb/ 6%)[a7~za%;3]a^!F`r:I "U5x l$R'lqs}ЄFh@a<w /3֡+j^]hڪ`@`@^0ޑ*o]obXc:}L=Àۖce/y -)՛O$uÖWh^M1jCvA&`}BpVI~1;# kʉd18+7Ul08Rw1G;ǯ嫾3WTNYP6p~?\ah$ґ d aυ K¨A]j1toO{gcgxu:DyBҏ$SDҔJȬiF§Ȇ7Vľ$>]}Z~w"tyձKvrGpڧvɚRsN^[a9Evip!:Eq!q5F>4:j^4]1f ^F5kNgASeY ö[Qҗ kH;{==fͦ -\_RY29֋9?֋4'L -9+~ -hqye9,0O (G7ܞXaZ!*8HCf ŅIR.Qalܩ,JԵQWM_̣r~e+98}4t?-H5IY&߄6fY>stream +xڍP-[p =iq ww$;wLf̜^սEUkGE(bfg;12Ty,,L,,l(TT 'R*M d^ 4vz;)؁6Vv++7 ?v> Q! K,КXyy~Dl1`d }hjlP3+=3+#=d P:!.@3tƶĘP ?jvN E`2_f@%7@MFdi,XX@Ʀv`w`$噜ܜ`? m^]A6&/ 7H_wrdr0/MN('M_{`;W ̜5 g_/"d@'' 7/+Z2\[[R=d|h8AޞV7BaeL&@ /be@eX,[fv`YKSRMF7UvnOFv.#' QƠjc' '_;A׹; 'v?_tCۂlҿlE(ؽM?7ϕ[Z(1h +.`O[z^3L0PcF+,D2RMZ̹ +FbrO?{ъ/pIWky,Q>{Zr͸ *5\ZRUr( +c/O@JS&?5K6b 껃xÃ6`lW"~!(V2cQV9|j4[!$U``ׂmچ"bxCjt/d%-Q<{. 'HVI ',V(N+Vn5] (⅄c B1lCg7!~nGP]--WFVֵoTKpCA?51fG1370hSMZ "[!u|v;ӸRcA(3'He4P!>W/e8c-V>`k~I*-pw(w͚wz6CXKh!7w"cf=>idHQi>2!1פcQlO|riT0h.Jޚȅ=m+g|Ɛ`V<{3#xr-s0pC@]7o4uOu3n*!zWͱTdž)hasbvqĂ[jT7oŒb8 _u 4Aj֎=rw'hqޕ|HcPB~WX &,UJz~("é&&F"J2&}4NL,Dg({Bl 7C-nΒ6tP(v~k{yTm=>an\mqZגbJnAw(V,Z`Ifƃx-}tFB 4}_4Z0^탲,{`!:1֪`r]~hVmEAܘL05 &XPt`>H!ܺ){8VYsG +Vp;}{ 9 h6Wv; +Qiq^#NͫH8SuR AC58h;:C돖JZwCsg}UW3n> +N8?Q4Ue1Ӽ[p`$/;,&T. M~{LV7=İַhG=z(0>Vʻ(PM𹚹brp Y>J֜91js۩<T/z)osu#,D +FO&RގkbY{J1VD 0T\C6{GIgu(i@XքmA)&whrw[0y Eq%bQO*^hԳESuSYYh?u-FIp8VQxeG4鿚Ba)G̴8"0D!qy5a ,d#JV_h?m5s# mi!: +dկ}RlZCQG=Bۣ4ΘN g+bN{e, 3( '|甜#iAu pnzY{TICm5̦D~="n "exEVԐb.z܊h+s ~ՎEѩ)qjTC( =^{(D1~V~q3;f{8i7>6p!]ģ<6gVe+DJ]C HbLPy5&пm88yĎUQjޚiw.cH<[KgmGnAns쾴ڽ }/V>%BԸ&ZyIs 0װ8n1Q:\395b|r1!q_o}$-JXFwacF.l,oԼ^F(<"fSR5c؁UC<n),W/d_9'6mg)$p5T_iQe=B7 ޼JIF9CSԲDj 9F ҩϾ|! 4BbʾkQ7_&zkZ(Ț|3*5'ַ BQRF]LDsgvs|Vb=GWr-F%UCΝ X4;Wc f NjW V?>ҼZn3bD0-⏰DPȷQfZ1vvGKv +j'u}Uw8\1R`t#@39)m5B.Iy;a]Yk(k٦Sa +51m?'kv 6&ڭϿ}= M ְe wљ 8 ڹV{eb“m{݄/`'uؠCIM$v|Rs.3+NÏlqſ f y7,c e-pNV 3Ѕ=)+syD֩eMJ\UxE_wNQ/ϫ T +e 6 lO9&Qw8zQ۪n.Ul>6ɓQ_a f&9dj$!,0aS~F{m!2}+/29/S P{{9`xR5PLcByR h#y]m:>|6n[nMyˮ -AТ9$!l'y+riDlI\_,2 TY2d +P7Q=ѿYJpkSBLPs G*j_8lgVEWB!F>L7ZBRJ1#ֽաcu mu]|+ʋe +Và>O儰zk7 IU*+2Wqaӳ@z_%I RFSFZ8() lL ip?"ς_heTLVO{[`L^Y;=݆Y~vAFf +,>xg6%$'S|lh'?6nG;ori z|*D[uQr +!J)ˇe ).M!K;UNOB.Y:O4I[o3&zN4GP֐|Gj³~ ŽV:Z;hӦ/]L +q +fP`Ȱe冷}eZ~M]_\B뢵x,v+S~yId(~[:BU}Ṕ-dg]nd# X֙IE4w!K]c-Y}uBch{Tb?9)˶! L#_y`/1ܴh\*.HJzq75>U6.JNaA(QN+Vpz܎dPb|__wL0/kK#LmP_֠Z@AȘa'3TꍵшMɃJO=ë+]j+e9{PM{s^r1vن M2.Ϸv|H\J_OHg& k, dsh(BݖT|D܊ķ6,pXJo Bw{Tr&b{Pr7A W&&pm˹.] *,MñxCC~:o2<D=Cp2W@gH,?O"Ӫk0-ѸPfF +)Il?*MS^l&܌^˕/@l㶈Ì 7{  E6mM™NMaDɗ(;疴idQ"8s^cEFˠ`!V/je|Tڥf7Zcm~@N2$e- L<7gSqH-|?;䯂]JdA.%;0{8 '/�#&Bޢ%`Q퀐!Ż:\Ju%Y)WsNS+ʠx;=0:%2J +K^hi o-`o }vyv˹PzA/;G̏1ZOiL~ +3-BzT5\X*;XEK71=+\k(3$i bm%*P+h;0V1dTtQKHOƩR:/ >+=XO5RLm%. ]]fc?-3k6cѠL$!ⷺ_nCkΞh_׳ c7#E5~jQ(14n40kƉji8<ǧL8YSL+LGt1{9"[~i l#6#E>]eH'߸6/bv滉CgKA." vgh\iY,'ئ5b]@v [0؊]E&*;>n=SH=.Q#{Jx,bp< ů+O8JIr})͐U臲H0:w +P0 AXuFŎיw3g~僞OBg!iԳJF +Oo0T1Ӡ}2rnAk1ő.l3 +Ll8C=ezz"}iy O5ndY#7Sx"۸rc_eI 0|U' c*o Yޛ*JSi _jf6ٮ'Oo Mh񣦋9[1w蒿2]&#iCb|&P</X{'3ZFBh{fD#"畍;V !?rjP%Do!pMǮ4"&ZHz+ vNY w9WAeș9a:dT8O.U` r>d"oLuF&75>XnƩ5筝naCwmއ%r]<.1$#U ^WFWm܀5,! -cXgJ;3NrW N}ӏb)"*5'X M.NB<&IzNŒydb↫J vG{=(&xvbtQ#>mߛX18]͌V3dTx& NfItKQI#K}4bgK9p9=d͘]it\;+ rEx]wnaro?_^.XpKf'긯q@nu l]ZU \Ba[;j sxJF1hIEp`-:R^<.9/-:+ +tqWBbflQH,r-gƾٷ  [r}o1|۷U)pioS猪8@44%Ym%w椥qglq7PtxVfWB㏃mJ͔ݎn"#gwJ͞i7r[* g?I0Ƒo40<9 +[oغY٨L ۽"({+N42誫K2_y+jc +Z?Fq +%+jD) +Bs&W8I?oO: 1o. (;m1 , 0@e)6׋,\O/dNQ15Jgtah_% ?&{l4i1 i;-•ċ؈B2>mWI[Ydz*g4B|B*bBܤp4 i{N]l q_I*x=]rr%pc"&mjl2j!ME\Y%&q!vP9f$Pmplq9F/ɳ+ktGLanOGe12 O R5n!PoO?p,rӏaҤ^{K>U A/:2-Cr_PuX G>q@.ػH+..씯ps/'%nN)S)4&ݺy_ +⁳lTޗQ,i22媏[q/;Q0ݒhH [TQgwLa!K+=qeFd 4,C`7*)D?t.]b^ EV:$ 2Q"|˹xЏR}Vά;Fɵ!)dk=w]?{%NMZҥ2pj*FmQ@qGN)) Lv5ŇOڼs%[ot_:tح<Vûw9|zR,:9C>yb曨xYH>\N rx9j`!"4|֧lP|C۟ ˲G Zv>j|I9d!9i-FAHK(O:V,Y@Ob^;>`<i[eu؝jBT>nwj#0<ϸ;`osD9@XwGG'2VGmMEu~ɝ7=k#\sVz/`4 y&b +fSC'Q4FR>v"]BA") +ܾ~#W;hN+^NZ 9V!]s;= +`]mRżzkI)ze,/ +g#(l,I.x6Y1baQm*!6voiXaHܨ}ǣANCL,#>`f6["${uMn ;qxB`8qY~&-ȧTa}K;J4t8,70 endstream endobj 1415 0 obj<>stream @@ -3903,10 +3899,15 @@ endobj endobj 1477 0 obj<> endobj -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 +1478 0 obj<>/Info 6 0 R/DecodeParms<>/Size 1479/Length 1076>>stream +xڽXMlMAVTlUn+)(}DZI I. K~6HFR$6v~6'{׹jqs9g1& &o +& +ݒ&JaˁovQKtE砽F>;@{#^.d vx3IwO@_AuO)/׾l6^~ ]AMEQjWA^ y 8jY>GMtc A%qh<:ۊ3jcks"Tjk>Ujl͗>))Z'ǜkߧ!xN!L7۔0}+F$L.w5kWط.|7d4,tpc;UۢpF*̥StI 5PlZqW% ǥ]ju5Ө~qu8&'R?~a`OgGЎ؟k<*Xd>J?',OakTٯpqCeYa9$YN}G[_}!VΞ\ +cOtӻȏ׀ps\ Z*p$ HTyPNe~ oo@?!@4 wЃI^?IyAvP'h@wȱp/qqX<$K[F5KϡEa@%-?"qz3wC~?M8@sA" {yd' +-*- {:+؏+8?ic2 rIJk(5C +ӈccYUg`\qcRlW ?VnU)JnU=[U+Wkl3Fk1"/-na`]|Zȸ>"XWl7pGj& + ke-*=[np7*YC{\ w}'XJ[5 endstream endobj startxref -385161 +385395 %%EOF diff --git a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf index a2588dab78e..b8c88491493 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/manual.css b/Master/texmf-dist/doc/latex/hyperref/manual.css index 9fbec5d532e..4a0b27433de 100644 --- a/Master/texmf-dist/doc/latex/hyperref/manual.css +++ b/Master/texmf-dist/doc/latex/hyperref/manual.css @@ -13,6 +13,7 @@ .ec-lmss-17{ font-family: sans-serif;} .ec-lmss-17{ font-family: sans-serif;} .ec-lmss-17{ font-family: sans-serif;} +.ec-lmss-17{ font-family: sans-serif;} .ec-lmr-12{font-size:120%;} .ec-lmtt-10{ font-family: monospace;} .ec-lmtt-10{ font-family: monospace;} @@ -26,6 +27,7 @@ .ec-lmtt-10{ font-family: monospace;} .ec-lmtt-10{ font-family: monospace;} .ec-lmtt-10{ font-family: monospace;} +.ec-lmtt-10{ font-family: monospace;} .lmsy7-{font-size:70%;} .ec-lmri-10{ font-style:italic;} .ec-lmri-10{ font-style:italic;} @@ -39,6 +41,8 @@ .ec-lmri-10{ font-style:italic;} .ec-lmri-10{ font-style:italic;} .ec-lmri-10{ font-style:italic;} +.ec-lmri-10{ font-style:italic;} +.ec-lmss-10{ font-family: sans-serif;} .ec-lmss-10{ font-family: sans-serif;} .ec-lmss-10{ font-family: sans-serif;} .ec-lmss-10{ font-family: sans-serif;} @@ -65,6 +69,7 @@ .ec-lmbx-10{ font-weight: bold;} .ec-lmbx-10{ font-weight: bold;} .ec-lmbx-10{ font-weight: bold;} +.ec-lmbx-10{ font-weight: bold;} .ec-lmss-8{font-size:80%; font-family: sans-serif;} .ec-lmss-8{ font-family: sans-serif;} .ec-lmss-8{ font-family: sans-serif;} @@ -77,6 +82,21 @@ .ec-lmss-8{ font-family: sans-serif;} .ec-lmss-8{ font-family: sans-serif;} .ec-lmss-8{ font-family: sans-serif;} +.ec-lmss-8{ font-family: sans-serif;} +.ec-lmtk-10{ font-family: monospace;} +.ec-lmtk-10{ font-family: monospace;} +.ec-lmtk-10{ font-family: monospace;} +.ec-lmtk-10{ font-family: monospace;} +.ec-lmtk-10{ font-family: monospace;} +.ec-lmtk-10{ font-family: monospace;} +.ec-lmtk-10{ font-family: monospace;} +.ec-lmtk-10{ font-family: monospace;} +.ec-lmtk-10{ font-family: monospace;} +.ec-lmtk-10{ font-family: monospace;} +.ec-lmtk-10{ font-family: monospace;} +.ec-lmtk-10{ font-family: monospace;} +.ec-lmtk-10{ font-family: monospace;} +.ec-lmtti-10{ font-family: monospace; font-style:italic;} .ec-lmtti-10{ font-family: monospace; font-style:italic;} .ec-lmtti-10{ font-family: monospace; font-style:italic;} .ec-lmtti-10{ font-family: monospace; font-style:italic;} diff --git a/Master/texmf-dist/doc/latex/hyperref/manual.html b/Master/texmf-dist/doc/latex/hyperref/manual.html index 5d0a1dbddbb..7c75271d2ff 100644 --- a/Master/texmf-dist/doc/latex/hyperref/manual.html +++ b/Master/texmf-dist/doc/latex/hyperref/manual.html @@ -7,7 +7,7 @@ - + @@ -23,7 +23,7 @@ class="E">EX: a manual for hyperref class="ec-lmr-12">Sebastian Rahtz
Heiko Oberdiek
January 2010
+class="ec-lmr-12">September 2010

Contents

@@ -1417,60 +1417,60 @@ class="td10"> pdfpagescrop pdfremotestartview -

n - n - n - n

text Fit -

Sets the default PDF crop box for pages. This - should be a set of four numbers +

Set the startup page view of remote PDF files pdfcenterwindow pdfpagescrop -

boolean false

n + n + n + n -

position the document window in the center - of the screen +

Sets the default PDF crop box for pages. This + should be a set of four numbers pdfdirection pdfcenterwindow -

text

boolean empty false -

direction setting +

position the document window in the center + of the screen pdfdisplaydoctitle pdfdirection -

boolean

text false empty -

display document title instead of file name in - title bar +

direction setting pdfduplex pdfdisplaydoctitle -

text

boolean empty false -

paper handling option for print dialog +

display document title instead of file name in + title bar pdffitwindow pdfduplex -

boolean

text false empty -

resize document window to fit document size +

paper handling option for print dialog pdflang pdffitwindow -

text

boolean empty false -

PDF language identifier (RFC 3066) +

resize document window to fit document size pdfmenubar pdflang -

boolean

text true empty -

make PDF viewer’s menu bar visible +

PDF language identifier (RFC 3066) pdfnewwindow pdfmenubar

boolean false true -

make links that open another PDF file start a - new window +

make PDF viewer’s menu bar visible pdfnonfullscreenpagemode pdfnewwindow -

boolean

boolean empty false -

page mode setting on exiting full-screen mode +

make links that open another PDF file start a + new window pdfnumcopies pdfnonfullscreenpagemode -

integer

boolean empty -

number of printed copies +

page mode setting on exiting full-screen mode pdfpagelayout pdfnumcopies -

text

integer empty -

set layout of PDF pages +

number of printed copies pdfpagelabels pdfpagelayout -

boolean

text true empty -

set PDF page labels +

set layout of PDF pages pdfpagetransition pdfpagelabels -

text

boolean empty true -

set PDF page transition style +

set PDF page labels pdfpicktraybypdfsize pdfpagetransition

text empty -

set option for print dialog +

set PDF page transition style pdfprintarea pdfpicktraybypdfsize

text empty -

set /PrintArea of viewer preferences +

set option for print dialog pdfprintclip pdfprintarea

text empty -

set /PrintClip of viewer preferences +

set /PrintArea of viewer preferences pdfprintpagerange pdfprintclip -

n - n - (n - n)*

text empty -

set /PrintPageRange of viewer preferences +

set /PrintClip of viewer preferences pdfprintscaling pdfprintpagerange -

text

n + n + (n + n)* empty -

page scaling option for print dialog (option - /PrintScaling of viewer preferences, PDF 1.6); - valid values are None and AppDefault +

set /PrintPageRange of viewer preferences pdftoolbar pdfprintscaling -

boolean

text true empty -

make PDF toolbar visible +

page scaling option for print dialog (option + /PrintScaling of viewer preferences, PDF 1.6); + valid values are None and AppDefault pdfviewarea pdftoolbar -

text

boolean empty true -

set /ViewArea of viewer preferences +

make PDF toolbar visible pdfviewclip pdfviewarea

text empty -

set /ViewClip of viewer preferences +

set /ViewArea of viewer preferences pdfwindowui pdfviewclip -

boolean

text true empty -

make PDF user interface elements visible +

set /ViewClip of viewer preferences unicode pdfwindowui

boolean false true -

Unicode encoded PDF strings +

make PDF user interface elements visible +class="td01">unicode +

boolean false +

Unicode encoded PDF strings + + @@ -1686,31 +1695,34 @@ class="td01"> class="td01"> + -

Each link in Acrobat carries its own magnification level, which is set using PDF coordinate space, - +

Each link in Acrobat carries its own magnification level, which is set using PDF coordinate space, which is not the same as TEX’s. The unit is bp and the origin is in the lower left corner. -See also EX’s. The unit is bp and the origin is in the lower left corner. See also +\hypercalcbp that is explained on page 37. pdfTEX works by supplying default -values for XYZ (horizontal EX works by supplying default values for XYZ +(horizontal × vertical × zoom) and FitBH. However, drivers using pdfmark do -not supply defaults, so hyperref passes in a value of -32768, which causes Acrobat to set -(usually) sensible defaults. The following are possible values for the pdfview and pdfstartview +class="ec-lmtt-10">pdfmark do not supply defaults, so +hyperref passes in a value of -32768, which causes Acrobat to set (usually) sensible defaults. +The following are possible values for the pdfview, pdfstartview and pdfremotestartview parameters. -

+

XYZ +

Fits the page to the window.

+

Fits the width of the page to the window.

+

Fits the height of the page to the window.

+

Fits the page bounding box to the window.

left top zoom -

Sets a coordinate and a zoom factor. If any one +

Sets a coordinate and a zoom factor. If any one is null, the source link value is used. null null Fit

-

Fits the page to the window.

FitH top -

Fits the width of the page to the window.

FitV left -

Fits the height of the page to the window.

FitR left bottom right top -

Fits the rectangle specified by the four +

Fits the rectangle specified by the four coordinates to the window.

FitB -

Fits the page bounding box to the window.

FitBH top -

Fits the width of the page bounding box to +

Fits the width of the page bounding box to the window.

FitBV left -

Fits the height of the page bounding box to +

Fits the height of the page bounding box to the window.

-

The

The pdfpagelayout can be one of the following values. -

+

class="td11"> SinglePage +

Displays a single page; advancing flips the page

+

Displays the document in one column; continuous scrolling.

+ + - - @@ -1869,7 +1881,7 @@ class="td11"> class="td11">
-

Displays a single page; advancing flips the page

OneColumn -

Displays the document in one column; continuous scrolling.

TwoColumnLeft -

Displays the document in two columns, odd-numbered pages to +

Displays the document in two columns, odd-numbered pages to the left.

TwoColumnRight -

Displays the document in two columns, odd-numbered pages to +

Displays the document in two columns, odd-numbered pages to the right.

TwoPageLeft -

Displays two pages, odd-numbered pages to the left (since PDF +

Displays two pages, odd-numbered pages to the left (since PDF 1.5).

TwoPageRight -

Displays two pages, odd-numbered pages to the right (since PDF +

Displays two pages, odd-numbered pages to the right (since PDF 1.5).

-

Finally, the

Finally, the pdfpagetransition can be one of the following values, where /Di stands for direction of motion in degrees, generally in 90Blinds /Dm /V), and /M is for motion, either in (/I) or out (/O). -

+

Blinds +

A box sweeps in or out.

+

Two lines sweep across the screen to reveal the new page.

/Dm -

Multiple lines distributed evenly across the screen sweep +

Multiple lines distributed evenly across the screen sweep in the same direction to reveal the new page.

Box /M -

A box sweeps in or out.

Dissolve -

The page image dissolves in a piecemeal fashion to reveal +

The page image dissolves in a piecemeal fashion to reveal the new page.

Glitter /Di -

Similar to Dissolve, except the effect sweeps across the +

Similar to Dissolve, except the effect sweeps across the screen.

Split /Dm /M -

Two lines sweep across the screen to reveal the new page.

Wipe /Di -

A single line sweeps across the screen to reveal the new +

A single line sweeps across the screen to reveal the new page.

-

+

3.7 Option pdfinfo

-

The information entries can be set using

The information entries can be set using pdftitle, pdfsubject, …. Option pdfinfo provides an @@ -1982,15 +1994,15 @@ values are text strings (see PDF specification). Example:  
  }  
} -

-

+

+

3.8 Big alphabetical list

-

The following is a complete listing of available options for

The following is a complete listing of available options for hyperref, arranged alphabetically. -

+

anchorcolor +

set color of anchors

+

do bibliographical back references

+

set base URL for document

+

make bookmarks

+

put section numbers in bookmarks

+

open up bookmark tree

+

level to which bookmarks are open

+

to specify which ‘toc’ file to mimic

+

allow links to break over lines

+

to produce CJK bookmarks

+

color of border around cites

+

color of citation links

+

color links

debug +

do not do any hyperlinking

dvipdfm +

to set encap character for hyperindex

+

suffix of linked files

+

color of border around file links

+

color of file links

+

opposite of option draft

+

use small caps instead of color for links

+

make figures hyper links

+

set up hyperlinked footnotes

+

set up hyperlinked indices

+

use guessable names for links

+

use legalpaper

+

use letterpaper

+

color of border around links

+

color of links

+

color of border around menu links

@@ -2344,7 +2356,7 @@ class="ec-lmtt-10">menucolor +

color for menu links

+

allow nesting of links

+

put an anchor on every page

+

backreference by page number

pdfauthor +

text for PDF Author field

+

width of PDF link border

+

text for PDF Creator field

+

+

+

direction setting

+

paper handling option for print dialog

+

resize document window to fit document size

+

set highlighting of PDF links

+

text for PDF Keywords field

@@ -2512,7 +2524,7 @@ class="ec-lmtt-10">pdflang +

PDF language identifier (RFC 3066)

+

make PDF viewer’s menu bar visible

+

make links that open another PDF

+

file start a new window

+

page mode setting on exiting full-screen mode

+

number of printed copies

+

set layout of PDF pages

+

set default mode of PDF display

+

set PDF page labels

+

set crop size of PDF document

+

set PDF page transition style

+

set option for print dialog

+

set /PrintArea of viewer preferences

+

set /PrintClip of viewer preferences

pdfprintpagerange +

set /PrintPageRange of viewer preferences

+

page scaling option for print dialog

+

text for PDF Producer field

+

starting view of remote PDF documents

+

page at which PDF document opens

+

starting view of PDF document

+ +

text for PDF Title field

+

make PDF toolbar visible

- +

PDF ‘view’ when on link traversal

+

set /ViewArea of viewer preferences

+

set /ViewClip of viewer preferences

+

make PDF user interface elements visible

+ +

color of border around ‘run’ links

+

color of ‘run’ links

+

set page size by special driver commands

- +

use Textures backend

+

Unicode encoded pdf strings

+

color of border around URL links

+

color of URL links

+

be chatty

+ - +class="td01"> +class="td01"> + + +class="td01"> - - +class="td01"> +
black -

set color of anchors

backref false -

do bibliographical back references

baseurl empty -

set base URL for document

bookmarks true -

make bookmarks

bookmarksnumbered false -

put section numbers in bookmarks

bookmarksopen false -

open up bookmark tree

bookmarksopenlevel \maxdimen -

level to which bookmarks are open

bookmarkstype toc -

to specify which ‘toc’ file to mimic

breaklinks false -

allow links to break over lines

CJKbookmarks false -

to produce CJK bookmarks

citebordercolor 0 1 0 -

color of border around cites

citecolor green -

color of citation links

colorlinks false -

color links

true -

(

(tex4ht, dviwindo)

false -

provide details of anchors defined; same as +

provide details of anchors defined; same as verbose

draft false -

do not do any hyperlinking

-

use

use dvipdfm backend

dvipdfmx -

use

use dvipdfmx backend

dvips -

use

use dvips backend

dvipsone -

use

use dvipsone backend

dviwindo -

use

use dviwindo backend

encap -

to set encap character for hyperindex

extension dvi -

suffix of linked files

filebordercolor 0 .5 .5 -

color of border around file links

filecolor cyan -

color of file links

final true -

opposite of option draft

frenchlinks false -

use small caps instead of color for links

hyperfigures false -

make figures hyper links

hyperfootnotes true -

set up hyperlinked footnotes

hyperindex true -

set up hyperlinked indices

hypertex -

use

use HyperThypertexnames

true -

use guessable names for links

implicit true -

redefine LAT

redefine LATEX internals

latex2html -

use

use LATlegalpaper

-

use legalpaper

letterpaper -

use letterpaper

linkbordercolor 1 0 0 -

color of border around links

linkcolor red -

color of links

linktocpage false -

make page number, not text, be link on TOC, +

make page number, not text, be link on TOC, LOF and LOT

menubordercolor 1 0 0 -

color of border around menu links

red -

color for menu links

nativepdf false -

an alias for

an alias for dvips

naturalnames false -

use LAT

use LATEX-computed names for links

nesting false -

allow nesting of links

pageanchor true -

put an anchor on every page

pagebackref false -

backreference by page number

empty -

text for PDF Author field

pdfborder 0 0 1 -

width of PDF link border

0 0 0 -

(

(colorlinks)

pdfcenterwindow false -

position the document window in the center +

position the document window in the center of the screen

pdfcreator LaTeX with -

text for PDF Creator field

hyperref -

package -

pdfdirection empty -

direction setting

pdfdisplaydoctitle false -

display document title instead of file name in +

display document title instead of file name in title bar

pdfduplex empty -

paper handling option for print dialog

pdffitwindow false -

resize document window to fit document size

pdfhighlight /I -

set highlighting of PDF links

pdfinfo empty -

alternative interface for setting document +

alternative interface for setting document information

pdfkeywords empty -

text for PDF Keywords field

empty -

PDF language identifier (RFC 3066)

pdfmark false -

an alias for

an alias for dvips

pdfmenubar true -

make PDF viewer’s menu bar visible

pdfnewwindow false -

make links that open another PDF

-

file start a new window

pdfnonfullscreenpagemode empty -

page mode setting on exiting full-screen mode

pdfnumcopies empty -

number of printed copies

pdfpagelayout empty -

set layout of PDF pages

pdfpagemode empty -

set default mode of PDF display

pdfpagelabels true -

set PDF page labels

pdfpagescrop empty -

set crop size of PDF document

pdfpagetransition empty -

set PDF page transition style

pdfpicktraybypdfsize empty -

set option for print dialog

pdfprintarea empty -

set /PrintArea of viewer preferences

pdfprintclip empty -

set /PrintClip of viewer preferences

empty -

set /PrintPageRange of viewer preferences

pdfprintscaling empty -

page scaling option for print dialog

pdfproducer empty -

text for PDF Producer field

pdfstartpage pdfremotestartview 1 Fit -

page at which PDF document opens

pdfstartview pdfstartpage Fit 1 -

starting view of PDF document

pdfsubject pdfstartview empty Fit -

text for PDF Subject field

pdftex pdfsubject empty -

use

text for PDF Subject field

pdftex +

use pdfTEX backend

pdftitle pdftitle empty empty -

text for PDF Title field

pdftoolbar pdftoolbar true true -

make PDF toolbar visible

pdftrapped pdftrapped empty empty -

Sets the document information Trapped entry. +

Sets the document information Trapped entry. Possible values are True, False and Unknown. An empty value means, the entry is not set.

pdfview XYZ -

PDF ‘view’ when on link traversal

pdfviewarea pdfview empty XYZ -

set /ViewArea of viewer preferences

pdfviewclip pdfviewarea empty empty -

set /ViewClip of viewer preferences

pdfwindowui pdfviewclip true empty -

make PDF user interface elements visible

plainpages pdfwindowui false true -

do page number anchors as plain arabic

ps2pdf plainpages false +

do page number anchors as plain arabic

ps2pdf -

use

use ps2pdf backend

raiselinks raiselinks false false -

raise up links (for

raise up links (for HyperTEX backend)

runbordercolor runbordercolor 0 .7 .7 0 .7 .7 -

color of border around ‘run’ links

runcolor runcolor filecolor filecolor -

color of ‘run’ links

setpagesize setpagesize true true -

set page size by special driver commands

tex4ht tex4ht -

use

use TEX4ht backend

textures -

use Textures backend

unicode false textures -

Unicode encoded pdf strings

urlbordercolor unicode 0 1 1 false -

color of border around URL links

urlcolor urlbordercolor magenta 0 1 1 -

color of URL links

verbose urlcolor false magenta -

be chatty

vtex verbose false -

use VTeX backend

xetex vtex +

use VTeX backend

xetex -

use

use XeTEX backend

-

+

4 Additional user macros

-

If you need to make references to URLs, or write explicit links, the following low-level user macros are +

If you need to make references to URLs, or write explicit links, the following low-level user macros are provided: -

+

\href[options]{URL}{text}
-

The } + +

The text is made a hyperlink to the URL; this must be a full URL (relative to the base URL, if that is defined). The special characters # and ˜ do not need to be escaped in any way. -

+

The optional argument options recognizes the hyperref options pdfremotestartview, pdfnewwindow +and the following key value options: +

+page:
Specifies the start page number of remote PDF documents. First page is 1. +
+ismap:
Boolean key, if set to |true|, the URL should appended by the coordinates as query + parameters by the PDF viewer. +
+nextactionraw:
The value of key |/Next| of action dictionaries, see PDF specification.
+

\url{URL}
-

Similar to

Similar to \href{URLURL}}. Depending on the driver \href also tries to detect the link type. Thus the result can be a url link, file link, … -

+

\nolinkurl{URL}
-

Write

Write URL in the same way as \url, without creating a hyperlink. -

+

{URL}
-

A base

A base URL is established, which is prepended to other specified URLs, to make it easier to write portable documents. -

+

}{text}
-

The link to the image referenced by the URL is inserted, using

The link to the image referenced by the URL is inserted, using text as the anchor. -

For drivers that produce HTML, the image itself is inserted by the browser, with the

For drivers that produce HTML, the image itself is inserted by the browser, with the text being ignored completely. -

+

}{text}
-

A target area of the document (the

A target area of the document (the text) is marked, and given the name category.name -

+

}{text}
-

text is made into a link to URL#category.name - - -

+

]{text}
-

text is made into a link to the same place as \ref{label} would be linked. -

+

}{text}
-

+

}{text}
-

A simple internal link is created with

A simple internal link is created with \hypertarget, with two parameters of an anchor name, and anchor \hyperlink has two arguments, the name o \hypertarget, and the text which be used as the link on the page. -

Note that in HTML parlance, the

Note that in HTML parlance, the \hyperlink command inserts a notional # in front of each link, making it relative to the current testdocument; \href expects a full URL. -

+

\phantomsection
-

This sets an anchor at this location. It works similar to

This sets an anchor at this location. It works similar to \hypertarget{}{} with an automatically choosen anchor name. Often it is used in conjunction with \addcontentsline for sectionlike things @@ -3116,10 +3162,10 @@ is set. Example:  
\addcontentsline{toc}{chapter}{\indexname}  
\printindex -

-

Now the entry in the table of contents (and bookmarks) for the index points to the start of the index page, +

+

Now the entry in the table of contents (and bookmarks) for the index points to the start of the index page, not to a location before this page. -

+

\autoref< class="ec-lmtt-10">{label}
-

This is a replacement for the usual

This is a replacement for the usual \ref command that places a contextual label in front of the reference. This gives your users a bigger target to click for hyperlinks (e.g. ‘section 2’ instead of merely the number ‘2’). -

The label is worked out from the context of the original

The label is worked out from the context of the original \label command by hyperref by using the macros listed below (shown with their default values). The macros can be (re)defined in documents using @@ -3142,16 +3188,16 @@ macros listed below (shown with their default values). The macros can be (re)def class="ec-lmtt-10">\(re)newcommand; note that some of these macros are already defined in the standard document classes. The mixture of lowercase and uppercase initial letters is deliberate and corresponds to the author’s practice. -

For each macro below,

For each macro below, hyperref checks \*autorefname before \*name. For instance, it looks for \figureautorefname before \figurename. -

+

class="td11"> Macro +

Figure

+

Table

+

Part

+

Appendix

+

Equation

+

item

+

chapter

+

section

+

subsection

+

subsubsection

+

paragraph

+

footnote

+

Equation

+

Theorem

+

page

@@ -3271,7 +3317,7 @@ class="td11"> class="td11">
-

Default

\figurename -

Figure

\tablename -

Table

\partname -

Part

\appendixname -

Appendix

\equationname -

Equation

\Itemname -

item

\chaptername -

chapter

\sectionname -

section

\subsectionname -

subsection

\subsubsectionname -

subsubsection

\paragraphname -

paragraph

\Hfootnotename -

footnote

\AMSname -

Equation

\theoremname -

Theorem

\page -

page

-

Example for a redefinition if

Example for a redefinition if babel is used:

@@ -3282,8 +3328,8 @@ class="ec-lmss-10">babel is used:  
  \def\subsectionautorefname{Unterkapitel}%  
}
-

-

Hint:

+

Hint: \autoref works via the counter name that the reference is based on. Sometimes \autoref chooses the wrong name, if the counter is used for different things. For example, it happens with @@ -3323,8 +3369,8 @@ lemmas:  
 
\end{document} -

-

+

+

{label}
-

It replaces

It replaces \pageref and adds the name for page in front of the page reference. First \pageautorefname is checked before \pagename. -

For instances where you want a reference to use the correct counter, but not to create a link, there +

For instances where you want a reference to use the correct counter, but not to create a link, there are starred forms: -

+

\ref*{label}
-

+

{label}
-

+

\autoref* class="ec-lmtt-10">{label}
-

+

{label}
-

A typical use would be to write +

A typical use would be to write

\hyperref[other]{that nice section (\ref*{other}) we read before}
-

-

We want

+

We want \ref*{other} to generate the correct number, but not to form a link, since we do this ourselves with \hyperref. -

+

Xstring}
-

\pdfstringdef returns a macro containing the PDF string. (Currently this is done globally, but do not rely on it.) All the following tasks, definitions and redefinitions are made in a group to keep them local: @@ -3464,24 +3510,24 @@ class="ec-lmtt-10">\textbf, etc.

  • Support for \xspace provided by the xspace package
  • -

    In addition, parentheses are protected to avoid the danger of unsafe unbalanced parentheses in +

    In addition, parentheses are protected to avoid the danger of unsafe unbalanced parentheses in the PDF string. For further details, see Heiko Oberdiek’s EuroTEX paper distributed with hyperref. -

    +

    4.1 Bookmark macros

    -

    +

    4.1.1 Setting bookmarks
    -

    Usually

    Usually hyperref automatically adds bookmarks for \section and similar macros. But they can also set manually. -

    +

    }{name}
    -

    creates a bookmark with the specified text and at the given level (defaul is 0). As name for the +

    creates a bookmark with the specified text and at the given level (defaul is 0). As name for the internal anchor name is used (in conjunction with level). Therefore the name must be unique (similar to \label). -

    +

    }{name}
    -

    creates a bookmark at the current level. -

    +

    creates a bookmark at the current level. +

    }{name}
    -

    creates a bookmark one step down in the bookmark hierarchy. Internally the current level is increased +

    creates a bookmark one step down in the bookmark hierarchy. Internally the current level is increased by one. -

    +

    }{name}
    -

    creates a bookmark below the current bookmark level. However after the command the current +

    creates a bookmark below the current bookmark level. However after the command the current bookmark level has not changed. -

    Hint: Package bookmark replaces hyperref’s bookmark organization by a new algorithm: @@ -3558,16 +3604,16 @@ class="E">EX run is needed.

  • More control over the bookmark appearance (color, font).
  • Different bookmark actions are supported (external file links, urls, …).
  • -

    Therefore I recommend using this package. -

    +

    Therefore I recommend using this package. +

    4.1.2 Replacement macros
    -

    hyperref takes the text for bookmarks from the arguments of commands like \section, which can contain things like math, colors, or font changes, none of which will display in bookmarks as is. -

    +

    }{PDFstring}
    -

    For example, +

    For example,

    \section{Pythagoras: @@ -3596,8 +3642,8 @@ class="ec-lmtt-10">}  
    }  
    \section{\texorpdfstring{\textcolor{red}}{}{Red} Mars}
    -

    -

    +

    \pdfstringdef executes the hook before it expands the string. Therefore, you can use this hook to perform additional tasks or to disable additional commands. @@ -3609,8 +3655,8 @@ perform additional tasks or to disable additional commands.  
      \renewcommand{\mycommand}[1]{}%  
    } -

    -

    However, for disabling commands, an easier way is via

    +

    However, for disabling commands, an easier way is via \pdfstringdefDisableCommands, which adds its argument to the definition of \pdfstringdefPreHook (‘@’ can here be used as letter in command @@ -3624,11 +3670,11 @@ names):  
      \let\textcolor\@gobble  
    } -

    -

    +

    +

    4.2 Utility macros

    -

    +

    {dimen specification}
    -

    \hypercalcbp takes a TEX dimen specification and converts it to bp and returns the number without -the unit. This is useful for options EX dimen specification and converts it to bp and returns the number +without the unit. This is useful for options pdfview, pdfstartview and pdfview. Example: +class="ec-lmtt-10">pdfremotestartview. +Example:

    @@ -3655,9 +3703,9 @@ class="ec-lmtt-10">pdfview. Example:  
        -\headheight-\headsep}  
    }
    -

    -

    The origin of the PDF coordinate system is the lower left corner. -

    Note, for calculations you need either package |calc| or

    +

    The origin of the PDF coordinate system is the lower left corner. +

    Note, for calculations you need either package |calc| or ε-TEX. Nowadays the latter should automatically be enabled for LATε-TEX, please, look in the source documentation hyperref.dtx for further limitations. -

    Also

    Also \hypercalcbp cannot be used in option specifications of \documentclass and \usepackage, @@ -3674,12 +3722,12 @@ because LATEX expands the option lists of these commands. However package hyperref is not yet loaded and an undefined control sequence error would arise. -

    +

    5 Acrobat-specific behavior

    -

    If you want to access the menu options of Acrobat Reader or Exchange, the following macro is provided +

    If you want to access the menu options of Acrobat Reader or Exchange, the following macro is provided in the appropriate drivers: -

    +

    }{text}
    -

    The

    The text is used to create a button which activates the appropriate menuoption. The following table lists the option names you can use—comparison of this with the menus in Acrobat Reader or Exchange will show what they do. Obviously some are only appropriate to Exchange. -

    +

    style="vertical-align:baseline;" id="TBL-38-1-"> +

    ImportImage, ImportNotes, AcroForm:ImportFDF

    +

    ExportNotes, AcroForm:ExportFDF

    @@ -3752,18 +3800,18 @@ class="td11"> style="vertical-align:baseline;" id="TBL-38-7-"> +

    Properties

    +

    AcroForm:Duplicate, AcroForm:TabOrder

    @@ -3771,7 +3819,7 @@ class="td11"> style="vertical-align:baseline;" id="TBL-38-10-"> @@ -3789,28 +3837,28 @@ class="td11"> class="td11"> ToolsSearch +

    About

    @@ -3825,13 +3873,13 @@ class="td11"> class="td11">
    File -

    Open, Close, Scan, Save, SaveAs, Optimizer:SaveAsOpt, +

    Open, Close, Scan, Save, SaveAs, Optimizer:SaveAsOpt, Print, PageSetup, Quit

    FileImport -

    ImportImage, ImportNotes, AcroForm:ImportFDF

    FileExport -

    ExportNotes, AcroForm:ExportFDF

    FileDocumentInfo -

    GeneralInfo, OpenInfo, FontsInfo, SecurityInfo, +

    GeneralInfo, OpenInfo, FontsInfo, SecurityInfo, Weblink:Base, AutoIndex:DocInfo

    FilePreferences -

    GeneralPrefs, NotePrefs, FullScreenPrefs, Weblink:Prefs, +

    GeneralPrefs, NotePrefs, FullScreenPrefs, Weblink:Prefs, AcroSearch:Preferences(Windows) or, AcroSearch:Prefs(Mac), Cpt:Capture

    Edit -

    Undo, Cut, Copy, Paste, Clear, SelectAll, Ole:CopyFile, +

    Undo, Cut, Copy, Paste, Clear, SelectAll, Ole:CopyFile, TouchUp:TextAttributes, TouchUp:FitTextToSelection, TouchUp:ShowLineMarkers, TouchUp:ShowCaptureSuspects, TouchUp:FindSuspect,

    -

    Properties

    EditFields -

    AcroForm:Duplicate, AcroForm:TabOrder

    Document -

    Cpt:CapturePages, +

    Cpt:CapturePages, AcroForm:Actions, CropPages, RotatePages, InsertPages, ExtractPages, ReplacePages, DeletePages, NewBookmark, SetBookmarkDest, CreateAllThumbs, DeleteAllThumbs

    View -

    ActualSize, FitVisible, FitWidth, FitPage, ZoomTo, +

    ActualSize, FitVisible, FitWidth, FitPage, ZoomTo, FullScreen, FirstPage, PrevPage, NextPage, LastPage, GoToPage, GoBack, GoForward, SinglePage, OneColumn, TwoColumns, ArticleThreads, PageOnly, ShowBookmarks, @@ -3780,7 +3828,7 @@ class="td11"> style="vertical-align:baseline;" id="TBL-38-11-">

    Tools -

    Hand, ZoomIn, ZoomOut, SelectText, SelectGraphics, +

    Hand, ZoomIn, ZoomOut, SelectText, SelectGraphics, Note, Link, Thread, AcroForm:Tool, Acro_Movie:MoviePlayer, TouchUp:TextTool, Find, FindAgain, FindNextNote, CreateNotesFile

    -

    AcroSrch:Query, AcroSrch:Indexes, AcroSrch:Results, +

    AcroSrch:Query, AcroSrch:Indexes, AcroSrch:Results, AcroSrch:Assist, AcroSrch:PrevDoc, AcroSrch:PrevHit, AcroSrch:NextHit, AcroSrch:NextDoc

    Window -

    ShowHideToolBar, ShowHideMenuBar, +

    ShowHideToolBar, ShowHideMenuBar, ShowHideClipboard, Cascade, TileHorizontal, TileVertical, CloseAll

    Help -

    HelpUserGuide, HelpTutorial, HelpExchange, HelpScan, +

    HelpUserGuide, HelpTutorial, HelpExchange, HelpScan, HelpCapture, HelpPDFWriter, HelpDistiller, HelpSearch, HelpCatalog, HelpReader, Weblink:Home

    Help(Windows) -

    About

    -

    +

    6 PDF and HTML forms

    -

    You must put your fields inside a

    You must put your fields inside a Form environment (only one per file). -

    There are six macros to prepare fields: -

    +

    There are six macros to prepare fields: +

    ]{label}
    -

    +

    ]{label}
    -

    +

    }{choices}
    -

    +

    ]{label}
    -

    +

    ]{label}
    -

    +

    ]{label}
    -

    The way forms and their labels are laid out is determined by: -

    +

    The way forms and their labels are laid out is determined by: +

    }{field}
    -

    +

    }{field}
    -

    +

    }{field}
    -

    These macros default to #1 #2 -

    What is actually shown in as the field is determined by: -

    +

    These macros default to #1 #2 +

    What is actually shown in as the field is determined by: +

    }{height}
    -

    +

    }{height}
    -

    +

    }{height}
    -

    +

    }{height}
    -

    +

    \MakeButtonField{text}
    -

    These macros default to

    These macros default to \vbox to #2{\hbox #1{\hfill}\vfill}, except the la to #1; it is used for buttons, and the special \Submit and \Reset macros. -

    You may also want to redefine the following macros: +

    You may also want to redefine the following macros:

    @@ -4058,13 +4106,13 @@ class="ec-lmtt-10">\Reset macros.  
    \def\DefaultHeightofTextMultiline{4\baselineskip}  
    \def\DefaultWidthofText{3cm}
    -

    -

    +

    +

    6.1 Forms environment parameters

    -

    +

    action encoding method @@ -4119,16 +4167,16 @@ class="td11">
    URL -

    The URL that will receive the form data if a

    The URL that will receive the form data if a Submit button is included in the form

    name -

    The encoding for the string set to the URL; FDF-encoding +

    The encoding for the string set to the URL; FDF-encoding is usual, and html is the only valid value

    name -

    Used only when generating HTML; values can be

    Used only when generating HTML; values can be post or get

    -

    +

    6.2 Forms optional parameters

    -

    Note that all colors must be expressed as RGB triples, in the range 0..1 (i.e. 

    Note that all colors must be expressed as RGB triples, in the range 0..1 (i.e. color=0 0 0.5) -

    +

    style="vertical-align:baseline;" id="TBL-54-58-">
    -

    +

    7 Defining a new driver

    -

    A hyperref driver has to provide definitions for eight macros: -

    1.

    A hyperref driver has to provide definitions for eight macros: +

    1. \hyper@anchor -

    2.

    2. \hyper@link -

    3.

    3. \hyper@linkfile -

    4.

    4. \hyper@linkurl -

    5.

    5. \hyper@anchorstart -

    6.

    6. \hyper@anchorend -

    7.

    7. \hyper@linkstart -

    8.

    8. \hyper@linkend -

    The draft option defines the macros as follows +

    The draft option defines the macros as follows

    @@ -4577,11 +4625,11 @@ class="ec-lmtt-10">\hyper@linkend  
    \let\hyper@linkstart\@gobbletwo  
    \let\hyper@linkend\@empty
    -

    -

    +

    +

    8 Special support for other packages

    -

    hyperref aims to cooperate with other packages, but there are several possible sources for conflict, such as

      @@ -4604,7 +4652,7 @@ class="ec-lmtt-10">implicit=false for these packages to work.
    • Packages that do anything serious with the index.
    -

    The

    The hyperref package is distributed with variants on two useful packages designed to work especially well with it. These are xr and minitoc, which support crossdocument links using EX’s normal \label/\ref mechanisms and per-chapter tables of contents, respectively. -

    +

    9 History and acknowledgments

    -

    The original authors of

    The original authors of hyperbasics.tex and hypertex.sty, from which this package descends, are Tanmoy Bhattacharya (

    Tanmoy found a great many of the bugs, and (even better) often provided fixes, which has made the +

    Tanmoy found a great many of the bugs, and (even better) often provided fixes, which has made the package more robust. The days spent on RevTEX are entirely due to him! The investigations of Bill Moss (bmoss@math.clemson.edu) into the later versions includ many bugs, and his testing is appreciated. Hans Hagen (pragma@pi.net) provided a lot of insight into PDF. -

    Berthold Horn provided help, encouragement and sponsorship for the

    Berthold Horn provided help, encouragement and sponsorship for the dvipsone and dviwindo drivers. Sergey Lesenko provided the changes needed for hyper package (developed in parallel with hyperref) showed me solutions for some problems. Hopefully the two packages will combine one day. -

    The forms creation section owes a great deal to: T. V. Raman, for encouragement, support and +

    The forms creation section owes a great deal to: T. V. Raman, for encouragement, support and ideas; Thomas Merz, whose book Web Publishing with Acrobat/PDF provided crucial insights; D. P. Story, whose detailed article about pdfmarks and forms solved many practical problems; and Hans Hagen, who explained how to do it in pdftex. -

    Steve Peter recreated the manual source in July 2003 after it had been lost. -

    Especial extra thanks to David Carlisle for the

    Steve Peter recreated the manual source in July 2003 after it had been lost. +

    Especial extra thanks to David Carlisle for the backref module, the ps2pdf and dviwindo support, frequent general rewrites of my bad code, and for working on changes to the xr package to suit diff --git a/Master/texmf-dist/doc/latex/hyperref/manual.pdf b/Master/texmf-dist/doc/latex/hyperref/manual.pdf index 855a04ebe5d..5dd52090839 100644 Binary files a/Master/texmf-dist/doc/latex/hyperref/manual.pdf and b/Master/texmf-dist/doc/latex/hyperref/manual.pdf differ diff --git a/Master/texmf-dist/doc/latex/hyperref/manual2.html b/Master/texmf-dist/doc/latex/hyperref/manual2.html index 8b069f6b6b9..6c613c4303c 100644 --- a/Master/texmf-dist/doc/latex/hyperref/manual2.html +++ b/Master/texmf-dist/doc/latex/hyperref/manual2.html @@ -7,7 +7,7 @@ - + diff --git a/Master/texmf-dist/doc/latex/hyperref/manual3.html b/Master/texmf-dist/doc/latex/hyperref/manual3.html index a1fdbf61495..038029a8e6c 100644 --- a/Master/texmf-dist/doc/latex/hyperref/manual3.html +++ b/Master/texmf-dist/doc/latex/hyperref/manual3.html @@ -7,7 +7,7 @@ - + diff --git a/Master/texmf-dist/doc/latex/hyperref/nameref.pdf b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf index 41792cf4e10..82e48f94fb4 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 @@ -77,23 +77,23 @@ endstream endobj 36 0 obj<>>> endobj -37 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> +37 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> endobj -38 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> +38 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> endobj -39 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> +39 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> endobj -40 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> +40 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> endobj -41 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> +41 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> endobj -42 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> +42 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> endobj -43 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> +43 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> endobj -44 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> +44 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> endobj -45 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> +45 0 obj<>/C[0 0.5 0.5]/Border[0 0 0]>> endobj 46 0 obj<> endobj @@ -3775,14 +3775,12 @@ endobj endobj 1411 0 obj<> endobj -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 +1412 0 obj<>/Info 6 0 R/DecodeParms<>/Size 1413/Length 1014>>stream +xڽXoMAT*,BiRTJ|DhާA ‚ZՏ H,l|$""Bkw{o:wνZ;g̙3s1\8pH0 h|,yx3 3,˺. 6` (_nѰW!/Hc SyGa_NC߀r3^!]m-`!-eN?T_@G|Ȫ\bK7+'O|Zo( RQ߆x"aouCl r2ey5/&2nYlQ >"t{2y01b΃dָ;v寒m.W7o.Y<=öɇoJ*ɇkZ]kA=lVlSӜSWYd]XUe˟roŷfۧMk9]{obʜ1~(c}7gz 3_OW}\!c_)537nf`_L<1>B67cڲI8fJ16]h7Vo ͇KEQ$3*}߅|w + w'<`_k`>>l#d9]b|2X-=e5lMЎg(sT3v#e&?^?EWa̪U1vӴS&˫MU˾liȩWaT=0ZU9?^׼k\̏Z= X$X#6Cn.f ,[oWpWYyGB8ּVw H]{dVV +SHt> endstream endobj startxref -372433 +372322 %%EOF diff --git a/Master/texmf-dist/doc/latex/hyperref/options.pdf b/Master/texmf-dist/doc/latex/hyperref/options.pdf index a70b7a9c289..12a83d62f28 100644 Binary files a/Master/texmf-dist/doc/latex/hyperref/options.pdf and b/Master/texmf-dist/doc/latex/hyperref/options.pdf differ diff --git a/Master/texmf-dist/source/latex/hyperref/backref.dtx b/Master/texmf-dist/source/latex/hyperref/backref.dtx index f1928a6b765..64016f1fadc 100644 --- a/Master/texmf-dist/source/latex/hyperref/backref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/backref.dtx @@ -29,7 +29,7 @@ %\ProvidesFile{backref.drv} % \fi % \ProvidesFile{backref.dtx} - [2010/03/11 v1.35 Bibliographical back referencing]% + [2010/08/30 v1.36 Bibliographical back referencing]% % % \CheckSum{747} % @@ -856,7 +856,7 @@ \immediate\closeout\tf@brf }% }{% - Rerun to get bibliographicsl references right% + Rerun to get bibliographical references right% }% } % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/hyperref/doc/manual.tex b/Master/texmf-dist/source/latex/hyperref/doc/manual.tex index b758085e2f4..956606fcf4f 100644 --- a/Master/texmf-dist/source/latex/hyperref/doc/manual.tex +++ b/Master/texmf-dist/source/latex/hyperref/doc/manual.tex @@ -14,7 +14,7 @@ % * Heiko Oberdiek, 2006-2010. % -\def\mydate{January 2010} +\def\mydate{September 2010} \RequirePackage{ifpdf} \ifpdf % We are running pdfTeX in pdf mode @@ -517,6 +517,7 @@ pdfinfo & key value list & empty & Alternative interface for setting pdfview & text & XYZ & Sets the default PDF `view' for each link \\ pdfstartpage & text & 1 & Determines on which page the PDF file is opened. \\ pdfstartview & text & Fit & Set the startup page view \\ +pdfremotestartview & text & Fit & Set the startup page view of remote PDF files \\ pdfpagescrop & n n n n & & Sets the default PDF crop box for pages. This should be a set of four numbers \\ pdfcenterwindow & boolean & false & position the document window in the center of the screen \\ pdfdirection & text & empty & direction setting \\ @@ -561,8 +562,8 @@ works by supplying default values for \texttt{XYZ} (horizontal $\times$ vertical $\times$ zoom) and \texttt{FitBH}. However, drivers using \texttt{pdfmark} do not supply defaults, so \textsf{hyperref} passes in a value of -32768, which causes Acrobat to set (usually) sensible -defaults. The following are possible values for the \texttt{pdfview} and -\texttt{pdfstartview} parameters. +defaults. The following are possible values for the \texttt{pdfview}, +\texttt{pdfstartview} and \texttt{pdfremotestartview} parameters. \noindent\begin{longtable}{>{\ttfamily}l>{\itshape}lp{7cm}} XYZ & left top zoom & Sets a coordinate and a zoom factor. If any one is null, the source link value is used. @@ -717,6 +718,7 @@ pdfprintclip & \textit{empty} & set /PrintClip of viewer preferenc pdfprintpagerange & \textit{empty} & set /PrintPageRange of viewer preferences \\ pdfprintscaling & \textit{empty} & page scaling option for print dialog \\ pdfproducer & \textit{empty} & text for PDF Producer field \\ +pdfremotestartview & \textit{Fit} & starting view of remote PDF documents \\ pdfstartpage & \textit{1} & page at which PDF document opens \\ pdfstartview & \textit{Fit} & starting view of PDF document \\ pdfsubject & \textit{empty} & text for PDF Subject field \\ @@ -752,7 +754,7 @@ If you need to make references to URLs, or write explicit links, the following low-level user macros are provided: \begin{cmdsyntax} -\ci{href}\verb|{|\emph{URL}\verb|}{|\emph{text}\verb|}| +\ci{href}\verb|[|\emph{options}\verb|]|\verb|{|\emph{URL}\verb|}{|\emph{text}\verb|}| \end{cmdsyntax} \noindent The \emph{text} is made a hyperlink to the \emph{URL}; this @@ -760,6 +762,19 @@ must be a full URL (relative to the base URL, if that is defined). The special characters \# and \~{} do \emph{not} need to be escaped in any way. +The optional argument \emph{options} recognizes the hyperref options +\texttt{pdfremotestartview}, \texttt{pdfnewwindow} and the following +key value options: +\begin{description} +\item[\texttt{page}:] Specifies the start page number of remote +PDF documents. First page is \verb|1|. +\item[\texttt{ismap}:] Boolean key, if set to |true|, the +URL should appended by the coordinates as query parameters by +the PDF viewer. +\item[\texttt{nextactionraw}:] The value of key |/Next| of +action dictionaries, see PDF specification. +\end{description} + \begin{cmdsyntax} \ci{url}\verb|{|\emph{URL}\verb|}| \end{cmdsyntax} @@ -1099,7 +1114,8 @@ command names): \noindent \verb|\hypercalcbp| takes a \TeX\ dimen specification and converts it to bp and returns the number without the unit. -This is useful for options \verb|pdfstartview| and \verb|pdfview|. +This is useful for options \verb|pdfview|, \verb|pdfstartview| +and \verb|pdfremotestartview|. Example: \begin{quote} \begin{verbatim} diff --git a/Master/texmf-dist/source/latex/hyperref/doc/options.tex b/Master/texmf-dist/source/latex/hyperref/doc/options.tex index 04f14859f9b..7e8278cea26 100644 --- a/Master/texmf-dist/source/latex/hyperref/doc/options.tex +++ b/Master/texmf-dist/source/latex/hyperref/doc/options.tex @@ -90,9 +90,10 @@ pdfprintclip &set /PrintClip of viewer preferences&\optempty\\ pdfprintpagerange &set /PrintPageRange of viewer preferences&\optempty\\ pdfprintscaling &page scaling option for print dialog&\optempty\\ pdfproducer &text for PDF Producer field&\optempty\\ +pdfremotestartview & starting view for links into remote PDF documents&Fit\\ pdftrapped & set the document information Trapped entry&\optempty\\ pdfstartpage &page at which PDF document opens&1\\ -pdfstartview &starting view of PDF document& /Fit\\ +pdfstartview &starting view of PDF document& Fit\\ pdfsubject &text for PDF Subject field&\optempty\\ pdftex &use pdf\TeX\ backend\\ pdftitle &text for PDF Title field&\optempty\\ diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx index e34fb0073c6..353532ad87f 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/18 v6.81g +% [2010/09/11 v6.81m % Hypertext links for LaTeX] % Dummy hyperref (SR)] % Hyperref documentation driver file] @@ -126,7 +126,7 @@ \end{document} % % \fi -% \CheckSum{27158} +% \CheckSum{27643} % % \MakeShortVerb{|} % \StopEventually{} @@ -579,6 +579,50 @@ \def\Hy@Info#1{\PackageInfo{hyperref}{#1}} % \end{macrocode} % +% \subsection{Checks with regular expressions} +% +% \begin{macrocode} +\ltx@IfUndefined{pdfmatch}{% + \def\Hy@Match#1#2#3#4{}% +}{% + \def\Hy@Match#1#2{% + \begingroup + \edef\^{\ltx@backslashchar\string^}% + \edef\.{\ltx@backslashchar.}% + \edef\[{\ltx@backslashchar[}% ]] + \edef\${\ltx@backslashchar$}% + \edef\({\ltx@backslashchar(}% + \edef\){\ltx@backslashchar)}% + \edef\|{\ltx@backslashchar|}% + \edef\*{\ltx@backslashchar*}% + \edef\+{\ltx@backslashchar+}% + \edef\?{\ltx@backslashchar?}% + \edef\{{\ltx@backslashchar\ltx@leftbracechar}% + \edef\}{\ltx@rightbracechar}% + \edef\\{\ltx@backslashchar\ltx@backslashchar}% + \ifnum\pdfmatch{#2}{#1}=\ltx@one + \endgroup + \expandafter\ltx@firstoftwo + \else + \endgroup + \expandafter\ltx@secondoftwo + \fi + }% +} +\ltx@ifpackagelater{ltxcmds}{2010/09/11}{}{% + \begingroup + \lccode`0=`\{\relax + \lowercase{\endgroup + \def\ltx@leftbracechar{0}% + }% + \begingroup + \lccode`0=`\}\relax + \lowercase{\endgroup + \def\ltx@rightbracechar{0}% + }% +} +% \end{macrocode} +% % \subsection{Compatibility with format dumps} % % \begin{macro}{\AfterBeginDocument} @@ -1228,7 +1272,7 @@ \let\label\@gobble \let\index\@gobble \let\glossary\@gobble - \let\href\@secondoftwo + \let\href\HyPsd@href \let\@mkboth\@gobbletwo % \end{macrocode} % @@ -2902,6 +2946,12 @@ % % \subsubsection{Reference commands} % +% \begin{macro}{\HyPsd@href} +% \begin{macrocode} +\def\HyPsd@href#1#{\@secondoftwo} +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\HyPsd@ref} % Macro \cs{HyPsd@ref} calls the macro \cs{HyPsd@@ref} for star checking. % The same methods like in \cs{HyPsd@hspace} is used. @@ -4246,10 +4296,28 @@ % |\HyperRaiseLinkHook| allows the user to reassign % |\HyperRaiseLinkLength|. % \begin{macrocode} +\newcount\Hy@SavedSpaceFactor +\def\Hy@SaveSpaceFactor{% + \global\Hy@SavedSpaceFactor=\ifhmode\spacefactor\else\z@\fi +} +\def\Hy@RestoreSpaceFactor{% + \relax + \ifhmode + \ifnum\Hy@SavedSpaceFactor>\z@ + \spacefactor=\Hy@SavedSpaceFactor + \fi + \fi +} +\def\Hy@SaveSavedSpaceFactor{% + \edef\Hy@RestoreSavedSpaceFactor{% + \global\Hy@SavedSpaceFactor=\the\Hy@SavedSpaceFactor\relax + }% +} \def\Hy@raisedlink#1{% \ifvmode #1% \else + \Hy@SaveSpaceFactor \penalty\@M \smash{% \begingroup @@ -4257,8 +4325,13 @@ \setlength\HyperRaiseLinkLength\HyperRaiseLinkDefault \HyperRaiseLinkHook \expandafter\endgroup - \expandafter\raise\the\HyperRaiseLinkLength\hbox{#1}% + \expandafter\raise\the\HyperRaiseLinkLength\hbox{% + \Hy@RestoreSpaceFactor + #1% + \Hy@SaveSpaceFactor + }% }% + \Hy@RestoreSpaceFactor \fi } % \end{macrocode} @@ -5954,7 +6027,40 @@ \ifx\\#1\\% \def\@pdfstartview{}% \else - \hypercalcbpdef\@pdfstartview{ /#1 }% + \hypercalcbpdef\@pdfstartview{/#1}% + \fi +} +\def\HyPat@NonNegativeReal/{% + ([0-9]+\.?[0-9]*|[0-9]*\.?[0-9]+)% +} +\define@key{Hyp}{pdfremotestartview}{% + \ifx\\#1\\% + \def\@pdfremotestartview{/Fit}% + \else + \hypercalcbpdef\@pdfremotestartview{#1}% + \edef\@pdfremotestartview{\@pdfremotestartview}% + \Hy@Match\@pdfremotestartview{% + ^(XYZ -?(null|\HyPat@NonNegativeReal/) % + -?(null|\HyPat@NonNegativeReal/) % + (null|\HyPat@NonNegativeReal/)|% + Fit(|B|% + (H|V|BH|BV) (null|\HyPat@NonNegativeReal/)|% + R \HyPat@NonNegativeReal/ \HyPat@NonNegativeReal/ % + \HyPat@NonNegativeReal/ \HyPat@NonNegativeReal/% + ))$% + }{}{% + \Hy@Warning{% + Invalid value `\@pdfremotestartview'\MessageBreak + of `pdfremotestartview'\MessageBreak + is replaced by `Fit'% + }% + \let\@pdfremotestartview\@empty + }% + \ifx\@pdfremotestartview\@empty + \def\@pdfremotestartview{/Fit}% + \else + \edef\@pdfremotestartview{/\@pdfremotestartview}% + \fi \fi } \define@key{Hyp}{pdfpagescrop}{\edef\@pdfpagescrop{#1}} @@ -6031,7 +6137,8 @@ \def\@pdfkeywords{} \def\@pdftrapped{} \def\@pdfpagescrop{} -\def\@pdfstartview{ /Fit } +\def\@pdfstartview{/Fit} +\def\@pdfremotestartview{/Fit} \def\@pdfstartpage{1} \def\@pdfprintpagerange{} \def\@pdflang{} @@ -6127,7 +6234,7 @@ \let\@secondoffive\@secondoftwo \let\ReadBookmarks\relax \let\WriteBookmarks\relax - \Hy@WarningNoLine{ draft mode on}% + \Hy@WarningNoLine{Draft mode on}% \fi \Hy@DisableOption{draft}% \Hy@DisableOption{nolinks}% @@ -6775,7 +6882,9 @@ % \end{macrocode} % % \begin{macrocode} -\DeclareRobustCommand*{\href}{% +\DeclareRobustCommand*{\href}[1][]{% + \begingroup + \setkeys{href}{#1}% \@ifnextchar\bgroup\Hy@href{\hyper@normalise\href@}% } \def\Hy@href#{% @@ -6785,11 +6894,99 @@ \catcode`\$=6 % \catcode`\#=12 % \gdef\href@$1{\expandafter\href@split$1##\\}% - \gdef\href@split$1#$2#$3\\{% - \hyper@@link{$1}{$2}% + \gdef\href@split$1#$2#$3\\$4{% + \hyper@@link{$1}{$2}{$4}% + \endgroup }% \endgroup % \end{macrocode} +% Option `page'. +% \begin{macrocode} +\define@key{href}{page}{% + \def\Hy@href@page{#1}% +} +\let\Hy@href@page\@empty +\newcount\c@Hy@tempcnt +\def\theHy@tempcnt{\the\c@Hy@tempcnt} +\def\Hy@MakeRemoteAction{% + \ifx\Hy@href@page\@empty + \def\Hy@href@page{0}% + \else + \setcounter{Hy@tempcnt}{\Hy@href@page}% + \ifnum\c@Hy@tempcnt<\@ne + \Hy@Warning{% + Invalid page number (\theHy@tempcnt)\MessageBreak + for remote PDF file.\MessageBreak + Using page 1% + }% + \def\Hy@href@page{0}% + \else + \global\advance\c@Hy@tempcnt\m@ne + \edef\Hy@href@page{\theHy@tempcnt}% + \fi + \fi +% \end{macrocode} +% If a next action is set, then also a new window +% should be opened. Otherwise AR reclaims that it +% closes the current file with discarding the next actions. +% \begin{macrocode} + \ifx\Hy@href@nextactionraw\@empty + \else + \Hy@newwindowsettrue + \Hy@newwindowtrue + \fi +} +% \end{macrocode} +% Option `pdfremotestartview'. +% \begin{macrocode} +\define@key{href}{pdfremotestartview}{% + \setkeys{Hyp}{pdfremotestartview={#1}}% +} +% \end{macrocode} +% Option `pdfnewwindow'. +% \begin{macrocode} +\let\KV@href@pdfnewwindow\KV@Hyp@pdfnewwindow +\let\KV@href@pdfnewwindow@default\KV@Hyp@pdfnewwindow@default +% \end{macrocode} +% Option `ismap'. +% \begin{macrocode} +\newif\ifHy@href@ismap +\define@key{href}{ismap}[true]{% + \ltx@IfUndefined{Hy@href@ismap#1}{% + \PackageError{hyperref}{% + Invalid value (#1) for key `ismap'.\MessageBreak + Permitted values are `true' or `false'.\MessageBreak + Ignoring `ismap'% + }\@ehc + }{% + \csname Hy@href@ismap#1\endcsname + }% +} +% \end{macrocode} +% Option `nextactionraw'. +% \begin{macrocode} +\let\Hy@href@nextactionraw\@empty +\define@key{href}{nextactionraw}{% + \edef\Hy@href@nextactionraw{#1}% + \ifx\Hy@href@nextactionraw\@empty + \else + \Hy@Match\Hy@href@nextactionraw{% + ^(\HyPat@ObjRef/|<<.*/S[ /].+>>|% + \[( ?\HyPat@ObjRef/|<<.*/S[ /].+>>)+ ?])$% + }{}{% + \Hy@Warning{Invalid value for `nextactionraw':\MessageBreak + \Hy@href@nextactionraw\MessageBreak + The action is discarded% + }% + }% + \ifx\Hy@href@nextactionraw\@empty + \else + \edef\Hy@href@nextactionraw{/Next \Hy@href@nextactionraw}% + \fi + \fi +} +\def\HyPat@ObjRef/{.+} +% \end{macrocode} % Load package |url.sty| and save the meaning of % the original \cmd{\url} in \cmd{\nolinkurl}. % \begin{macrocode} @@ -6949,6 +7146,12 @@ % % \begin{macrocode} \def\hyper@readexternallink#1\\#2#3#4{% + \begingroup + \let\\\relax + \expandafter\endgroup + \expandafter\@@hyper@@readexternallink#1\\{#2}{#3}{#4}% +} +\def\@@hyper@@readexternallink#1\\#2#3#4{% % \end{macrocode} % Parameters are: % \begin{enumerate} @@ -6960,7 +7163,7 @@ % We need to get the 1st parameter properly expanded, % so we delimit the arguments rather than passing it inside a group. % \begin{macrocode} - \expandafter\@hyper@readexternallink{#2}{#3}{#4}#1::\\{#1}% + \@hyper@readexternallink{#2}{#3}{#4}#1::\\{#1}% } % \end{macrocode} % Now (potentially), we are passed: @@ -6983,17 +7186,17 @@ % then we lose. Such names must be prefixed with an explicit |dvi:| % \begin{macrocode} \ifx\\#6\\% - \expandafter\@hyper@linkfile file:#7\\{#3}{#2}% + \@hyper@linkfile file:#7\\{#3}{#2}{#7}% \else \ifx\\#4\\% - \expandafter\@hyper@linkfile file:#7\\{#3}{#2}% + \@hyper@linkfile file:#7\\{#3}{#2}{#7}% \else % \end{macrocode} % If the URL type is `file', pass it for local opening % \begin{macrocode} \def\@pdftempa{#4}% \ifx\@pdftempa\@pdftempwordfile - \expandafter\@hyper@linkfile#7\\{#3}{#2}% + \@hyper@linkfile#7\\{#3}{#2}{#7}% \else % \end{macrocode} % if it starts `run:', its to launch an application. @@ -7008,7 +7211,7 @@ #2% \endgroup \else - \expandafter\@hyper@launch#7\\{#3}{#2}% + \@hyper@launch#7\\{#3}{#2}% \fi \else % \end{macrocode} @@ -7039,8 +7242,8 @@ % starting .. fell over. Switched to using |\filename@parse| to % solve this. % \begin{macrocode} -\def\@hyper@linkfile file:#1\\#2#3{% - %file url,link string, name +\def\@hyper@linkfile file:#1\\#2#3#4{% + %file url,link string, name, original uri \filename@parse{#1}% \ifx\filename@ext\relax \edef\filename@ext{\XR@ext}% @@ -7051,7 +7254,7 @@ }{% \ifx\@baseurl\@empty \hyper@linkurl{#2}{% - \Hy@linkfileprefix\use@file\ifx\\#3\\\else\hyper@hash#3\fi + #4\ifx\\#3\\\else\hyper@hash#3\fi }% \else \hyper@linkurl{#2}{\use@file\ifx\\#3\\\else\hyper@hash#3\fi}% @@ -7079,6 +7282,31 @@ \expandafter\expandafter\expandafter\z\expandafter\x\y\@nil } % \end{macrocode} +% \begin{macrocode} +\def\Hy@StringLocalhost{localhost} +\@onelevel@sanitize\Hy@StringLocalhost +\def\Hy@CleanupFile#1{% + \edef#1{#1}% + \expandafter\Hy@@CleanupFile#1\hbox///\hbox\@nil{#1}% +} +\def\Hy@@CleanupFile#1//#2/#3\hbox#4\@nil#5{% + \begingroup + \toks@{\endgroup}% + \def\x{#1}% + \ifx\x\@empty + \def\x{#2}% + \ifx\x\@empty + \toks@{\endgroup\def#5{/#3}}% + \else + \@onelevel@sanitize\x + \ifx\x\Hy@StringLocalhost + \toks@{\endgroup\def#5{/#3}}% + \fi + \fi + \fi + \the\toks@ +} +% \end{macrocode} % Anchors have a name, and marked text. % We have to be careful with the marked text, as if we break % off part of something to put a |\special| around it, all hell breaks @@ -7123,6 +7351,7 @@ \fi \let\anchor@spot\@empty } +\def\anchor@spot{} % \end{macrocode} % \section{Compatibility with the \emph{\LaTeX{}2html} package}\label{latex2html} % Map our macro names on to Nikos', so that documents prepared @@ -7841,12 +8070,21 @@ \def\Field@boolkey#1#2{% \csname Fld@#2\ifx\relax#1\relax true\else#1\fi\endcsname } -\newtoks\Field@toks -\Field@toks={ }% -\def\Field@addtoks#1#2{% - \edef\@processme{\Field@toks{\the\Field@toks\space #1="#2"}}% - \@processme -} +\ifHy@texht + \newtoks\Field@toks + \Field@toks={ }% + \def\Field@addtoks#1#2{% + \edef\@processme{\Field@toks{\the\Field@toks\space #1="#2"}}% + \@processme + }% +\else + \def\Hy@WarnHTMLFieldOption#1{% + \Hy@Warning{% + HTML field option `#1'\MessageBreak + is ignored% + }% + }% +\fi \def\Fld@checkequals#1=#2=#3\\{% \def\@currDisplay{#1}% \ifx\\#2\\% @@ -7864,12 +8102,21 @@ \define@key{Field}{disabled}[true]{% \lowercase{\Field@boolkey{#1}}{disabled}% } -\define@key{Field}{accesskey}{% - \Field@addtoks{accesskey}{#1}% -} -\define@key{Field}{tabkey}{% - \Field@addtoks{tabkey}{#1}% -} +\ifHy@texht + \define@key{Field}{accesskey}{% + \Field@addtoks{accesskey}{#1}% + }% + \define@key{Field}{tabkey}{% + \Field@addtoks{tabkey}{#1}% + }% +\else + \define@key{Field}{accesskey}{% + \Hy@WarnHTMLFieldOption{accesskey}% + }% + \define@key{Field}{tabkey}{% + \Hy@WarnHTMLFieldOption{tabkey}% + }% +\fi \define@key{Field}{name}{% \def\Fld@name{#1}% } @@ -7993,33 +8240,46 @@ \Hy@temp{onblur} \Hy@temp{onenter} \Hy@temp{onexit} -\def\Hy@temp#1{% - \define@key{Field}{#1}{% - \Field@addtoks{#1}{##1}% +\ifHy@texht + \def\Hy@temp#1{% + \define@key{Field}{#1}{% + \Field@addtoks{#1}{##1}% + }% }% -} -\Hy@temp{onselect} -\Hy@temp{onchange} +\else + \def\Hy@temp#1{% + \define@key{Field}{#1}{% + \Hy@WarnHTMLFieldOption{#1}% + }% + }% +\fi \Hy@temp{ondblclick} \Hy@temp{onmousedown} \Hy@temp{onmouseup} \Hy@temp{onmouseover} \Hy@temp{onmousemove} \Hy@temp{onmouseout} -\Hy@temp{onkeypress} \Hy@temp{onkeydown} \Hy@temp{onkeyup} -\ifHy@pdfa - \define@key{Field}{onclick}{% - \PackageError{hyperref}{% - PDF/A: Action `onclick' is prohibited% - }\@ehc - }% -\else +\Hy@temp{onselect} +\Hy@temp{onchange} +\Hy@temp{onkeypress} +\ifHy@texht \define@key{Field}{onclick}{% - \def\Fld@onclick@code{#1}% \Field@addtoks{onclick}{#1}% }% +\else + \ifHy@pdfa + \define@key{Field}{onclick}{% + \PackageError{hyperref}{% + PDF/A: Action `onclick' is prohibited% + }\@ehc + }% + \else + \define@key{Field}{onclick}{% + \def\Fld@onclick@code{#1}% + }% + \fi \fi % \end{macrocode} % \begin{macrocode} @@ -8278,7 +8538,7 @@ \let\phantomsection\@empty \let\hypersetup\@gobble \let\hyperbaseurl\@gobble -\let\href\@gobble +\newcommand*{\href}[3][]{#3} \let\hyperdef\@gobbletwo \let\hyperlink\@gobble \let\hypertarget\@gobble @@ -9138,6 +9398,7 @@ \fi \fi } +\let\Hy@saved@refstepcounter\refstepcounter % \end{macrocode} % AMS\LaTeX\ processes all equations twice; we want to make sure % that the hyper stuff is not executed twice, so we use the AMS @@ -9474,6 +9735,23 @@ }{} % \end{macrocode} % +% Package varioref redefines \cs{refstepcounter}, thus it needs +% fixing, if the package is loaded *after* hyperref. +% \begin{macrocode} +\def\Hy@varioref@refstepcounter#1{% + \stepcounter{#1}% + \protected@edef\@currentlabel{% + \csname p@#1\expandafter\endcsname\csname the#1\endcsname + }% +} +\AtBeginDocument{% + \ifx\refstepcounter\Hy@varioref@refstepcounter + \let\H@refstepcounter\refstepcounter + \let\refstepcounter\Hy@saved@refstepcounter + \fi +} +% \end{macrocode} +% % \section{Package longtable support} % % Sometimes the anchor of the longtable goes to the previous @@ -10557,7 +10835,7 @@ \evensidemargin \fi \kern-1bp\relax - \Hy@TempPageAnchor + \Hy@TempPageAnchor\relax \hss }% \vss @@ -11583,6 +11861,9 @@ %<*pdftex> \providecommand*{\XR@ext}{pdf} \Hy@setbreaklinks{true} +\def\HyPat@ObjRef{% + [0-9]*[1-9][0-9]* 0 R% +} % \end{macrocode} % This driver is for Han The Thanh's \TeX{} variant % which produces PDF directly. This has new primitives @@ -11710,14 +11991,14 @@ \begingroup \ifHy@ocgcolorlinks \def\Hy@ocgcolor{#1}% - \setbox0=\color@hbox + \setbox0=\hbox\bgroup\color@begingroup \else \HyColor@UseColor#1% \fi }% \def\Hy@endcolorlink{% \ifHy@ocgcolorlinks - \color@endbox + \color@endgroup\egroup \mbox{% \pdfliteral page{/OC/OCPrint BDC}% \rlap{\copy0}% @@ -11757,11 +12038,17 @@ % First define the anchors: % \begin{macrocode} \def\new@pdflink#1{% + \ifhmode + \@savsf\spacefactor + \fi \Hy@SaveLastskip \Hy@VerboseAnchor{#1}% \Hy@pstringdef\Hy@pstringDest{\HyperDestNameFilter{#1}}% \Hy@DestName\Hy@pstringDest\@pdfview \Hy@RestoreLastskip + \ifhmode + \spacefactor\@savsf + \fi } \let\pdf@endanchor\@empty % \end{macrocode} @@ -11876,6 +12163,10 @@ /Type/Action% /S/URI% /URI(\Hy@pstringURI)% + \ifHy@href@ismap + /IsMap true% + \fi + \Hy@href@nextactionraw >>% }% \relax @@ -11885,8 +12176,11 @@ } \def\hyper@linkfile#1#2#3{% anchor text, filename, linkname \begingroup - \Hy@pstringdef\Hy@pstringF{#2}% + \def\Hy@pstringF{#2}% + \Hy@CleanupFile\Hy@pstringF + \Hy@pstringdef\Hy@pstringF\Hy@pstringF \Hy@pstringdef\Hy@pstringD{#3}% + \Hy@MakeRemoteAction \leavevmode \pdfstartlink attr{% @@ -11922,10 +12216,11 @@ % \end{verbatim} % \begin{macrocode} \ifx\\#3\\% - /D[0 \@pdfstartview]% + /D[\Hy@href@page\@pdfremotestartview]% \else /D(\Hy@pstringD)% \fi + \Hy@href@nextactionraw >>% }% \relax @@ -11961,6 +12256,7 @@ \else /Win<>% \fi + \Hy@href@nextactionraw >>% }% \relax @@ -12361,7 +12657,9 @@ /Subtype/Link% \ifHy@pdfa /F 4\fi /A<<% - /S/Named/N/#1% + /S/Named% + /N/#1% + \Hy@href@nextactionraw >>% }% \relax @@ -12509,13 +12807,19 @@ % \begin{macrocode} \leavevmode \ifHy@raiselinks - \setbox\@tempboxa=\color@hbox #1\color@endbox + \Hy@SaveSpaceFactor + \Hy@SaveSavedSpaceFactor + \sbox\@tempboxa{\Hy@RestoreSpaceFactor#1}% + \Hy@RestoreSavedSpaceFactor \@linkdim\dp\@tempboxa \lower\@linkdim\hbox{% \hyper@chars \special{html:}% }% - \Hy@colorlink\@urlcolor#1% + \Hy@colorlink\@urlcolor + \Hy@RestoreSpaceFactor + #1% + \Hy@SaveSpaceFactor \@linkdim\ht\@tempboxa % \end{macrocode} % Because of the interaction with the dvihps processor, we have to subtract a @@ -12526,6 +12830,7 @@ \advance\@linkdim by -6.5\p@ \raise\@linkdim\hbox{\special{html:}}% \Hy@endcolorlink + \Hy@RestoreSpaceFactor \else \begingroup \hyper@chars @@ -12611,9 +12916,12 @@ } \def\hyper@link#1#2#3{% \Hy@VerboseLinkStart{#1}{#2}% - \setbox\@tempboxa=\color@hbox #3\color@endbox \leavevmode \ifHy@raiselinks + \Hy@SaveSpaceFactor + \Hy@SaveSavedSpaceFactor + \sbox\@tempboxa{\Hy@RestoreSpaceFactor#3}% + \Hy@RestoreSavedSpaceFactor \@linkdim\dp\@tempboxa \lower\@linkdim\hbox{% \special{button: % @@ -12621,19 +12929,24 @@ \number\ht\@tempboxa\space #2% }% - \expandafter\Hy@colorlink\csname @#1color\endcsname#3% + \expandafter\Hy@colorlink\csname @#1color\endcsname + \Hy@RestoreSpaceFactor + #3% + \Hy@SaveSpaceFactor \Hy@endcolorlink }% \@linkdim\ht\@tempboxa \advance\@linkdim by -6.5\p@ \raise\@linkdim\hbox{}% + \Hy@RestoreSpaceFactor \else \special{button: % \number\wd\@tempboxa\space \number\ht\@tempboxa\space #2% }% - \expandafter\Hy@colorlink\csname @#1color\endcsname#3% + \expandafter\Hy@colorlink\csname @#1color\endcsname + #3% \Hy@endcolorlink \fi } @@ -12641,8 +12954,11 @@ \begingroup \hyper@chars \leavevmode - \setbox\@tempboxa=\color@hbox #1\color@endbox \ifHy@raiselinks + \Hy@SaveSpaceFactor + \Hy@SaveSavedSpaceFactor + \sbox\@tempboxa{\Hy@RestoreSpaceFactor#1}% + \Hy@RestoreSavedSpaceFactor \@linkdim\dp\@tempboxa \lower\@linkdim\hbox{% \special{button: % @@ -12651,11 +12967,16 @@ launch: \wwwbrowser\space #2% }% - \Hy@colorlink\@urlcolor#1\Hy@endcolorlink + \Hy@colorlink\@urlcolor + \Hy@RestoreSpaceFactor + #1% + \Hy@SaveSpaceFactor + \Hy@endcolorlink }% \@linkdim\ht\@tempboxa \advance\@linkdim by -6.5\p@ \raise\@linkdim\hbox{}% + \Hy@RestoreSpaceFactor \else \special{button: % \number\wd\@tempboxa\space @@ -12671,8 +12992,11 @@ \begingroup \hyper@chars \leavevmode - \setbox\@tempboxa=\color@hbox #1\color@endbox \ifHy@raiselinks + \Hy@SaveSpaceFactor + \Hy@SaveSavedSpaceFactor + \sbox\@tempboxa{\Hy@RestoreSpaceFactor#1}% + \Hy@RestoreSavedSpaceFactor \@linkdim\dp\@tempboxa \lower\@linkdim\hbox{% \special{button: % @@ -12681,11 +13005,16 @@ #3,% file: #2% }% - \Hy@colorlink\@filecolor#1\Hy@endcolorlink + \Hy@colorlink\@filecolor + \Hy@RestoreSpaceFactor + #1% + \Hy@SaveSpaceFactor + \Hy@endcolorlink }% \@linkdim\ht\@tempboxa \advance\@linkdim by -6.5\p@ \raise\@linkdim\hbox{}% + \Hy@RestoreSpaceFactor \else \special{button: % \number\wd\@tempboxa\space @@ -12815,6 +13144,9 @@ % \begin{macrocode} \providecommand*{\XR@ext}{pdf} \Hy@setbreaklinks{true} +\def\HyPat@ObjRef{% + @[^ ]+% +} \newsavebox{\pdfm@box} \def\@pdfm@mark#1{\special{pdf:#1}} \def\@pdfm@dest#1{% @@ -12975,14 +13307,14 @@ \begingroup \ifHy@ocgcolorlinks \def\Hy@ocgcolor{#1}% - \setbox0=\color@hbox + \setbox0=\hbox\bgroup\color@begingroup \else \HyColor@UseColor#1% \fi }% \def\Hy@endcolorlink{% \ifHy@ocgcolorlinks - \color@endbox + \color@endgroup\egroup \mbox{% \@pdfm@mark{content /OC/OCPrint BDC}% \rlap{\copy0}% @@ -13048,6 +13380,7 @@ /A<<% /S/GoTo% /D(\Hy@testname)% + \Hy@href@nextactionraw >>% >>% }% @@ -13061,8 +13394,11 @@ \def\hyper@linkfile#1#2#3{% \leavevmode \Hy@BeginAnnot{% - \Hy@pstringdef\Hy@pstringF{#2}% + \def\Hy@pstringF{#2}% + \Hy@CleanupFile\Hy@pstringF + \Hy@pstringdef\Hy@pstringF\Hy@pstringF \Hy@pstringdef\Hy@pstringD{#3}% + \Hy@MakeRemoteAction \@pdfm@mark{% bann<<% /Type/Annot% @@ -13076,8 +13412,14 @@ /A<<% /S/GoToR% /F(\Hy@pstringF)% - /D\ifx\\#3\\[0 \@pdfstartview]\else(\Hy@pstringD)\fi + /D% + \ifx\\#3\\% + [\Hy@href@page\@pdfremotestartview]% + \else + (\Hy@pstringD)% + \fi \Hy@SetNewWindow + \Hy@href@nextactionraw >>% >>% }% @@ -13103,6 +13445,10 @@ /A<<% /S/URI% /URI(\Hy@pstringURI)% + \ifHy@href@ismap + /IsMap true% + \fi + \Hy@href@nextactionraw >>% >>% }% @@ -13122,6 +13468,7 @@ /A<<% /S/Named% /N/#1% + \Hy@href@nextactionraw >>% \Hy@setpdfborder \ifx\@menubordercolor\relax @@ -13483,7 +13830,12 @@ \def\Hy@tempa{#1}% \ifx\Hy@tempa\@urltype \special{!% - aref ;% + aref ;% a=<% \ifHy@pdfa /F 4\fi \Hy@setpdfborder @@ -13522,10 +13874,12 @@ } \def\hyper@linkfile#1#2#3{% \leavevmode + \def\Hy@pstringF{#2}% + \Hy@CleanupFile\Hy@pstringF \special{!% aref <% \ifnum\Hy@VTeXversion>753 \ifHy@newwindow n\fi\fi - f=#2>#3;% + f=\Hy@pstringF>#3;% a=<% \ifHy@pdfa /F 4\fi \Hy@setpdfborder @@ -13544,7 +13898,12 @@ \hyper@chars \leavevmode \special{!% - aref ;% + aref ;% a=<% \ifHy@pdfa /F 4\fi \Hy@setpdfborder @@ -13606,7 +13965,8 @@ \ifx\\#3\\% \else /Win<>% - \fi% + \fi + \Hy@href@nextactionraw >;% a=<% \ifHy@pdfa /F 4\fi @@ -14107,6 +14467,9 @@ % \begin{macrocode} %<*pdfmark> \Hy@breaklinks@unsupported +\def\HyPat@ObjRef{% + \{[^{}]+\}% +} \def\hyper@anchor#1{% \Hy@SaveLastskip \Hy@VerboseAnchor{#1}% @@ -14144,7 +14507,10 @@ \Hy@VerboseLinkStart{#1}{#2}% \ifHy@breaklinks \else - \leavevmode\hbox\bgroup + \leavevmode + \Hy@SaveSpaceFactor + \hbox\bgroup + \Hy@RestoreSpaceFactor \fi \expandafter\Hy@colorlink\csname @#1color\endcsname \literalps@out{H.S}% @@ -14176,7 +14542,9 @@ \Hy@endcolorlink \ifHy@breaklinks \else + \Hy@SaveSpaceFactor \egroup + \Hy@RestoreSpaceFactor \fi } % \end{macrocode} @@ -14511,10 +14879,19 @@ \literalps@out{H.R}% \else \leavevmode + \Hy@SaveSpaceFactor \ifHy@breaklinks - \Hy@setouterhbox\pdf@box{\Hy@AllowHyphens#1}% + \Hy@setouterhbox\pdf@box{% + \Hy@RestoreSpaceFactor + \Hy@AllowHyphens#1% + \Hy@SaveSpaceFactor + }% \else - \sbox\pdf@box{#1}% + \sbox\pdf@box{% + \Hy@RestoreSpaceFactor + #1% + \Hy@SaveSpaceFactor + }% \fi \dimen@\ht\pdf@box \ifdim\dp\pdf@box=\z@ @@ -14546,6 +14923,7 @@ \else \raise\dimen@\hbox{\literalps@out{H.R}}% \fi + \Hy@RestoreSpaceFactor \fi \ifx\pdf@type\Hy@DEST \else @@ -14775,7 +15153,13 @@ Border=\@pdfborder,% BorderStyle=\@pdfborderstyle,% Color=\@urlbordercolor,% - Action={<< /Subtype /URI /URI (\Hy@pstringURI) >>},% + Action={<<% + /Subtype/URI% + /URI(\Hy@pstringURI)% + \ifHy@href@ismap + /IsMap true% + \fi + >>},% Subtype=/Link,% PDFAFlags=4% }% @@ -14783,8 +15167,11 @@ } \def\hyper@linkfile#1#2#3{% \begingroup - \Hy@pstringdef\Hy@pstringF{#2}% + \def\Hy@pstringF{#2}% + \Hy@CleanupFile\Hy@pstringF + \Hy@pstringdef\Hy@pstringF\Hy@pstringF \Hy@pstringdef\Hy@pstringD{#3}% + \Hy@MakeRemoteAction \leavevmode \pdfmark[{#1}]{% pdfmark=/ANN,% @@ -14800,7 +15187,13 @@ /S/GoToR% \Hy@SetNewWindow /F(\Hy@pstringF)% - /D\ifx\\#3\\[0 \@pdfstartview]\else(\Hy@pstringD)cvn\fi + /D% + \ifx\\#3\\% + [\Hy@href@page\@pdfremotestartview]% + \else + (\Hy@pstringD)cvn% + \fi + \Hy@href@nextactionraw >>% }% }% @@ -14829,6 +15222,7 @@ \else /Win<>% \fi + \Hy@href@nextactionraw >>% }% }% @@ -15309,17 +15703,24 @@ \def\hyper@linkurl#1#2{% \leavevmode \ifHy@raiselinks - \setbox\@tempboxa=\color@hbox #1\color@endbox + \Hy@SaveSpaceFactor + \Hy@SaveSavedSpaceFactor + \sbox\@tempboxa{\Hy@RestoreSpaceFactor#1}% + \Hy@RestoreSavedSpaceFactor \@linkdim\dp\@tempboxa \lower\@linkdim\hbox{% \hyper@chars \special{html:}% }% - \Hy@colorlink\@urlcolor#1% - \@linkdim\ht\@tempboxa - \advance\@linkdim by -6.5\p@ - \raise\@linkdim\hbox{\special{html:}}% + \Hy@colorlink\@urlcolor + \Hy@RestoreSpaceFactor + #1% + \Hy@SaveSpaceFactor + \@linkdim\ht\@tempboxa + \advance\@linkdim by -6.5\p@ + \raise\@linkdim\hbox{\special{html:}}% \Hy@endcolorlink + \Hy@RestoreSpaceFactor \else \begingroup \hyper@chars @@ -15608,7 +16009,10 @@ \def\hyper@linkurl#1#2{% \leavevmode \ifHy@raiselinks - \setbox\@tempboxa=\color@hbox #1\color@endbox + \Hy@SaveSpaceFactor + \Hy@SaveSavedSpaceFactor + \sbox\@tempboxa{\Hy@RestoreSpaceFactor#1}% + \Hy@RestoreSavedSpaceFactor \@linkdim\dp\@tempboxa \lower\@linkdim\hbox{% \begingroup @@ -15618,10 +16022,15 @@ }% \endgroup }% - \Hy@colorlink\@urlcolor#1\Hy@endcolorlink + \Hy@colorlink\@urlcolor + \Hy@RestoreSpaceFactor + #1% + \Hy@SaveSpaceFactor + \Hy@endcolorlink \@linkdim\ht\@tempboxa \advance\@linkdim by -6.5\p@ \raise\@linkdim\hbox{\special{t4ht=}}% + \Hy@RestoreSpaceFactor \else \begingroup \hyper@chars @@ -15649,6 +16058,25 @@ \def\rEfLiNK #1#2{#2}% \fi \def\backref#1{} +% \end{macrocode} +% Fix for tex4ht. +% \begin{macrocode} +\AtBeginDocument{% + \expandafter\let\expandafter\Hy@OrgMakeLabel\csname Make:Label\endcsname + \expandafter\def\csname Make:Label\endcsname#1#2{% + \ifhmode + \Hy@SaveSpaceFactor + \else + \global\Hy@SavedSpaceFactor=1000 % + \fi + \Hy@OrgMakeLabel{#1}{% + \Hy@RestoreSpaceFactor + #2% + \Hy@SaveSpaceFactor + }% + \Hy@RestoreSpaceFactor + }% +} % %<*tex4htcfg> \IfFileExists{\jobname.cfg}{\endinput}{} @@ -15867,7 +16295,6 @@ \fi }% \begingroup - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofText,#1% }% @@ -15898,7 +16325,6 @@ \ifdim\@tempdimb>\@tempdima\@tempdima\@tempdimb\fi }% \advance\@tempdima by 15\p@ - \Field@toks={ }% \begingroup \HyField@SetKeys{#1}% \edef\x{\endgroup @@ -15977,7 +16403,6 @@ \def\@PushButton[#1]#2{% parameters, label \def\Fld@name{#2}% \begingroup - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofPushButton,#1% }% @@ -16003,7 +16428,6 @@ \endgroup } \def\@Submit[#1]#2{% - \Field@toks={ }% \def\Fld@width{\DefaultWidthofSubmit}% \def\Fld@height{\DefaultHeightofSubmit}% \begingroup @@ -16021,7 +16445,6 @@ \endgroup } \def\@Reset[#1]#2{% - \Field@toks={ }% \def\Fld@width{\DefaultWidthofReset}% \def\Fld@height{\DefaultHeightofReset}% \begingroup @@ -16050,7 +16473,6 @@ \begingroup \def\Fld@width{\DefaultWidthofCheckBox}% \def\Fld@height{\DefaultHeightofCheckBox}% - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofCheckBox,#1% }% @@ -16360,7 +16782,6 @@ \fi }% \begingroup - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofText,#1% }% @@ -16392,7 +16813,6 @@ \ifdim\@tempdimb>\@tempdima\@tempdima\@tempdimb\fi }% \advance\@tempdima by 15\p@ - \Field@toks={ }% \begingroup \HyField@SetKeys{#1}% \edef\x{\endgroup @@ -16489,7 +16909,6 @@ \def\@PushButton[#1]#2{% parameters, label \def\Fld@name{#2}% \begingroup - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofPushButton,#1% }% @@ -16517,7 +16936,6 @@ \endgroup } \def\@Submit[#1]#2{% - \Field@toks={ }% \def\Fld@width{\DefaultWidthofSubmit}% \def\Fld@height{\DefaultHeightofSubmit}% \begingroup @@ -16540,7 +16958,6 @@ \endgroup } \def\@Reset[#1]#2{% - \Field@toks={ }% \def\Fld@width{\DefaultWidthofReset}% \def\Fld@height{\DefaultHeightofReset}% \begingroup @@ -16570,7 +16987,6 @@ \begingroup \def\Fld@width{\DefaultWidthofCheckBox}% \def\Fld@height{\DefaultHeightofCheckBox}% - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofCheckBox,#1% }% @@ -16743,7 +17159,6 @@ \fi }% \begingroup - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofText,#1% }% @@ -16788,7 +17203,6 @@ \ifdim\@tempdimb>\@tempdima\@tempdima\@tempdimb\fi }% \advance\@tempdima by 15\p@ - \Field@toks={ }% \begingroup \HyField@SetKeys{#1}% \edef\x{\endgroup @@ -16915,7 +17329,6 @@ \def\@PushButton[#1]#2{% parameters, label \def\Fld@name{#2}% \begingroup - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofPushButton,#1% }% @@ -16953,7 +17366,6 @@ % \begin{macro}{\@Submit} % \begin{macrocode} \def\@Submit[#1]#2{% - \Field@toks={ }% \def\Fld@width{\DefaultWidthofSubmit}% \def\Fld@height{\DefaultHeightofSubmit}% \begingroup @@ -16982,7 +17394,6 @@ % \begin{macro}{\@Reset} % \begin{macrocode} \def\@Reset[#1]#2{% - \Field@toks={ }% \def\Fld@width{\DefaultWidthofReset}% \def\Fld@height{\DefaultHeightofReset}% \begingroup @@ -17022,7 +17433,6 @@ \begingroup \def\Fld@width{\DefaultWidthofCheckBox}% \def\Fld@height{\DefaultHeightofCheckBox}% - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofCheckBox,#1% }% @@ -17173,71 +17583,6 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\PDFForm@Check} -% \begin{macrocode} -\def\PDFForm@Check{% - /Subtype/Widget% - \Fld@annotflags - /T(\Fld@name)% - /FT/Btn% - \Fld@flags - /Q \Fld@align - /BS<>% - /MK<<% - \ifnum\Fld@rotation=\z@ - \else - /R \Fld@rotation - \fi - \ifx\Fld@bordercolor\relax - \else - /BC[\Fld@bordercolor]% - \fi - \ifx\Fld@bcolor\relax - \else - /BG[\Fld@bcolor]% - \fi - /CA(\Hy@escapestring{\Fld@cbsymbol})% - >>% - /DA(/ZaDb \strip@pt\Fld@charsize\space Tf% - \ifx\Fld@color\@empty\else\space\Fld@color\fi)% - /H/P% - \ifFld@checked /V/Yes\else /V/Off\fi -} -% \end{macrocode} -% \end{macro} -% \begin{macro}{\PDFForm@Push} -% \begin{macrocode} -\ifHy@pdfa -\else - \def\PDFForm@Push{% - /Subtype/Widget% - \Fld@annotflags - /T(\Fld@name)% - /FT/Btn% - \Fld@flags - /H/P% - /BS<>% - \ifcase0\ifnum\Fld@rotation=\z@ \else 1\fi - \ifx\Fld@bordercolor\relax\else 1\fi - \space - \else - /MK<<% - \ifnum\Fld@rotation=\z@ - \else - /R \Fld@rotation - \fi - \ifx\Fld@bordercolor\relax - \else - /BC[\Fld@bordercolor]% - \fi - >>% - \fi - /A<>% - }% -\fi -% \end{macrocode} -% \end{macro} -% % \begin{macro}{\Fld@additionalactions} % \begin{macrocode} \def\Fld@@additionalactions{% @@ -17324,6 +17669,73 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\PDFForm@Check} +% \begin{macrocode} +\def\PDFForm@Check{% + /Subtype/Widget% + \Fld@annotflags + /T(\Fld@name)% + /FT/Btn% + \Fld@flags + /Q \Fld@align + /BS<>% + /MK<<% + \ifnum\Fld@rotation=\z@ + \else + /R \Fld@rotation + \fi + \ifx\Fld@bordercolor\relax + \else + /BC[\Fld@bordercolor]% + \fi + \ifx\Fld@bcolor\relax + \else + /BG[\Fld@bcolor]% + \fi + /CA(\Hy@escapestring{\Fld@cbsymbol})% + >>% + /DA(/ZaDb \strip@pt\Fld@charsize\space Tf% + \ifx\Fld@color\@empty\else\space\Fld@color\fi)% + /H/P% + \ifFld@checked /V/Yes\else /V/Off\fi + \Fld@additionalactions +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\PDFForm@Push} +% \begin{macrocode} +\ifHy@pdfa +\else + \def\PDFForm@Push{% + /Subtype/Widget% + \Fld@annotflags + /T(\Fld@name)% + /FT/Btn% + \Fld@flags + /H/P% + /BS<>% + \ifcase0\ifnum\Fld@rotation=\z@ \else 1\fi + \ifx\Fld@bordercolor\relax\else 1\fi + \space + \else + /MK<<% + \ifnum\Fld@rotation=\z@ + \else + /R \Fld@rotation + \fi + \ifx\Fld@bordercolor\relax + \else + /BC[\Fld@bordercolor]% + \fi + >>% + \fi + /A<>% + \Fld@additionalactions + }% +\fi +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\PDFForm@List} % \begin{macrocode} \def\PDFForm@List{% @@ -17469,6 +17881,7 @@ >>% \Fld@submitflags >>% + \Fld@additionalactions } % \end{macrocode} % \end{macro} @@ -17503,6 +17916,7 @@ \fi /BS<>% /A<>% + \Fld@additionalactions }% \fi % \end{macrocode} diff --git a/Master/texmf-dist/tex/latex/hyperref/backref.sty b/Master/texmf-dist/tex/latex/hyperref/backref.sty index 4e4e35ee4e8..c553bfba9a3 100644 --- a/Master/texmf-dist/tex/latex/hyperref/backref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/backref.sty @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{backref} - [2010/03/11 v1.35 Bibliographical back referencing]% + [2010/08/30 v1.36 Bibliographical back referencing]% \newif\ifBR@verbose \@ifundefined{ifHy@verbose}{% \BR@verbosefalse @@ -427,7 +427,7 @@ \immediate\closeout\tf@brf }% }{% - Rerun to get bibliographicsl references right% + Rerun to get bibliographical references right% }% } \endinput diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def index 9683f9293fa..f45ea7ed2c6 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/18 v6.81g + [2010/09/11 v6.81m Hyperref driver for dvipdfm] \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}} \ifHy@pagelabels @@ -123,6 +123,9 @@ \fi \providecommand*{\XR@ext}{pdf} \Hy@setbreaklinks{true} +\def\HyPat@ObjRef{% + @[^ ]+% +} \newsavebox{\pdfm@box} \def\@pdfm@mark#1{\special{pdf:#1}} \def\@pdfm@dest#1{% @@ -279,14 +282,14 @@ \begingroup \ifHy@ocgcolorlinks \def\Hy@ocgcolor{#1}% - \setbox0=\color@hbox + \setbox0=\hbox\bgroup\color@begingroup \else \HyColor@UseColor#1% \fi }% \def\Hy@endcolorlink{% \ifHy@ocgcolorlinks - \color@endbox + \color@endgroup\egroup \mbox{% \@pdfm@mark{content /OC/OCPrint BDC}% \rlap{\copy0}% @@ -348,6 +351,7 @@ /A<<% /S/GoTo% /D(\Hy@testname)% + \Hy@href@nextactionraw >>% >>% }% @@ -361,8 +365,11 @@ \def\hyper@linkfile#1#2#3{% \leavevmode \Hy@BeginAnnot{% - \Hy@pstringdef\Hy@pstringF{#2}% + \def\Hy@pstringF{#2}% + \Hy@CleanupFile\Hy@pstringF + \Hy@pstringdef\Hy@pstringF\Hy@pstringF \Hy@pstringdef\Hy@pstringD{#3}% + \Hy@MakeRemoteAction \@pdfm@mark{% bann<<% /Type/Annot% @@ -376,8 +383,14 @@ /A<<% /S/GoToR% /F(\Hy@pstringF)% - /D\ifx\\#3\\[0 \@pdfstartview]\else(\Hy@pstringD)\fi + /D% + \ifx\\#3\\% + [\Hy@href@page\@pdfremotestartview]% + \else + (\Hy@pstringD)% + \fi \Hy@SetNewWindow + \Hy@href@nextactionraw >>% >>% }% @@ -403,6 +416,10 @@ /A<<% /S/URI% /URI(\Hy@pstringURI)% + \ifHy@href@ismap + /IsMap true% + \fi + \Hy@href@nextactionraw >>% >>% }% @@ -422,6 +439,7 @@ /A<<% /S/Named% /N/#1% + \Hy@href@nextactionraw >>% \Hy@setpdfborder \ifx\@menubordercolor\relax @@ -619,7 +637,6 @@ \fi }% \begingroup - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofText,#1% }% @@ -659,7 +676,6 @@ \ifdim\@tempdimb>\@tempdima\@tempdima\@tempdimb\fi }% \advance\@tempdima by 15\p@ - \Field@toks={ }% \begingroup \HyField@SetKeys{#1}% \edef\x{\endgroup @@ -767,7 +783,6 @@ \def\@PushButton[#1]#2{% parameters, label \def\Fld@name{#2}% \begingroup - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofPushButton,#1% }% @@ -800,7 +815,6 @@ \endgroup } \def\@Submit[#1]#2{% - \Field@toks={ }% \def\Fld@width{\DefaultWidthofSubmit}% \def\Fld@height{\DefaultHeightofSubmit}% \begingroup @@ -824,7 +838,6 @@ \endgroup } \def\@Reset[#1]#2{% - \Field@toks={ }% \def\Fld@width{\DefaultWidthofReset}% \def\Fld@height{\DefaultHeightofReset}% \begingroup @@ -859,7 +872,6 @@ \begingroup \def\Fld@width{\DefaultWidthofCheckBox}% \def\Fld@height{\DefaultHeightofCheckBox}% - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofCheckBox,#1% }% @@ -988,6 +1000,57 @@ \endgroup \let\Fld@name\Hy@gtemp } +\def\Fld@@additionalactions{% + \ifx\Fld@keystroke@code\@empty + \else + /K<>% + \fi + \ifx\Fld@format@code\@empty + \else + /F<>% + \fi + \ifx\Fld@validate@code\@empty + \else + /V<>% + \fi + \ifx\Fld@calculate@code\@empty + \else + /C<>% + \fi + \ifx\Fld@onfocus@code\@empty + \else + /Fo<>% + \fi + \ifx\Fld@onblur@code\@empty + \else + /Bl<>% + \fi + \ifx\Fld@onmousedown@code\@empty + \else + /D<>% + \fi + \ifx\Fld@onmouseup@code\@empty + \else + /U<>% + \fi + \ifx\Fld@onenter@code\@empty + \else + /E<>% + \fi + \ifx\Fld@onexit@code\@empty + \else + /X<>% + \fi +} +\def\Fld@additionalactions{% + \if-\Fld@@additionalactions-% + \else + \ifHy@pdfa + \else + /AA<<\Fld@@additionalactions>>% + \fi + \fi +} \def\PDFForm@Check{% /Subtype/Widget% \Fld@annotflags @@ -1015,6 +1078,7 @@ \ifx\Fld@color\@empty\else\space\Fld@color\fi)% /H/P% \ifFld@checked /V/Yes\else /V/Off\fi + \Fld@additionalactions } \ifHy@pdfa \else @@ -1042,59 +1106,9 @@ >>% \fi /A<>% + \Fld@additionalactions }% \fi -\def\Fld@@additionalactions{% - \ifx\Fld@keystroke@code\@empty - \else - /K<>% - \fi - \ifx\Fld@format@code\@empty - \else - /F<>% - \fi - \ifx\Fld@validate@code\@empty - \else - /V<>% - \fi - \ifx\Fld@calculate@code\@empty - \else - /C<>% - \fi - \ifx\Fld@onfocus@code\@empty - \else - /Fo<>% - \fi - \ifx\Fld@onblur@code\@empty - \else - /Bl<>% - \fi - \ifx\Fld@onmousedown@code\@empty - \else - /D<>% - \fi - \ifx\Fld@onmouseup@code\@empty - \else - /U<>% - \fi - \ifx\Fld@onenter@code\@empty - \else - /E<>% - \fi - \ifx\Fld@onexit@code\@empty - \else - /X<>% - \fi -} -\def\Fld@additionalactions{% - \if-\Fld@@additionalactions-% - \else - \ifHy@pdfa - \else - /AA<<\Fld@@additionalactions>>% - \fi - \fi -} \def\PDFForm@List{% /Subtype/Widget% \Fld@annotflags @@ -1226,6 +1240,7 @@ >>% \Fld@submitflags >>% + \Fld@additionalactions } \ifHy@pdfa \else @@ -1254,6 +1269,7 @@ \fi /BS<>% /A<>% + \Fld@additionalactions }% \fi \def\Hy@writebookmark#1#2#3#4#5{% diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def index fd48afc6b17..6cda6f66845 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/18 v6.81g + [2010/09/11 v6.81m 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 45f7013ccc0..a27928fe904 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/18 v6.81g + [2010/09/11 v6.81m 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 899b9c77bea..30d960f878f 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/18 v6.81g + [2010/09/11 v6.81m Hyperref driver for dviwindo] \begingroup \@ifundefined{headerps@out}{}{% @@ -179,9 +179,12 @@ } \def\hyper@link#1#2#3{% \Hy@VerboseLinkStart{#1}{#2}% - \setbox\@tempboxa=\color@hbox #3\color@endbox \leavevmode \ifHy@raiselinks + \Hy@SaveSpaceFactor + \Hy@SaveSavedSpaceFactor + \sbox\@tempboxa{\Hy@RestoreSpaceFactor#3}% + \Hy@RestoreSavedSpaceFactor \@linkdim\dp\@tempboxa \lower\@linkdim\hbox{% \special{button: % @@ -189,19 +192,24 @@ \number\ht\@tempboxa\space #2% }% - \expandafter\Hy@colorlink\csname @#1color\endcsname#3% + \expandafter\Hy@colorlink\csname @#1color\endcsname + \Hy@RestoreSpaceFactor + #3% + \Hy@SaveSpaceFactor \Hy@endcolorlink }% \@linkdim\ht\@tempboxa \advance\@linkdim by -6.5\p@ \raise\@linkdim\hbox{}% + \Hy@RestoreSpaceFactor \else \special{button: % \number\wd\@tempboxa\space \number\ht\@tempboxa\space #2% }% - \expandafter\Hy@colorlink\csname @#1color\endcsname#3% + \expandafter\Hy@colorlink\csname @#1color\endcsname + #3% \Hy@endcolorlink \fi } @@ -209,8 +217,11 @@ \begingroup \hyper@chars \leavevmode - \setbox\@tempboxa=\color@hbox #1\color@endbox \ifHy@raiselinks + \Hy@SaveSpaceFactor + \Hy@SaveSavedSpaceFactor + \sbox\@tempboxa{\Hy@RestoreSpaceFactor#1}% + \Hy@RestoreSavedSpaceFactor \@linkdim\dp\@tempboxa \lower\@linkdim\hbox{% \special{button: % @@ -219,11 +230,16 @@ launch: \wwwbrowser\space #2% }% - \Hy@colorlink\@urlcolor#1\Hy@endcolorlink + \Hy@colorlink\@urlcolor + \Hy@RestoreSpaceFactor + #1% + \Hy@SaveSpaceFactor + \Hy@endcolorlink }% \@linkdim\ht\@tempboxa \advance\@linkdim by -6.5\p@ \raise\@linkdim\hbox{}% + \Hy@RestoreSpaceFactor \else \special{button: % \number\wd\@tempboxa\space @@ -239,8 +255,11 @@ \begingroup \hyper@chars \leavevmode - \setbox\@tempboxa=\color@hbox #1\color@endbox \ifHy@raiselinks + \Hy@SaveSpaceFactor + \Hy@SaveSavedSpaceFactor + \sbox\@tempboxa{\Hy@RestoreSpaceFactor#1}% + \Hy@RestoreSavedSpaceFactor \@linkdim\dp\@tempboxa \lower\@linkdim\hbox{% \special{button: % @@ -249,11 +268,16 @@ #3,% file: #2% }% - \Hy@colorlink\@filecolor#1\Hy@endcolorlink + \Hy@colorlink\@filecolor + \Hy@RestoreSpaceFactor + #1% + \Hy@SaveSpaceFactor + \Hy@endcolorlink }% \@linkdim\ht\@tempboxa \advance\@linkdim by -6.5\p@ \raise\@linkdim\hbox{}% + \Hy@RestoreSpaceFactor \else \special{button: % \number\wd\@tempboxa\space @@ -469,10 +493,19 @@ \literalps@out{H.R}% \else \leavevmode + \Hy@SaveSpaceFactor \ifHy@breaklinks - \Hy@setouterhbox\pdf@box{\Hy@AllowHyphens#1}% + \Hy@setouterhbox\pdf@box{% + \Hy@RestoreSpaceFactor + \Hy@AllowHyphens#1% + \Hy@SaveSpaceFactor + }% \else - \sbox\pdf@box{#1}% + \sbox\pdf@box{% + \Hy@RestoreSpaceFactor + #1% + \Hy@SaveSpaceFactor + }% \fi \dimen@\ht\pdf@box \ifdim\dp\pdf@box=\z@ @@ -491,6 +524,7 @@ \else \raise\dimen@\hbox{\literalps@out{H.R}}% \fi + \Hy@RestoreSpaceFactor \fi \ifx\pdf@type\Hy@DEST \else diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def index 40c42faa8de..a6a93bab7df 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/18 v6.81g + [2010/09/11 v6.81m Hyperref driver for pdfTeX] \let\Hy@PutCatalog\pdfcatalog \ifHy@pagelabels @@ -105,6 +105,9 @@ \fi \providecommand*{\XR@ext}{pdf} \Hy@setbreaklinks{true} +\def\HyPat@ObjRef{% + [0-9]*[1-9][0-9]* 0 R% +} \let\Hy@pdfminorversion\relax \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdfminorversion\endcsname\relax @@ -216,14 +219,14 @@ \begingroup \ifHy@ocgcolorlinks \def\Hy@ocgcolor{#1}% - \setbox0=\color@hbox + \setbox0=\hbox\bgroup\color@begingroup \else \HyColor@UseColor#1% \fi }% \def\Hy@endcolorlink{% \ifHy@ocgcolorlinks - \color@endbox + \color@endgroup\egroup \mbox{% \pdfliteral page{/OC/OCPrint BDC}% \rlap{\copy0}% @@ -253,11 +256,17 @@ \fi \providecommand*\@pdfview{XYZ} \def\new@pdflink#1{% + \ifhmode + \@savsf\spacefactor + \fi \Hy@SaveLastskip \Hy@VerboseAnchor{#1}% \Hy@pstringdef\Hy@pstringDest{\HyperDestNameFilter{#1}}% \Hy@DestName\Hy@pstringDest\@pdfview \Hy@RestoreLastskip + \ifhmode + \spacefactor\@savsf + \fi } \let\pdf@endanchor\@empty \def\Hy@DestName#1#2{% @@ -358,6 +367,10 @@ /Type/Action% /S/URI% /URI(\Hy@pstringURI)% + \ifHy@href@ismap + /IsMap true% + \fi + \Hy@href@nextactionraw >>% }% \relax @@ -367,8 +380,11 @@ } \def\hyper@linkfile#1#2#3{% anchor text, filename, linkname \begingroup - \Hy@pstringdef\Hy@pstringF{#2}% + \def\Hy@pstringF{#2}% + \Hy@CleanupFile\Hy@pstringF + \Hy@pstringdef\Hy@pstringF\Hy@pstringF \Hy@pstringdef\Hy@pstringD{#3}% + \Hy@MakeRemoteAction \leavevmode \pdfstartlink attr{% @@ -390,10 +406,11 @@ /S/GoToR% \Hy@SetNewWindow \ifx\\#3\\% - /D[0 \@pdfstartview]% + /D[\Hy@href@page\@pdfremotestartview]% \else /D(\Hy@pstringD)% \fi + \Hy@href@nextactionraw >>% }% \relax @@ -429,6 +446,7 @@ \else /Win<>% \fi + \Hy@href@nextactionraw >>% }% \relax @@ -743,7 +761,9 @@ /Subtype/Link% \ifHy@pdfa /F 4\fi /A<<% - /S/Named/N/#1% + /S/Named% + /N/#1% + \Hy@href@nextactionraw >>% }% \relax @@ -875,7 +895,6 @@ \fi }% \begingroup - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofText,#1% }% @@ -907,7 +926,6 @@ \ifdim\@tempdimb>\@tempdima\@tempdima\@tempdimb\fi }% \advance\@tempdima by 15\p@ - \Field@toks={ }% \begingroup \HyField@SetKeys{#1}% \edef\x{\endgroup @@ -998,7 +1016,6 @@ \def\@PushButton[#1]#2{% parameters, label \def\Fld@name{#2}% \begingroup - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofPushButton,#1% }% @@ -1026,7 +1043,6 @@ \endgroup } \def\@Submit[#1]#2{% - \Field@toks={ }% \def\Fld@width{\DefaultWidthofSubmit}% \def\Fld@height{\DefaultHeightofSubmit}% \begingroup @@ -1049,7 +1065,6 @@ \endgroup } \def\@Reset[#1]#2{% - \Field@toks={ }% \def\Fld@width{\DefaultWidthofReset}% \def\Fld@height{\DefaultHeightofReset}% \begingroup @@ -1079,7 +1094,6 @@ \begingroup \def\Fld@width{\DefaultWidthofCheckBox}% \def\Fld@height{\DefaultHeightofCheckBox}% - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofCheckBox,#1% }% @@ -1205,6 +1219,57 @@ \endgroup \let\Fld@name\Hy@gtemp } +\def\Fld@@additionalactions{% + \ifx\Fld@keystroke@code\@empty + \else + /K<>% + \fi + \ifx\Fld@format@code\@empty + \else + /F<>% + \fi + \ifx\Fld@validate@code\@empty + \else + /V<>% + \fi + \ifx\Fld@calculate@code\@empty + \else + /C<>% + \fi + \ifx\Fld@onfocus@code\@empty + \else + /Fo<>% + \fi + \ifx\Fld@onblur@code\@empty + \else + /Bl<>% + \fi + \ifx\Fld@onmousedown@code\@empty + \else + /D<>% + \fi + \ifx\Fld@onmouseup@code\@empty + \else + /U<>% + \fi + \ifx\Fld@onenter@code\@empty + \else + /E<>% + \fi + \ifx\Fld@onexit@code\@empty + \else + /X<>% + \fi +} +\def\Fld@additionalactions{% + \if-\Fld@@additionalactions-% + \else + \ifHy@pdfa + \else + /AA<<\Fld@@additionalactions>>% + \fi + \fi +} \def\PDFForm@Check{% /Subtype/Widget% \Fld@annotflags @@ -1232,6 +1297,7 @@ \ifx\Fld@color\@empty\else\space\Fld@color\fi)% /H/P% \ifFld@checked /V/Yes\else /V/Off\fi + \Fld@additionalactions } \ifHy@pdfa \else @@ -1259,59 +1325,9 @@ >>% \fi /A<>% + \Fld@additionalactions }% \fi -\def\Fld@@additionalactions{% - \ifx\Fld@keystroke@code\@empty - \else - /K<>% - \fi - \ifx\Fld@format@code\@empty - \else - /F<>% - \fi - \ifx\Fld@validate@code\@empty - \else - /V<>% - \fi - \ifx\Fld@calculate@code\@empty - \else - /C<>% - \fi - \ifx\Fld@onfocus@code\@empty - \else - /Fo<>% - \fi - \ifx\Fld@onblur@code\@empty - \else - /Bl<>% - \fi - \ifx\Fld@onmousedown@code\@empty - \else - /D<>% - \fi - \ifx\Fld@onmouseup@code\@empty - \else - /U<>% - \fi - \ifx\Fld@onenter@code\@empty - \else - /E<>% - \fi - \ifx\Fld@onexit@code\@empty - \else - /X<>% - \fi -} -\def\Fld@additionalactions{% - \if-\Fld@@additionalactions-% - \else - \ifHy@pdfa - \else - /AA<<\Fld@@additionalactions>>% - \fi - \fi -} \def\PDFForm@List{% /Subtype/Widget% \Fld@annotflags @@ -1443,6 +1459,7 @@ >>% \Fld@submitflags >>% + \Fld@additionalactions } \ifHy@pdfa \else @@ -1471,6 +1488,7 @@ \fi /BS<>% /A<>% + \Fld@additionalactions }% \fi \def\Hy@writebookmark#1#2#3#4#5{% diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg index 1f54cb91452..580ff7cee7d 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/18 v6.81g + [2010/09/11 v6.81m 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 ec044058cfc..dd6a0058c35 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/18 v6.81g + [2010/09/11 v6.81m Hyperref driver for TeX4ht] \providecommand*{\XR@ext}{html} \def\Hy@raisedlink{} @@ -99,7 +99,10 @@ \def\hyper@linkurl#1#2{% \leavevmode \ifHy@raiselinks - \setbox\@tempboxa=\color@hbox #1\color@endbox + \Hy@SaveSpaceFactor + \Hy@SaveSavedSpaceFactor + \sbox\@tempboxa{\Hy@RestoreSpaceFactor#1}% + \Hy@RestoreSavedSpaceFactor \@linkdim\dp\@tempboxa \lower\@linkdim\hbox{% \begingroup @@ -109,10 +112,15 @@ }% \endgroup }% - \Hy@colorlink\@urlcolor#1\Hy@endcolorlink + \Hy@colorlink\@urlcolor + \Hy@RestoreSpaceFactor + #1% + \Hy@SaveSpaceFactor + \Hy@endcolorlink \@linkdim\ht\@tempboxa \advance\@linkdim by -6.5\p@ \raise\@linkdim\hbox{\special{t4ht=}}% + \Hy@RestoreSpaceFactor \else \begingroup \hyper@chars @@ -137,6 +145,22 @@ \def\rEfLiNK #1#2{#2}% \fi \def\backref#1{} +\AtBeginDocument{% + \expandafter\let\expandafter\Hy@OrgMakeLabel\csname Make:Label\endcsname + \expandafter\def\csname Make:Label\endcsname#1#2{% + \ifhmode + \Hy@SaveSpaceFactor + \else + \global\Hy@SavedSpaceFactor=1000 % + \fi + \Hy@OrgMakeLabel{#1}{% + \Hy@RestoreSpaceFactor + #2% + \Hy@SaveSpaceFactor + }% + \Hy@RestoreSpaceFactor + }% +} \def\@Form[#1]{% \kvsetkeys{Form}{#1}% \HCode{

    }% diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def index b8d48f62d04..396cec13baa 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} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hyperref driver for Textures] \providecommand*{\XR@ext}{pdf} \begingroup @@ -182,17 +182,24 @@ \def\hyper@linkurl#1#2{% \leavevmode \ifHy@raiselinks - \setbox\@tempboxa=\color@hbox #1\color@endbox + \Hy@SaveSpaceFactor + \Hy@SaveSavedSpaceFactor + \sbox\@tempboxa{\Hy@RestoreSpaceFactor#1}% + \Hy@RestoreSavedSpaceFactor \@linkdim\dp\@tempboxa \lower\@linkdim\hbox{% \hyper@chars \special{html:}% }% - \Hy@colorlink\@urlcolor#1% - \@linkdim\ht\@tempboxa - \advance\@linkdim by -6.5\p@ - \raise\@linkdim\hbox{\special{html:}}% + \Hy@colorlink\@urlcolor + \Hy@RestoreSpaceFactor + #1% + \Hy@SaveSpaceFactor + \@linkdim\ht\@tempboxa + \advance\@linkdim by -6.5\p@ + \raise\@linkdim\hbox{\special{html:}}% \Hy@endcolorlink + \Hy@RestoreSpaceFactor \else \begingroup \hyper@chars diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def index 70d948c0d6a..a436643199e 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} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hyperref driver for VTeX in PDF/PS mode] \providecommand*{\XR@ext}{pdf} \edef\Hy@VTeXversion{% @@ -206,7 +206,12 @@ \def\Hy@tempa{#1}% \ifx\Hy@tempa\@urltype \special{!% - aref ;% + aref ;% a=<% \ifHy@pdfa /F 4\fi \Hy@setpdfborder @@ -245,10 +250,12 @@ } \def\hyper@linkfile#1#2#3{% \leavevmode + \def\Hy@pstringF{#2}% + \Hy@CleanupFile\Hy@pstringF \special{!% aref <% \ifnum\Hy@VTeXversion>753 \ifHy@newwindow n\fi\fi - f=#2>#3;% + f=\Hy@pstringF>#3;% a=<% \ifHy@pdfa /F 4\fi \Hy@setpdfborder @@ -267,7 +274,12 @@ \hyper@chars \leavevmode \special{!% - aref ;% + aref ;% a=<% \ifHy@pdfa /F 4\fi \Hy@setpdfborder @@ -329,7 +341,8 @@ \ifx\\#3\\% \else /Win<>% - \fi% + \fi + \Hy@href@nextactionraw >;% a=<% \ifHy@pdfa /F 4\fi diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def index c231807ba17..b21b4f9bdcd 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} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hyperref driver for VTeX in HTML mode] \providecommand*{\XR@ext}{htm} \RequirePackage{vtexhtml} diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def index ab4d7e7c87b..f52225cfd92 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} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)] \providecommand*{\XR@ext}{pdf} \def\Hy@raisedlink{} diff --git a/Master/texmf-dist/tex/latex/hyperref/hxetex.def b/Master/texmf-dist/tex/latex/hyperref/hxetex.def index a4b82dd6c4f..a02683aca73 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} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hyperref driver for XeTeX] \HyPsd@LoadUnicode \Hy@unicodetrue @@ -205,6 +205,9 @@ } \providecommand*{\XR@ext}{pdf} \Hy@setbreaklinks{true} +\def\HyPat@ObjRef{% + @[^ ]+% +} \newsavebox{\pdfm@box} \def\@pdfm@mark#1{\special{pdf:#1}} \def\@pdfm@dest#1{% @@ -361,14 +364,14 @@ \begingroup \ifHy@ocgcolorlinks \def\Hy@ocgcolor{#1}% - \setbox0=\color@hbox + \setbox0=\hbox\bgroup\color@begingroup \else \HyColor@UseColor#1% \fi }% \def\Hy@endcolorlink{% \ifHy@ocgcolorlinks - \color@endbox + \color@endgroup\egroup \mbox{% \@pdfm@mark{content /OC/OCPrint BDC}% \rlap{\copy0}% @@ -430,6 +433,7 @@ /A<<% /S/GoTo% /D(\Hy@testname)% + \Hy@href@nextactionraw >>% >>% }% @@ -443,8 +447,11 @@ \def\hyper@linkfile#1#2#3{% \leavevmode \Hy@BeginAnnot{% - \Hy@pstringdef\Hy@pstringF{#2}% + \def\Hy@pstringF{#2}% + \Hy@CleanupFile\Hy@pstringF + \Hy@pstringdef\Hy@pstringF\Hy@pstringF \Hy@pstringdef\Hy@pstringD{#3}% + \Hy@MakeRemoteAction \@pdfm@mark{% bann<<% /Type/Annot% @@ -458,8 +465,14 @@ /A<<% /S/GoToR% /F(\Hy@pstringF)% - /D\ifx\\#3\\[0 \@pdfstartview]\else(\Hy@pstringD)\fi + /D% + \ifx\\#3\\% + [\Hy@href@page\@pdfremotestartview]% + \else + (\Hy@pstringD)% + \fi \Hy@SetNewWindow + \Hy@href@nextactionraw >>% >>% }% @@ -485,6 +498,10 @@ /A<<% /S/URI% /URI(\Hy@pstringURI)% + \ifHy@href@ismap + /IsMap true% + \fi + \Hy@href@nextactionraw >>% >>% }% @@ -504,6 +521,7 @@ /A<<% /S/Named% /N/#1% + \Hy@href@nextactionraw >>% \Hy@setpdfborder \ifx\@menubordercolor\relax @@ -681,7 +699,6 @@ \fi }% \begingroup - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofText,#1% }% @@ -721,7 +738,6 @@ \ifdim\@tempdimb>\@tempdima\@tempdima\@tempdimb\fi }% \advance\@tempdima by 15\p@ - \Field@toks={ }% \begingroup \HyField@SetKeys{#1}% \edef\x{\endgroup @@ -829,7 +845,6 @@ \def\@PushButton[#1]#2{% parameters, label \def\Fld@name{#2}% \begingroup - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofPushButton,#1% }% @@ -862,7 +877,6 @@ \endgroup } \def\@Submit[#1]#2{% - \Field@toks={ }% \def\Fld@width{\DefaultWidthofSubmit}% \def\Fld@height{\DefaultHeightofSubmit}% \begingroup @@ -886,7 +900,6 @@ \endgroup } \def\@Reset[#1]#2{% - \Field@toks={ }% \def\Fld@width{\DefaultWidthofReset}% \def\Fld@height{\DefaultHeightofReset}% \begingroup @@ -921,7 +934,6 @@ \begingroup \def\Fld@width{\DefaultWidthofCheckBox}% \def\Fld@height{\DefaultHeightofCheckBox}% - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofCheckBox,#1% }% @@ -1050,6 +1062,57 @@ \endgroup \let\Fld@name\Hy@gtemp } +\def\Fld@@additionalactions{% + \ifx\Fld@keystroke@code\@empty + \else + /K<>% + \fi + \ifx\Fld@format@code\@empty + \else + /F<>% + \fi + \ifx\Fld@validate@code\@empty + \else + /V<>% + \fi + \ifx\Fld@calculate@code\@empty + \else + /C<>% + \fi + \ifx\Fld@onfocus@code\@empty + \else + /Fo<>% + \fi + \ifx\Fld@onblur@code\@empty + \else + /Bl<>% + \fi + \ifx\Fld@onmousedown@code\@empty + \else + /D<>% + \fi + \ifx\Fld@onmouseup@code\@empty + \else + /U<>% + \fi + \ifx\Fld@onenter@code\@empty + \else + /E<>% + \fi + \ifx\Fld@onexit@code\@empty + \else + /X<>% + \fi +} +\def\Fld@additionalactions{% + \if-\Fld@@additionalactions-% + \else + \ifHy@pdfa + \else + /AA<<\Fld@@additionalactions>>% + \fi + \fi +} \def\PDFForm@Check{% /Subtype/Widget% \Fld@annotflags @@ -1077,6 +1140,7 @@ \ifx\Fld@color\@empty\else\space\Fld@color\fi)% /H/P% \ifFld@checked /V/Yes\else /V/Off\fi + \Fld@additionalactions } \ifHy@pdfa \else @@ -1104,59 +1168,9 @@ >>% \fi /A<>% + \Fld@additionalactions }% \fi -\def\Fld@@additionalactions{% - \ifx\Fld@keystroke@code\@empty - \else - /K<>% - \fi - \ifx\Fld@format@code\@empty - \else - /F<>% - \fi - \ifx\Fld@validate@code\@empty - \else - /V<>% - \fi - \ifx\Fld@calculate@code\@empty - \else - /C<>% - \fi - \ifx\Fld@onfocus@code\@empty - \else - /Fo<>% - \fi - \ifx\Fld@onblur@code\@empty - \else - /Bl<>% - \fi - \ifx\Fld@onmousedown@code\@empty - \else - /D<>% - \fi - \ifx\Fld@onmouseup@code\@empty - \else - /U<>% - \fi - \ifx\Fld@onenter@code\@empty - \else - /E<>% - \fi - \ifx\Fld@onexit@code\@empty - \else - /X<>% - \fi -} -\def\Fld@additionalactions{% - \if-\Fld@@additionalactions-% - \else - \ifHy@pdfa - \else - /AA<<\Fld@@additionalactions>>% - \fi - \fi -} \def\PDFForm@List{% /Subtype/Widget% \Fld@annotflags @@ -1288,6 +1302,7 @@ >>% \Fld@submitflags >>% + \Fld@additionalactions } \ifHy@pdfa \else @@ -1316,6 +1331,7 @@ \fi /BS<>% /A<>% + \Fld@additionalactions }% \fi \def\Hy@writebookmark#1#2#3#4#5{% diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index 4e42f4f12b8..d7c55490684 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} \ProvidesPackage{hyperref} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -111,6 +111,45 @@ \def\Hy@Warning#1{\PackageWarning{hyperref}{#1}} \def\Hy@WarningNoLine#1{\PackageWarningNoLine{hyperref}{#1}} \def\Hy@Info#1{\PackageInfo{hyperref}{#1}} +\ltx@IfUndefined{pdfmatch}{% + \def\Hy@Match#1#2#3#4{}% +}{% + \def\Hy@Match#1#2{% + \begingroup + \edef\^{\ltx@backslashchar\string^}% + \edef\.{\ltx@backslashchar.}% + \edef\[{\ltx@backslashchar[}% ]] + \edef\${\ltx@backslashchar$}% + \edef\({\ltx@backslashchar(}% + \edef\){\ltx@backslashchar)}% + \edef\|{\ltx@backslashchar|}% + \edef\*{\ltx@backslashchar*}% + \edef\+{\ltx@backslashchar+}% + \edef\?{\ltx@backslashchar?}% + \edef\{{\ltx@backslashchar\ltx@leftbracechar}% + \edef\}{\ltx@rightbracechar}% + \edef\\{\ltx@backslashchar\ltx@backslashchar}% + \ifnum\pdfmatch{#2}{#1}=\ltx@one + \endgroup + \expandafter\ltx@firstoftwo + \else + \endgroup + \expandafter\ltx@secondoftwo + \fi + }% +} +\ltx@ifpackagelater{ltxcmds}{2010/09/11}{}{% + \begingroup + \lccode`0=`\{\relax + \lowercase{\endgroup + \def\ltx@leftbracechar{0}% + }% + \begingroup + \lccode`0=`\}\relax + \lowercase{\endgroup + \def\ltx@rightbracechar{0}% + }% +} \@ifundefined{AfterBeginDocument}{% \def\AfterBeginDocument{\AtBeginDocument}% }{}% @@ -391,7 +430,7 @@ \let\label\@gobble \let\index\@gobble \let\glossary\@gobble - \let\href\@secondoftwo + \let\href\HyPsd@href \let\@mkboth\@gobbletwo \let\ref\HyPsd@ref \let\pageref\HyPsd@pageref @@ -1365,6 +1404,7 @@ #3% }% } +\def\HyPsd@href#1#{\@secondoftwo} \def\HyPsd@ref#1{\HyPsd@@ref#1*\END}% \def\HyPsd@@ref#1*#2\END{% \ifx\\#2\\% @@ -2156,10 +2196,28 @@ \def\Hy@writebookmark#1#2#3#4#5{}% \let\HyperRaiseLinkHook\@empty \def\HyperRaiseLinkDefault{\baselineskip} +\newcount\Hy@SavedSpaceFactor +\def\Hy@SaveSpaceFactor{% + \global\Hy@SavedSpaceFactor=\ifhmode\spacefactor\else\z@\fi +} +\def\Hy@RestoreSpaceFactor{% + \relax + \ifhmode + \ifnum\Hy@SavedSpaceFactor>\z@ + \spacefactor=\Hy@SavedSpaceFactor + \fi + \fi +} +\def\Hy@SaveSavedSpaceFactor{% + \edef\Hy@RestoreSavedSpaceFactor{% + \global\Hy@SavedSpaceFactor=\the\Hy@SavedSpaceFactor\relax + }% +} \def\Hy@raisedlink#1{% \ifvmode #1% \else + \Hy@SaveSpaceFactor \penalty\@M \smash{% \begingroup @@ -2167,8 +2225,13 @@ \setlength\HyperRaiseLinkLength\HyperRaiseLinkDefault \HyperRaiseLinkHook \expandafter\endgroup - \expandafter\raise\the\HyperRaiseLinkLength\hbox{#1}% + \expandafter\raise\the\HyperRaiseLinkLength\hbox{% + \Hy@RestoreSpaceFactor + #1% + \Hy@SaveSpaceFactor + }% }% + \Hy@RestoreSpaceFactor \fi } \def\Hy@SaveLastskip{% @@ -3455,7 +3518,40 @@ \ifx\\#1\\% \def\@pdfstartview{}% \else - \hypercalcbpdef\@pdfstartview{ /#1 }% + \hypercalcbpdef\@pdfstartview{/#1}% + \fi +} +\def\HyPat@NonNegativeReal/{% + ([0-9]+\.?[0-9]*|[0-9]*\.?[0-9]+)% +} +\define@key{Hyp}{pdfremotestartview}{% + \ifx\\#1\\% + \def\@pdfremotestartview{/Fit}% + \else + \hypercalcbpdef\@pdfremotestartview{#1}% + \edef\@pdfremotestartview{\@pdfremotestartview}% + \Hy@Match\@pdfremotestartview{% + ^(XYZ -?(null|\HyPat@NonNegativeReal/) % + -?(null|\HyPat@NonNegativeReal/) % + (null|\HyPat@NonNegativeReal/)|% + Fit(|B|% + (H|V|BH|BV) (null|\HyPat@NonNegativeReal/)|% + R \HyPat@NonNegativeReal/ \HyPat@NonNegativeReal/ % + \HyPat@NonNegativeReal/ \HyPat@NonNegativeReal/% + ))$% + }{}{% + \Hy@Warning{% + Invalid value `\@pdfremotestartview'\MessageBreak + of `pdfremotestartview'\MessageBreak + is replaced by `Fit'% + }% + \let\@pdfremotestartview\@empty + }% + \ifx\@pdfremotestartview\@empty + \def\@pdfremotestartview{/Fit}% + \else + \edef\@pdfremotestartview{/\@pdfremotestartview}% + \fi \fi } \define@key{Hyp}{pdfpagescrop}{\edef\@pdfpagescrop{#1}} @@ -3529,7 +3625,8 @@ \def\@pdfkeywords{} \def\@pdftrapped{} \def\@pdfpagescrop{} -\def\@pdfstartview{ /Fit } +\def\@pdfstartview{/Fit} +\def\@pdfremotestartview{/Fit} \def\@pdfstartpage{1} \def\@pdfprintpagerange{} \def\@pdflang{} @@ -3593,7 +3690,7 @@ \let\@secondoffive\@secondoftwo \let\ReadBookmarks\relax \let\WriteBookmarks\relax - \Hy@WarningNoLine{ draft mode on}% + \Hy@WarningNoLine{Draft mode on}% \fi \Hy@DisableOption{draft}% \Hy@DisableOption{nolinks}% @@ -4137,7 +4234,9 @@ \hskip\z@skip \fi } -\DeclareRobustCommand*{\href}{% +\DeclareRobustCommand*{\href}[1][]{% + \begingroup + \setkeys{href}{#1}% \@ifnextchar\bgroup\Hy@href{\hyper@normalise\href@}% } \def\Hy@href#{% @@ -4147,10 +4246,78 @@ \catcode`\$=6 % \catcode`\#=12 % \gdef\href@$1{\expandafter\href@split$1##\\}% - \gdef\href@split$1#$2#$3\\{% - \hyper@@link{$1}{$2}% + \gdef\href@split$1#$2#$3\\$4{% + \hyper@@link{$1}{$2}{$4}% + \endgroup }% \endgroup +\define@key{href}{page}{% + \def\Hy@href@page{#1}% +} +\let\Hy@href@page\@empty +\newcount\c@Hy@tempcnt +\def\theHy@tempcnt{\the\c@Hy@tempcnt} +\def\Hy@MakeRemoteAction{% + \ifx\Hy@href@page\@empty + \def\Hy@href@page{0}% + \else + \setcounter{Hy@tempcnt}{\Hy@href@page}% + \ifnum\c@Hy@tempcnt<\@ne + \Hy@Warning{% + Invalid page number (\theHy@tempcnt)\MessageBreak + for remote PDF file.\MessageBreak + Using page 1% + }% + \def\Hy@href@page{0}% + \else + \global\advance\c@Hy@tempcnt\m@ne + \edef\Hy@href@page{\theHy@tempcnt}% + \fi + \fi + \ifx\Hy@href@nextactionraw\@empty + \else + \Hy@newwindowsettrue + \Hy@newwindowtrue + \fi +} +\define@key{href}{pdfremotestartview}{% + \setkeys{Hyp}{pdfremotestartview={#1}}% +} +\let\KV@href@pdfnewwindow\KV@Hyp@pdfnewwindow +\let\KV@href@pdfnewwindow@default\KV@Hyp@pdfnewwindow@default +\newif\ifHy@href@ismap +\define@key{href}{ismap}[true]{% + \ltx@IfUndefined{Hy@href@ismap#1}{% + \PackageError{hyperref}{% + Invalid value (#1) for key `ismap'.\MessageBreak + Permitted values are `true' or `false'.\MessageBreak + Ignoring `ismap'% + }\@ehc + }{% + \csname Hy@href@ismap#1\endcsname + }% +} +\let\Hy@href@nextactionraw\@empty +\define@key{href}{nextactionraw}{% + \edef\Hy@href@nextactionraw{#1}% + \ifx\Hy@href@nextactionraw\@empty + \else + \Hy@Match\Hy@href@nextactionraw{% + ^(\HyPat@ObjRef/|<<.*/S[ /].+>>|% + \[( ?\HyPat@ObjRef/|<<.*/S[ /].+>>)+ ?])$% + }{}{% + \Hy@Warning{Invalid value for `nextactionraw':\MessageBreak + \Hy@href@nextactionraw\MessageBreak + The action is discarded% + }% + }% + \ifx\Hy@href@nextactionraw\@empty + \else + \edef\Hy@href@nextactionraw{/Next \Hy@href@nextactionraw}% + \fi + \fi +} +\def\HyPat@ObjRef/{.+} \RequirePackage{url} \let\HyOrg@url\url \def\Hurl{\begingroup \Url} @@ -4263,20 +4430,26 @@ \x } \def\hyper@readexternallink#1\\#2#3#4{% - \expandafter\@hyper@readexternallink{#2}{#3}{#4}#1::\\{#1}% + \begingroup + \let\\\relax + \expandafter\endgroup + \expandafter\@@hyper@@readexternallink#1\\{#2}{#3}{#4}% +} +\def\@@hyper@@readexternallink#1\\#2#3#4{% + \@hyper@readexternallink{#2}{#3}{#4}#1::\\{#1}% } \def\@pdftempwordfile{file}% \def\@pdftempwordrun{run}% \def\@hyper@readexternallink#1#2#3#4:#5:#6\\#7{% \ifx\\#6\\% - \expandafter\@hyper@linkfile file:#7\\{#3}{#2}% + \@hyper@linkfile file:#7\\{#3}{#2}{#7}% \else \ifx\\#4\\% - \expandafter\@hyper@linkfile file:#7\\{#3}{#2}% + \@hyper@linkfile file:#7\\{#3}{#2}{#7}% \else \def\@pdftempa{#4}% \ifx\@pdftempa\@pdftempwordfile - \expandafter\@hyper@linkfile#7\\{#3}{#2}% + \@hyper@linkfile#7\\{#3}{#2}{#7}% \else \ifx\@pdftempa\@pdftempwordrun \ifHy@pdfa @@ -4288,7 +4461,7 @@ #2% \endgroup \else - \expandafter\@hyper@launch#7\\{#3}{#2}% + \@hyper@launch#7\\{#3}{#2}% \fi \else \hyper@linkurl{#3}{#7\ifx\\#2\\\else\hyper@hash#2\fi}% @@ -4308,8 +4481,8 @@ \fi }% } -\def\@hyper@linkfile file:#1\\#2#3{% - %file url,link string, name +\def\@hyper@linkfile file:#1\\#2#3#4{% + %file url,link string, name, original uri \filename@parse{#1}% \ifx\filename@ext\relax \edef\filename@ext{\XR@ext}% @@ -4320,7 +4493,7 @@ }{% \ifx\@baseurl\@empty \hyper@linkurl{#2}{% - \Hy@linkfileprefix\use@file\ifx\\#3\\\else\hyper@hash#3\fi + #4\ifx\\#3\\\else\hyper@hash#3\fi }% \else \hyper@linkurl{#2}{\use@file\ifx\\#3\\\else\hyper@hash#3\fi}% @@ -4345,6 +4518,29 @@ }% \expandafter\expandafter\expandafter\z\expandafter\x\y\@nil } +\def\Hy@StringLocalhost{localhost} +\@onelevel@sanitize\Hy@StringLocalhost +\def\Hy@CleanupFile#1{% + \edef#1{#1}% + \expandafter\Hy@@CleanupFile#1\hbox///\hbox\@nil{#1}% +} +\def\Hy@@CleanupFile#1//#2/#3\hbox#4\@nil#5{% + \begingroup + \toks@{\endgroup}% + \def\x{#1}% + \ifx\x\@empty + \def\x{#2}% + \ifx\x\@empty + \toks@{\endgroup\def#5{/#3}}% + \else + \@onelevel@sanitize\x + \ifx\x\Hy@StringLocalhost + \toks@{\endgroup\def#5{/#3}}% + \fi + \fi + \fi + \the\toks@ +} \long\def\hyper@@anchor#1#2{\@hyper@@anchor#1\relax#2\relax} \long\def\@hyper@@anchor#1\relax#2#3\relax{% \ifx\\#1\\% @@ -4375,6 +4571,7 @@ \fi \let\anchor@spot\@empty } +\def\anchor@spot{} \let\htmladdimg\hyperimage \def\htmladdnormallink#1#2{\href{#2}{#1}} \def\htmladdnormallinkfoot#1#2{\href{#2}{#1}\footnote{#2}} @@ -4886,12 +5083,21 @@ \def\Field@boolkey#1#2{% \csname Fld@#2\ifx\relax#1\relax true\else#1\fi\endcsname } -\newtoks\Field@toks -\Field@toks={ }% -\def\Field@addtoks#1#2{% - \edef\@processme{\Field@toks{\the\Field@toks\space #1="#2"}}% - \@processme -} +\ifHy@texht + \newtoks\Field@toks + \Field@toks={ }% + \def\Field@addtoks#1#2{% + \edef\@processme{\Field@toks{\the\Field@toks\space #1="#2"}}% + \@processme + }% +\else + \def\Hy@WarnHTMLFieldOption#1{% + \Hy@Warning{% + HTML field option `#1'\MessageBreak + is ignored% + }% + }% +\fi \def\Fld@checkequals#1=#2=#3\\{% \def\@currDisplay{#1}% \ifx\\#2\\% @@ -4909,12 +5115,21 @@ \define@key{Field}{disabled}[true]{% \lowercase{\Field@boolkey{#1}}{disabled}% } -\define@key{Field}{accesskey}{% - \Field@addtoks{accesskey}{#1}% -} -\define@key{Field}{tabkey}{% - \Field@addtoks{tabkey}{#1}% -} +\ifHy@texht + \define@key{Field}{accesskey}{% + \Field@addtoks{accesskey}{#1}% + }% + \define@key{Field}{tabkey}{% + \Field@addtoks{tabkey}{#1}% + }% +\else + \define@key{Field}{accesskey}{% + \Hy@WarnHTMLFieldOption{accesskey}% + }% + \define@key{Field}{tabkey}{% + \Hy@WarnHTMLFieldOption{tabkey}% + }% +\fi \define@key{Field}{name}{% \def\Fld@name{#1}% } @@ -5032,33 +5247,46 @@ \Hy@temp{onblur} \Hy@temp{onenter} \Hy@temp{onexit} -\def\Hy@temp#1{% - \define@key{Field}{#1}{% - \Field@addtoks{#1}{##1}% +\ifHy@texht + \def\Hy@temp#1{% + \define@key{Field}{#1}{% + \Field@addtoks{#1}{##1}% + }% }% -} -\Hy@temp{onselect} -\Hy@temp{onchange} +\else + \def\Hy@temp#1{% + \define@key{Field}{#1}{% + \Hy@WarnHTMLFieldOption{#1}% + }% + }% +\fi \Hy@temp{ondblclick} \Hy@temp{onmousedown} \Hy@temp{onmouseup} \Hy@temp{onmouseover} \Hy@temp{onmousemove} \Hy@temp{onmouseout} -\Hy@temp{onkeypress} \Hy@temp{onkeydown} \Hy@temp{onkeyup} -\ifHy@pdfa - \define@key{Field}{onclick}{% - \PackageError{hyperref}{% - PDF/A: Action `onclick' is prohibited% - }\@ehc - }% -\else +\Hy@temp{onselect} +\Hy@temp{onchange} +\Hy@temp{onkeypress} +\ifHy@texht \define@key{Field}{onclick}{% - \def\Fld@onclick@code{#1}% \Field@addtoks{onclick}{#1}% }% +\else + \ifHy@pdfa + \define@key{Field}{onclick}{% + \PackageError{hyperref}{% + PDF/A: Action `onclick' is prohibited% + }\@ehc + }% + \else + \define@key{Field}{onclick}{% + \def\Fld@onclick@code{#1}% + }% + \fi \fi \DeclareRobustCommand\TextField{% \@ifnextchar[{\@TextField}{\@TextField[]}% @@ -5610,6 +5838,7 @@ \fi \fi } +\let\Hy@saved@refstepcounter\refstepcounter \@ifpackageloaded{amsmath}{}{\newif\ifmeasuring@\measuring@false} \def\hyper@refstepcounter#1{% \edef\This@name{#1}% @@ -5832,6 +6061,18 @@ \edef#1{\getpagerefnumber{#2}}% }% }{} +\def\Hy@varioref@refstepcounter#1{% + \stepcounter{#1}% + \protected@edef\@currentlabel{% + \csname p@#1\expandafter\endcsname\csname the#1\endcsname + }% +} +\AtBeginDocument{% + \ifx\refstepcounter\Hy@varioref@refstepcounter + \let\H@refstepcounter\refstepcounter + \let\refstepcounter\Hy@saved@refstepcounter + \fi +} \@ifpackageloaded{longtable}{% \begingroup \def\y{\LT@array}% @@ -6581,7 +6822,7 @@ \evensidemargin \fi \kern-1bp\relax - \Hy@TempPageAnchor + \Hy@TempPageAnchor\relax \hss }% \vss diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def index dd4cd0ea113..e5f03a5338c 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} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hyperref driver for HyperTeX specials] \providecommand*{\XR@ext}{dvi} \def\PDF@FinishDoc{} @@ -94,17 +94,24 @@ \def\hyper@linkurl#1#2{% \leavevmode \ifHy@raiselinks - \setbox\@tempboxa=\color@hbox #1\color@endbox + \Hy@SaveSpaceFactor + \Hy@SaveSavedSpaceFactor + \sbox\@tempboxa{\Hy@RestoreSpaceFactor#1}% + \Hy@RestoreSavedSpaceFactor \@linkdim\dp\@tempboxa \lower\@linkdim\hbox{% \hyper@chars \special{html:}% }% - \Hy@colorlink\@urlcolor#1% + \Hy@colorlink\@urlcolor + \Hy@RestoreSpaceFactor + #1% + \Hy@SaveSpaceFactor \@linkdim\ht\@tempboxa \advance\@linkdim by -6.5\p@ \raise\@linkdim\hbox{\special{html:}}% \Hy@endcolorlink + \Hy@RestoreSpaceFactor \else \begingroup \hyper@chars diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty index 5bc5acf4fdc..327ba2cb427 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} \ProvidesPackage{nohyperref} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Dummy hyperref (SR)] \RequirePackage{letltxmacro}[2008/06/13] \let\hyper@@anchor\@gobble @@ -53,7 +53,7 @@ \let\phantomsection\@empty \let\hypersetup\@gobble \let\hyperbaseurl\@gobble -\let\href\@gobble +\newcommand*{\href}[3][]{#3} \let\hyperdef\@gobbletwo \let\hyperlink\@gobble \let\hypertarget\@gobble diff --git a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def index 97f3d2b8451..a3665096d49 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} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hyperref: PDFDocEncoding definition (HO)] \DeclareFontEncoding{PD1}{}{} \DeclareTextAccent{\`}{PD1}{\textasciigrave} diff --git a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def index 34d6b323562..c3256fa429d 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} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hyperref definitions for pdfmark specials] \begingroup \@ifundefined{headerps@out}{}{% @@ -173,6 +173,9 @@ \endgroup } \Hy@breaklinks@unsupported +\def\HyPat@ObjRef{% + \{[^{}]+\}% +} \def\hyper@anchor#1{% \Hy@SaveLastskip \Hy@VerboseAnchor{#1}% @@ -210,7 +213,10 @@ \Hy@VerboseLinkStart{#1}{#2}% \ifHy@breaklinks \else - \leavevmode\hbox\bgroup + \leavevmode + \Hy@SaveSpaceFactor + \hbox\bgroup + \Hy@RestoreSpaceFactor \fi \expandafter\Hy@colorlink\csname @#1color\endcsname \literalps@out{H.S}% @@ -242,7 +248,9 @@ \Hy@endcolorlink \ifHy@breaklinks \else + \Hy@SaveSpaceFactor \egroup + \Hy@RestoreSpaceFactor \fi } \begingroup @@ -523,10 +531,19 @@ \literalps@out{H.R}% \else \leavevmode + \Hy@SaveSpaceFactor \ifHy@breaklinks - \Hy@setouterhbox\pdf@box{\Hy@AllowHyphens#1}% + \Hy@setouterhbox\pdf@box{% + \Hy@RestoreSpaceFactor + \Hy@AllowHyphens#1% + \Hy@SaveSpaceFactor + }% \else - \sbox\pdf@box{#1}% + \sbox\pdf@box{% + \Hy@RestoreSpaceFactor + #1% + \Hy@SaveSpaceFactor + }% \fi \dimen@\ht\pdf@box \ifdim\dp\pdf@box=\z@ @@ -545,6 +562,7 @@ \else \raise\dimen@\hbox{\literalps@out{H.R}}% \fi + \Hy@RestoreSpaceFactor \fi \ifx\pdf@type\Hy@DEST \else @@ -721,7 +739,13 @@ Border=\@pdfborder,% BorderStyle=\@pdfborderstyle,% Color=\@urlbordercolor,% - Action={<< /Subtype /URI /URI (\Hy@pstringURI) >>},% + Action={<<% + /Subtype/URI% + /URI(\Hy@pstringURI)% + \ifHy@href@ismap + /IsMap true% + \fi + >>},% Subtype=/Link,% PDFAFlags=4% }% @@ -729,8 +753,11 @@ } \def\hyper@linkfile#1#2#3{% \begingroup - \Hy@pstringdef\Hy@pstringF{#2}% + \def\Hy@pstringF{#2}% + \Hy@CleanupFile\Hy@pstringF + \Hy@pstringdef\Hy@pstringF\Hy@pstringF \Hy@pstringdef\Hy@pstringD{#3}% + \Hy@MakeRemoteAction \leavevmode \pdfmark[{#1}]{% pdfmark=/ANN,% @@ -746,7 +773,13 @@ /S/GoToR% \Hy@SetNewWindow /F(\Hy@pstringF)% - /D\ifx\\#3\\[0 \@pdfstartview]\else(\Hy@pstringD)cvn\fi + /D% + \ifx\\#3\\% + [\Hy@href@page\@pdfremotestartview]% + \else + (\Hy@pstringD)cvn% + \fi + \Hy@href@nextactionraw >>% }% }% @@ -775,6 +808,7 @@ \else /Win<>% \fi + \Hy@href@nextactionraw >>% }% }% @@ -978,7 +1012,6 @@ \fi }% \begingroup - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofText,#1% }% @@ -1009,7 +1042,6 @@ \ifdim\@tempdimb>\@tempdima\@tempdima\@tempdimb\fi }% \advance\@tempdima by 15\p@ - \Field@toks={ }% \begingroup \HyField@SetKeys{#1}% \edef\x{\endgroup @@ -1088,7 +1120,6 @@ \def\@PushButton[#1]#2{% parameters, label \def\Fld@name{#2}% \begingroup - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofPushButton,#1% }% @@ -1114,7 +1145,6 @@ \endgroup } \def\@Submit[#1]#2{% - \Field@toks={ }% \def\Fld@width{\DefaultWidthofSubmit}% \def\Fld@height{\DefaultHeightofSubmit}% \begingroup @@ -1132,7 +1162,6 @@ \endgroup } \def\@Reset[#1]#2{% - \Field@toks={ }% \def\Fld@width{\DefaultWidthofReset}% \def\Fld@height{\DefaultHeightofReset}% \begingroup @@ -1161,7 +1190,6 @@ \begingroup \def\Fld@width{\DefaultWidthofCheckBox}% \def\Fld@height{\DefaultHeightofCheckBox}% - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofCheckBox,#1% }% @@ -1229,6 +1257,57 @@ \endgroup \let\Fld@name\Hy@gtemp } +\def\Fld@@additionalactions{% + \ifx\Fld@keystroke@code\@empty + \else + /K<>% + \fi + \ifx\Fld@format@code\@empty + \else + /F<>% + \fi + \ifx\Fld@validate@code\@empty + \else + /V<>% + \fi + \ifx\Fld@calculate@code\@empty + \else + /C<>% + \fi + \ifx\Fld@onfocus@code\@empty + \else + /Fo<>% + \fi + \ifx\Fld@onblur@code\@empty + \else + /Bl<>% + \fi + \ifx\Fld@onmousedown@code\@empty + \else + /D<>% + \fi + \ifx\Fld@onmouseup@code\@empty + \else + /U<>% + \fi + \ifx\Fld@onenter@code\@empty + \else + /E<>% + \fi + \ifx\Fld@onexit@code\@empty + \else + /X<>% + \fi +} +\def\Fld@additionalactions{% + \if-\Fld@@additionalactions-% + \else + \ifHy@pdfa + \else + /AA<<\Fld@@additionalactions>>% + \fi + \fi +} \def\PDFForm@Check{% /Subtype/Widget% \Fld@annotflags @@ -1256,6 +1335,7 @@ \ifx\Fld@color\@empty\else\space\Fld@color\fi)% /H/P% \ifFld@checked /V/Yes\else /V/Off\fi + \Fld@additionalactions } \ifHy@pdfa \else @@ -1283,59 +1363,9 @@ >>% \fi /A<>% + \Fld@additionalactions }% \fi -\def\Fld@@additionalactions{% - \ifx\Fld@keystroke@code\@empty - \else - /K<>% - \fi - \ifx\Fld@format@code\@empty - \else - /F<>% - \fi - \ifx\Fld@validate@code\@empty - \else - /V<>% - \fi - \ifx\Fld@calculate@code\@empty - \else - /C<>% - \fi - \ifx\Fld@onfocus@code\@empty - \else - /Fo<>% - \fi - \ifx\Fld@onblur@code\@empty - \else - /Bl<>% - \fi - \ifx\Fld@onmousedown@code\@empty - \else - /D<>% - \fi - \ifx\Fld@onmouseup@code\@empty - \else - /U<>% - \fi - \ifx\Fld@onenter@code\@empty - \else - /E<>% - \fi - \ifx\Fld@onexit@code\@empty - \else - /X<>% - \fi -} -\def\Fld@additionalactions{% - \if-\Fld@@additionalactions-% - \else - \ifHy@pdfa - \else - /AA<<\Fld@@additionalactions>>% - \fi - \fi -} \def\PDFForm@List{% /Subtype/Widget% \Fld@annotflags @@ -1467,6 +1497,7 @@ >>% \Fld@submitflags >>% + \Fld@additionalactions } \ifHy@pdfa \else @@ -1495,6 +1526,7 @@ \fi /BS<>% /A<>% + \Fld@additionalactions }% \fi \def\Hy@writebookmark#1#2#3#4#5{% diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def index 87d225407a1..00279107b34 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} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hyperref: Additions to puenc.def for Arabi] \DeclareTextCommand{\hamza}{PU}{\86\041}% 0621;afii57409;ARABIC LETTER HAMZA \DeclareTextCommand{\alefmadda}{PU}{\86\042}% 0622;afii57410;ARABIC LETTER ALEF WITH MADDA ABOVE diff --git a/Master/texmf-dist/tex/latex/hyperref/puenc.def b/Master/texmf-dist/tex/latex/hyperref/puenc.def index 83ad4a22306..d976e048a98 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} - [2010/06/18 v6.81g + [2010/09/11 v6.81m 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 c8ff698e21e..b698f9c8c2c 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} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hyperref: Additions to puenc.def for VnTeX] \DeclareTextCommand{\abreve}{PU}{\81\003} \DeclareTextCommand{\acircumflex}{PU}{\80\342} -- cgit v1.2.3