From 81e85f9bb5875b6c3cd460112e26e715d8965004 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 20 Aug 2006 00:16:44 +0000 Subject: hyperref 6.75a (1aug06) git-svn-id: svn://tug.org/texlive/trunk@1993 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/hyperref/backref.sty | 45 +- Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def | 253 +++++++-- Master/texmf-dist/tex/latex/hyperref/hdvips.def | 19 +- Master/texmf-dist/tex/latex/hyperref/hdvipson.def | 36 +- Master/texmf-dist/tex/latex/hyperref/hdviwind.def | 165 ++++-- Master/texmf-dist/tex/latex/hyperref/hpdftex.def | 388 ++++++++++---- Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg | 3 +- Master/texmf-dist/tex/latex/hyperref/htex4ht.def | 11 +- Master/texmf-dist/tex/latex/hyperref/htexture.def | 23 +- Master/texmf-dist/tex/latex/hyperref/hvtex.def | 183 +++++-- Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def | 3 +- Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def | 22 +- Master/texmf-dist/tex/latex/hyperref/hylatex.ltx | 43 ++ Master/texmf-dist/tex/latex/hyperref/hyperref.sty | 581 +++++++++++++++------ Master/texmf-dist/tex/latex/hyperref/hypertex.def | 24 +- Master/texmf-dist/tex/latex/hyperref/nameref.sty | 58 +- .../texmf-dist/tex/latex/hyperref/nohyperref.sty | 3 +- Master/texmf-dist/tex/latex/hyperref/pd1enc.def | 4 +- Master/texmf-dist/tex/latex/hyperref/pdfmark.def | 386 ++++++++++---- Master/texmf-dist/tex/latex/hyperref/puenc.def | 55 +- Master/texmf-dist/tex/latex/hyperref/puvnenc.def | 163 ++++++ 21 files changed, 1867 insertions(+), 601 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/hyperref/hylatex.ltx create mode 100644 Master/texmf-dist/tex/latex/hyperref/puvnenc.def (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/hyperref/backref.sty b/Master/texmf-dist/tex/latex/hyperref/backref.sty index 7de1c59f522..8ae300d0dd3 100644 --- a/Master/texmf-dist/tex/latex/hyperref/backref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/backref.sty @@ -6,9 +6,7 @@ %% %% backref.dtx (with options: `package') %% -\def\fileversion{1.23} -\def\filedate{2003/03/20} -%% File: backref.dtx Copyright (C) 1995-2003 David Carlisle, Sebastian Rahtz, Heiko Oberdiek +%% File: backref.dtx Copyright (C) 1995-2005 David Carlisle, Sebastian Rahtz, Heiko Oberdiek %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- %% @@ -21,8 +19,9 @@ %% %% The list of all files belonging to the `Hyperref Bundle' is %% given in the file `manifest.txt'. -\ProvidesPackage{backref}% - [\filedate\space v\fileversion\space Bibliographical back referencing] +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{backref} + [2006/08/01 v1.26 Bibliographical back referencing] \newif\ifBR@verbose \@ifundefined{ifHy@verbose}{% \BR@verbosefalse @@ -127,15 +126,43 @@ \backrefenglish \ExecuteOptions{pageref} \ProcessOptions*\relax -\def\BR@bibitem{\@ifnextchar[\BR@@lbibitem\BR@@bibitem} +\newif\ifbackrefparscan +\backrefparscantrue +\def\BR@bibitem{% + \ifbackrefparscan + \expandafter\@ifnextchar\expandafter[\expandafter + \BR@@lbibitem\expandafter\BR@@bibitem + \else + \expandafter\@ifnextchar\expandafter[\expandafter + \BR@@@lbibitem\expandafter\BR@@@bibitem + \fi +} \def\BR@@lbibitem[#1]#2#3\par{% - \BRorg@bibitem[#1]{#2}#3% + \let\backrefprint\BR@backrefprint + \BRorg@bibitem[{#1}]{#2}#3% \BR@backref{#2}% }% \def\BR@@bibitem#1#2\par{% + \let\backrefprint\BR@backrefprint \BRorg@bibitem{#1}#2% \BR@backref{#1}% } +\def\BR@@@lbibitem[#1]#2{% + \def\backrefprint{\BR@backref{#2}}% + \BRorg@bibitem[{#1}]{#2}% +} +\def\BR@@@bibitem#1{% + \def\backrefprint{\BR@backref{#1}}% + \BRorg@bibitem{#1}% +} +\def\BR@backrefprint{% + \PackageError{backref}{% + \string\backrefprint\space is only available after \string\bibitem + \MessageBreak + with setting \string\backrefparscanfalse + }\@ehc +} +\let\backrefprint\BR@backrefprint \def\BR@backref#1{% \newblock \begingroup @@ -245,7 +272,7 @@ }% } \def\BR@citex[#1]#2{% - \BRorg@citex[#1]{#2}% + \BRorg@citex[{#1}]{#2}% \ifBR@verbose \PackageInfo{backref}{back cite \string`#2\string'}% \fi @@ -254,7 +281,7 @@ \@ifpackageloaded{chicago}{% \let\BRorg@citedatax\@citedatax \def\@citedatax[#1]#2{% - \BRorg@citedatax[#1]{#2}% + \BRorg@citedatax[{#1}]{#2}% \Hy@backout{#2}% }% }{} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def index c9203673486..746d8608377 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def @@ -7,7 +7,6 @@ %% hyperref.dtx (with options: `dvipdfm,pdfform,outlines') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, -%% RCS: $Id: hyperref.dtx 6.71 2000/10/04 rahtz Exp rahtz $ %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -23,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipdfm.def} - [2003/11/30 v6.74m + [2006/08/16 v6.75c Hyperref driver for dvipdfm] \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}} \ifHy@pagelabels @@ -57,15 +56,66 @@ }% } \fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdfescapestring\endcsname\relax + \begingroup + \catcode`\|=0 % + \@makeother\\% + |@firstofone{|endgroup + |def|Hy@pstringdef#1#2{% + |edef#1{#2}% + |@onelevel@sanitize#1% + |edef#1{|expandafter|Hy@ExchangeBackslash#1\|@nil}% + |edef#1{|expandafter|Hy@ExchangeLeftParenthesis#1(|@nil}% + |edef#1{|expandafter|Hy@ExchangeRightParenthesis#1)|@nil}% + }% + |def|Hy@ExchangeBackslash#1\#2|@nil{% + #1% + |ifx|\#2|\% + |else + \\% + |Hy@ReturnAfterFi{% + |Hy@ExchangeBackslash#2|@nil + }% + |fi + }% + } + \def\Hy@ExchangeLeftParenthesis#1(#2\@nil{% + #1% + \ifx\\#2\\% + \else + \@backslashchar(% + \Hy@ReturnAfterFi{% + \Hy@ExchangeLeftParenthesis#2\@nil + }% + \fi + } + \def\Hy@ExchangeRightParenthesis#1)#2\@nil{% + #1% + \ifx\\#2\\% + \else + \@backslashchar)% + \Hy@ReturnAfterFi{% + \Hy@ExchangeRightParenthesis#2\@nil + }% + \fi + } +\else + \def\Hy@pstringdef#1#2{% + \edef#1{\pdfescapestring{#2}}% + }% +\fi \newsavebox{\pdfm@box} \def\@pdfm@mark#1{\special{pdf:#1}} \def\@pdfm@dest#1{% \Hy@SaveLastskip - \@pdfm@mark{dest (#1) [@thispage /\@pdfview\space @xpos @ypos]}% + \Hy@pstringdef\Hy@pstringDest{#1}% + \@pdfm@mark{dest (\Hy@pstringDest) [@thispage /\@pdfview\space @xpos @ypos]}% \Hy@RestoreLastskip } \providecommand\@pdfview{XYZ} \providecommand\@pdfborder{0 0 1} +\providecommand*\@pdfborderstyle{} \def\hyper@anchor#1{% \@pdfm@dest{#1}% } @@ -81,12 +131,14 @@ \protected@edef\Hy@testname{#2}% \ifx\Hy@testname\@empty \let\Hy@testname\Hy@undefinedname + \else + \Hy@pstringdef\Hy@testname\Hy@testname \fi \@pdfm@mark{% bann << /Type /Annot /Subtype /Link - /Border [\@pdfborder] + \Hy@setpdfborder /C [\csname @#1bordercolor\endcsname] /A << /S /GoTo @@ -94,7 +146,7 @@ >> >> }% - \Hy@colorlink{\csname @#1color\endcsname}% + \expandafter\Hy@colorlink\csname @#1color\endcsname } \def\hyper@linkend{% \Hy@endcolorlink @@ -104,58 +156,63 @@ \hyper@linkstart{#1}{#2}#3\hyper@linkend } \def\hyper@linkfile#1#2#3{% + \Hy@pstringdef\Hy@pstringF{#2}% + \Hy@pstringdef\Hy@pstringD{#3}% \@pdfm@mark{% bann << /Type /Annot /Subtype /Link - /Border [\@pdfborder] + \Hy@setpdfborder /C [\@filebordercolor] /A << /S /GoToR - /F (#2) - /D \ifx\\#3\\[0 \@pdfstartview]\else(#3)\fi\space + /F (\Hy@pstringF) + /D \ifx\\#3\\[0 \@pdfstartview]\else(\Hy@pstringD)\fi\space \ifHy@newwindow /NewWindow true \fi >> >>% }% - \Hy@colorlink{\@filecolor}#1\Hy@endcolorlink + \Hy@colorlink\@filecolor#1\Hy@endcolorlink \@pdfm@mark{eann}% } \def\@hyper@launch run:#1\\#2#3{% filename, anchor text linkname + \Hy@pstringdef\Hy@pstringF{#1}% + \Hy@pstringdef\Hy@pstringP{#3}% \@pdfm@mark{% bann << /Type /Annot /Subtype /Link - /Border [\@pdfborder] + \Hy@setpdfborder /C [\@filebordercolor] /A << /S /Launch - /F (#1) + /F (\Hy@pstringF) \ifHy@newwindow /NewWindow true \fi \ifx\\#3\\% \else - /Win << /P (#3) /F (#1) >> + /Win << /P (\Hy@pstringP) /F (\Hy@pstringF) >> \fi >> >>% }% - \Hy@colorlink{\@filecolor}#2\Hy@endcolorlink + \Hy@colorlink\@filecolor#2\Hy@endcolorlink \@pdfm@mark{eann}% } \def\hyper@linkurl#1#2{% + \Hy@pstringdef\Hy@pstringURI{#2}% \@pdfm@mark{% bann << /Type /Annot /Subtype /Link - /Border [\@pdfborder] + \Hy@setpdfborder /C [\@urlbordercolor] /A << /S /URI - /URI (#2) + /URI (\Hy@pstringURI) >> >>% }% - \Hy@colorlink{\@urlcolor}#1\Hy@endcolorlink + \Hy@colorlink\@urlcolor#1\Hy@endcolorlink \@pdfm@mark{eann}% } \def\Acrobatmenu#1#2{% @@ -167,14 +224,16 @@ /S /Named /N /#1 >> - /Border [\@pdfborder] + \Hy@setpdfborder /C [\@menubordercolor] >>% }% - \Hy@colorlink{\@menucolor}#2\Hy@endcolorlink + \Hy@colorlink\@menucolor#2\Hy@endcolorlink \@pdfm@mark{eann}% } -\def\@pdfproducer{dvipdfm} +\ifx\@pdfproducer\relax + \def\@pdfproducer{dvipdfm} +\fi \def\PDF@FinishDoc{% \Hy@UseMaketitleInfos \@pdfm@mark{% @@ -182,8 +241,19 @@ /Title (\@pdftitle) /Subject (\@pdfsubject) /Creator (\@pdfcreator) + \ifx\@pdfcreationdate\@empty + \else + /CreationDate(\@pdfcreationdate) % + \fi + \ifx\@pdfmoddate\@empty + \else + /ModDate(\@pdfmoddate) % + \fi /Author (\@pdfauthor) - /Producer (\@pdfproducer) + \ifx\@pdfproducer\relax + \else + /Producer (\@pdfproducer) + \fi /Keywords (\@pdfkeywords) >>% }% @@ -191,6 +261,8 @@ \Hy@DisableOption{pdftitle}% \Hy@DisableOption{pdfsubject}% \Hy@DisableOption{pdfcreator}% + \Hy@DisableOption{pdfcreationdate}% + \Hy@DisableOption{pdfmoddate}% \Hy@DisableOption{pdfproducer}% \Hy@DisableOption{pdfkeywords}% } @@ -207,6 +279,7 @@ /NonFullScreenPageMode\@pdfnonfullscreenpagemode \fi }% + \Hy@pstringdef\Hy@pstringB{\@baseurl}% \@pdfm@mark{% docview <<% \ifx\@pdfstartview\@empty @@ -215,7 +288,7 @@ \fi \ifx\@baseurl\@empty \else - /URI<>% + /URI<>% \fi /PageMode \@pdfpagemode \ifx\Hy@temp\@empty @@ -282,6 +355,7 @@ \MakeTextField{\Fld@width}{\Fld@height}% }% \LayoutTextField{#2}{% + \Hy@escapeform\PDFForm@Text \@pdfm@mark{% ann @\Fld@name\space \dvipdfm@setdim << \PDFForm@Text >>% }% @@ -340,6 +414,7 @@ \Hy@StepCount\Fld@listcount \@currDisplay\space \leavevmode + \Hy@escapeform\PDFForm@Radio \@pdfm@mark{% ann \ifnum\Fld@listcount=1 @\Fld@name\space\fi \dvipdfm@setdim @@ -365,6 +440,7 @@ }% \setbox\pdfm@box=\hbox{\MakeChoiceField{\Fld@width}{\Fld@height}}% \leavevmode + \Hy@escapeform\PDFForm@List \@pdfm@mark{% ann @\Fld@name\space\dvipdfm@setdim << \PDFForm@List >>% @@ -381,6 +457,7 @@ \setbox\pdfm@box=\hbox{\MakeButtonField{#2}}% \LayoutPushButtonField{% \leavevmode + \Hy@escapeform\PDFForm@Push \@pdfm@mark{% ann @\Fld@name\space\dvipdfm@setdim << \PDFForm@Push >>% @@ -400,6 +477,7 @@ \ifFld@hidden\def\Fld@width{1sp}\fi \setbox\pdfm@box=\hbox{\MakeButtonField{#2}}% \leavevmode + \Hy@escapeform\PDFForm@Submit \@pdfm@mark{% ann @\Fld@name\space\dvipdfm@setdim << \PDFForm@Submit >>% @@ -418,6 +496,7 @@ \ifFld@hidden\def\Fld@width{1sp}\fi \setbox\pdfm@box=\hbox{\MakeButtonField{#2}}% \leavevmode + \Hy@escapeform\PDFForm@Reset \@pdfm@mark{% ann @\Fld@name\space\dvipdfm@setdim << \PDFForm@Reset >>% @@ -437,6 +516,7 @@ \ifFld@hidden\def\Fld@width{1sp}\fi \setbox\pdfm@box=\hbox{\MakeCheckField{\Fld@width}{\Fld@height}}% \LayoutCheckField{#2}{% + \Hy@escapeform\PDFForm@Check \@pdfm@mark{% ann @\Fld@name\space\dvipdfm@setdim << \PDFForm@Check >>% @@ -492,10 +572,51 @@ /Encoding @OBJpdfdocencoding >> } +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdfescapestring\endcsname\relax + \let\Hy@escapestring\@firstofone + \def\Hy@escapeform#1{% + \ifHy@escapeform + \def\Hy@escapestring##1{% + \noexpand\Hy@escapestring{\noexpand##1}% + }% + \edef\Hy@temp{#1}% + \expandafter\Hy@@escapeform\Hy@temp\Hy@escapestring{}\@nil + \def\Hy@escapestring##1{% + \@ifundefined{Hy@esc@\string##1}{% + ##1% + \ThisShouldNotHappen + }{% + \csname Hy@esc@\string##1\endcsname + }% + }% + \else + \let\Hy@escapestring\@firstofone + \fi + }% + \def\Hy@@escapeform#1\Hy@escapestring#2#3\@nil{% + \ifx\\#3\\% + \else + \expandafter\Hy@pstringdef\csname Hy@esc@\string#2\endcsname{#2}% + \Hy@ReturnAfterFi{% + \Hy@@escapeform#3\@nil + }% + \fi + }% +\else + \def\Hy@escapeform#1{% + \ifHy@escapeform + \let\Hy@escapestring\pdfescapestring + \else + \let\Hy@escapestring\@firstofone + \fi + }% + \Hy@escapeform{}% +\fi \def\PDFForm@Check{% /Subtype /Widget \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Fld@name) + /T (\Hy@escapestring{\Fld@name}) /Q \Fld@align\space /BS << /W \Fld@borderwidth\space /S /\Fld@borderstyle\space >> /MK << @@ -504,7 +625,7 @@ \else /BG [\Fld@bcolor] \fi - /CA (\Fld@cbsymbol) + /CA (\Hy@escapestring{\Fld@cbsymbol}) >> /DA (/ZaDb \strip@pt\Fld@charsize\space Tf \Fld@color\space rg) /FT /Btn @@ -514,7 +635,7 @@ \def\PDFForm@Push{% /Subtype /Widget \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Fld@name) + /T (\Hy@escapestring{\Fld@name}) /FT /Btn /Ff 65540 /H /P @@ -522,56 +643,56 @@ /MK << /BC [\Fld@bordercolor] >> - /A << /S /JavaScript /JS (\Fld@onclick;) >> + /A << /S /JavaScript /JS (\Hy@escapestring{\Fld@onclick}) >> } \def\Fld@additionalactions{% /AA << \ifx\Fld@keystroke@code\@empty \else - /K << /S /JavaScript /JS (\Fld@keystroke@code) >> + /K << /S /JavaScript /JS (\Hy@escapestring{\Fld@keystroke@code}) >> \fi \ifx\Fld@format@code\@empty \else - /F << /S /JavaScript /JS (\Fld@format@code) >> + /F << /S /JavaScript /JS (\Hy@escapestring{\Fld@format@code}) >> \fi \ifx\Fld@validate@code\@empty \else - /V << /S /JavaScript /JS (\Fld@validate@code) >> + /V << /S /JavaScript /JS (\Hy@escapestring{\Fld@validate@code}) >> \fi \ifx\Fld@calculate@code\@empty \else - /C << /S /JavaScript /JS (\Fld@calculate@code) >> + /C << /S /JavaScript /JS (\Hy@escapestring{\Fld@calculate@code}) >> \fi \ifx\Fld@onfocus@code\@empty \else - /Fo << /S /JavaScript /JS (\Fld@onfocus@code) >> + /Fo << /S /JavaScript /JS (\Hy@escapestring{\Fld@onfocus@code}) >> \fi \ifx\Fld@onblur@code\@empty \else - /Bl << /S /JavaScript /JS (\Fld@onblur@code) >> + /Bl << /S /JavaScript /JS (\Hy@escapestring{\Fld@onblur@code}) >> \fi \ifx\Fld@onmousedown@code\@empty \else - /D << /S /JavaScript /JS (\Fld@onmousedown@code) >> + /D << /S /JavaScript /JS (\Hy@escapestring{\Fld@onmousedown@code}) >> \fi \ifx\Fld@onmouseup@code\@empty \else - /U << /S /JavaScript /JS (\Fld@onmouseup@code) >> + /U << /S /JavaScript /JS (\Hy@escapestring{\Fld@onmouseup@code}) >> \fi \ifx\Fld@onenter@code\@empty \else - /E << /S /JavaScript /JS (\Fld@onenter@code) >> + /E << /S /JavaScript /JS (\Hy@escapestring{\Fld@onenter@code}) >> \fi \ifx\Fld@onexit@code\@empty \else - /X << /S /JavaScript /JS (\Fld@onexit@code) >> + /X << /S /JavaScript /JS (\Hy@escapestring{\Fld@onexit@code}) >> \fi >> } \def\PDFForm@List{% /Subtype /Widget \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Fld@name) + /T (\Hy@escapestring{\Fld@name}) /FT /Ch /Q \Fld@align\space /BS << /W \Fld@borderwidth\space /S /\Fld@borderstyle\space >> @@ -584,14 +705,14 @@ >> /DA (/Helv \strip@pt\Fld@charsize\space Tf \Fld@color\space rg ) /Opt [\the\Choice@toks] - /DV (\Fld@default) + /DV (\Hy@escapestring{\Fld@default}) \Fld@additionalactions \Fld@flags } \def\PDFForm@Radio{% /Subtype /Widget \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Fld@name) + /T (\Hy@escapestring{\Fld@name}) /FT /Btn /Ff 49152 /H /P @@ -615,7 +736,7 @@ \def\PDFForm@Text{% /Subtype /Widget \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Fld@name) + /T (\Hy@escapestring{\Fld@name}) /Q \Fld@align\space /FT /Tx /BS << /W \Fld@borderwidth\space /S /\Fld@borderstyle\space >> @@ -627,8 +748,8 @@ \fi >> /DA (/Helv \strip@pt\Fld@charsize\space Tf \Fld@color\space rg ) - /DV (\Fld@default) - /V (\Fld@value) + /DV (\Hy@escapestring{\Fld@default}) + /V (\Hy@escapestring{\Fld@value}) \Fld@additionalactions \ifFld@multiline \ifFld@readonly /Ff 4097 \else /Ff 4096 \fi @@ -644,7 +765,7 @@ \def\PDFForm@Submit{% /Subtype /Widget \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Fld@name) + /T (\Hy@escapestring{\Fld@name}) /FT /Btn /Ff 65540 /H /P @@ -656,7 +777,7 @@ /S /SubmitForm /F << /FS /URL - /F (\Form@action) + /F (\Hy@escapestring{\Form@action}) >> \ifForm@html /Flags 4 \fi >> @@ -664,7 +785,7 @@ \def\PDFForm@Reset{% /Subtype /Widget \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Fld@name) + /T (\Hy@escapestring{\Fld@name}) /FT /Btn /H /P /DA (/Helv \strip@pt\Fld@charsize\space Tf 0 0 1 rg) @@ -675,11 +796,10 @@ /BS << /W \Fld@borderwidth\space /S /\Fld@borderstyle\space >> /A << /S /ResetForm >> } -\newwrite\@outlinefile \def\Hy@writebookmark#1#2#3#4#5{% section number, text, label, level, file \ifx\WriteBookmarks\relax% \else - \ifnum#4>\c@tocdepth + \ifnum#4>\Hy@bookmarksdepth\relax \else \@@writetorep{#1}{#2}{#3}{#4}{#5}% \fi @@ -727,11 +847,13 @@ \let\numberline\@gobble \fi \pdfstringdef\Hy@tempa{#2}% - \protected@write\@outlinefile{}{% - \protect\BOOKMARK - [\Hy@level][\@bookmarkopenstatus{\Hy@level}]{#3}% - {\Hy@tempa}{\Hy@tempb}% - }% + \if@filesw + \protected@write\@outlinefile{}{% + \protect\BOOKMARK + [\Hy@level][\@bookmarkopenstatus{\Hy@level}]{#3}% + {\Hy@tempa}{\Hy@tempb}% + }% + \fi \fi \endgroup } @@ -767,12 +889,13 @@ \fi \def\@@BOOKMARK[##1][##2]##3##4##5{% \def\Hy@temp{##4}% + \Hy@pstringdef\Hy@pstringName{##3}% \@pdfm@mark{% outline ##1 << /Title (\expandafter\strip@prefix\meaning\Hy@temp) /A << /S /GoTo - /D (##3) + /D (\Hy@pstringName) >> >> }% @@ -782,11 +905,14 @@ \InputIfFileExists{\jobname.out}{}{}% }% %{\escapechar\m@ne\InputIfFileExists{\jobname.out}{}{}}% - \ifx\WriteBookmarks\relax\else - \if@filesw\immediate\openout\@outlinefile=\jobname.out - \ifHy@typexml - \immediate\write\@outlinefile{\relax}% - \fi + \ifx\WriteBookmarks\relax + \else + \if@filesw + \newwrite\@outlinefile + \immediate\openout\@outlinefile=\jobname.out + \ifHy@typexml + \immediate\write\@outlinefile{\relax}% + \fi \fi \fi \endgroup @@ -845,6 +971,19 @@ \Hy@org@chapter }% } +\let\H@old@part\@part +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname chapter\endcsname\relax + \let\Hy@secnum@part\z@ +\else + \let\Hy@secnum@part\m@ne +\fi +\def\@part{% + \ifnum\Hy@secnum@part>\c@secnumdepth + \phantomsection + \fi + \H@old@part +} \let\H@old@spart\@spart \def\@spart#1{% \H@old@spart{#1}% diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def index 54f74594b7a..1087c38d970 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvips.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvips.def @@ -7,7 +7,6 @@ %% hyperref.dtx (with options: `dvips') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, -%% RCS: $Id: hyperref.dtx 6.71 2000/10/04 rahtz Exp rahtz $ %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -23,13 +22,16 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvips.def} - [2003/11/30 v6.74m + [2006/08/16 v6.75c Hyperref driver for dvips] \input{pdfmark.def}% -\def\@pdfproducer{dvips + Distiller} +\ifx\@pdfproducer\relax + \def\@pdfproducer{dvips + Distiller} +\fi \def\literalps@out#1{\special{ps:SDict begin #1 end}}% \def\headerps@out#1{\special{! #1}}% \providecommand\@pdfborder{0 0 12} +\providecommand*\@pdfborderstyle{} \providecommand\@pdfview{XYZ} \providecommand\@pdfviewparams{ H.V} \AtBeginDvi{% @@ -67,9 +69,14 @@ currentpoint exch pop vsize 72 sub exch DvipsToPDF sub /pdf@voff exch def } def - systemdict - /pdfmark known not - {userdict /pdfmark systemdict /cleartomark get put} if + systemdict /pdfmark known + { + userdict /?pdfmark systemdict /exec get put + }{ + userdict /?pdfmark systemdict /pop get put + userdict /pdfmark systemdict /cleartomark get put + } + ifelse }% } \AfterBeginDocument{% diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def index b01b172eafc..207ce19ae61 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def @@ -7,7 +7,6 @@ %% hyperref.dtx (with options: `dvipsone') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, -%% RCS: $Id: hyperref.dtx 6.71 2000/10/04 rahtz Exp rahtz $ %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -23,11 +22,14 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipson.def} - [2003/11/30 v6.74m + [2006/08/16 v6.75c Hyperref driver for dvipsone] \providecommand\@pdfborder{0 0 65781} +\providecommand*\@pdfborderstyle{} \input{pdfmark.def}% -\def\@pdfproducer{dvipsone + Distiller} +\ifx\@pdfproducer\relax + \def\@pdfproducer{dvipsone + Distiller} +\fi \def\literalps@out#1{\special{ps:#1}}% \def\headerps@out#1{\special{! #1}}% \def\PDF@FinishDoc{% @@ -35,13 +37,26 @@ \special{PDF: Keywords \@pdfkeywords}% \special{PDF: Title \@pdftitle}% \special{PDF: Creator \@pdfcreator}% + \ifx\@pdfcreationdate\@empty + \else + \special{PDF: CreationDate \@pdfcreationdate}% + \fi + \ifx\@pdfmoddate\@empty + \else + \special{PDF: ModDate \@pdfmoddate}% + \fi \special{PDF: Author \@pdfauthor}% - \special{PDF: Producer \@pdfproducer}% + \ifx\@pdfproducer\relax + \else + \special{PDF: Producer \@pdfproducer}% + \fi \special{PDF: Subject \@pdfsubject}% \Hy@DisableOption{pdfauthor}% \Hy@DisableOption{pdftitle}% \Hy@DisableOption{pdfsubject}% \Hy@DisableOption{pdfcreator}% + \Hy@DisableOption{pdfcreationdate}% + \Hy@DisableOption{pdfmoddate}% \Hy@DisableOption{pdfproducer}% \Hy@DisableOption{pdfkeywords}% } @@ -68,6 +83,7 @@ /NonFullScreenPageMode\@pdfnonfullscreenpagemode \fi }% + \Hy@pstringdef\Hy@pstringB{\@baseurl}% \pdfmark{% pdfmark=/PUT,% Raw={% @@ -82,7 +98,7 @@ \fi \ifx\@baseurl\@empty \else - /URI << /Base (\@baseurl) >>% + /URI << /Base (\Hy@pstringB) >>% \fi >>% }% @@ -124,8 +140,14 @@ currentpoint exch pop DvipsToPDF /pdf@voff exch def } def systemdict - /pdfmark known not - {userdict /pdfmark systemdict /cleartomark get put} if + /pdfmark known + { + userdict /?pdfmark /exec load put + }{ + userdict /?pdfmark /pop load put + userdict /pdfmark systemdict /cleartomark get put + } + ifelse } \endinput %% diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def index 8114140d14c..547ea49423f 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def @@ -7,7 +7,6 @@ %% hyperref.dtx (with options: `dviwindo,pdfmarkbase') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, -%% RCS: $Id: hyperref.dtx 6.71 2000/10/04 rahtz Exp rahtz $ %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -23,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdviwind.def} - [2003/11/30 v6.74m + [2006/08/16 v6.75c Hyperref driver for dviwindo] \def\Hy@PutCatalog#1{% \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} << #1 >>}}% @@ -59,6 +58,55 @@ }% } \fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdfescapestring\endcsname\relax + \begingroup + \catcode`\|=0 % + \@makeother\\% + |@firstofone{|endgroup + |def|Hy@pstringdef#1#2{% + |edef#1{#2}% + |@onelevel@sanitize#1% + |edef#1{|expandafter|Hy@ExchangeBackslash#1\|@nil}% + |edef#1{|expandafter|Hy@ExchangeLeftParenthesis#1(|@nil}% + |edef#1{|expandafter|Hy@ExchangeRightParenthesis#1)|@nil}% + }% + |def|Hy@ExchangeBackslash#1\#2|@nil{% + #1% + |ifx|\#2|\% + |else + \\% + |Hy@ReturnAfterFi{% + |Hy@ExchangeBackslash#2|@nil + }% + |fi + }% + } + \def\Hy@ExchangeLeftParenthesis#1(#2\@nil{% + #1% + \ifx\\#2\\% + \else + \@backslashchar(% + \Hy@ReturnAfterFi{% + \Hy@ExchangeLeftParenthesis#2\@nil + }% + \fi + } + \def\Hy@ExchangeRightParenthesis#1)#2\@nil{% + #1% + \ifx\\#2\\% + \else + \@backslashchar)% + \Hy@ReturnAfterFi{% + \Hy@ExchangeRightParenthesis#2\@nil + }% + \fi + } +\else + \def\Hy@pstringdef#1#2{% + \edef#1{\pdfescapestring{#2}}% + }% +\fi \providecommand\wwwbrowser{c:\string\netscape\string\netscape} \def\hyper@anchor#1{% \Hy@SaveLastskip @@ -67,7 +115,7 @@ \special{mark: #1}% \endgroup \Hy@activeanchortrue - \Hy@colorlink{\@anchorcolor}\anchor@spot\Hy@endcolorlink + \Hy@colorlink\@anchorcolor\anchor@spot\Hy@endcolorlink \Hy@activeanchorfalse \Hy@RestoreLastskip } @@ -81,7 +129,7 @@ \Hy@RestoreLastskip } \def\hyper@linkstart#1#2{% - \Hy@colorlink{\csname @#1color\endcsname}% + \expandafter\Hy@colorlink\csname @#1color\endcsname \special{button: 10000000 \number\baselineskip\space @@ -102,7 +150,7 @@ \number\ht\@tempboxa\space #2% }% - \Hy@colorlink{\csname @#1color\endcsname}#3% + \expandafter\Hy@colorlink\csname @#1color\endcsname#3% \Hy@endcolorlink }% \@linkdim\ht\@tempboxa @@ -114,7 +162,7 @@ \number\ht\@tempboxa\space #2% }% - \Hy@colorlink{\csname @#1color\endcsname}#3\Hy@endcolorlink + \exandafter\Hy@colorlink\csname @#1color\endcsname#3\Hy@endcolorlink \fi } \def\hyper@linkurl#1#2{% @@ -131,7 +179,7 @@ launch: \wwwbrowser\space #2% }% - \Hy@colorlink{\@urlcolor}#1\Hy@endcolorlink + \Hy@colorlink\@urlcolor#1\Hy@endcolorlink }% \@linkdim\ht\@tempboxa \advance\@linkdim by -6.5\p@ @@ -143,7 +191,7 @@ launch: \wwwbrowser\space #2% }% - \Hy@colorlink{\@urlcolor}#1\Hy@endcolorlink + \Hy@colorlink\@urlcolor#1\Hy@endcolorlink \fi \endgroup } @@ -161,7 +209,7 @@ #3, file: #2% }% - \Hy@colorlink{\@filecolor}#1\Hy@endcolorlink + \Hy@colorlink\@filecolor#1\Hy@endcolorlink }% \@linkdim\ht\@tempboxa \advance\@linkdim by -6.5\p@ @@ -173,23 +221,38 @@ #3, file: #2 }% - \Hy@colorlink{\@filecolor}#1\Hy@endcolorlink + \Hy@colorlink\@filecolor#1\Hy@endcolorlink \fi \endgroup } -\def\@pdfproducer{dviwindo + Distiller} +\ifx\@pdfproducer\relax + \def\@pdfproducer{dviwindo + Distiller} +\fi \def\PDF@FinishDoc{% \Hy@UseMaketitleInfos \special{PDF: Keywords \@pdfkeywords}% \special{PDF: Title \@pdftitle}% \special{PDF: Creator \@pdfcreator}% + \ifx\@pdfcreationdate\@empty + \else + \special{PDF: CreationDate \@pdfcreationdate}% + \fi + \ifx\@pdfmoddate\@empty + \else + \special{PDF: ModDate \@pdfmoddate}% + \fi \special{PDF: Author \@pdfauthor}% - \special{PDF: Producer \@pdfproducer}% + \ifx\@pdfproducer\relax + \else + \special{PDF: Producer \@pdfproducer}% + \fi \special{PDF: Subject \@pdfsubject}% \Hy@DisableOption{pdfauthor}% \Hy@DisableOption{pdftitle}% \Hy@DisableOption{pdfsubject}% \Hy@DisableOption{pdfcreator}% + \Hy@DisableOption{pdfcreationdate}% + \Hy@disableOption{pdfmoddate}% \Hy@DisableOption{pdfproducer}% \Hy@DisableOption{pdfkeywords}% } @@ -269,12 +332,16 @@ }% \endgroup } +\newif\ifHy@pdfmarkerror \def\pdfmark{\@ifnextchar[{\pdfmark@}{\pdfmark@[]}} \def\pdfmark@[#1]#2{% - \edef\@processme{\noexpand\pdf@toks={\the\pdf@defaulttoks}}% - \@processme - \let\pdf@type\relax - \setkeys{PDF}{#2}% + \Hy@pdfmarkerrorfalse + \edef\@processme{\noexpand\pdf@toks={\the\pdf@defaulttoks}}% + \@processme + \let\pdf@type\relax + \setkeys{PDF}{#2}% + \ifHy@pdfmarkerror + \else \ifx\pdf@type\relax \Hy@WarningNoLine{no pdfmark type specified in #2!!}% \ifx\\#1\\\relax\else\pdf@rect{#1}\fi @@ -282,27 +349,41 @@ \ifx\\#1\\\relax \literalps@out{[\the\pdf@toks\space\pdf@type\space pdfmark}% \else - \Hy@colorlink{\@ifundefined{@\pdf@linktype color}% - {\@linkcolor}% - {\csname @\pdf@linktype color\endcsname}}% + \@ifundefined{@\pdf@linktype color}{% + \Hy@colorlink\@linkcolor + }{% + \expandafter\Hy@colorlink + \csname @\pdf@linktype color\endcsname + }% \pdf@rect{#1}% \literalps@out{[\the\pdf@toks\space\pdf@type\space pdfmark}% \Hy@endcolorlink \fi \fi + \fi } \newsavebox{\pdf@box} +\providecommand{\Hy@setouterhbox}{\sbox} +\providecommand{\Hy@breaklinksunhbox}{\unhbox} \def\pdf@rect#1{% \leavevmode - \sbox\pdf@box{#1}% + \ifHy@breaklinks + \Hy@setouterhbox\pdf@box{#1}% + \else + \sbox\pdf@box{#1}% + \fi \dimen@\ht\pdf@box - \leavevmode \ifdim\dp\pdf@box=\z@ \literalps@out{H.S}% \else \lower\dp\pdf@box\hbox{\literalps@out{H.S}}% \fi - \ifHy@breaklinks\unhbox\else\box\fi\pdf@box + \ifHy@breaklinks + \expandafter\Hy@breaklinksunhbox + \else + \expandafter\box + \fi + \pdf@box \ifdim\dimen@=\z@ \literalps@out{H.R}% \else @@ -329,7 +410,20 @@ \def\pdf@linktype{link} \define@key{PDF}{Raw}{\pdf@addtoksx{#1}} \define@key{PDF}{Action}{\pdf@addtoks{#1}{Action}} -\define@key{PDF}{Border}{\pdf@addtoks{[#1]}{Border}} +\define@key{PDF}{Border}{% + \edef\Hy@temp{#1}% + \ifx\Hy@temp\@empty + \else + \pdf@addtoks{[#1]}{Border}% + \fi +} +\define@key{PDF}{BorderStyle}{% + \edef\Hy@temp{#1}% + \ifx\Hy@temp\@empty + \else + \pdf@addtoks{<<#1>>}{BS}% + \fi +} \define@key{PDF}{Color}{\pdf@addtoks{[#1]}{Color}} \define@key{PDF}{Contents}{\pdf@addtoks{(#1)}{Contents}} \define@key{PDF}{Count}{\pdf@addtoks{#1}{Count}} @@ -337,16 +431,22 @@ \define@key{PDF}{DOSFile}{\pdf@addtoks{(#1)}{DOSFile}} \define@key{PDF}{DataSource}{\pdf@addtoks{(#1)}{DataSource}} \define@key{PDF}{Dest}{% - \begingroup - \edef\x{#1}% - \expandafter\endgroup - \ifx\x\@empty\else\pdf@addtoks{(#1) cvn}{Dest}\fi + \Hy@pstringdef\Hy@pstringDest{#1}% + \ifx\Hy@pstringDest\@empty + \Hy@pdfmarkerrortrue + \Hy@Warning{Destination with empty name ignored}% + \else + \pdf@addtoks{(\Hy@pstringDest) cvn}{Dest}% + \fi } \define@key{PDF}{DestAnchor}{% - \begingroup - \edef\x{#1}% - \expandafter\endgroup - \ifx\x\@empty\else\pdf@addtoks{(#1) cvn}{Dest}\fi + \Hy@pstringdef\Hy@pstringDest{#1}% + \ifx\Hy@pstringDest\@empty + \Hy@pdfmarkerrortrue + \Hy@Warning{Destination with empty name ignored}% + \else + \pdf@addtoks{(\Hy@pstringDest) cvn}{Dest}% + \fi } \define@key{PDF}{Dir}{\pdf@addtoks{(#1)}{Dir}} \define@key{PDF}{File}{\pdf@addtoks{(#1)}{File}} @@ -369,8 +469,9 @@ \define@key{PDF}{View}{\pdf@addtoks{[#1]}{View}} \define@key{PDF}{WinFile}{\pdf@addtoks{(#1)}{WinFile}} \define@key{PDF}{Author}{\pdf@addtoks{(#1)}{Author}} -\define@key{PDF}{CreationDate}{\pdf@addtoks{(#1)}{CreationDate}} \define@key{PDF}{Creator}{\pdf@addtoks{(#1)}{Creator}} +\define@key{PDF}{CreationDate}{\pdf@addtoks{(#1)}{CreationDate}} +\define@key{PDF}{ModDate}{\pdf@addtoks{(#1)}{ModDate}} \define@key{PDF}{Producer}{\pdf@addtoks{(#1)}{Producer}} \define@key{PDF}{Subject}{\pdf@addtoks{(#1)}{Subject}} \define@key{PDF}{Keywords}{\pdf@addtoks{(#1)}{Keywords}} diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def index 22f7c945945..54c3a9b005d 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def @@ -7,7 +7,6 @@ %% hyperref.dtx (with options: `pdftex,pdfform,outlines') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, -%% RCS: $Id: hyperref.dtx 6.71 2000/10/04 rahtz Exp rahtz $ %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -23,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hpdftex.def} - [2003/11/30 v6.74m + [2006/08/16 v6.75c Hyperref driver for pdfTeX] \let\Hy@PutCatalog\pdfcatalog \ifHy@pagelabels @@ -36,6 +35,55 @@ } \AtEndDocument{\clearpage\HyPL@SetPageLabels} \fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdfescapestring\endcsname\relax + \begingroup + \catcode`\|=0 % + \@makeother\\% + |@firstofone{|endgroup + |def|Hy@pstringdef#1#2{% + |edef#1{#2}% + |@onelevel@sanitize#1% + |edef#1{|expandafter|Hy@ExchangeBackslash#1\|@nil}% + |edef#1{|expandafter|Hy@ExchangeLeftParenthesis#1(|@nil}% + |edef#1{|expandafter|Hy@ExchangeRightParenthesis#1)|@nil}% + }% + |def|Hy@ExchangeBackslash#1\#2|@nil{% + #1% + |ifx|\#2|\% + |else + \\% + |Hy@ReturnAfterFi{% + |Hy@ExchangeBackslash#2|@nil + }% + |fi + }% + } + \def\Hy@ExchangeLeftParenthesis#1(#2\@nil{% + #1% + \ifx\\#2\\% + \else + \@backslashchar(% + \Hy@ReturnAfterFi{% + \Hy@ExchangeLeftParenthesis#2\@nil + }% + \fi + } + \def\Hy@ExchangeRightParenthesis#1)#2\@nil{% + #1% + \ifx\\#2\\% + \else + \@backslashchar)% + \Hy@ReturnAfterFi{% + \Hy@ExchangeRightParenthesis#2\@nil + }% + \fi + } +\else + \def\Hy@pstringdef#1#2{% + \edef#1{\pdfescapestring{#2}}% + }% +\fi \def\setpdflinkmargin#1{\pdflinkmargin#1} \ifx\pdfstartlink\@undefined% less than version 14 \let\pdfstartlink\pdfannotlink @@ -52,26 +100,34 @@ \typeout{pdftex: define anchor at line \the\inputlineno: #1}% \fi \Hy@SaveLastskip - \pdfdest name {#1}\@pdfview + \Hy@pstringdef\Hy@pstringDest{#1}% + \Hy@DestName\Hy@pstringDest\@pdfview \Hy@RestoreLastskip } \let\pdf@endanchor\@empty +\def\Hy@DestName#1#2{% + \pdfdest name{#1}#2\relax +} \providecommand\@pdfborder{0 0 1} +\providecommand*\@pdfborderstyle{} \def\Hy@undefinedname{UNDEFINED} \def\find@pdflink#1#2{% \leavevmode \protected@edef\Hy@testname{#2}% \ifx\Hy@testname\@empty \let\Hy@testname\Hy@undefinedname + \else + \Hy@pstringdef\Hy@testname\Hy@testname \fi - \pdfstartlink - attr{% - /Border[\@pdfborder]% - /H\@pdfhighlight - /C[\CurrentBorderColor]% - }% - goto name {\Hy@testname}% - \Hy@colorlink{\csname @#1color\endcsname}% + \Hy@StartlinkName{% + \Hy@setpdfborder + /H\@pdfhighlight + /C[\CurrentBorderColor]% + }\Hy@testname + \expandafter\Hy@colorlink\csname @#1color\endcsname +} +\def\Hy@StartlinkName#1#2{% + \pdfstartlink attr{#1}goto name{#2}\relax } \def\close@pdflink{\Hy@endcolorlink\pdfendlink} \def\hyper@anchor#1{\new@pdflink{#1}\anchor@spot\pdf@endanchor} @@ -87,12 +143,13 @@ } \def\CurrentBorderColor{\@linkbordercolor} \def\hyper@linkurl#1#2{% - \bgroup + \begingroup + \Hy@pstringdef\Hy@pstringURI{#2}% \hyper@chars \leavevmode \pdfstartlink attr{% - /Border[\@pdfborder]% + \Hy@setpdfborder /H\@pdfhighlight /C[\@urlbordercolor]% }% @@ -101,88 +158,106 @@ /A<<% /Type/Action% /S/URI% - /URI(#2)% + /URI(\Hy@pstringURI)% >>% }% - \Hy@colorlink{\@urlcolor}#1% + \relax + \Hy@colorlink\@urlcolor#1% \close@pdflink - \egroup + \endgroup } \def\hyper@linkfile#1#2#3{% anchor text, filename, linkname - \bgroup + \begingroup + \Hy@pstringdef\Hy@pstringF{#2}% + \Hy@pstringdef\Hy@pstringD{#3}% \leavevmode \pdfstartlink attr{% - /Border[\@pdfborder]% + \Hy@setpdfborder /H\@pdfhighlight /C[\@filebordercolor]% }% user {% /Subtype/Link% /A<<% - /F(#2)% + /F(\Hy@pstringF)% /S/GoToR% - \ifHy@newwindow /NewWindow true \fi + \ifHy@newwindow /NewWindow true\fi \ifx\\#3\\% /D[0 \@pdfstartview]% \else - /D(#3)% + /D(\Hy@pstringD)% \fi >>% }% - \Hy@colorlink{\@filecolor}#1% + \relax + \Hy@colorlink\@filecolor#1% \close@pdflink - \egroup + \endgroup } \def\@hyper@launch run:#1\\#2#3{% filename, anchor text linkname - \bgroup + \begingroup + \Hy@pstringdef\Hy@pstringF{#1}% + \Hy@pstringdef\Hy@pstringP{#3}% \leavevmode \pdfstartlink attr{% - /Border[\@pdfborder]% + \Hy@setpdfborder /H\@pdfhighlight /C[\@runbordercolor]% }% user {% /Subtype/Link% /A<<% - /F(#1)% + /F(\Hy@pstringF)% /S/Launch% - \ifHy@newwindow /NewWindow true \fi + \ifHy@newwindow /NewWindow true\fi \ifx\\#3\\% \else - /Win<>% + /Win<>% \fi >>% }% - \Hy@colorlink{\@filecolor}#2% + \relax + \Hy@colorlink\@filecolor#2% \close@pdflink - \egroup + \endgroup } -\def\@pdfproducer{pdfTeX} -\ifx\eTeXversion\@undefined -\else - \ifx\eTeXversion\relax +\ifx\@pdfproducer\relax + \def\@pdfproducer{pdfTeX} + \ifx\eTeXversion\@undefined \else - \ifnum\eTeXversion>0 % - \def\@pdfproducer{pdfeTeX} + \ifx\eTeXversion\relax + \else + \ifnum\eTeXversion>0 % + \def\@pdfproducer{pdfeTeX} + \fi \fi \fi -\fi -\ifx\pdftexversion\@undefined -\else - \ifnum\pdftexversion<100 % - \edef\@pdfproducer{% - \@pdfproducer - \the\pdftexversion.\pdftexrevision - } + \ifx\pdftexversion\@undefined \else - \edef\@pdfproducer{% - \@pdfproducer-% - \expandafter\@car\the\pdftexversion\@empty\@nil.% - \expandafter\@cdr\the\pdftexversion\@empty\@nil - \pdftexrevision - } + \ifnum\pdftexversion<100 % + \edef\@pdfproducer{% + \@pdfproducer + \the\pdftexversion.\pdftexrevision + } + \else + \ifnum\pdftexversion<130 % + \edef\@pdfproducer{% + \@pdfproducer-% + \expandafter\@car\the\pdftexversion\@empty\@nil.% + \expandafter\@cdr\the\pdftexversion\@empty\@nil + \pdftexrevision + } + \else + \edef\@pdfproducer{% + \@pdfproducer-% + \expandafter\@car\the\pdftexversion\@empty\@nil.% + \expandafter\@cdr\the\pdftexversion\@empty\@nil.% + \pdftexrevision + }% + \fi + \fi \fi \fi \def\PDF@SetupDoc{% @@ -199,11 +274,12 @@ }% \process@me \fi + \Hy@pstringdef\Hy@pstringB{\@baseurl}% \pdfcatalog{% - /PageMode \@pdfpagemode + /PageMode\@pdfpagemode \ifx\@baseurl\@empty \else - /URI<> + /URI<>% \fi }% \ifx\@pdfstartview\@empty @@ -229,7 +305,7 @@ \fi \ifx\pdf@pagelayout\@empty \else - /PageLayout/\pdf@pagelayout\space + /PageLayout/\pdf@pagelayout \fi }% } @@ -240,13 +316,26 @@ /Title(\@pdftitle)% /Subject(\@pdfsubject)% /Creator(\@pdfcreator)% - /Producer(\@pdfproducer)% + \ifx\@pdfcreationdate\@empty + \else + /CreationDate(\@pdfcreationdate)% + \fi + \ifx\@pdfmoddate\@empty + \else + /ModDate(\@pdfmoddate)% + \fi + \ifx\@pdfproducer\relax + \else + /Producer(\@pdfproducer)% + \fi /Keywords(\@pdfkeywords)% }% \Hy@DisableOption{pdfauthor}% \Hy@DisableOption{pdftitle}% \Hy@DisableOption{pdfsubject}% \Hy@DisableOption{pdfcreator}% + \Hy@DisableOption{pdfcreationdate}% + \Hy@DisableOption{pdfmoddate}% \Hy@DisableOption{pdfproducer}% \Hy@DisableOption{pdfkeywords}% } @@ -376,22 +465,22 @@ \leavevmode \pdfstartlink attr{% - /Border [\@pdfborder] - /H \@pdfhighlight\space - /C [\@menubordercolor]% + \Hy@setpdfborder + /H \@pdfhighlight + /C[\@menubordercolor]% }% user{ /Subtype /Link - /A << - /S /Named /N /#1 - >> + /A<<% + /S/Named/N/#1% + >>% }% - \Hy@colorlink{\@menucolor}#2\close@pdflink + \relax + \Hy@colorlink\@menucolor#2\close@pdflink } \def\@Gauge[#1]#2#3#4{% parameters, label, minimum, maximum \typeout{Sorry, pdftex does not support FORM gauges}% } -\RequirePackage{pifont}% \def\MakeFieldObject#1#2{\sbox0{#1}% \immediate\pdfxform0 % \expandafter\edef\csname #2Object\endcsname{% @@ -408,7 +497,16 @@ \pdfrefobj\OBJ@acroform \fi \pdfcatalog{/AcroForm \OBJ@acroform\space 0 R}% - \MakeFieldObject{\ding{123}}{Ding}% + \MakeFieldObject{% + \begingroup + \fontfamily{pzd}% + \fontencoding{U}% + \fontseries{m}% + \fontshape{n}% + \selectfont + \char123 % + \endgroup + }{Ding}% \MakeFieldObject{\fbox{\textcolor{yellow}{\textsf{Submit}}}}{Submit}% \MakeFieldObject{\fbox{\textcolor{yellow}{\textsf{SubmitP}}}}{SubmitP}% } @@ -434,8 +532,10 @@ \ifFld@hidden\def\Fld@width{1sp}\fi \ifx\Fld@value\@empty\def\Fld@value{\Fld@default}\fi \LayoutTextField{#2}{% - \pdfstartlink user {\PDFForm@Text}% - \MakeTextField{\Fld@width}{\Fld@height}\pdfendlink}% + \Hy@escapeform\PDFForm@Text + \pdfstartlink user {\PDFForm@Text}\relax + \MakeTextField{\Fld@width}{\Fld@height}\pdfendlink + }% \egroup } \def\@ChoiceMenu[#1]#2#3{% parameters, label, choices @@ -487,6 +587,7 @@ \Hy@StepCount\Fld@listcount \@currDisplay\space \leavevmode + \Hy@escapeform\PDFForm@Radio \pdfstartlink user {% \PDFForm@Radio /AP << @@ -495,6 +596,7 @@ >> >> }% + \relax \MakeRadioField{\Fld@width}{\Fld@height}\pdfendlink \space% deliberate space between radio buttons }% @@ -511,7 +613,8 @@ }\@processme }% \leavevmode - \pdfstartlink user {\PDFForm@List}% + \Hy@escapeform\PDFForm@List + \pdfstartlink user {\PDFForm@List}\relax \MakeChoiceField{\Fld@width}{\Fld@height}% \pdfendlink } @@ -523,7 +626,8 @@ \ifFld@hidden\def\Fld@width{1sp}\fi \LayoutPushButtonField{% \leavevmode - \pdfstartlink user {\PDFForm@Push}% + \Hy@escapeform\PDFForm@Push + \pdfstartlink user {\PDFForm@Push}\relax \MakeButtonField{#2}% \pdfendlink }% @@ -538,10 +642,12 @@ \setkeys{Field}{#1}% \ifFld@hidden\def\Fld@width{1sp}\fi \leavevmode + \Hy@escapeform\PDFForm@Submit \pdfstartlink user {% \PDFForm@Submit /AP << /N \SubmitObject\space /D \SubmitPObject >> }% + \relax \MakeButtonField{#2}% \pdfendlink \egroup @@ -555,7 +661,8 @@ \setkeys{Field}{#1}% \ifFld@hidden\def\Fld@width{1sp}\fi \leavevmode - \pdfstartlink user {\PDFForm@Reset}% + \Hy@escapeform\PDFForm@Reset + \pdfstartlink user {\PDFForm@Reset}\relax \MakeButtonField{#2}% \pdfendlink \egroup @@ -570,7 +677,8 @@ \setkeys{Field}{#1}% \ifFld@hidden\def\Fld@width{1sp}\fi \LayoutCheckField{#2}{% - \pdfstartlink user {\PDFForm@Check}% + \Hy@escapeform\PDFForm@Check + \pdfstartlink user {\PDFForm@Check}\relax \MakeCheckField{\Fld@width}{\Fld@height}% \pdfendlink }% @@ -627,10 +735,51 @@ >> } \edef\OBJ@acroform{\the\pdflastobj} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdfescapestring\endcsname\relax + \let\Hy@escapestring\@firstofone + \def\Hy@escapeform#1{% + \ifHy@escapeform + \def\Hy@escapestring##1{% + \noexpand\Hy@escapestring{\noexpand##1}% + }% + \edef\Hy@temp{#1}% + \expandafter\Hy@@escapeform\Hy@temp\Hy@escapestring{}\@nil + \def\Hy@escapestring##1{% + \@ifundefined{Hy@esc@\string##1}{% + ##1% + \ThisShouldNotHappen + }{% + \csname Hy@esc@\string##1\endcsname + }% + }% + \else + \let\Hy@escapestring\@firstofone + \fi + }% + \def\Hy@@escapeform#1\Hy@escapestring#2#3\@nil{% + \ifx\\#3\\% + \else + \expandafter\Hy@pstringdef\csname Hy@esc@\string#2\endcsname{#2}% + \Hy@ReturnAfterFi{% + \Hy@@escapeform#3\@nil + }% + \fi + }% +\else + \def\Hy@escapeform#1{% + \ifHy@escapeform + \let\Hy@escapestring\pdfescapestring + \else + \let\Hy@escapestring\@firstofone + \fi + }% + \Hy@escapeform{}% +\fi \def\PDFForm@Check{% /Subtype /Widget \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Fld@name) + /T (\Hy@escapestring{\Fld@name}) /Q \Fld@align\space /BS << /W \Fld@borderwidth\space /S /\Fld@borderstyle\space >> /MK << @@ -639,7 +788,7 @@ \else /BG [\Fld@bcolor] \fi - /CA (\Fld@cbsymbol) + /CA (\Hy@escapestring{\Fld@cbsymbol}) >> /DA (/ZaDb \strip@pt\Fld@charsize\space Tf \Fld@color\space rg) /FT /Btn @@ -649,7 +798,7 @@ \def\PDFForm@Push{% /Subtype /Widget \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Fld@name) + /T (\Hy@escapestring{\Fld@name}) /FT /Btn /Ff 65540 /H /P @@ -657,56 +806,56 @@ /MK << /BC [\Fld@bordercolor] >> - /A << /S /JavaScript /JS (\Fld@onclick;) >> + /A << /S /JavaScript /JS (\Hy@escapestring{\Fld@onclick}) >> } \def\Fld@additionalactions{% /AA << \ifx\Fld@keystroke@code\@empty \else - /K << /S /JavaScript /JS (\Fld@keystroke@code) >> + /K << /S /JavaScript /JS (\Hy@escapestring{\Fld@keystroke@code}) >> \fi \ifx\Fld@format@code\@empty \else - /F << /S /JavaScript /JS (\Fld@format@code) >> + /F << /S /JavaScript /JS (\Hy@escapestring{\Fld@format@code}) >> \fi \ifx\Fld@validate@code\@empty \else - /V << /S /JavaScript /JS (\Fld@validate@code) >> + /V << /S /JavaScript /JS (\Hy@escapestring{\Fld@validate@code}) >> \fi \ifx\Fld@calculate@code\@empty \else - /C << /S /JavaScript /JS (\Fld@calculate@code) >> + /C << /S /JavaScript /JS (\Hy@escapestring{\Fld@calculate@code}) >> \fi \ifx\Fld@onfocus@code\@empty \else - /Fo << /S /JavaScript /JS (\Fld@onfocus@code) >> + /Fo << /S /JavaScript /JS (\Hy@escapestring{\Fld@onfocus@code}) >> \fi \ifx\Fld@onblur@code\@empty \else - /Bl << /S /JavaScript /JS (\Fld@onblur@code) >> + /Bl << /S /JavaScript /JS (\Hy@escapestring{\Fld@onblur@code}) >> \fi \ifx\Fld@onmousedown@code\@empty \else - /D << /S /JavaScript /JS (\Fld@onmousedown@code) >> + /D << /S /JavaScript /JS (\Hy@escapestring{\Fld@onmousedown@code}) >> \fi \ifx\Fld@onmouseup@code\@empty \else - /U << /S /JavaScript /JS (\Fld@onmouseup@code) >> + /U << /S /JavaScript /JS (\Hy@escapestring{\Fld@onmouseup@code}) >> \fi \ifx\Fld@onenter@code\@empty \else - /E << /S /JavaScript /JS (\Fld@onenter@code) >> + /E << /S /JavaScript /JS (\Hy@escapestring{\Fld@onenter@code}) >> \fi \ifx\Fld@onexit@code\@empty \else - /X << /S /JavaScript /JS (\Fld@onexit@code) >> + /X << /S /JavaScript /JS (\Hy@escapestring{\Fld@onexit@code}) >> \fi >> } \def\PDFForm@List{% /Subtype /Widget \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Fld@name) + /T (\Hy@escapestring{\Fld@name}) /FT /Ch /Q \Fld@align\space /BS << /W \Fld@borderwidth\space /S /\Fld@borderstyle\space >> @@ -719,14 +868,14 @@ >> /DA (/Helv \strip@pt\Fld@charsize\space Tf \Fld@color\space rg ) /Opt [\the\Choice@toks] - /DV (\Fld@default) + /DV (\Hy@escapestring{\Fld@default}) \Fld@additionalactions \Fld@flags } \def\PDFForm@Radio{% /Subtype /Widget \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Fld@name) + /T (\Hy@escapestring{\Fld@name}) /FT /Btn /Ff 49152 /H /P @@ -750,7 +899,7 @@ \def\PDFForm@Text{% /Subtype /Widget \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Fld@name) + /T (\Hy@escapestring{\Fld@name}) /Q \Fld@align\space /FT /Tx /BS << /W \Fld@borderwidth\space /S /\Fld@borderstyle\space >> @@ -762,8 +911,8 @@ \fi >> /DA (/Helv \strip@pt\Fld@charsize\space Tf \Fld@color\space rg ) - /DV (\Fld@default) - /V (\Fld@value) + /DV (\Hy@escapestring{\Fld@default}) + /V (\Hy@escapestring{\Fld@value}) \Fld@additionalactions \ifFld@multiline \ifFld@readonly /Ff 4097 \else /Ff 4096 \fi @@ -779,7 +928,7 @@ \def\PDFForm@Submit{% /Subtype /Widget \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Fld@name) + /T (\Hy@escapestring{\Fld@name}) /FT /Btn /Ff 65540 /H /P @@ -791,7 +940,7 @@ /S /SubmitForm /F << /FS /URL - /F (\Form@action) + /F (\Hy@escapestring{\Form@action}) >> \ifForm@html /Flags 4 \fi >> @@ -799,7 +948,7 @@ \def\PDFForm@Reset{% /Subtype /Widget \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Fld@name) + /T (\Hy@escapestring{\Fld@name}) /FT /Btn /H /P /DA (/Helv \strip@pt\Fld@charsize\space Tf 0 0 1 rg) @@ -810,11 +959,10 @@ /BS << /W \Fld@borderwidth\space /S /\Fld@borderstyle\space >> /A << /S /ResetForm >> } -\newwrite\@outlinefile \def\Hy@writebookmark#1#2#3#4#5{% section number, text, label, level, file \ifx\WriteBookmarks\relax% \else - \ifnum#4>\c@tocdepth + \ifnum#4>\Hy@bookmarksdepth\relax \else \@@writetorep{#1}{#2}{#3}{#4}{#5}% \fi @@ -862,11 +1010,13 @@ \let\numberline\@gobble \fi \pdfstringdef\Hy@tempa{#2}% - \protected@write\@outlinefile{}{% - \protect\BOOKMARK - [\Hy@level][\@bookmarkopenstatus{\Hy@level}]{#3}% - {\Hy@tempa}{\Hy@tempb}% - }% + \if@filesw + \protected@write\@outlinefile{}{% + \protect\BOOKMARK + [\Hy@level][\@bookmarkopenstatus{\Hy@level}]{#3}% + {\Hy@tempa}{\Hy@tempb}% + }% + \fi \fi \endgroup } @@ -902,26 +1052,33 @@ \fi \def\@@BOOKMARK[##1][##2]##3##4##5{% \def\Hy@temp{##4}% - \pdfoutline goto - name{##3}% - count ##2\check@bm@number{##3}{% - \expandafter\strip@prefix\meaning\Hy@temp - }% + \Hy@pstringdef\Hy@pstringName{##3}% + \Hy@OutlineName{}\Hy@pstringName{% + ##2\check@bm@number{##3}% + }{% + \expandafter\strip@prefix\meaning\Hy@temp + }% }% {% \def\WriteBookmarks{0}% \InputIfFileExists{\jobname.out}{}{}% }% %{\escapechar\m@ne\InputIfFileExists{\jobname.out}{}{}}% - \ifx\WriteBookmarks\relax\else - \if@filesw\immediate\openout\@outlinefile=\jobname.out - \ifHy@typexml - \immediate\write\@outlinefile{\relax}% - \fi + \ifx\WriteBookmarks\relax + \else + \if@filesw + \newwrite\@outlinefile + \immediate\openout\@outlinefile=\jobname.out + \ifHy@typexml + \immediate\write\@outlinefile{\relax}% + \fi \fi \fi \endgroup } +\def\Hy@OutlineName#1#2#3#4{% + \pdfoutline goto name{#2}count#3{#4}% +} \def\check@bm@number#1{% \expandafter\ifx\csname B_#1\endcsname\relax 0% @@ -976,6 +1133,19 @@ \Hy@org@chapter }% } +\let\H@old@part\@part +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname chapter\endcsname\relax + \let\Hy@secnum@part\z@ +\else + \let\Hy@secnum@part\m@ne +\fi +\def\@part{% + \ifnum\Hy@secnum@part>\c@secnumdepth + \phantomsection + \fi + \H@old@part +} \let\H@old@spart\@spart \def\@spart#1{% \H@old@spart{#1}% diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg index 2fc266382cc..979cd7d4737 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg @@ -7,7 +7,6 @@ %% hyperref.dtx (with options: `tex4htcfg') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, -%% RCS: $Id: hyperref.dtx 6.71 2000/10/04 rahtz Exp rahtz $ %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -23,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.cfg} - [2003/11/30 v6.74m + [2006/08/16 v6.75c 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 d838a7f0f9f..fb0eea222ce 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def @@ -7,7 +7,6 @@ %% hyperref.dtx (with options: `tex4ht') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, -%% RCS: $Id: hyperref.dtx 6.71 2000/10/04 rahtz Exp rahtz $ %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -23,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.def} - [2003/11/30 v6.74m + [2006/08/16 v6.75c Hyperref driver for TeX4ht] \@ifpackageloaded{tex4ht} {\typeout{hyperref tex4ht: tex4ht already loaded}}% @@ -42,7 +41,7 @@ \special{t4ht=}% \endgroup \Hy@activeanchortrue - \Hy@colorlink{\@anchorcolor}\anchor@spot\Hy@endcolorlink + \Hy@colorlink\@anchorcolor\anchor@spot\Hy@endcolorlink \special{t4ht=}% \Hy@activeanchorfalse \Hy@RestoreLastskip @@ -61,7 +60,7 @@ } \def\@urltype{url} \def\hyper@linkstart#1#2{% - \Hy@colorlink{\csname @#1color\endcsname}% + \expandafter\Hy@colorlink\csname @#1color\endcsname \def\Hy@tempa{#1}% \ifx\Hy@tempa\@urltype \special{t4ht=}% @@ -86,7 +85,7 @@ \hyper@chars\special{t4ht=}% \endgroup }% - \Hy@colorlink{\@urlcolor}#1\Hy@endcolorlink + \Hy@colorlink\@urlcolor#1\Hy@endcolorlink \@linkdim\ht\@tempboxa \advance\@linkdim by -6.5\p@ \raise\@linkdim\hbox{\special{t4ht=}}% @@ -94,7 +93,7 @@ \begingroup \hyper@chars \special{t4ht=}% - \Hy@colorlink{\@urlcolor}#1\Hy@endcolorlink + \Hy@colorlink\@urlcolor#1\Hy@endcolorlink \special{t4ht=}% \endgroup \fi diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def index 06fe4e35a63..c26cceca047 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htexture.def +++ b/Master/texmf-dist/tex/latex/hyperref/htexture.def @@ -7,7 +7,6 @@ %% hyperref.dtx (with options: `textures') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, -%% RCS: $Id: hyperref.dtx 6.71 2000/10/04 rahtz Exp rahtz $ %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -23,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htexture.def} - [2003/11/30 v6.74m + [2006/08/16 v6.75c Hyperref driver for Textures] \begingroup \obeylines % @@ -55,11 +54,21 @@ end }def\Hy@ps@CR __pdfmark__ not{/pdfmark /betterpdfmark load def}if + systemdict /pdfmark known + { + userdict /?pdfmark systemdict /load get put + }{ + userdict /?pdfmark systemdict /pop get put + } + ifelse }% end of \headerps@out }% end of \AtBeginDvi \input{pdfmark.def}% -\def\@pdfproducer{Textures + Distiller}% +\ifx\@pdfproducer\relax + \def\@pdfproducer{Textures + Distiller}% +\fi \providecommand\@pdfborder{0 0 1} +\providecommand*\@pdfborderstyle{} \providecommand\@pdfview{XYZ} \providecommand\@pdfviewparams{ H.V} \headerps@out{% @@ -118,7 +127,7 @@ \special{html:}% \endgroup \Hy@activeanchortrue - \Hy@colorlink{\@anchorcolor}\anchor@spot\Hy@endcolorlink + \Hy@colorlink\@anchorcolor\anchor@spot\Hy@endcolorlink \special{html:}% \Hy@activeanchorfalse \Hy@RestoreLastskip @@ -138,7 +147,7 @@ } \def\@urltype{url} \def\hyper@linkstart#1#2{% - \Hy@colorlink{\csname @#1color\endcsname}% + \expandafter\Hy@colorlink\csname @#1color\endcsname \def\Hy@tempa{#1}% \ifx\Hy@tempa\@urltype \special{html:}% @@ -165,7 +174,7 @@ \hyper@chars \special{html:}% }% - \Hy@colorlink{\@urlcolor}#1% + \Hy@colorlink\@urlcolor#1% \@linkdim\ht\@tempboxa \advance\@linkdim by -6.5\p@ \raise\@linkdim\hbox{\special{html:}}% @@ -174,7 +183,7 @@ \begingroup \hyper@chars \special{html:}% - \Hy@colorlink{\@urlcolor}#1% + \Hy@colorlink\@urlcolor#1% \special{html:}% \Hy@endcolorlink \endgroup diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def index 9cb65ed6973..9f010ac5318 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtex.def @@ -7,7 +7,6 @@ %% hyperref.dtx (with options: `vtex,outlines') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, -%% RCS: $Id: hyperref.dtx 6.71 2000/10/04 rahtz Exp rahtz $ %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -23,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtex.def} - [2003/11/30 v6.74m + [2006/08/16 v6.75c Hyperref driver for VTeX in PDF/PS mode] \edef\Hy@VTeXversion{% \ifx\VTeXversion\@undefined @@ -65,6 +64,55 @@ } \AtEndDocument{\clearpage\HyPL@SetPageLabels} \fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdfescapestring\endcsname\relax + \begingroup + \catcode`\|=0 % + \@makeother\\% + |@firstofone{|endgroup + |def|Hy@pstringdef#1#2{% + |edef#1{#2}% + |@onelevel@sanitize#1% + |edef#1{|expandafter|Hy@ExchangeBackslash#1\|@nil}% + |edef#1{|expandafter|Hy@ExchangeLeftParenthesis#1(|@nil}% + |edef#1{|expandafter|Hy@ExchangeRightParenthesis#1)|@nil}% + }% + |def|Hy@ExchangeBackslash#1\#2|@nil{% + #1% + |ifx|\#2|\% + |else + \\% + |Hy@ReturnAfterFi{% + |Hy@ExchangeBackslash#2|@nil + }% + |fi + }% + } + \def\Hy@ExchangeLeftParenthesis#1(#2\@nil{% + #1% + \ifx\\#2\\% + \else + \@backslashchar(% + \Hy@ReturnAfterFi{% + \Hy@ExchangeLeftParenthesis#2\@nil + }% + \fi + } + \def\Hy@ExchangeRightParenthesis#1)#2\@nil{% + #1% + \ifx\\#2\\% + \else + \@backslashchar)% + \Hy@ReturnAfterFi{% + \Hy@ExchangeRightParenthesis#2\@nil + }% + \fi + } +\else + \def\Hy@pstringdef#1#2{% + \edef#1{\pdfescapestring{#2}}% + }% +\fi \ifx\mediaheight\@undefined \else \ifx\mediaheight\relax @@ -93,7 +141,8 @@ \fi \fi \providecommand\@pdfview{xyz} -\providecommand\@pdfborder{0 0 1}% +\providecommand\@pdfborder{0 0 1} +\providecommand*\@pdfborderstyle{} \def\CurrentBorderColor{\@linkbordercolor} \def\hyper@anchor#1{% \Hy@SaveLastskip @@ -103,7 +152,7 @@ \special{!aname #1;\@pdfview}% \endgroup \Hy@activeanchortrue - \Hy@colorlink{\@anchorcolor}\anchor@spot\Hy@endcolorlink + \Hy@colorlink\@anchorcolor\anchor@spot\Hy@endcolorlink \Hy@activeanchorfalse \Hy@RestoreLastskip } @@ -122,13 +171,14 @@ \def\@urltype{url} \def\Hy@undefinedname{UNDEFINED} \def\hyper@linkstart#1#2{% - \Hy@colorlink{\csname @#1color\endcsname}% + \Hy@pstringdef\Hy@pstringURI{#2}% + \expandafter\Hy@colorlink\csname @#1color\endcsname \edef\CurrentBorderColor{\csname @#1bordercolor\endcsname}% \def\Hy@tempa{#1}% \ifx\Hy@tempa\@urltype \special{!% - aref ;% - a=% + aref ;% + a=<\Hy@setpdfborder /C [\CurrentBorderColor]>% }% \else \protected@edef\Hy@testname{#2}% @@ -137,7 +187,7 @@ \fi \special{!% aref \Hy@testname;% - a=% + a=<\Hy@setpdfborder /C [\CurrentBorderColor]>% }% \fi } @@ -151,20 +201,21 @@ aref <% \ifnum\Hy@VTeXversion>753 \ifHy@newwindow n\fi\fi f=#2>#3;% - a=% + a=<\Hy@setpdfborder /C [\@filebordercolor]>% }% - \Hy@colorlink{\@filecolor}#1\Hy@endcolorlink + \Hy@colorlink\@filecolor#1\Hy@endcolorlink \special{!endaref}% } \def\hyper@linkurl#1#2{% \begingroup + \Hy@pstringdef\Hy@pstringURI{#2}% \hyper@chars \leavevmode \special{!% - aref ;% - a=% + aref ;% + a=<\Hy@setpdfborder /C [\@urlbordercolor]>% }% - \Hy@colorlink{\@urlcolor}#1\Hy@endcolorlink + \Hy@colorlink\@urlcolor#1\Hy@endcolorlink \special{!endaref}% \endgroup } @@ -177,36 +228,38 @@ \fi \special{!% aref \Hy@testname;% - a=% + a=<\Hy@setpdfborder /C [\CurrentBorderColor]>% }% - \Hy@colorlink{\csname @#1color\endcsname}#3\Hy@endcolorlink + \expandafter\Hy@colorlink\csname @#1color\endcsname#3\Hy@endcolorlink \special{!endaref}% } \def\hyper@image#1#2{% \hyper@linkurl{#2}{#1}% } \def\@hyper@launch run:#1\\#2#3{% + \Hy@pstringdef\Hy@pstringF{#1}% + \Hy@pstringdef\Hy@pstringP{#3}% \leavevmode \special{!aref > \fi% + \ifx\\#3\\\else /Win << /F (\Hy@pstringF) /P (\Hy@pstringP) >> \fi% >;% - a=% + a=<\Hy@setpdfborder /C [\@runbordercolor]>% }% - \Hy@colorlink{\@filecolor}#2\Hy@endcolorlink + \Hy@colorlink\@filecolor#2\Hy@endcolorlink \special{!endaref}% } \def\Acrobatmenu#1#2{% \leavevmode \special{!% aref ;% - a=% + a=<\Hy@setpdfborder /C [\@menubordercolor]>% }% - \Hy@colorlink{\@menucolor}#2\Hy@endcolorlink + \Hy@colorlink\@menucolor#2\Hy@endcolorlink \special{!endaref}% } \ifnum\Hy@VTeXversion<702 % @@ -326,34 +379,36 @@ \fi } \fi -\def\@pdfproducer{VTeX} -\ifnum\Hy@VTeXversion>\z@ - \count@\VTeXversion - \divide\count@ 100 - \edef\@pdfproducer{\@pdfproducer\space v\the\count@} - \multiply\count@ -100 - \advance\count@\VTeXversion - \edef\@pdfproducer{% - \@pdfproducer - .\ifnum\count@<10 0\fi\the\count@ - \ifx\VTeXOS\@undefined\else - \ifnum\VTeXOS>0 % - \ifnum\VTeXOS<6 % - \space(% - \ifcase\VTeXOS - \or Windows\or Linux\or OS/2\or MacOS\or MacOS/X% +\ifx\@pdfproducer\relax + \def\@pdfproducer{VTeX} + \ifnum\Hy@VTeXversion>\z@ + \count@\VTeXversion + \divide\count@ 100 + \edef\@pdfproducer{\@pdfproducer\space v\the\count@} + \multiply\count@ -100 + \advance\count@\VTeXversion + \edef\@pdfproducer{% + \@pdfproducer + .\ifnum\count@<10 0\fi\the\count@ + \ifx\VTeXOS\@undefined\else + \ifnum\VTeXOS>0 % + \ifnum\VTeXOS<6 % + \space(% + \ifcase\VTeXOS + \or Windows\or Linux\or OS/2\or MacOS\or MacOS/X% + \fi + )% \fi - )% \fi \fi - \fi - ,\space - \ifnum\OpMode=\@ne PDF\else PS\fi - \space backend% - \ifx\gexmode\@undefined\else - \ifnum\gexmode>\z@\space with GeX\fi - \fi - } + ,\space + \ifnum\OpMode=\@ne PDF\else PS\fi + \space backend% + \ifx\gexmode\@undefined\else + \ifnum\gexmode>\z@\space with GeX\fi + \fi + } + \fi \fi \def\PDF@SetupDoc{% \ifx\@pdfpagescrop\@empty @@ -389,20 +444,24 @@ \special{!pdfinfo t=<\@pdftitle>}% \special{!pdfinfo s=<\@pdfsubject>}% \special{!pdfinfo c=<\@pdfcreator>}% - \special{!pdfinfo r=<\@pdfproducer>}% + \ifx\@pdfproducer\relax + \else + \special{!pdfinfo r=<\@pdfproducer>}% + \fi \special{!pdfinfo k=<\@pdfkeywords>}% \Hy@DisableOption{pdfauthor}% \Hy@DisableOption{pdftitle}% \Hy@DisableOption{pdfsubject}% \Hy@DisableOption{pdfcreator}% + \Hy@DisableOption{pdfcreationdate}% + \Hy@DisableOption{pdfmoddate}% \Hy@DisableOption{pdfproducer}% \Hy@DisableOption{pdfkeywords}% } -\newwrite\@outlinefile \def\Hy@writebookmark#1#2#3#4#5{% section number, text, label, level, file \ifx\WriteBookmarks\relax% \else - \ifnum#4>\c@tocdepth + \ifnum#4>\Hy@bookmarksdepth\relax \else \@@writetorep{#1}{#2}{#3}{#4}{#5}% \fi @@ -450,11 +509,13 @@ \let\numberline\@gobble \fi \pdfstringdef\Hy@tempa{#2}% - \protected@write\@outlinefile{}{% - \protect\BOOKMARK - [\Hy@level][\@bookmarkopenstatus{\Hy@level}]{#3}% - {\Hy@tempa}{\Hy@tempb}% - }% + \if@filesw + \protected@write\@outlinefile{}{% + \protect\BOOKMARK + [\Hy@level][\@bookmarkopenstatus{\Hy@level}]{#3}% + {\Hy@tempa}{\Hy@tempb}% + }% + \fi \fi \endgroup } @@ -558,6 +619,7 @@ o\fi,t=#4}% \ifx\WriteBookmarks\relax \else \if@filesw + \newwrite\@outlinefile \immediate\openout\@outlinefile=\jobname.out \ifHy@typexml \immediate\write\@outlinefile{\relax}% @@ -607,6 +669,19 @@ o\fi,t=#4}% \Hy@org@chapter }% } +\let\H@old@part\@part +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname chapter\endcsname\relax + \let\Hy@secnum@part\z@ +\else + \let\Hy@secnum@part\m@ne +\fi +\def\@part{% + \ifnum\Hy@secnum@part>\c@secnumdepth + \phantomsection + \fi + \H@old@part +} \let\H@old@spart\@spart \def\@spart#1{% \H@old@spart{#1}% diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def index 81e7733982c..6e147b64a4a 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def @@ -7,7 +7,6 @@ %% hyperref.dtx (with options: `vtexhtml') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, -%% RCS: $Id: hyperref.dtx 6.71 2000/10/04 rahtz Exp rahtz $ %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -23,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexhtml.def} - [2003/11/30 v6.74m + [2006/08/16 v6.75c Hyperref driver for VTeX in HTML mode] \RequirePackage{vtexhtml} \newif\if@Localurl diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def index 8b040e1fefd..9774056375e 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def @@ -7,7 +7,6 @@ %% hyperref.dtx (with options: `vtexpdfmark') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, -%% RCS: $Id: hyperref.dtx 6.71 2000/10/04 rahtz Exp rahtz $ %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -23,17 +22,20 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexmrk.def} - [2003/11/30 v6.74m + [2006/08/16 v6.75c Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)] \input{pdfmark.def}% -\ifnum\OpMode=\@ne - \def\@pdfproducer{VTeX} -\else - \def\@pdfproducer{VTeX + Distiller} +\ifx\@pdfproducer\relax + \ifnum\OpMode=\@ne + \def\@pdfproducer{VTeX} + \else + \def\@pdfproducer{VTeX + Distiller} + \fi \fi \def\literalps@out#1{\special{pS:#1}}% \def\headerps@out#1{\immediate\special{pS:#1}}% \providecommand\@pdfborder{0 0 1} +\providecommand*\@pdfborderstyle{} \providecommand\@pdfview{XYZ} \providecommand\@pdfviewparams{ H.V} \AtBeginDvi{% @@ -75,6 +77,14 @@ currentpoint exch pop vsize 72 sub add /pdf@voff exch def } def + systemdict /pdfmark known + { + userdict /?pdfmark systemdict /exec get put + }{ + userdict /?pdfmark systemdict /pop get put + userdict /pdfmark systemdict /cleartomark get put + } + ifelse }% } \endinput diff --git a/Master/texmf-dist/tex/latex/hyperref/hylatex.ltx b/Master/texmf-dist/tex/latex/hyperref/hylatex.ltx new file mode 100644 index 00000000000..7eb223db30d --- /dev/null +++ b/Master/texmf-dist/tex/latex/hyperref/hylatex.ltx @@ -0,0 +1,43 @@ +% +% hylatex.ltx +% Tanmoy Bhattacharya and Sebastian Rahtz, June 1995 +% +% Use this file to make a format which includes the +% hyperref package in every LaTeX job. +% +% In web2c 7-based TeX world, we create the format file with +% tex -ini \&latex hylatex.ltx +% and then use with +% tex \&hylatex +% +% In teTeX (TeX version 3.14159 (C version 6.1), LaTeX2e <1996/12/01> +% patch level 1), I create the format file with +% initex \&latex hylatex.ltx +% and then use with +% virtex \&hylatex +% +% This method is not supported by the LaTeX2e team, so +% I will try to find a better way. \AtBeginDocument does not +% work for reasons which I do not understand. +% +\makeatletter +\expandafter\everyjob\expandafter{\the\everyjob + \typeout{ ********* Hyperref Macros loaded ******* }} +% +\expandafter\let\csname REAL document\endcsname\document +% +\def\document{% + \endgroup +% +% NOTE: +% This setup sets up no options by default; +% change to suit your needs, by writing a hyperref.cfg control +% file. +% + \RequirePackage{hyperref} + \begingroup + \@endpefalse\csname REAL document\endcsname +} +\makeatother +\dump + diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index a257cd26536..688bfa117cd 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty @@ -7,7 +7,6 @@ %% hyperref.dtx (with options: `package') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, -%% RCS: $Id: hyperref.dtx 6.71 2000/10/04 rahtz Exp rahtz $ %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -24,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hyperref} - [2003/11/30 v6.74m + [2006/08/16 v6.75c Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -111,6 +110,9 @@ \newif\ifHy@CJKbookmarks \newif\ifHy@colorlinks \newif\ifHy@draft +\let\Hy@finaltrue\Hy@draftfalse +\let\Hy@finalfalse\Hy@drafttrue +\newif\ifHy@escapeform \newif\ifHy@figures \newif\ifHy@fitwindow \newif\ifHy@frenchlinks @@ -146,6 +148,7 @@ \Hy@breaklinksfalse \Hy@centerwindowfalse \Hy@CJKbookmarksfalse +\Hy@escapeformfalse \Hy@figuresfalse \Hy@fitwindowfalse \Hy@hyperfootnotestrue @@ -158,10 +161,10 @@ \Hy@nestingfalse \Hy@newwindowfalse \Hy@pageanchortrue -\Hy@pagelabelsfalse +\Hy@pagelabelstrue \Hy@pdfpagehiddenfalse \Hy@pdfstringfalse -\Hy@plainpagestrue +\Hy@plainpagesfalse \Hy@raiselinksfalse \Hy@setpagesizetrue \Hy@texhtfalse @@ -235,6 +238,7 @@ \edef\8{\string\8}% \edef\9{\string\9}% \fontencoding{PU}% + \HyPsd@UTFviii \else \fontencoding{PD1}% \fi @@ -296,6 +300,7 @@ \let\@safe@activestrue\relax \let\@safe@activesfalse\relax \let\cyr\relax + \let\es@roman\@Roman \let\glqq\textglqq \let\grqq\textgrqq \let\glq\textglq @@ -304,6 +309,7 @@ \let\frqq\textfrqq \let\flq\textflq \let\frq\textfrq + \let\if@mid@expandable\@firstoftwo \HyPSD@AMSclassfix \let\hspace\HyPsd@hspace \let\label\@gobble @@ -333,6 +339,7 @@ \fi }% \let\leavevmode\@empty + \let\mbox\@empty \def\halign{\pdfstringdefWarn\halign\@gobble}% \ifHy@CJKbookmarks \HyPsd@CJKhook @@ -353,6 +360,7 @@ \let\egroup\/% \let\discretionary\@gobbletwo \let\@ifnextchar\HyPsd@ifnextchar + \let\@ifnextchar\HyPsd@new@ifnextchar \let\@protected@testopt\HyPsd@protected@testopt \begingroup \let\GenericError\@gobblefour @@ -761,18 +769,40 @@ \@gobble }% \let#2\let - \def\HyPsd@LetCommand##1{% - #2% - \expandafter\noexpand - \csname\expandafter\@gobble\string##1\@empty\endcsname + \def\HyPsd@@LetCommand##1{% + \expandafter\ifx\csname##1\expandafter\endcsname + \csname iftrue\endcsname + \pdfstringdefWarn\let + \expandafter\@gobble + \else + \expandafter\ifx\csname##1\expandafter\endcsname + \csname iffalse\endcsname + \pdfstringdefWarn\let + \expandafter\expandafter\expandafter\@gobble + \else + #2% + \expandafter\noexpand + \csname##1\expandafter\expandafter\expandafter\endcsname + \fi + \fi }% }% \expandafter\x\csname -command\expandafter\endcsname \csname -command\endcsname +\def\HyPsd@LetCommand#1{% + \expandafter\expandafter\expandafter\HyPsd@@LetCommand + \expandafter\expandafter\expandafter{% + \expandafter\@gobble\string#1\@empty + }% +} \def\HyPsd@ifnextchar{% \pdfstringdefWarn\@ifnextchar \expandafter\@gobbletwo\@gobble } +\def\HyPsd@new@ifnextchar{% + \pdfstringdefWarn\new@ifnextchar + \expandafter\@gobbletwo\@gobble +} \def\HyPsd@protected@testopt#1{% \pdfstringdefWarn#1% \@gobbletwo @@ -1051,9 +1081,15 @@ \catcode`\\=12 |gdef|HyPsd@ConvertToUnicode#1{% |xdef#1{% - \376\377% |expandafter|HyPsd@DoConvert#1|@empty|@empty|@empty }% + |xdef#1{% + |ifx#1|@empty + |else + \376\377% + #1% + |fi + }% } |gdef|HyPsd@DoConvert#1{% |ifx#1|@empty @@ -1097,6 +1133,96 @@ \xdef#4{#4#1#2}% \HyPsd@@ConvertToUnicode#3\END#4% } +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname numexpr\endcsname\relax + \let\HyPsd@UTFviii\relax +\else + \def\HyPsd@UTFviii{% + \let\UTFviii@two@octets\HyPsd@UTFviii@two + \let\UTFviii@three@octets\HyPsd@UTFviii@three + \let\unichar\HyPsd@unichar + }% + \def\HyPsd@UTFviii@two#1#2{% + \expandafter\HyPsd@UTFviii@@two + \number\dimexpr.25\dimexpr`#1sp\expandafter\relax\expandafter|% + \number`#1\expandafter|% + \number\dimexpr.125\dimexpr`#2sp\expandafter\relax\expandafter|% + \number`#2 \@nil + }% + \def\HyPsd@UTFviii@@two#1|#2|#3|#4\@nil{% + \expandafter\8% + \number\numexpr #1-48\expandafter\relax + \csname\number\numexpr #2-4*#1\relax\expandafter\endcsname + \number\numexpr #3-8*% + \number\dimexpr.125\dimexpr#3sp\relax\relax\expandafter\relax + \number\numexpr #4-8*#3\relax + }% + \def\HyPsd@UTFviii@three#1#2#3{% + \expandafter\HyPsd@UTFviii@@three + \number\dimexpr.25\dimexpr`#1sp\expandafter\relax\expandafter|% + \number`#1\expandafter|% + \number\ifnum\numexpr`#2-128\relax <32 0\else 1\fi\expandafter|% + \number\dimexpr.25\dimexpr`#2sp\expandafter\relax\expandafter|% + \number`#2\expandafter|% + \number\dimexpr.125\dimexpr`#3sp\expandafter\relax\expandafter|% + \number`#3 \@nil + }% + \def\HyPsd@UTFviii@@three#1|#2|#3|#4|#5|#6|#7\@nil{% + \expandafter\9% + \number\numexpr #1-56\expandafter\relax + \number\numexpr 2*(#2-4*#1)+#3\expandafter\relax + \number\numexpr #4 - 32 -\ifcase#3 0\else 8\fi\expandafter\relax + \csname\number\numexpr #5-4*#4\relax\expandafter\endcsname + \number\numexpr #6-16\expandafter\relax + \number\numexpr #7-8*#6\relax + }% + \def\HyPsd@UTFviii@four#1{% + \expandafter\HyPsd@UTFviii@@four\number`#1|% + }% + \def\HyPsd@UTFviii@@four#1|#2#3#4{% + \expandafter\HyPsd@UTFviii@@@four\number#1\expandafter|% + \number`#2\expandafter| + \number\dimexpr.03125\dimexpr`#2sp\expandafter|% + \number`#3\expandafter|% + \number\dimexpr.03125\dimexpr`#3sp\expandafter|% + \number`#4\expandafter|% + \number\dimexpr.125\dimexpr`#4|% + }% + \def\HyPsd@UTFviii@@@four#1|#2|#3|#4|#5|#6|#7|{% + \931% + \number\numexpr\dimexpr.5\dimexpr#1sp\relax\relax -120\relax + \csname\number\numexpr\ifodd#1 2\else 0\fi +#3-4\relax\endcsname + \number\dimexpr.25\dimexpr #2sp - 32\dimexpr#3sp\relax\relax\relax + % ... + }% + \def\HyPsd@unichar#1{% + \expandafter\HyPsd@@unichar\string#1\@empty\@empty\@empty\@nil + }% + \def\HyPsd@@unichar #1-#2-#3#4#5#6\@nil{% + \ifnum#2>191 % + \ifnum#2<224 % + \expandafter\HyPsd@UTFviii@@two + \number\dimexpr.25\dimexpr#2sp\expandafter\relax\expandafter|% + \number#2\expandafter|% + \number\dimexpr.125\dimexpr`#3sp\expandafter\relax\expandafter|% + \number`#3 \@nil + \else + \ifnum#2<240 % + \expandafter\HyPsd@UTFviii@@three + \number\dimexpr.25\dimexpr#2sp\expandafter\relax\expandafter|% + \number#2\expandafter|% + \number\ifnum\numexpr`#3-128\relax <32 0\else 1\fi\expandafter|% + \number\dimexpr.25\dimexpr`#3sp\expandafter\relax\expandafter|% + \number`#3\expandafter|% + \number\dimexpr.125\dimexpr`#4sp\expandafter\relax\expandafter|% + \number`#4 \@nil + \else + ?% unsupported + \fi + \fi + \fi + }% +\fi \@ifpackageloaded{subfigure}{% \@ifundefined{sub@label}{% \Hy@hypertexnamesfalse @@ -1104,20 +1230,22 @@ \renewcommand*{\sub@label}[1]{% \@bsphack \subfig@oldlabel{#1}% - \begingroup - \edef\@currentlabstr{% - \expandafter\strip@prefix\meaning\@currentlabelname - }% - \protected@write\@auxout{}{% - \string\newlabel{sub@#1}{% - {\@nameuse{@@thesub\@captype}}% - {\thepage}% - {\expandafter\strip@period\@currentlabstr\relax.\relax\@@@}% - {\@currentHref}% - {}% + \if@filesw + \begingroup + \edef\@currentlabstr{% + \expandafter\strip@prefix\meaning\@currentlabelname }% - }% - \endgroup + \protected@write\@auxout{}{% + \string\newlabel{sub@#1}{% + {\@nameuse{@@thesub\@captype}}% + {\thepage}% + {\expandafter\strip@period\@currentlabstr\relax.\relax\@@@}% + {\@currentHref}% + {}% + }% + }% + \endgroup + \fi \@esphack }% \@ifpackagelater{subfigure}{2002/03/26}{}{% @@ -1152,6 +1280,7 @@ \ifvmode #1% \else + \penalty\@M \smash{\raise\HyperRaiseLinkLength\hbox{#1}}% \fi } @@ -1245,12 +1374,7 @@ \Hy@boolkey{draft}{#1}% } \define@key{Hyp}{final}[true]{% - \Hy@boolkey{draft}{#1}% - \ifHy@draft - \Hy@draftfalse - \else - \Hy@drafttrue - \fi + \Hy@boolkey{final}{#1}% } \let\KV@Hyp@nolinks\KV@Hyp@draft \define@key{Hyp}{a4paper}[true]{% @@ -1340,6 +1464,10 @@ \Hy@breaklinkstrue } \define@key{Hyp}{dvipdf}[true]{% + \Hy@WarningNoLine{% + Option `dvipdf' is deprecated.\MessageBreak + See the user manual for available driver options% + }% } \define@key{Hyp}{nativepdf}[true]{% \def\Hy@driver{hdvips}% @@ -1578,6 +1706,40 @@ \def\FancyVerbLineautorefname{Lyn}% \def\theoremautorefname{Teorema}% } +\def\HyLang@french{% + \def\equationautorefname{\'Equation}% + \def\footnoteautorefname{note}% + \def\itemautorefname{item}% + \def\figureautorefname{Figure}% + \def\tableautorefname{Tableau}% + \def\partautorefname{Partie}% + \def\appendixautorefname{Appendice}% + \def\chapterautorefname{chapitre}% + \def\sectionautorefname{section}% + \def\subsectionautorefname{sous-section}% + \def\subsubsectionautorefname{sous-sous-section}% + \def\paragraphautorefname{paragraphe}% + \def\subparagraphautorefname{sous-paragraphe}% + \def\FancyVerbLineautorefname{ligne}% + \def\theoremautorefname{Th\'eor\`eme}% +} +\def\HyLang@vietnamese{% + \def\equationautorefname{Ph\uhorn{}\ohorn{}ng tr\`inh}% + \def\footnoteautorefname{Ch\'u th\'ich}% + \def\itemautorefname{m\d{u}c}% + \def\figureautorefname{H\`inh}% + \def\tableautorefname{B\h{a}ng}% + \def\partautorefname{Ph\`\acircumflex{}n}% + \def\appendixautorefname{Ph\d{u} l\d{u}c}% + \def\chapterautorefname{ch\uhorn{}\ohorn{}ng}% + \def\sectionautorefname{m\d{u}c}% + \def\subsectionautorefname{m\d{u}c}% + \def\subsubsectionautorefname{m\d{u}c}% + \def\paragraphautorefname{\dj{}o\d{a}n}% + \def\subparagraphautorefname{\dj{}o\d{a}n}% + \def\FancyVerbLineautorefname{d\`ong}% + \def\theoremautorefname{\DJ{}\d{i}nh l\'y}% +} \def\HyLang@addto#1#2{% #2% \@temptokena{#2}% @@ -1604,7 +1766,7 @@ }% }% \expandafter\x\csname extras#1\expandafter\endcsname - \csname HyLang@#2\expandafter\endcsname + \csname HyLang@#2\endcsname } \HyLang@DeclareLang{english}{english} \HyLang@DeclareLang{UKenglish}{english} @@ -1620,6 +1782,27 @@ \HyLang@DeclareLang{portuguese}{portuges} \HyLang@DeclareLang{spanish}{spanish} \HyLang@DeclareLang{afrikaans}{afrikaans} +\HyLang@DeclareLang{french}{french} +\HyLang@DeclareLang{frenchb}{french} +\HyLang@DeclareLang{francais}{french} +\HyLang@DeclareLang{acadian}{french} +\HyLang@DeclareLang{canadien}{french} +\define@key{Hyp}{vietnamese}[]{% + \HyLang@addto\extrasvietnamese\HyLang@vietnamese + \AtEndOfPackage{% + \@ifundefined{T@PU}{}{% + \input{puvnenc.def}% + }% + }% +} +\define@key{Hyp}{vietnam}[]{% + \HyLang@addto\extrasvietnam\HyLang@vietnamese + \AtEndOfPackage{% + \@ifundefined{T@PU}{}{% + \input{puvnenc.def}% + }% + }% +} \define@key{Hyp}{colorlinks}[true]{% \Hy@boolkey{colorlinks}{#1}% \ifHy@colorlinks @@ -1635,6 +1818,35 @@ \define@key{Hyp}{bookmarksopen}[true]{% \Hy@boolkey{bookmarksopen}{#1}% } +\let\Hy@bookmarksdepth\c@tocdepth +\define@key{Hyp}{bookmarksdepth}[]{% + \begingroup + \edef\x{#1}% + \ifx\x\empty + \global\let\Hy@bookmarksdepth\c@tocdepth + \else + \@ifundefined{toclevel@\x}{% + \@onelevel@sanitize\x + \edef\y{\expandafter\@car\x\@nil}% + \ifcase 0\expandafter\ifx\y-1\fi + \expandafter\ifnum\expandafter`\y>47 % + \expandafter\ifnum\expandafter`\y<58 1\fi\fi\relax + \Hy@Warning{Unknown document division name (\x)}% + \else + \setbox\z@=\hbox{% + \count@=\x + \xdef\Hy@bookmarksdepth{\the\count@}% + }% + \fi + }{% + \setbox\z@=\hbox{% + \count@=\csname toclevel@\x\endcsname + \xdef\Hy@bookmarksdepth{\the\count@}% + }% + }% + \fi + \endgroup +} \define@key{Hyp}{bookmarksopenlevel}{% \def\@bookmarksopenlevel{#1}% } @@ -1681,15 +1893,52 @@ \global\Hy@useHidKeytrue \fi } -\define@key{Hyp}{linkbordercolor}{\def\@linkbordercolor{#1}} -\define@key{Hyp}{urlbordercolor}{\def\@urlbordercolor{#1}} -\define@key{Hyp}{menubordercolor}{\def\@menubordercolor{#1}} -\define@key{Hyp}{filebordercolor}{\def\@filebordercolor{#1}} -\define@key{Hyp}{runbordercolor}{\def\@runbordercolor{#1}} -\define@key{Hyp}{citebordercolor}{\def\@citebordercolor{#1}} -\define@key{Hyp}{pagebordercolor}{\def\@pagebordercolor{#1}} +\def\Hy@ColorList{cite,file,link,menu,page,run,url} +\@for\Hy@temp:=\Hy@ColorList\do{% + \edef\Hy@temp{% + \noexpand\define@key{Hyp}{\Hy@temp bordercolor}{% + \noexpand\Hy@bordercolor{\Hy@temp}{##1}{ }% + }% + }% + \Hy@temp +} +\def\Hy@bordercolor#1#2#3{% + \begingroup + \csname @safe@activestrue\endcsname + \@ifundefined{XC@edef}{\edef}{\XC@edef}\x{#2}% + \expandafter\Hy@CheckColorSpec\x#3#3\@nil{#1}{#2}% +} +\def\Hy@CheckColorSpec#1 #2 #3\@nil#4#5{% + \ifx\\#3\\% + \@ifundefined{XC@bordercolor}{% + \Hy@Warning{% + Unsupported color specification (#4bordercolor).\MessageBreak + Load package `xcolor' (version >= 1.11) first.\MessageBreak + Ignoring color specification% + }% + \endgroup + }{% + \endgroup + \XC@bordercolor{#4}{#5}% + }% + \else + \endgroup + \@namedef{@#4bordercolor}{#5}% + \fi +} \define@key{Hyp}{pdfhighlight}{\def\@pdfhighlight{#1}} \define@key{Hyp}{pdfborder}{\def\@pdfborder{#1}} +\define@key{Hyp}{pdfborderstyle}{\def\@pdfborderstyle{#1}} +\def\Hy@setpdfborder{% + \ifx\@pdfborder\@empty + \else + /Border[\@pdfborder]% + \fi + \ifx\@pdfborderstyle\@empty + \else + /BS<<\@pdfborderstyle>>% + \fi +} \define@key{Hyp}{pdfpagemode}{% \def\Hy@tempa{#1}% \ifx\Hy@tempa\@empty @@ -1713,6 +1962,8 @@ \define@key{Hyp}{pdfauthor}{\pdfstringdef\@pdfauthor{#1}} \define@key{Hyp}{pdfproducer}{\pdfstringdef\@pdfproducer{#1}} \define@key{Hyp}{pdfcreator}{\pdfstringdef\@pdfcreator{#1}} +\define@key{Hyp}{pdfcreationdate}{\pdfstringdef\@pdfcreationdate{#1}} +\define@key{Hyp}{pdfmoddate}{\pdfstringdef\@pdfmoddate{#1}} \define@key{Hyp}{pdfsubject}{\pdfstringdef\@pdfsubject{#1}} \define@key{Hyp}{pdfkeywords}{\pdfstringdef\@pdfkeywords{#1}} \define@key{Hyp}{pdfview}{\calculate@pdfview#1 \\} @@ -1761,6 +2012,9 @@ \define@key{Hyp}{pdfpagelabels}[true]{% \Hy@boolkey[pdfpagelabels]{pagelabels}{#1}% } +\define@key{Hyp}{pdfescapeform}[true]{% + \Hy@boolkey[pdfescapeform]{escapeform}{#1}% +} \def\@linkbordercolor{1 0 0} \def\@urlbordercolor{0 1 1} \def\@menubordercolor{1 0 0} @@ -1773,8 +2027,10 @@ \def\@pdfnonfullscreenpagemode{} \def\@pdftitle{} \def\@pdfauthor{} -\def\@pdfproducer{} +\let\@pdfproducer\relax \def\@pdfcreator{LaTeX with hyperref package} +\def\@pdfcreationdate{} +\def\@pdfmoddate{} \def\@pdfsubject{} \def\@pdfkeywords{} \def\@pdfpagescrop{} @@ -1802,32 +2058,14 @@ \Hy@SetCatcodes \let\ExecuteOptions\hyper@normalise \Hy@MaybeStopNow -\def\ProcessOptionsWithKV#1{% - \let\@tempc\relax - \let\Hy@tempa\@empty - \@for\CurrentOption:=\@classoptionslist\do{% - \@ifundefined{KV@#1@\CurrentOption}% - {}% - {% - \edef\Hy@tempa{\Hy@tempa,\CurrentOption,}% - \@expandtwoargs\@removeelement\CurrentOption - \@unusedoptionlist\@unusedoptionlist - }% - }% - \edef\Hy@tempa{% - \noexpand\setkeys{#1}{% - \Hy@tempa\@ptionlist{\@currname.\@currext}% - }% - }% - \Hy@tempa -} +\RequirePackage{kvoptions} \@ifpackageloaded{tex4ht}{% \@ifpackagewith{hyperref}{tex4ht}{}{% \PassOptionsToPackage{tex4ht}{hyperref}% }% }{} \let\ReadBookmarks\relax -\ProcessOptionsWithKV{Hyp} +\ProcessKeyvalOptions{Hyp} \AtBeginDocument{% \ifHy@draft \let\hyper@@anchor\@gobble @@ -1956,7 +2194,7 @@ \fi \fi \else - \ifcase\pdfoutput + \ifnum\pdfoutput<1 % \let\Hy@driver\Hy@defaultdriver \else \def\Hy@driver{hpdftex}% @@ -1965,6 +2203,32 @@ \Hy@breaklinkstrue \fi \fi + \ifx\Hy@driver\Hy@defaultdriver + \def\Hy@temp{hdvips}% + \ifx\Hy@temp\Hy@driver + \def\Hy@raisedlink{}% + \def\XR@ext{pdf}% + \fi + \def\Hy@temp{hdvipdfm}% + \ifx\Hy@temp\Hy@driver + \def\XR@ext{pdf}% + \Hy@breaklinkstrue + \fi + \def\Hy@temp{hdviwind}% + \ifx\Hy@temp\Hy@driver + \setkeys{Hyp}{colorlinks}% + \PassOptionsToPackage{dviwindo}{color}% + \fi + \def\Hy@temp{hdvipson}% + \ifx\Hy@temp\Hy@driver + \def\XR@ext{pdf}% + \def\Hy@raisedlink{}% + \fi + \def\Hy@temp{textures}% + \ifx\Hy@temp\Hy@driver + \def\XR@ext{pdf}% + \fi + \fi \typeout{*hyperref using default driver \Hy@driver*}% \else \typeout{*hyperref using driver \Hy@driver*}% @@ -2020,7 +2284,19 @@ \AtBeginDocument{% \ifHy@colorlinks \ifHy@typexml\else\RequirePackage{color}\fi - \def\Hy@colorlink#1{\begingroup\color{#1}}% + \def\Hy@colorlink#1{% + \begingroup + \expandafter\Hy@colorscan\expandafter#1#1\@nil% + }% + \def\Hy@colorscan#1{% + \@ifnextchar[% ] + {% + \Hy@@colorscan + }{% + \expandafter\color\expandafter#1\@car{}% + }% + }% + \def\Hy@@colorscan#1\@nil{\color#1}% \def\Hy@endcolorlink{\endgroup}% \Hy@Info{Link coloring ON}% \else @@ -2082,6 +2358,7 @@ \catcode`\%\active \catcode`\#\active \catcode`\_\active + \catcode`\$\active \gdef\hyper@normalise{ \begingroup \catcode`\^^M\active @@ -2092,6 +2369,7 @@ \catcode`\#\active \def#{\hyper@hash} \def\#{\hyper@hash} + \@makeother\& \edef\textunderscore{\string_} \let\_\textunderscore \catcode`\_\active @@ -2099,6 +2377,8 @@ \let~\hyper@tilde \let\~\hyper@tilde \let\textasciitilde\hyper@tilde + \let\\\@backslashchar + \edef${\string$} \ifx\@safe@activestrue\@undefined\else\@safe@activestrue\fi \hyper@n@rmalise } @@ -2197,8 +2477,10 @@ \def\label@hyperdef[#1]#2#3#4{% label name, category, name, % anchor text \@bsphack - \protected@write\@auxout{}% - {\string\newlabel{#1}{{}{}{}\##2.#3}}% + \if@filesw + \protected@write\@auxout{}% + {\string\newlabel{#1}{{}{}{}\##2.#3}}% + \fi \@esphack \ifHy@nesting \hyper@@anchor{#2.#3}{#4}% @@ -2244,14 +2526,14 @@ \ifx\@pdftempa\@pdftempwordrun \expandafter\@hyper@launch#7\\{#3}{#2}% \else - \hyper@linkurl{#3}{#7\ifx\\#2\\\else\##2\fi}% + \hyper@linkurl{#3}{#7\ifx\\#2\\\else\hyper@hash#2\fi}% \fi \fi \fi \fi } \def\@hyper@launch run:#1\\#2#3{% filename, anchor text, linkname - \hyper@linkurl{#2}{\Hy@linkfileprefix#1\ifx\\#3\\\else\##3\fi}% + \hyper@linkurl{#2}{\Hy@linkfileprefix#1\ifx\\#3\\\else\hyper@hash#3\fi}% } \def\@hyper@linkfile file:#1\\#2#3{% %file url,link string, name @@ -2265,10 +2547,10 @@ \else \ifx\@baseurl\@empty \hyper@linkurl{#2}{% - \Hy@linkfileprefix\use@file\ifx\\#3\\\else\##3\fi + \Hy@linkfileprefix\use@file\ifx\\#3\\\else\hyper@hash#3\fi }% \else - \hyper@linkurl{#2}{\use@file\ifx\\#3\\\else\##3\fi}% + \hyper@linkurl{#2}{\use@file\ifx\\#3\\\else\hyper@hash#3\fi}% \fi \fi } @@ -2357,8 +2639,9 @@ \csname Form@#2\ifx\relax#1\relax true\else#1\fi\endcsname } \define@key{Form}{action}{% - \def\Form@action{#1}% + \hyper@normalise\Hy@DefFormAction{#1}% } +\def\Hy@DefFormAction{\def\Form@action} \def\enc@@html{html} \define@key{Form}{encoding}{% \def\Hy@tempa{#1}% @@ -2692,12 +2975,12 @@ } \AfterBeginDocument{% \if@filesw - \ifHy@typexml - \immediate\closeout\@mainaux - \immediate\openout\@mainaux\jobname.aux - \immediate\write\@auxout{\relax}% - \fi - \immediate\write\@auxout{% + \ifHy@typexml + \immediate\closeout\@mainaux + \immediate\openout\@mainaux\jobname.aux + \immediate\write\@auxout{\relax}% + \fi + \immediate\write\@auxout{% \string\ifx\string\hyper@anchor\string\@undefined^^J% \global\let\string\oldcontentsline\string\contentsline^^J% \gdef\string\contentsline% @@ -2925,7 +3208,9 @@ } \providecommand*{\HyPL@StorePageLabel}[1]{} \def\HyPL@Useless{0 << /S /D >> }% + \@onelevel@sanitize\HyPL@Useless \def\HyPL@SetPageLabels{% + \@onelevel@sanitize\HyPL@Labels \ifx\HyPL@Labels\@empty \else \ifx\HyPL@Labels\HyPL@Useless @@ -3073,8 +3358,7 @@ \ifHy@plainpages \def\Hy@temp{\arabic{page}}% \else - \let\textlatin\@firstofone - \edef\Hy@temp{\thepage}% + \pdfstringdef\Hy@temp{\thepage}% \fi \else \def\Hy@temp{\the\Hy@pagecounter}% @@ -3091,49 +3375,8 @@ }% }{}% } -\newcommand*{\hypergetpageref}[1]{% - \expandafter\Hy@getpageref\csname r@#1\endcsname{#1}% -} -\def\Hy@getpageref#1#2{% - \ifx#1\relax - 0% - \protect\G@refundefinedtrue - \@latex@warning{Reference `#2' on page \thepage\space - undefined% - }% - \else - \expandafter\Hy@GetSecondArg#1\@nil - \fi -} -\long\def\Hy@GetSecondArg#1#2#3\@nil{#2} -\newcommand*{\hypergetref}[1]{% - \expandafter\Hy@getref\csname r@#1\endcsname{#1}% -} -\def\Hy@getref#1#2{% - \ifx#1\relax - ??% - \protect\G@refundefinedtrue - \@latex@warning{Reference `#2' on page \thepage\space - undefined% - }% - \else - \expandafter\@car#1\@nil - \fi -} -\@ifpackageloaded{ifthen}{% - \let\HyOrg@ifthenelse\ifthenelse - \def\ifthenelse{% - \let\begingroup\Hy@TE@begingroup - \HyOrg@ifthenelse - }% - \let\HyOrg@begingroup\begingroup - \def\Hy@TE@begingroup{% - \let\begingroup\HyOrg@begingroup - \begingroup - \let\ref\hypergetref - \let\pageref\hypergetpageref - }% -}{} +\def\hypergetref#1{\getrefbykeydefault{#1}{}{??}} +\def\hypergetpageref#1{\getrefbykeydefault{#1}{page}{0}} \@ifpackageloaded{titlesec}{% \def\ttl@Hy@steplink#1{% \Hy@GlobalStepCount\Hy@linkcounter @@ -3152,12 +3395,13 @@ \@ifpackageloaded{titletoc}{% \def\ttl@gobblecontents#1#2#3#4{\ignorespaces}% }{} +\def\Hy@varioref@undefined{{???}{??}{}{}{}} \@ifpackageloaded{varioref}{% \def\vref@pagenum#1#2{% \@ifundefined{r@#2}{% - \@namedef{r@#2}{{??}{??}{}{}{}}% + \expandafter\let\csname r@#2\endcsname\Hy@varioref@undefined }{}% - \edef#1{\hypergetpageref{#2}}% + \edef#1{\getpagerefnumber{#2}}% }% }{} \@ifpackageloaded{longtable}{% @@ -3442,6 +3686,7 @@ } \long\def\@caption#1[#2]#3{% \hyper@makecurrent{\@captype}% + \def\@currentlabelname{#2}% \par\addcontentsline{\csname ext@#1\endcsname}{#1}{% \protect\numberline{\csname the#1\endcsname}{\ignorespaces #2}% }% @@ -3472,7 +3717,10 @@ \renewcommand{\float@makebox}[1]{% \HyOrg@float@makebox{% #1\relax - \hyper@@anchor{\@currentHref}{\relax}% + \begingroup + \hyper@makecurrent{\@captype}% + \hyper@@anchor{\@currentHref}{\relax}% + \endgroup }% }% }{} @@ -3617,13 +3865,15 @@ \ifx\@empty\@currentlabel \else \@bsphack - \protected@write\@auxout{}{% - \string\@writefile{brf}{% - \string\backcite{#1}{% - {\thepage}{\@currentlabel}{\@currentHref}% + \if@filesw + \protected@write\@auxout{}{% + \string\@writefile{brf}{% + \string\backcite{#1}{% + {\thepage}{\@currentlabel}{\@currentHref}% + }% }% }% - }% + \fi \@esphack \fi \fi @@ -3706,9 +3956,7 @@ \global\let\@begindvi\Hy@begindvi } \def\Hy@begindvi{% - \ifHy@pageanchor - \@hyperfixhead - \fi + \@hyperfixhead \HyPL@EveryPage } \def\pagenumbering#1{% @@ -3721,20 +3969,23 @@ \providecommand\hyper@pagehidden{} \def\@hyperfixhead{% \Hy@DistillerDestFix - \ifHy@hypertexnames - \ifHy@plainpages - \gdef\Hy@TempPageAnchor{\hyper@@anchor{page.\the\c@page}}% + \ifHy@pageanchor + \ifHy@hypertexnames + \ifHy@plainpages + \gdef\Hy@TempPageAnchor{\hyper@@anchor{page.\the\c@page}}% + \else + \begingroup + \let\@number\@firstofone + \pdfstringdef\@the@H@page{\thepage}% + \endgroup + \gdef\Hy@TempPageAnchor{\hyper@@anchor{page.\@the@H@page}}% + \fi \else - \begingroup - \let\@number\@firstofone - \let\textlatin\@firstofone - \xdef\@the@H@page{\thepage}% - \endgroup - \gdef\Hy@TempPageAnchor{\hyper@@anchor{page.\@the@H@page}}% + \Hy@GlobalStepCount\Hy@pagecounter + \gdef\Hy@TempPageAnchor{\hyper@@anchor{page.\the\Hy@pagecounter}}% \fi \else - \Hy@GlobalStepCount\Hy@pagecounter - \gdef\Hy@TempPageAnchor{\hyper@@anchor{page.\the\Hy@pagecounter}}% + \let\Hy@TempPageAnchor\@empty \fi \let\H@old@thehead\@thehead \if^\@thehead^% @@ -3818,9 +4069,11 @@ {\Hy@toclevel}% {#1}% \ifHy@verbose + \def\Hy@tempa{#3}% + \@onelevel@sanitize\Hy@tempa \typeout{pdftex: bookmark at \the\inputlineno: {\csname the#2\endcsname} - {#3} + {\Hy@tempa} {\@currentHref}% {\Hy@toclevel}% {#1}% @@ -3950,22 +4203,24 @@ \else \def\@wrindex#1{\@@wrindex#1||\\} \def\@@wrindex#1|#2|#3\\{% - \ifx\\#2\\% - \protected@write\@indexfile{}{% - \string\indexentry{#1|hyperpage}{\thepage}% - }% - \else - \def\Hy@temp@A{#2}% - \ifcase0\ifx\Hy@temp@A\HyInd@ParenLeft 1\fi - \ifx\Hy@temp@A\HyInd@ParenRight 1\fi - \relax + \if@filesw + \ifx\\#2\\% \protected@write\@indexfile{}{% - \string\indexentry{#1|#2}{\thepage}% + \string\indexentry{#1|hyperpage}{\thepage}% }% \else - \protected@write\@indexfile{}{% - \string\indexentry{#1|#2hyperpage}{\thepage}% - }% + \def\Hy@temp@A{#2}% + \ifcase0\ifx\Hy@temp@A\HyInd@ParenLeft 1\fi + \ifx\Hy@temp@A\HyInd@ParenRight 1\fi + \relax + \protected@write\@indexfile{}{% + \string\indexentry{#1|#2}{\thepage}% + }% + \else + \protected@write\@indexfile{}{% + \string\indexentry{#1|#2hyperpage}{\thepage}% + }% + \fi \fi \fi \endgroup @@ -4259,19 +4514,19 @@ \@safe@activesfalse } \def\auto@setref#1#2#3{% csname, extract group, refname - \ifx#1\relax - \protect\G@refundefinedtrue - \nfss@text{\reset@font\bfseries ??}% - \@latex@warning{% - Reference `#3' on page \thepage \space undefined% - }% - \else + \ifcase 0\ifx#1\relax 1\fi\ifx#1\Hy@varioref@undefined 1\fi\relax \edef\@thisref{\expandafter\@fourthoffive#1\@empty\@empty}% \expandafter\test@reftype\@thisref\\% \hyper@@link {\expandafter\@fifthoffive#1}% {\expandafter\@fourthoffive#1\@empty\@empty}% {\@currentHtag\expandafter#2#1\@empty\@empty\null}% + \else + \protect\G@refundefinedtrue + \nfss@text{\reset@font\bfseries ??}% + \@latex@warning{% + Reference `#3' on page \thepage \space undefined% + }% \fi } \def\test@reftype#1.#2\\{% @@ -4308,9 +4563,9 @@ \providecommand\theoremautorefname{Theorem} \providecommand*{\Hy@DistillerDestFix}{} \def\phantomsection{% - \Hy@GlobalStepCount\Hy@linkcounter - \xdef\@currentHref{section*.\the\Hy@linkcounter}% - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@GlobalStepCount\Hy@linkcounter + \xdef\@currentHref{section*.\the\Hy@linkcounter}% + \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% } \endinput %% diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def index ed3d90bf7cd..9415e410618 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hypertex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hypertex.def @@ -7,7 +7,6 @@ %% hyperref.dtx (with options: `hypertex') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, -%% RCS: $Id: hyperref.dtx 6.71 2000/10/04 rahtz Exp rahtz $ %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -23,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hypertex.def} - [2003/11/30 v6.74m + [2006/08/16 v6.75c Hyperref driver for HyperTeX specials] \def\PDF@FinishDoc{} \def\PDF@SetupDoc{% @@ -40,7 +39,7 @@ \special{html:}% \endgroup \Hy@activeanchortrue - \Hy@colorlink{\@anchorcolor}\anchor@spot\Hy@endcolorlink + \Hy@colorlink\@anchorcolor\anchor@spot\Hy@endcolorlink \special{html:}% \Hy@activeanchorfalse \Hy@RestoreLastskip @@ -60,7 +59,7 @@ } \def\@urltype{url} \def\hyper@linkstart#1#2{% - \Hy@colorlink{\csname @#1color\endcsname}% + \expandafter\Hy@colorlink\csname @#1color\endcsname \def\Hy@tempa{#1}% \ifx\Hy@tempa\@urltype \special{html:}% @@ -87,7 +86,7 @@ \hyper@chars \special{html:}% }% - \Hy@colorlink{\@urlcolor}#1% + \Hy@colorlink\@urlcolor#1% \@linkdim\ht\@tempboxa \advance\@linkdim by -6.5\p@ \raise\@linkdim\hbox{\special{html:}}% @@ -96,7 +95,7 @@ \begingroup \hyper@chars \special{html:}% - \Hy@colorlink{\@urlcolor}#1% + \Hy@colorlink\@urlcolor#1% \special{html:}% \Hy@endcolorlink \endgroup @@ -163,6 +162,19 @@ \Hy@org@chapter }% } +\let\H@old@part\@part +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname chapter\endcsname\relax + \let\Hy@secnum@part\z@ +\else + \let\Hy@secnum@part\m@ne +\fi +\def\@part{% + \ifnum\Hy@secnum@part>\c@secnumdepth + \phantomsection + \fi + \H@old@part +} \let\H@old@spart\@spart \def\@spart#1{% \H@old@spart{#1}% diff --git a/Master/texmf-dist/tex/latex/hyperref/nameref.sty b/Master/texmf-dist/tex/latex/hyperref/nameref.sty index 4cde86550c5..55270920da3 100644 --- a/Master/texmf-dist/tex/latex/hyperref/nameref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/nameref.sty @@ -6,8 +6,6 @@ %% %% nameref.dtx (with options: `package') %% -\def\filedate{2003/12/03} -\def\fileversion{2.21} %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- %% @@ -20,8 +18,10 @@ %% %% The list of all files belonging to the `Hyperref Bundle' is %% given in the file `manifest.txt'. -\ProvidesPackage{nameref}[\filedate\space v\fileversion - \space Cross-referencing by name of section] +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{nameref} + [2006/08/15 v2.26 Cross-referencing by name of section] +\RequirePackage{refcount}[2006/02/12] \def\strip@period#1.\relax#2\@@@{#1} \newif\ifNR@showkeys \NR@showkeysfalse @@ -143,6 +143,11 @@ \def\@currentlabelname{#1}% \NR@schapter{#1}% } +\let\NR@@caption\@caption +\long\def\@caption#1[#2]{% + \def\@currentlabelname{#2}% + \NR@@caption{#1}[{#2}]% +} \AtBeginDocument{% \@ifpackageloaded{titlesec}{% \let\NRorg@ttl@sect@i\ttl@sect@i @@ -161,15 +166,24 @@ \long\def\@fifthoffive#1#2#3#4#5{#5} \providecommand*\@safe@activestrue{}% \providecommand*\@safe@activesfalse{}% +\def\NR@setref#1{% + \begingroup + \@safe@activestrue + \expandafter + \endgroup + \expandafter\NR@@setref\csname r@#1\endcsname +} +\def\NR@@setref#1{% + \ifx\@undefined#1% + \let#1\relax + \fi + \@setref#1% +} \def\T@ref#1{% - \@safe@activestrue - \expandafter\@setref\csname r@#1\endcsname\@firstoffive{#1}% - \@safe@activesfalse + \NR@setref{#1}\@firstoffive{#1}% }% \def\T@pageref#1{% - \@safe@activestrue - \expandafter\@setref\csname r@#1\endcsname\@secondoffive{#1}% - \@safe@activesfalse + \NR@setref{#1}\@secondoffive{#1}% }% \ifNR@showkeys \ifx\SK@ref\@empty @@ -177,14 +191,14 @@ \def\T@ref#1{% \@safe@activestrue \SK@\SK@@ref{#1}% - \expandafter\@setref\csname r@#1\endcsname\@firstoffive{#1}% \@safe@activesfalse + \NR@setref{#1}\@firstoffive{#1}% }% \def\T@pageref#1{% \@safe@activestrue \SK@\SK@@ref{#1}% - \expandafter\@setref\csname r@#1\endcsname\@secondoffive{#1}% \@safe@activesfalse + \NR@setref{#1}\@secondoffive{#1}% }% \fi \fi @@ -194,9 +208,7 @@ \DeclareRobustCommand{\pageref}{\T@pageref}% } \def\T@nameref#1{% - \@safe@activestrue - \expandafter\@setref\csname r@#1\endcsname\@thirdoffive{#1}% - \@safe@activesfalse + \NR@setref{#1}\@thirdoffive{#1}% }% \ifNR@showkeys \ifx\SK@ref\@empty @@ -204,14 +216,28 @@ \def\T@nameref#1{% \@safe@activestrue \SK@\SK@@ref{#1}% - \expandafter\@setref\csname r@#1\endcsname\@thirdoffive{#1}% \@safe@activesfalse + \NR@setref{#1}\@thirdoffive{#1}% }% \fi \fi \def\nameref{\protect\T@nameref} \def\Nameref#1{`\nameref{#1}' on page~\pageref{#1}} \providecommand\Sectionformat[2]{#1} +\@ifpackageloaded{ifthen}{% + \let\NROrg@ifthenelse\ifthenelse + \def\ifthenelse{% + \let\begingroup\NR@TE@begingroup + \NROrg@ifthenelse + }% + \let\NROrg@begingroup\begingroup + \def\NR@TE@begingroup{% + \let\begingroup\NROrg@begingroup + \begingroup + \def\ref##1{\getrefbykeydefault{##1}{}{??}}% + \def\pageref##1{\getrefbykeydefault{##1}{page}{0}}% + }% +}{} \ifx\csname @@vpageref\endcsname\relax \else \def\@@vpageref#1[#2]#3{% diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty index e1b9f29fc52..45b93ba3169 100644 --- a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty @@ -7,7 +7,6 @@ %% hyperref.dtx (with options: `nohyperref') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, -%% RCS: $Id: hyperref.dtx 6.71 2000/10/04 rahtz Exp rahtz $ %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -24,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{nohyperref} - [2003/11/30 v6.74m + [2006/08/16 v6.75c Dummy hyperref (SR)] \let\hyper@@anchor\@gobble \def\hyper@link#1#2#3{#3}% diff --git a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def index 5960f7d4a05..ae50e8dabbe 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def +++ b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def @@ -7,7 +7,6 @@ %% hyperref.dtx (with options: `pd1enc') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, -%% RCS: $Id: hyperref.dtx 6.71 2000/10/04 rahtz Exp rahtz $ %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -23,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{pd1enc.def} - [2003/11/30 v6.74m + [2006/08/16 v6.75c Hyperref: PDFDocEncoding definition (HO)] \DeclareFontEncoding{PD1}{}{} \DeclareTextCommand{\textLF}{PD1}{\012} % line feed @@ -49,6 +48,7 @@ \DeclareTextCompositeCommand{\v}{PD1}{\@empty}{\textcaron} \DeclareTextCompositeCommand{\.}{PD1}{\@empty}{\textdotaccent} \DeclareTextCompositeCommand{\c}{PD1}{\@empty}{\textcedilla} +\DeclareTextCommand{\k}{PD1}[1]{\TextSymbolUnavailable{\k{#1}}#1} \DeclareTextCommand{\textbreve}{PD1}{\030} % breve \DeclareTextCommand{\textcaron}{PD1}{\031} % caron \DeclareTextCommand{\textcircumflex}{PD1}{\032} % circumflex diff --git a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def index 1f4d65eefec..8050bf2e0f6 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def +++ b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def @@ -7,7 +7,6 @@ %% hyperref.dtx (with options: `pdfmark,pdfmarkbase,pdfform,outlines') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, -%% RCS: $Id: hyperref.dtx 6.71 2000/10/04 rahtz Exp rahtz $ %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -23,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{pdfmark.def} - [2003/11/30 v6.74m + [2006/08/16 v6.75c Hyperref definitions for pdfmark specials] \def\Hy@PutCatalog#1{% \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} << #1 >>}}% @@ -59,6 +58,55 @@ }% } \fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdfescapestring\endcsname\relax + \begingroup + \catcode`\|=0 % + \@makeother\\% + |@firstofone{|endgroup + |def|Hy@pstringdef#1#2{% + |edef#1{#2}% + |@onelevel@sanitize#1% + |edef#1{|expandafter|Hy@ExchangeBackslash#1\|@nil}% + |edef#1{|expandafter|Hy@ExchangeLeftParenthesis#1(|@nil}% + |edef#1{|expandafter|Hy@ExchangeRightParenthesis#1)|@nil}% + }% + |def|Hy@ExchangeBackslash#1\#2|@nil{% + #1% + |ifx|\#2|\% + |else + \\% + |Hy@ReturnAfterFi{% + |Hy@ExchangeBackslash#2|@nil + }% + |fi + }% + } + \def\Hy@ExchangeLeftParenthesis#1(#2\@nil{% + #1% + \ifx\\#2\\% + \else + \@backslashchar(% + \Hy@ReturnAfterFi{% + \Hy@ExchangeLeftParenthesis#2\@nil + }% + \fi + } + \def\Hy@ExchangeRightParenthesis#1)#2\@nil{% + #1% + \ifx\\#2\\% + \else + \@backslashchar)% + \Hy@ReturnAfterFi{% + \Hy@ExchangeRightParenthesis#2\@nil + }% + \fi + } +\else + \def\Hy@pstringdef#1#2{% + \edef#1{\pdfescapestring{#2}}% + }% +\fi \def\Hy@DistillerDestFix{% \begingroup \let\x\literalps@out @@ -126,7 +174,7 @@ \else \leavevmode\hbox\bgroup \fi - \Hy@colorlink{\csname @#1color\endcsname}% + \expandafter\Hy@colorlink\csname @#1color\endcsname \literalps@out{H.S}% \xdef\hyper@currentanchor{#2}% \gdef\hyper@currentlinktype{#1}% @@ -141,6 +189,7 @@ Dest=\hyper@currentanchor,% AcroHighlight=\@pdfhighlight,% Border=\@pdfborder,% + BorderStyle=\@pdfborderstyle,% Color=\Hy@temp,% Raw=H.B% }% @@ -217,6 +266,7 @@ linktype={#1},% AcroHighlight=\@pdfhighlight,% Border=\@pdfborder,% + BorderStyle=\@pdfborderstyle,% pdfmark=/ANN,% Subtype=/Link,% Dest=\Hy@testname @@ -226,19 +276,41 @@ \newtoks\pdf@docset \def\PDF@FinishDoc{% \Hy@UseMaketitleInfos - \pdfmark{% + \let\Hy@temp\@empty + \ifx\@pdfcreationdate\@empty + \else + \def\Hy@temp{CreationDate=\@pdfcreationdate,}% + \fi + \ifx\@pdfmoddate\@empty + \else + \expandafter\def\expandafter\Hy@temp\expandafter{% + \Hy@temp + ModDate=\@pdfmoddate,% + }% + \fi + \ifx\@pdfproducer\relax + \else + \expandafter\def\expandafter\Hy@temp\expandafter{% + \Hy@temp + Producer=\@pdfproducer,% + }% + \fi + \expandafter + \pdfmark\expandafter{% + \Hy@temp pdfmark=/DOCINFO,% Title=\@pdftitle,% Subject=\@pdfsubject,% Creator=\@pdfcreator,% Author=\@pdfauthor,% - Producer=\@pdfproducer,% Keywords=\@pdfkeywords }% \Hy@DisableOption{pdfauthor}% \Hy@DisableOption{pdftitle}% \Hy@DisableOption{pdfsubject}% \Hy@DisableOption{pdfcreator}% + \Hy@DisableOption{pdfcreationdate}% + \Hy@DisableOption{pdfmoddate}% \Hy@DisableOption{pdfproducer}% \Hy@DisableOption{pdfkeywords}% } @@ -265,6 +337,7 @@ /NonFullScreenPageMode\@pdfnonfullscreenpagemode \fi }% + \Hy@pstringdef\Hy@pstringB{\@baseurl}% \pdfmark{% pdfmark=/PUT,% Raw={% @@ -279,18 +352,22 @@ \fi \ifx\@baseurl\@empty \else - /URI << /Base (\@baseurl) >>% + /URI << /Base (\Hy@pstringB) >>% \fi >>% }% }% } +\newif\ifHy@pdfmarkerror \def\pdfmark{\@ifnextchar[{\pdfmark@}{\pdfmark@[]}} \def\pdfmark@[#1]#2{% - \edef\@processme{\noexpand\pdf@toks={\the\pdf@defaulttoks}}% - \@processme - \let\pdf@type\relax - \setkeys{PDF}{#2}% + \Hy@pdfmarkerrorfalse + \edef\@processme{\noexpand\pdf@toks={\the\pdf@defaulttoks}}% + \@processme + \let\pdf@type\relax + \setkeys{PDF}{#2}% + \ifHy@pdfmarkerror + \else \ifx\pdf@type\relax \Hy@WarningNoLine{no pdfmark type specified in #2!!}% \ifx\\#1\\\relax\else\pdf@rect{#1}\fi @@ -298,27 +375,41 @@ \ifx\\#1\\\relax \literalps@out{[\the\pdf@toks\space\pdf@type\space pdfmark}% \else - \Hy@colorlink{\@ifundefined{@\pdf@linktype color}% - {\@linkcolor}% - {\csname @\pdf@linktype color\endcsname}}% + \@ifundefined{@\pdf@linktype color}{% + \Hy@colorlink\@linkcolor + }{% + \expandafter\Hy@colorlink + \csname @\pdf@linktype color\endcsname + }% \pdf@rect{#1}% \literalps@out{[\the\pdf@toks\space\pdf@type\space pdfmark}% \Hy@endcolorlink \fi \fi + \fi } \newsavebox{\pdf@box} +\providecommand{\Hy@setouterhbox}{\sbox} +\providecommand{\Hy@breaklinksunhbox}{\unhbox} \def\pdf@rect#1{% \leavevmode - \sbox\pdf@box{#1}% + \ifHy@breaklinks + \Hy@setouterhbox\pdf@box{#1}% + \else + \sbox\pdf@box{#1}% + \fi \dimen@\ht\pdf@box - \leavevmode \ifdim\dp\pdf@box=\z@ \literalps@out{H.S}% \else \lower\dp\pdf@box\hbox{\literalps@out{H.S}}% \fi - \ifHy@breaklinks\unhbox\else\box\fi\pdf@box + \ifHy@breaklinks + \expandafter\Hy@breaklinksunhbox + \else + \expandafter\box + \fi + \pdf@box \ifdim\dimen@=\z@ \literalps@out{H.R}% \else @@ -345,7 +436,20 @@ \def\pdf@linktype{link} \define@key{PDF}{Raw}{\pdf@addtoksx{#1}} \define@key{PDF}{Action}{\pdf@addtoks{#1}{Action}} -\define@key{PDF}{Border}{\pdf@addtoks{[#1]}{Border}} +\define@key{PDF}{Border}{% + \edef\Hy@temp{#1}% + \ifx\Hy@temp\@empty + \else + \pdf@addtoks{[#1]}{Border}% + \fi +} +\define@key{PDF}{BorderStyle}{% + \edef\Hy@temp{#1}% + \ifx\Hy@temp\@empty + \else + \pdf@addtoks{<<#1>>}{BS}% + \fi +} \define@key{PDF}{Color}{\pdf@addtoks{[#1]}{Color}} \define@key{PDF}{Contents}{\pdf@addtoks{(#1)}{Contents}} \define@key{PDF}{Count}{\pdf@addtoks{#1}{Count}} @@ -353,16 +457,22 @@ \define@key{PDF}{DOSFile}{\pdf@addtoks{(#1)}{DOSFile}} \define@key{PDF}{DataSource}{\pdf@addtoks{(#1)}{DataSource}} \define@key{PDF}{Dest}{% - \begingroup - \edef\x{#1}% - \expandafter\endgroup - \ifx\x\@empty\else\pdf@addtoks{(#1) cvn}{Dest}\fi + \Hy@pstringdef\Hy@pstringDest{#1}% + \ifx\Hy@pstringDest\@empty + \Hy@pdfmarkerrortrue + \Hy@Warning{Destination with empty name ignored}% + \else + \pdf@addtoks{(\Hy@pstringDest) cvn}{Dest}% + \fi } \define@key{PDF}{DestAnchor}{% - \begingroup - \edef\x{#1}% - \expandafter\endgroup - \ifx\x\@empty\else\pdf@addtoks{(#1) cvn}{Dest}\fi + \Hy@pstringdef\Hy@pstringDest{#1}% + \ifx\Hy@pstringDest\@empty + \Hy@pdfmarkerrortrue + \Hy@Warning{Destination with empty name ignored}% + \else + \pdf@addtoks{(\Hy@pstringDest) cvn}{Dest}% + \fi } \define@key{PDF}{Dir}{\pdf@addtoks{(#1)}{Dir}} \define@key{PDF}{File}{\pdf@addtoks{(#1)}{File}} @@ -385,8 +495,9 @@ \define@key{PDF}{View}{\pdf@addtoks{[#1]}{View}} \define@key{PDF}{WinFile}{\pdf@addtoks{(#1)}{WinFile}} \define@key{PDF}{Author}{\pdf@addtoks{(#1)}{Author}} -\define@key{PDF}{CreationDate}{\pdf@addtoks{(#1)}{CreationDate}} \define@key{PDF}{Creator}{\pdf@addtoks{(#1)}{Creator}} +\define@key{PDF}{CreationDate}{\pdf@addtoks{(#1)}{CreationDate}} +\define@key{PDF}{ModDate}{\pdf@addtoks{(#1)}{ModDate}} \define@key{PDF}{Producer}{\pdf@addtoks{(#1)}{Producer}} \define@key{PDF}{Subject}{\pdf@addtoks{(#1)}{Subject}} \define@key{PDF}{Keywords}{\pdf@addtoks{(#1)}{Keywords}} @@ -399,20 +510,37 @@ pdfmark=/ANN,% AcroHighlight=\@pdfhighlight,% Border=\@pdfborder,% + BorderStyle=\@pdfborderstyle,% Action={<< /Subtype /Named /N /#1 >>},% Subtype=/Link% }% } \def\PDFNextPage{\@ifnextchar[{\PDFNextPage@}{\PDFNextPage@[]}} \def\PDFNextPage@[#1]#2{% - \pdfmark[{#2}]{#1,Border=\@pdfborder,Color=.2 .1 .5, - pdfmark=/ANN,Subtype=/Link,Page=/Next}} + \pdfmark[{#2}]{% + #1,% + Border=\@pdfborder,% + BorderStyle=\@pdfborderstyle,% + Color=.2 .1 .5, + pdfmark=/ANN,% + Subtype=/Link,% + Page=/Next% + }% +} \def\PDFPreviousPage{% \@ifnextchar[{\PDFPreviousPage@}{\PDFPreviousPage@[]}% } \def\PDFPreviousPage@[#1]#2{% - \pdfmark[{#2}]{#1,Border=\@pdfborder,Color=.4 .4 .1, - pdfmark=/ANN,Subtype=/Link,Page=/Prev}} + \pdfmark[{#2}]{% + #1,% + Border=\@pdfborder,% + BorderStyle=\@pdfborderstyle,% + Color=.4 .4 .1,% + pdfmark=/ANN,% + Subtype=/Link,% + Page=/Prev% + }% +} \def\PDFOpen#1{% \pdfmark{#1,pdfmark=/DOCVIEW}% } @@ -424,6 +552,7 @@ Page={#2},% AcroHighlight=\@pdfhighlight,% Border=\@pdfborder,% + BorderStyle=\@pdfborderstyle,% Color=\@pagebordercolor,% pdfmark=/ANN,% Subtype=/Link% @@ -438,6 +567,7 @@ \fi} \def\hyper@linkurl#1#2{% \begingroup + \Hy@pstringdef\Hy@pstringURI{#2}% \hyper@chars \leavevmode \pdfmark[{#1}]{% @@ -445,46 +575,56 @@ linktype=url,% AcroHighlight=\@pdfhighlight,% Border=\@pdfborder,% + BorderStyle=\@pdfborderstyle,% Color=\@urlbordercolor,% - Action={<< /Subtype /URI /URI (#2) >>},% + Action={<< /Subtype /URI /URI (\Hy@pstringURI) >>},% Subtype=/Link% }% \endgroup } \def\hyper@linkfile#1#2#3{% \begingroup + \Hy@pstringdef\Hy@pstringF{#2}% + \Hy@pstringdef\Hy@pstringD{#3}% \leavevmode \pdfmark[{#1}]{% pdfmark=/ANN,% Subtype=/Link, AcroHighlight=\@pdfhighlight,% Border=\@pdfborder,% + BorderStyle=\@pdfborderstyle,% linktype=file,% Color=\@filebordercolor,% Action={<< /S /GoToR \ifHy@newwindow /NewWindow true \fi - /F (#2) - /D \ifx\\#3\\[0 \@pdfstartview]\else(#3) cvn\fi + /F (\Hy@pstringF) + /D \ifx\\#3\\[0 \@pdfstartview]\else(\Hy@pstringD) cvn\fi >>}% }% \endgroup } \def\@hyper@launch run:#1\\#2#3{% \begingroup + \Hy@pstringdef\Hy@pstringF{#1}% + \Hy@pstringdef\Hy@pstringP{#3}% \leavevmode \pdfmark[{#2}]{% pdfmark=/ANN,% Subtype=/Link,% AcroHighlight=\@pdfhighlight,% Border=\@pdfborder,% + BorderStyle=\@pdfborderstyle,% linktype=file,% Color=\@filebordercolor,% Action={<< /S /Launch \ifHy@newwindow /NewWindow true \fi - /F (#1) - \ifx\\#3\\\else /Win << /P (#3) /F (#1) >> \fi + /F (\Hy@pstringF) + \ifx\\#3\\% + \else + /Win << /P (\Hy@pstringP) /F (\Hy@pstringF) >> + \fi >>}% }% \endgroup @@ -548,24 +688,26 @@ [ /_objdef {afields} /type /array /OBJ pdfmark -[/BBox [0 0 100 100] /_objdef {Check} /BP pdfmark -1 0 0 setrgbcolor /ZapfDingbats 80 selectfont 20 20 moveto (4) show -[/EP pdfmark -[/BBox [0 0 100 100] /_objdef {Cross} /BP pdfmark -1 0 0 setrgbcolor /ZapfDingbats 80 selectfont 20 20 moveto (8) show -[/EP pdfmark -[/BBox [0 0 250 100] /_objdef {Submit} /BP pdfmark 0.6 setgray 0 0 250 -100 rectfill 1 setgray 2 2 moveto 2 98 lineto 248 98 lineto 246 96 -lineto 4 96 lineto 4 4 lineto fill 0.34 setgray 248 98 moveto 248 2 -lineto 2 2 lineto 4 4 lineto 246 4 lineto 246 96 lineto fill -/Helvetica 76 selectfont 0 setgray 8 22.5 moveto (Submit) show -[/EP pdfmark -[/BBox [0 0 250 100] /_objdef {SubmitP} /BP pdfmark 0.6 setgray 0 0 -250 100 rectfill 0.34 setgray 2 2 moveto 2 98 lineto 248 98 lineto 246 -96 lineto 4 96 lineto 4 4 lineto fill 1 setgray 248 98 moveto 248 2 -lineto 2 2 lineto 4 4 lineto 246 4 lineto 246 96 lineto fill -/Helvetica 76 selectfont 0 setgray 10 20.5 moveto (Submit) show -[/EP pdfmark +{ + [/BBox [0 0 100 100] /_objdef {Check} /BP pdfmark + 1 0 0 setrgbcolor /ZapfDingbats 80 selectfont 20 20 moveto (4) show + [/EP pdfmark + [/BBox [0 0 100 100] /_objdef {Cross} /BP pdfmark + 1 0 0 setrgbcolor /ZapfDingbats 80 selectfont 20 20 moveto (8) show + [/EP pdfmark + [/BBox [0 0 250 100] /_objdef {Submit} /BP pdfmark 0.6 setgray 0 0 250 + 100 rectfill 1 setgray 2 2 moveto 2 98 lineto 248 98 lineto 246 96 + lineto 4 96 lineto 4 4 lineto fill 0.34 setgray 248 98 moveto 248 2 + lineto 2 2 lineto 4 4 lineto 246 4 lineto 246 96 lineto fill + /Helvetica 76 selectfont 0 setgray 8 22.5 moveto (Submit) show + [/EP pdfmark + [/BBox [0 0 250 100] /_objdef {SubmitP} /BP pdfmark 0.6 setgray 0 0 + 250 100 rectfill 0.34 setgray 2 2 moveto 2 98 lineto 248 98 lineto 246 + 96 lineto 4 96 lineto 4 4 lineto fill 1 setgray 248 98 moveto 248 2 + lineto 2 2 lineto 4 4 lineto 246 4 lineto 246 96 lineto fill + /Helvetica 76 selectfont 0 setgray 10 20.5 moveto (Submit) show + [/EP pdfmark +} ?pdfmark [ {aform} << /Fields {afields} @@ -609,6 +751,7 @@ lineto 2 2 lineto 4 4 lineto 246 4 lineto 246 96 lineto fill \ifFld@hidden\def\Fld@width{1sp}\fi \ifx\Fld@value\@empty\def\Fld@value{\Fld@default}\fi \LayoutTextField{#2}{% + \Hy@escapeform\PDFForm@Text \pdfmark[\MakeTextField{\Fld@width}{\Fld@height}]{% pdfmark=/ANN,Raw={\PDFForm@Text}% }% @@ -663,6 +806,7 @@ lineto 2 2 lineto 4 4 lineto 246 4 lineto 246 96 lineto fill \expandafter\Fld@checkequals\@curropt==\\% \Hy@StepCount\Fld@listcount \@currDisplay\space + \Hy@escapeform\PDFForm@Radio \pdfmark[\MakeRadioField{\Fld@width}{\Fld@height}]{% pdfmark=/ANN,% Raw={\PDFForm@Radio /AP <> >>}% @@ -680,6 +824,7 @@ lineto 2 2 lineto 4 4 lineto 246 4 lineto 246 96 lineto fill \Choice@toks{\the\Choice@toks [(\@currValue) (\@currDisplay)]}% }\@processme }% + \Hy@escapeform\PDFForm@List \pdfmark[\MakeChoiceField{\Fld@width}{\Fld@height}]{% pdfmark=/ANN,Raw={\PDFForm@List}% }% @@ -691,6 +836,7 @@ lineto 2 2 lineto 4 4 lineto 246 4 lineto 246 96 lineto fill \setkeys{Field}{#1}% \ifFld@hidden\def\Fld@width{1sp}\fi \LayoutPushButtonField{% + \Hy@escapeform\PDFForm@Push \pdfmark[\MakeButtonField{#2}]{% pdfmark=/ANN,Raw={\PDFForm@Push}% }% @@ -705,6 +851,7 @@ lineto 2 2 lineto 4 4 lineto 246 4 lineto 246 96 lineto fill \def\Fld@name{Submit}% \setkeys{Field}{#1}% \ifFld@hidden\def\Fld@width{1sp}\fi + \Hy@escapeform\PDFForm@Submit \pdfmark[\MakeButtonField{#2}]{% pdfmark=/ANN,% Raw={\PDFForm@Submit /AP << /N {Submit} /D {SubmitP} >>}% @@ -719,6 +866,7 @@ lineto 2 2 lineto 4 4 lineto 246 4 lineto 246 96 lineto fill \def\Fld@name{Reset}% \setkeys{Field}{#1}% \ifFld@hidden\def\Fld@width{1sp}\fi + \Hy@escapeform\PDFForm@Reset \pdfmark[\MakeButtonField{#2}]{% pdfmark=/ANN,Raw={\PDFForm@Reset}% }% @@ -734,16 +882,58 @@ lineto 2 2 lineto 4 4 lineto 246 4 lineto 246 96 lineto fill \setkeys{Field}{#1}% \ifFld@hidden\def\Fld@width{1sp}\fi \LayoutCheckField{#2}{% + \Hy@escapeform\PDFForm@Check \pdfmark[\MakeCheckField{\Fld@width}{\Fld@height}]{% pdfmark=/ANN,Raw={\PDFForm@Check}% }% }% \egroup } +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdfescapestring\endcsname\relax + \let\Hy@escapestring\@firstofone + \def\Hy@escapeform#1{% + \ifHy@escapeform + \def\Hy@escapestring##1{% + \noexpand\Hy@escapestring{\noexpand##1}% + }% + \edef\Hy@temp{#1}% + \expandafter\Hy@@escapeform\Hy@temp\Hy@escapestring{}\@nil + \def\Hy@escapestring##1{% + \@ifundefined{Hy@esc@\string##1}{% + ##1% + \ThisShouldNotHappen + }{% + \csname Hy@esc@\string##1\endcsname + }% + }% + \else + \let\Hy@escapestring\@firstofone + \fi + }% + \def\Hy@@escapeform#1\Hy@escapestring#2#3\@nil{% + \ifx\\#3\\% + \else + \expandafter\Hy@pstringdef\csname Hy@esc@\string#2\endcsname{#2}% + \Hy@ReturnAfterFi{% + \Hy@@escapeform#3\@nil + }% + \fi + }% +\else + \def\Hy@escapeform#1{% + \ifHy@escapeform + \let\Hy@escapestring\pdfescapestring + \else + \let\Hy@escapestring\@firstofone + \fi + }% + \Hy@escapeform{}% +\fi \def\PDFForm@Check{% /Subtype /Widget \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Fld@name) + /T (\Hy@escapestring{\Fld@name}) /Q \Fld@align\space /BS << /W \Fld@borderwidth\space /S /\Fld@borderstyle\space >> /MK << @@ -752,7 +942,7 @@ lineto 2 2 lineto 4 4 lineto 246 4 lineto 246 96 lineto fill \else /BG [\Fld@bcolor] \fi - /CA (\Fld@cbsymbol) + /CA (\Hy@escapestring{\Fld@cbsymbol}) >> /DA (/ZaDb \strip@pt\Fld@charsize\space Tf \Fld@color\space rg) /FT /Btn @@ -762,7 +952,7 @@ lineto 2 2 lineto 4 4 lineto 246 4 lineto 246 96 lineto fill \def\PDFForm@Push{% /Subtype /Widget \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Fld@name) + /T (\Hy@escapestring{\Fld@name}) /FT /Btn /Ff 65540 /H /P @@ -770,56 +960,56 @@ lineto 2 2 lineto 4 4 lineto 246 4 lineto 246 96 lineto fill /MK << /BC [\Fld@bordercolor] >> - /A << /S /JavaScript /JS (\Fld@onclick;) >> + /A << /S /JavaScript /JS (\Hy@escapestring{\Fld@onclick}) >> } \def\Fld@additionalactions{% /AA << \ifx\Fld@keystroke@code\@empty \else - /K << /S /JavaScript /JS (\Fld@keystroke@code) >> + /K << /S /JavaScript /JS (\Hy@escapestring{\Fld@keystroke@code}) >> \fi \ifx\Fld@format@code\@empty \else - /F << /S /JavaScript /JS (\Fld@format@code) >> + /F << /S /JavaScript /JS (\Hy@escapestring{\Fld@format@code}) >> \fi \ifx\Fld@validate@code\@empty \else - /V << /S /JavaScript /JS (\Fld@validate@code) >> + /V << /S /JavaScript /JS (\Hy@escapestring{\Fld@validate@code}) >> \fi \ifx\Fld@calculate@code\@empty \else - /C << /S /JavaScript /JS (\Fld@calculate@code) >> + /C << /S /JavaScript /JS (\Hy@escapestring{\Fld@calculate@code}) >> \fi \ifx\Fld@onfocus@code\@empty \else - /Fo << /S /JavaScript /JS (\Fld@onfocus@code) >> + /Fo << /S /JavaScript /JS (\Hy@escapestring{\Fld@onfocus@code}) >> \fi \ifx\Fld@onblur@code\@empty \else - /Bl << /S /JavaScript /JS (\Fld@onblur@code) >> + /Bl << /S /JavaScript /JS (\Hy@escapestring{\Fld@onblur@code}) >> \fi \ifx\Fld@onmousedown@code\@empty \else - /D << /S /JavaScript /JS (\Fld@onmousedown@code) >> + /D << /S /JavaScript /JS (\Hy@escapestring{\Fld@onmousedown@code}) >> \fi \ifx\Fld@onmouseup@code\@empty \else - /U << /S /JavaScript /JS (\Fld@onmouseup@code) >> + /U << /S /JavaScript /JS (\Hy@escapestring{\Fld@onmouseup@code}) >> \fi \ifx\Fld@onenter@code\@empty \else - /E << /S /JavaScript /JS (\Fld@onenter@code) >> + /E << /S /JavaScript /JS (\Hy@escapestring{\Fld@onenter@code}) >> \fi \ifx\Fld@onexit@code\@empty \else - /X << /S /JavaScript /JS (\Fld@onexit@code) >> + /X << /S /JavaScript /JS (\Hy@escapestring{\Fld@onexit@code}) >> \fi >> } \def\PDFForm@List{% /Subtype /Widget \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Fld@name) + /T (\Hy@escapestring{\Fld@name}) /FT /Ch /Q \Fld@align\space /BS << /W \Fld@borderwidth\space /S /\Fld@borderstyle\space >> @@ -832,14 +1022,14 @@ lineto 2 2 lineto 4 4 lineto 246 4 lineto 246 96 lineto fill >> /DA (/Helv \strip@pt\Fld@charsize\space Tf \Fld@color\space rg ) /Opt [\the\Choice@toks] - /DV (\Fld@default) + /DV (\Hy@escapestring{\Fld@default}) \Fld@additionalactions \Fld@flags } \def\PDFForm@Radio{% /Subtype /Widget \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Fld@name) + /T (\Hy@escapestring{\Fld@name}) /FT /Btn /Ff 49152 /H /P @@ -863,7 +1053,7 @@ lineto 2 2 lineto 4 4 lineto 246 4 lineto 246 96 lineto fill \def\PDFForm@Text{% /Subtype /Widget \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Fld@name) + /T (\Hy@escapestring{\Fld@name}) /Q \Fld@align\space /FT /Tx /BS << /W \Fld@borderwidth\space /S /\Fld@borderstyle\space >> @@ -875,8 +1065,8 @@ lineto 2 2 lineto 4 4 lineto 246 4 lineto 246 96 lineto fill \fi >> /DA (/Helv \strip@pt\Fld@charsize\space Tf \Fld@color\space rg ) - /DV (\Fld@default) - /V (\Fld@value) + /DV (\Hy@escapestring{\Fld@default}) + /V (\Hy@escapestring{\Fld@value}) \Fld@additionalactions \ifFld@multiline \ifFld@readonly /Ff 4097 \else /Ff 4096 \fi @@ -892,7 +1082,7 @@ lineto 2 2 lineto 4 4 lineto 246 4 lineto 246 96 lineto fill \def\PDFForm@Submit{% /Subtype /Widget \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Fld@name) + /T (\Hy@escapestring{\Fld@name}) /FT /Btn /Ff 65540 /H /P @@ -904,7 +1094,7 @@ lineto 2 2 lineto 4 4 lineto 246 4 lineto 246 96 lineto fill /S /SubmitForm /F << /FS /URL - /F (\Form@action) + /F (\Hy@escapestring{\Form@action}) >> \ifForm@html /Flags 4 \fi >> @@ -912,7 +1102,7 @@ lineto 2 2 lineto 4 4 lineto 246 4 lineto 246 96 lineto fill \def\PDFForm@Reset{% /Subtype /Widget \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Fld@name) + /T (\Hy@escapestring{\Fld@name}) /FT /Btn /H /P /DA (/Helv \strip@pt\Fld@charsize\space Tf 0 0 1 rg) @@ -923,11 +1113,10 @@ lineto 2 2 lineto 4 4 lineto 246 4 lineto 246 96 lineto fill /BS << /W \Fld@borderwidth\space /S /\Fld@borderstyle\space >> /A << /S /ResetForm >> } -\newwrite\@outlinefile \def\Hy@writebookmark#1#2#3#4#5{% section number, text, label, level, file \ifx\WriteBookmarks\relax% \else - \ifnum#4>\c@tocdepth + \ifnum#4>\Hy@bookmarksdepth\relax \else \@@writetorep{#1}{#2}{#3}{#4}{#5}% \fi @@ -975,11 +1164,13 @@ lineto 2 2 lineto 4 4 lineto 246 4 lineto 246 96 lineto fill \let\numberline\@gobble \fi \pdfstringdef\Hy@tempa{#2}% - \protected@write\@outlinefile{}{% - \protect\BOOKMARK - [\Hy@level][\@bookmarkopenstatus{\Hy@level}]{#3}% - {\Hy@tempa}{\Hy@tempb}% - }% + \if@filesw + \protected@write\@outlinefile{}{% + \protect\BOOKMARK + [\Hy@level][\@bookmarkopenstatus{\Hy@level}]{#3}% + {\Hy@tempa}{\Hy@tempb}% + }% + \fi \fi \endgroup } @@ -1015,10 +1206,11 @@ lineto 2 2 lineto 4 4 lineto 246 4 lineto 246 96 lineto fill \fi \def\@@BOOKMARK[##1][##2]##3##4##5{% \def\Hy@temp{##4}% + \Hy@pstringdef\Hy@pstringName{##3}% \pdfmark{% pdfmark=/OUT,% Count={##2\check@bm@number{##3}},% - Dest={##3},% + Dest={\Hy@pstringName},% Title=\expandafter\strip@prefix\meaning\Hy@temp }% }% @@ -1027,11 +1219,14 @@ lineto 2 2 lineto 4 4 lineto 246 4 lineto 246 96 lineto fill \InputIfFileExists{\jobname.out}{}{}% }% %{\escapechar\m@ne\InputIfFileExists{\jobname.out}{}{}}% - \ifx\WriteBookmarks\relax\else - \if@filesw\immediate\openout\@outlinefile=\jobname.out - \ifHy@typexml - \immediate\write\@outlinefile{\relax}% - \fi + \ifx\WriteBookmarks\relax + \else + \if@filesw + \newwrite\@outlinefile + \immediate\openout\@outlinefile=\jobname.out + \ifHy@typexml + \immediate\write\@outlinefile{\relax}% + \fi \fi \fi \endgroup @@ -1090,6 +1285,19 @@ lineto 2 2 lineto 4 4 lineto 246 4 lineto 246 96 lineto fill \Hy@org@chapter }% } +\let\H@old@part\@part +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname chapter\endcsname\relax + \let\Hy@secnum@part\z@ +\else + \let\Hy@secnum@part\m@ne +\fi +\def\@part{% + \ifnum\Hy@secnum@part>\c@secnumdepth + \phantomsection + \fi + \H@old@part +} \let\H@old@spart\@spart \def\@spart#1{% \H@old@spart{#1}% diff --git a/Master/texmf-dist/tex/latex/hyperref/puenc.def b/Master/texmf-dist/tex/latex/hyperref/puenc.def index de9f7ebbdac..61edb3754f7 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puenc.def @@ -7,7 +7,6 @@ %% hyperref.dtx (with options: `puenc') %% %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, -%% RCS: $Id: hyperref.dtx 6.71 2000/10/04 rahtz Exp rahtz $ %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -23,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puenc.def} - [2003/11/30 v6.74m + [2006/08/16 v6.75c Hyperref: PDF Unicode definition (HO)] \DeclareFontEncoding{PU}{}{} \DeclareTextCommand{\textLF}{PU}{\80\012} % line feed @@ -53,6 +52,10 @@ \DeclareTextCompositeCommand{\c}{PU}{\@empty}{\textcedilla} \DeclareTextCompositeCommand{\U}{PU}{\@empty}{\textbreve} \DeclareTextCompositeCommand{\C}{PU}{\@empty}{\textdoublegrave} +\DeclareTextCommand{\=}{PU}[1]{\TextSymbolUnavailable{\={#1}}#1} +\DeclareTextCommand{\H}{PU}[1]{\TextSymbolUnavailable{\H{#1}}#1} +\DeclareTextCommand{\k}{PU}[1]{\TextSymbolUnavailable{\k{#1}}#1} +\DeclareTextCommand{\u}{PU}[1]{\TextSymbolUnavailable{\u{#1}}#1} \DeclareTextCommand{\textbreve}{PU}{\80\030} % breve \DeclareTextCommand{\textcaron}{PU}{\80\031} % caron \DeclareTextCommand{\textcircumflex}{PU}{\80\032} % circumflex @@ -81,29 +84,9 @@ \DeclareTextCommand{\textbar}{PU}{|} % bar \DeclareTextCommand{\textbraceright}{PU}{\80\175} % braceright \DeclareTextCommand{\textasciitilde}{PU}{\80\176} % asciitilde -\DeclareTextCommand{\textbullet}{PU}{\80\200} % bullet -\DeclareTextCommand{\textdagger}{PU}{\80\201} % dagger -\DeclareTextCommand{\textdaggerdbl}{PU}{\80\202} % daggerdbl -\DeclareTextCommand{\textellipsis}{PU}{\80\203} % ellipsis -\DeclareTextCommand{\textemdash}{PU}{\80\204} % emdash -\DeclareTextCommand{\textendash}{PU}{\80\205} % endash -\DeclareTextCommand{\textflorin}{PU}{\80\206} % florin -\DeclareTextCommand{\textfractionmark}{PU}{/} % fraction, \80\207 -\DeclareTextCommand{\guilsinglleft}{PU}{\80\210} % guilsinglleft -\DeclareTextCommand{\guilsinglright}{PU}{\80\211} % guilsinglright \DeclareTextCommand{\textminus}{PU}{-} % minus, \80\212 -\DeclareTextCommand{\textperthousand}{PU}{\80\213} % perthousand -\DeclareTextCommand{\quotedblbase}{PU}{\80\214} % quotedblbase -\DeclareTextCommand{\textquotedblleft}{PU}{\80\215} % quotedblleft -\DeclareTextCommand{\textquotedblright}{PU}{\80\216} % quotedblright -\DeclareTextCommand{\textquoteleft}{PU}{\80\217} % quoteleft -\DeclareTextCommand{\textquoteright}{PU}{\80\220} % quoteright -\DeclareTextCommand{\quotesinglbase}{PU}{\80\221} % quotesinglbase -\DeclareTextCommand{\texttrademark}{PU}{\80\222} % trademark \DeclareTextCommand{\textfi}{PU}{fi} % fi ?? \80\223 \DeclareTextCommand{\textfl}{PU}{fl} % fl ?? \80\224 -\DeclareTextCommand{\OE}{PU}{\80\226} % OE -\DeclareTextCommand{\oe}{PU}{\80\234} % oe \DeclareTextCommand{\textexclamdown}{PU}{\80\241} % exclamdown \DeclareTextCommand{\textcent}{PU}{\80\242} % cent \DeclareTextCommand{\textsterling}{PU}{\80\243} % sterling @@ -204,7 +187,6 @@ \DeclareTextCompositeCommand{\"}{PU}{y}{\80\377} % ydieresis \DeclareTextCommand{\ij}{PU}{\80\377} \DeclareTextCommand{\SS}{PU}{SS} -\DeclareTextCommand{\textcelsius}{PU}{\textdegree C} \DeclareTextCommand{\textglqq}{PU}{\quotedblbase} \DeclareTextCommand{\textgrqq}{PU}{\textquotedblleft} \DeclareTextCommand{\textglq}{PU}{\quotesinglbase} @@ -218,7 +200,6 @@ \DeclareTextCommand{\textdiv}{PU}{\textdivide} \DeclareTextCommand{\textpm}{PU}{\textplusminus} \DeclareTextCommand{\textcdot}{PU}{\textperiodcentered} -\DeclareTextCommand{\textbeta}{PU}{\ss} \DeclareTextCompositeCommand{\=}{PU}{A}{\81\000}% Amacron \DeclareTextCompositeCommand{\=}{PU}{a}{\81\001}% amacron \DeclareTextCompositeCommand{\u}{PU}{A}{\81\002}% Abreve @@ -292,14 +273,16 @@ \DeclareTextCompositeCommand{\c}{PU}{n}{\81\106} % ncedilla \DeclareTextCompositeCommand{\v}{PU}{N}{\81\107} % Ncaron \DeclareTextCompositeCommand{\v}{PU}{n}{\81\110} % ncaron -\DeclareTextCommand{\NG}{PU}{NG} % \81\112 -\DeclareTextCommand{\ng}{PU}{ng} % \81\113 +\DeclareTextCommand{\NG}{PU}{\81\112} % NG +\DeclareTextCommand{\ng}{PU}{\81\113} % ng \DeclareTextCompositeCommand{\=}{PU}{O}{\81\114} % Omacron \DeclareTextCompositeCommand{\=}{PU}{o}{\81\115} % omacron \DeclareTextCompositeCommand{\u}{PU}{O}{\81\116} % Obreve \DeclareTextCompositeCommand{\u}{PU}{o}{\81\117} % obreve \DeclareTextCompositeCommand{\H}{PU}{O}{\81\120} % Odoubleacute \DeclareTextCompositeCommand{\H}{PU}{o}{\81\121} % odoubleacute +\DeclareTextCommand{\OE}{PU}{\81\122} % OE +\DeclareTextCommand{\oe}{PU}{\81\123} % oe \DeclareTextCompositeCommand{\'}{PU}{R}{\81\124} % Racute \DeclareTextCompositeCommand{\'}{PU}{r}{\81\125} % racute \DeclareTextCompositeCommand{\c}{PU}{R}{\81\126} % Rcedilla @@ -344,6 +327,7 @@ \DeclareTextCompositeCommand{\.}{PU}{z}{\81\174} % zdot \DeclareTextCompositeCommand{\v}{PU}{Z}{\81\175} % Zcaron \DeclareTextCompositeCommand{\v}{PU}{z}{\81\176} % zcaron +\DeclareTextCommand{\textflorin}{PU}{\81\222} % florin \DeclareTextCompositeCommand{\v}{PU}{A}{\81\315} % Acaron \DeclareTextCompositeCommand{\v}{PU}{a}{\81\316} % acaron \DeclareTextCompositeCommand{\v}{PU}{I}{\81\317} % Icaron @@ -658,8 +642,27 @@ \DeclareTextCompositeCommand{\"}{PU}{\cyrch}{\84\365}% che diaeresis \DeclareTextCompositeCommand{\"}{PU}{\CYRERY}{\84\370}% YERU diaeresis \DeclareTextCompositeCommand{\"}{PU}{\cyrery}{\84\371}% yeru diaeresis +\DeclareTextCommand{\textendash}{PU}{\9040\023} % endash +\DeclareTextCommand{\textemdash}{PU}{\9040\024} % emdash +\DeclareTextCommand{\textquoteleft}{PU}{\9040\030} % quoteleft +\DeclareTextCommand{\textquoteright}{PU}{\9040\031} % quoteright +\DeclareTextCommand{\quotesinglbase}{PU}{\9040\032} % quotesinglbase +\DeclareTextCommand{\textquotedblleft}{PU}{\9040\034} % quotedblleft +\DeclareTextCommand{\textquotedblright}{PU}{\9040\035} % quotedblright +\DeclareTextCommand{\quotedblbase}{PU}{\9040\036} % quotedblbase +\DeclareTextCommand{\textdagger}{PU}{\9040\040} % dagger +\DeclareTextCommand{\textdaggerdbl}{PU}{\9040\041} % daggerdbl +\DeclareTextCommand{\textbullet}{PU}{\9040\042} % bullet +\DeclareTextCommand{\textellipsis}{PU}{\9040\046} % ellipsis +\DeclareTextCommand{\textperthousand}{PU}{\9040\060} % perthousand +\DeclareTextCommand{\textpertenthousand}{PU}{\9040\061} % pertenthousand +\DeclareTextCommand{\guilsinglleft}{PU}{\9040\071} % guilsinglleft +\DeclareTextCommand{\guilsinglright}{PU}{\9040\072} % guilsinglright +\DeclareTextCommand{\textfractionmark}{PU}{\9040\104} % fraction slash \DeclareTextCommand{\texteuro}{PU}{\9040\254} % Euro +\DeclareTextCommand{\textcelsius}{PU}{\9041\003} \DeclareTextCommand{\textnumero}{PU}{\9041\026} +\DeclareTextCommand{\texttrademark}{PU}{\9041\042} % trademark \endinput %% %% End of file `puenc.def'. diff --git a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def new file mode 100644 index 00000000000..53ee5ad0886 --- /dev/null +++ b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def @@ -0,0 +1,163 @@ +%% +%% This is file `puvnenc.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% hyperref.dtx (with options: `puvnenc') +%% +%% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, +%% +%% This file is part of the `Hyperref Bundle'. +%% ------------------------------------------- +%% +%% It may be distributed under the conditions of the LaTeX Project Public +%% License, either version 1.2 of this license or (at your option) any +%% later version. The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.2 or later is part of all distributions of LaTeX +%% version 1999/12/01 or later. +%% +%% The list of all files belonging to the `Hyperref Bundle' is +%% given in the file `manifest.txt'. +%% +\ProvidesFile{puvnenc.def} + [2006/08/16 v6.75c + Hyperref: Additions to puenc.def for VnTeX] +\DeclareTextCommand{\abreve}{PU}{\81\003} +\DeclareTextCommand{\acircumflex}{PU}{\80\342} +\DeclareTextCommand{\dj}{PU}{\81\021} +\DeclareTextCommand{\ecircumflex}{PU}{\80\352} +\DeclareTextCommand{\ocircumflex}{PU}{\80\364} +\DeclareTextCommand{\ohorn}{PU}{\81\241} +\DeclareTextCommand{\uhorn}{PU}{\81\260} +\DeclareTextCommand{\ABREVE}{PU}{\81\002} +\DeclareTextCommand{\ACIRCUMFLEX}{PU}{\80\302} +\DeclareTextCommand{\DJ}{PU}{\81\020} +\DeclareTextCommand{\ECIRCUMFLEX}{PU}{\80\312} +\DeclareTextCommand{\OCIRCUMFLEX}{PU}{\80\324} +\DeclareTextCommand{\OHORN}{PU}{\81\240} +\DeclareTextCommand{\UHORN}{PU}{\81\257} +\DeclareTextCompositeCommand{\'}{PU}{a}{\80\341} +\DeclareTextCompositeCommand{\d}{PU}{a}{\9036\241} +\DeclareTextCompositeCommand{\`}{PU}{a}{\80\340} +\DeclareTextCompositeCommand{\h}{PU}{a}{\9036\243} +\DeclareTextCompositeCommand{\~}{PU}{a}{\80\343} +\DeclareTextCompositeCommand{\'}{PU}{\abreve}{\9036\257} +\DeclareTextCompositeCommand{\d}{PU}{\abreve}{\9036\267} +\DeclareTextCompositeCommand{\`}{PU}{\abreve}{\9036\261} +\DeclareTextCompositeCommand{\h}{PU}{\abreve}{\9036\263} +\DeclareTextCompositeCommand{\~}{PU}{\abreve}{\9036\265} +\DeclareTextCompositeCommand{\'}{PU}{\acircumflex}{\9036\245} +\DeclareTextCompositeCommand{\d}{PU}{\acircumflex}{\9036\255} +\DeclareTextCompositeCommand{\`}{PU}{\acircumflex}{\9036\247} +\DeclareTextCompositeCommand{\h}{PU}{\acircumflex}{\9036\251} +\DeclareTextCompositeCommand{\~}{PU}{\acircumflex}{\9036\253} +\DeclareTextCompositeCommand{\'}{PU}{e}{\80\351} +\DeclareTextCompositeCommand{\d}{PU}{e}{\9036\271} +\DeclareTextCompositeCommand{\`}{PU}{e}{\80\350} +\DeclareTextCompositeCommand{\h}{PU}{e}{\9036\273} +\DeclareTextCompositeCommand{\~}{PU}{e}{\9036\275} +\DeclareTextCompositeCommand{\'}{PU}{\ecircumflex}{\9036\277} +\DeclareTextCompositeCommand{\d}{PU}{\ecircumflex}{\9036\307} +\DeclareTextCompositeCommand{\`}{PU}{\ecircumflex}{\9036\301} +\DeclareTextCompositeCommand{\h}{PU}{\ecircumflex}{\9036\303} +\DeclareTextCompositeCommand{\~}{PU}{\ecircumflex}{\9036\305} +\DeclareTextCompositeCommand{\'}{PU}{i}{\80\355} +\DeclareTextCompositeCommand{\d}{PU}{i}{\9036\313} +\DeclareTextCompositeCommand{\`}{PU}{i}{\80\354} +\DeclareTextCompositeCommand{\h}{PU}{i}{\9036\311} +\DeclareTextCompositeCommand{\~}{PU}{i}{\81\051} +\DeclareTextCompositeCommand{\'}{PU}{o}{\80\363} +\DeclareTextCompositeCommand{\d}{PU}{o}{\9036\315} +\DeclareTextCompositeCommand{\`}{PU}{o}{\80\362} +\DeclareTextCompositeCommand{\h}{PU}{o}{\9036\317} +\DeclareTextCompositeCommand{\~}{PU}{o}{\80\365} +\DeclareTextCompositeCommand{\'}{PU}{\ocircumflex}{\9036\321} +\DeclareTextCompositeCommand{\d}{PU}{\ocircumflex}{\9036\331} +\DeclareTextCompositeCommand{\`}{PU}{\ocircumflex}{\9036\323} +\DeclareTextCompositeCommand{\h}{PU}{\ocircumflex}{\9036\325} +\DeclareTextCompositeCommand{\~}{PU}{\ocircumflex}{\9036\327} +\DeclareTextCompositeCommand{\'}{PU}{\ohorn}{\9036\333} +\DeclareTextCompositeCommand{\d}{PU}{\ohorn}{\9036\343} +\DeclareTextCompositeCommand{\`}{PU}{\ohorn}{\9036\335} +\DeclareTextCompositeCommand{\h}{PU}{\ohorn}{\9036\337} +\DeclareTextCompositeCommand{\~}{PU}{\ohorn}{\9036\341} +\DeclareTextCompositeCommand{\'}{PU}{u}{\80\372} +\DeclareTextCompositeCommand{\d}{PU}{u}{\9036\345} +\DeclareTextCompositeCommand{\`}{PU}{u}{\80\371} +\DeclareTextCompositeCommand{\h}{PU}{u}{\9036\347} +\DeclareTextCompositeCommand{\~}{PU}{u}{\81\151} +\DeclareTextCompositeCommand{\'}{PU}{\uhorn}{\9036\351} +\DeclareTextCompositeCommand{\d}{PU}{\uhorn}{\9036\361} +\DeclareTextCompositeCommand{\`}{PU}{\uhorn}{\9036\353} +\DeclareTextCompositeCommand{\h}{PU}{\uhorn}{\9036\355} +\DeclareTextCompositeCommand{\~}{PU}{\uhorn}{\9036\357} +\DeclareTextCompositeCommand{\'}{PU}{y}{\80\375} +\DeclareTextCompositeCommand{\d}{PU}{y}{\9036\365} +\DeclareTextCompositeCommand{\`}{PU}{y}{\9036\363} +\DeclareTextCompositeCommand{\h}{PU}{y}{\9036\367} +\DeclareTextCompositeCommand{\~}{PU}{y}{\9036\371} +\DeclareTextCompositeCommand{\'}{PU}{A}{\80\301} +\DeclareTextCompositeCommand{\d}{PU}{A}{\9036\240} +\DeclareTextCompositeCommand{\`}{PU}{A}{\80\300} +\DeclareTextCompositeCommand{\h}{PU}{A}{\9036\242} +\DeclareTextCompositeCommand{\~}{PU}{A}{\80\303} +\DeclareTextCompositeCommand{\'}{PU}{\ABREVE}{\9036\256} +\DeclareTextCompositeCommand{\d}{PU}{\ABREVE}{\9036\266} +\DeclareTextCompositeCommand{\`}{PU}{\ABREVE}{\9036\260} +\DeclareTextCompositeCommand{\h}{PU}{\ABREVE}{\9036\262} +\DeclareTextCompositeCommand{\~}{PU}{\ABREVE}{\9036\264} +\DeclareTextCompositeCommand{\'}{PU}{\ACIRCUMFLEX}{\9036\244} +\DeclareTextCompositeCommand{\d}{PU}{\ACIRCUMFLEX}{\9036\254} +\DeclareTextCompositeCommand{\`}{PU}{\ACIRCUMFLEX}{\9036\246} +\DeclareTextCompositeCommand{\h}{PU}{\ACIRCUMFLEX}{\9036\250} +\DeclareTextCompositeCommand{\~}{PU}{\ACIRCUMFLEX}{\9036\252} +\DeclareTextCompositeCommand{\'}{PU}{E}{\80\311} +\DeclareTextCompositeCommand{\d}{PU}{E}{\9036\270} +\DeclareTextCompositeCommand{\`}{PU}{E}{\80\310} +\DeclareTextCompositeCommand{\h}{PU}{E}{\9036\272} +\DeclareTextCompositeCommand{\~}{PU}{E}{\9036\274} +\DeclareTextCompositeCommand{\'}{PU}{\ECIRCUMFLEX}{\9036\276} +\DeclareTextCompositeCommand{\d}{PU}{\ECIRCUMFLEX}{\9036\306} +\DeclareTextCompositeCommand{\`}{PU}{\ECIRCUMFLEX}{\9036\300} +\DeclareTextCompositeCommand{\h}{PU}{\ECIRCUMFLEX}{\9036\302} +\DeclareTextCompositeCommand{\~}{PU}{\ECIRCUMFLEX}{\9036\304} +\DeclareTextCompositeCommand{\'}{PU}{I}{\80\315} +\DeclareTextCompositeCommand{\d}{PU}{I}{\9036\312} +\DeclareTextCompositeCommand{\`}{PU}{I}{\80\314} +\DeclareTextCompositeCommand{\h}{PU}{I}{\9036\310} +\DeclareTextCompositeCommand{\~}{PU}{I}{\81\050} +\DeclareTextCompositeCommand{\'}{PU}{O}{\80\323} +\DeclareTextCompositeCommand{\d}{PU}{O}{\9036\314} +\DeclareTextCompositeCommand{\`}{PU}{O}{\80\322} +\DeclareTextCompositeCommand{\h}{PU}{O}{\9036\316} +\DeclareTextCompositeCommand{\~}{PU}{O}{\80\325} +\DeclareTextCompositeCommand{\'}{PU}{\OCIRCUMFLEX}{\9036\320} +\DeclareTextCompositeCommand{\d}{PU}{\OCIRCUMFLEX}{\9036\330} +\DeclareTextCompositeCommand{\`}{PU}{\OCIRCUMFLEX}{\9036\322} +\DeclareTextCompositeCommand{\h}{PU}{\OCIRCUMFLEX}{\9036\324} +\DeclareTextCompositeCommand{\~}{PU}{\OCIRCUMFLEX}{\9036\326} +\DeclareTextCompositeCommand{\'}{PU}{\OHORN}{\9036\332} +\DeclareTextCompositeCommand{\d}{PU}{\OHORN}{\9036\342} +\DeclareTextCompositeCommand{\`}{PU}{\OHORN}{\9036\334} +\DeclareTextCompositeCommand{\h}{PU}{\OHORN}{\9036\336} +\DeclareTextCompositeCommand{\~}{PU}{\OHORN}{\9036\340} +\DeclareTextCompositeCommand{\'}{PU}{U}{\80\332} +\DeclareTextCompositeCommand{\d}{PU}{U}{\9036\344} +\DeclareTextCompositeCommand{\`}{PU}{U}{\80\331} +\DeclareTextCompositeCommand{\h}{PU}{U}{\9036\346} +\DeclareTextCompositeCommand{\~}{PU}{U}{\81\150} +\DeclareTextCompositeCommand{\'}{PU}{\UHORN}{\9036\350} +\DeclareTextCompositeCommand{\d}{PU}{\UHORN}{\9036\360} +\DeclareTextCompositeCommand{\`}{PU}{\UHORN}{\9036\352} +\DeclareTextCompositeCommand{\h}{PU}{\UHORN}{\9036\354} +\DeclareTextCompositeCommand{\~}{PU}{\UHORN}{\9036\356} +\DeclareTextCompositeCommand{\'}{PU}{Y}{\80\335} +\DeclareTextCompositeCommand{\d}{PU}{Y}{\9036\364} +\DeclareTextCompositeCommand{\`}{PU}{Y}{\9036\362} +\DeclareTextCompositeCommand{\h}{PU}{Y}{\9036\366} +\DeclareTextCompositeCommand{\~}{PU}{Y}{\9036\370} +\endinput +%% +%% End of file `puvnenc.def'. -- cgit v1.2.3