diff options
Diffstat (limited to 'Master/texmf-dist/tex')
18 files changed, 322 insertions, 98 deletions
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def index a3a61c0eaf7..a8690a7e94e 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipdfm.def} - [2006/11/15 v6.75g + [2006/11/30 v6.75h Hyperref driver for dvipdfm] \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}} \ifHy@pagelabels @@ -278,13 +278,25 @@ \ifHy@fitwindow /FitWindow true\fi \ifHy@centerwindow /CenterWindow true\fi \ifHy@displaydoctitle /DisplayDocTitle true\fi - \ifx\@pdfnonfullscreenpagemode\@empty + \Hy@UseNameKey{NonFullScreenPageMode}\@pdfnonfullscreenpagemode + \Hy@UseNameKey{Direction}\@pdfdirection + \Hy@UseNameKey{ViewArea}\@pdfviewarea + \Hy@UseNameKey{ViewClip}\@pdfviewclip + \Hy@UseNameKey{PrintArea}\@pdfprintarea + \Hy@UseNameKey{PrintClip}\@pdfprintclip + \Hy@UseNameKey{PrintScaling}\@pdfprintscaling + \Hy@UseNameKey{Duplex}\@pdfduplex + \ifx\@pdfpicktraybypdfsize\@empty \else - /NonFullScreenPageMode\@pdfnonfullscreenpagemode + /PickTrayByPDFSize \@pdfpicktraybypdfsize \fi - \ifx\@pdfprintscaling\@empty + \ifx\@pdfprintpagerange\@empty \else - /PrintScaling\@pdfprintscaling + /PrintPageRange[\@pdfprintpagerange]% + \fi + \ifx\@pdfnumcopies\@empty + \else + /NumCopies \@pdfnumcopies \fi }% \Hy@pstringdef\Hy@pstringB{\@baseurl}% @@ -298,14 +310,15 @@ \else /URI<</Base(\Hy@pstringB)>>% \fi - /PageMode \@pdfpagemode + /PageMode/\@pdfpagemode \ifx\Hy@temp\@empty \else /ViewerPreferences<<\Hy@temp>>% \fi - \ifx\pdf@pagelayout\@empty + \Hy@UseNameKey{PageLayout}\@pdfpagelayout + \ifx\@pdflang\@empty \else - /PageLayout/\pdf@pagelayout\space + /Lang(\@pdflang)% \fi >>% }% diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def index 57864547898..61ada6a17b0 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvips.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvips.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvips.def} - [2006/11/15 v6.75g + [2006/11/30 v6.75h Hyperref driver for dvips] \input{pdfmark.def}% \ifx\@pdfproducer\relax diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def index 3b07f190cb8..e87f8460830 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipson.def} - [2006/11/15 v6.75g + [2006/11/30 v6.75h Hyperref driver for dvipsone] \providecommand\@pdfborder{0 0 65781} \providecommand*\@pdfborderstyle{} @@ -65,7 +65,7 @@ pdfmark=/DOCVIEW, Page=\@pdfstartpage, View=\@pdfstartview, - PageMode=\@pdfpagemode + PageMode=/\@pdfpagemode }% \ifx\@pdfpagescrop\@empty \else @@ -78,13 +78,25 @@ \ifHy@fitwindow /FitWindow true\fi \ifHy@centerwindow /CenterWindow true\fi \ifHy@displaydoctitle /DisplayDocTitle true\fi - \ifx\@pdfnonfullscreenpagemode\@empty + \Hy@UseNameKey{NonFullScreenPageMode}\@pdfnonfullscreenpagemode + \Hy@UseNameKey{Direction}\@pdfdirection + \Hy@UseNameKey{ViewArea}\@pdfviewarea + \Hy@UseNameKey{ViewClip}\@pdfviewclip + \Hy@UseNameKey{PrintArea}\@pdfprintarea + \Hy@UseNameKey{PrintClip}\@pdfprintclip + \Hy@UseNameKey{PrintScaling}\@pdfprintscaling + \Hy@UseNameKey{Duplex}\@pdfduplex + \ifx\@pdfpicktraybypdfsize\@empty \else - /NonFullScreenPageMode\@pdfnonfullscreenpagemode + /PickTrayByPDFSize \@pdfpicktraybypdfsize \fi - \ifx\@pdfprintscaling\@empty + \ifx\@pdfprintpagerange\@empty \else - /PrintScaling\@pdfprintscaling + /PrintPageRange[\@pdfprintpagerange]% + \fi + \ifx\@pdfnumcopies\@empty + \else + /NumCopies \@pdfnumcopies \fi }% \Hy@pstringdef\Hy@pstringB{\@baseurl}% @@ -96,9 +108,10 @@ \else /ViewerPreferences<<\Hy@temp>>% \fi - \ifx\pdf@pagelayout\@empty + \Hy@UseNameKey{PageLayout}\@pdfpagelayout + \ifx\@pdflang\@empty \else - /PageLayout /\pdf@pagelayout\space + /Lang(\@pdflang)% \fi \ifx\@baseurl\@empty \else diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def index 32607f5ff5d..ddbfa047a90 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdviwind.def} - [2006/11/15 v6.75g + [2006/11/30 v6.75h Hyperref driver for dviwindo] \def\Hy@PutCatalog#1{% \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} << #1 >>}}% @@ -267,7 +267,7 @@ \pdfmark{pdfmark=/DOCVIEW, Page=\@pdfstartpage, View=\@pdfstartview, - PageMode=\@pdfpagemode + PageMode=/\@pdfpagemode }% \ifx\@pdfpagescrop\@empty \else @@ -280,13 +280,25 @@ \ifHy@fitwindow /FitWindow true\fi \ifHy@centerwindow /CenterWindow true\fi \ifHy@displaydoctitle /DisplayDocTitle true\fi - \ifx\@pdfnonfullscreenpagemode\@empty + \Hy@UseNameKey{NonFullScreenPageMode}\@pdfnonfullscreenpagemode + \Hy@UseNameKey{Direction}\@pdfdirection + \Hy@UseNameKey{ViewArea}\@pdfviewarea + \Hy@UseNameKey{ViewClip}\@pdfviewclip + \Hy@UseNameKey{PrintArea}\@pdfprintarea + \Hy@UseNameKey{PrintClip}\@pdfprintclip + \Hy@UseNameKey{PrintScaling}\@pdfprintscaling + \Hy@UseNameKey{Duplex}\@pdfduplex + \ifx\@pdfpicktraybypdfsize\@empty \else - /NonFullScreenPageMode\@pdfnonfullscreenpagemode + /PickTrayByPDFSize \@pdfpicktraybypdfsize \fi - \ifx\@pdfprintscaling\@empty + \ifx\@pdfprintpagerange\@empty \else - /PrintScaling\@pdfprintscaling + /PrintPageRange[\@pdfprintpagerange]% + \fi + \ifx\@pdfnumcopies\@empty + \else + /NumCopies \@pdfnumcopies \fi }% \pdfmark{pdfmark=/PUT, @@ -296,9 +308,10 @@ \else /ViewerPreferences<<\Hy@temp>>% \fi - \ifx\pdf@pagelayout\@empty + \Hy@UseNameKey{PageLayout}\@pdfpagelayout + \ifx\@pdflang\@empty \else - /PageLayout /\pdf@pagelayout\space + /Lang(\@pdflang)% \fi >>% }% @@ -455,7 +468,14 @@ \define@key{PDF}{Dir}{\pdf@addtoks{(#1)}{Dir}} \define@key{PDF}{File}{\pdf@addtoks{(#1)}{File}} \define@key{PDF}{Flags}{\pdf@addtoks{#1}{Flags}} -\define@key{PDF}{AcroHighlight}{\pdf@addtoks{#1}{H}} +\define@key{PDF}{AcroHighlight}{% + \begingroup + \edef\x{#1}% + \expandafter\endgroup\ifx\x\@empty + \else + \pdf@addtoks{#1}{H}% + \fi +} \define@key{PDF}{ID}{\pdf@addtoks{[#1]}{ID}} \define@key{PDF}{MacFile}{\pdf@addtoks{(#1)}{MacFile}} \define@key{PDF}{ModDate}{\pdf@addtoks{(#1)}{ModDate}} diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def index 075252877b8..e29e3b7da92 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hpdftex.def} - [2006/11/15 v6.75g + [2006/11/30 v6.75h Hyperref driver for pdfTeX] \let\Hy@PutCatalog\pdfcatalog \ifHy@pagelabels @@ -121,7 +121,10 @@ \fi \Hy@StartlinkName{% \Hy@setpdfborder - /H\@pdfhighlight + \ifx\@pdfhighlight\@empty + \else + /H\@pdfhighlight + \fi /C[\CurrentBorderColor]% }\Hy@testname \expandafter\Hy@colorlink\csname @#1color\endcsname @@ -150,7 +153,10 @@ \pdfstartlink attr{% \Hy@setpdfborder - /H\@pdfhighlight + \ifx\@pdfhightlight\@empty + \else + /H\@pdfhighlight + \fi /C[\@urlbordercolor]% }% user{% @@ -174,7 +180,10 @@ \pdfstartlink attr{% \Hy@setpdfborder - /H\@pdfhighlight + \ifx\@pdfhighlight\@empty + \else + /H\@pdfhighlight + \fi /C[\@filebordercolor]% }% user {% @@ -203,7 +212,10 @@ \pdfstartlink attr{% \Hy@setpdfborder - /H\@pdfhighlight + \ifx\@pdfhighlight\@empty + \else + /H\@pdfhighlight + \fi /C[\@runbordercolor]% }% user {% @@ -276,7 +288,7 @@ \fi \Hy@pstringdef\Hy@pstringB{\@baseurl}% \pdfcatalog{% - /PageMode\@pdfpagemode + /PageMode/\@pdfpagemode \ifx\@baseurl\@empty \else /URI<</Base(\Hy@pstringB)>>% @@ -293,13 +305,25 @@ \ifHy@fitwindow /FitWindow true\fi \ifHy@centerwindow /CenterWindow true\fi \ifHy@displaydoctitle /DisplayDocTitle true\fi - \ifx\@pdfnonfullscreenpagemode\@empty + \Hy@UseNameKey{NonFullScreenPageMode}\@pdfnonfullscreenpagemode + \Hy@UseNameKey{Direction}\@pdfdirection + \Hy@UseNameKey{ViewArea}\@pdfviewarea + \Hy@UseNameKey{ViewClip}\@pdfviewclip + \Hy@UseNameKey{PrintArea}\@pdfprintarea + \Hy@UseNameKey{PrintClip}\@pdfprintclip + \Hy@UseNameKey{PrintScaling}\@pdfprintscaling + \Hy@UseNameKey{Duplex}\@pdfduplex + \ifx\@pdfpicktraybypdfsize\@empty + \else + /PickTrayByPDFSize \@pdfpicktraybypdfsize + \fi + \ifx\@pdfprintpagerange\@empty \else - /NonFullScreenPageMode\@pdfnonfullscreenpagemode + /PrintPageRange[\@pdfprintpagerange]% \fi - \ifx\@pdfprintscaling\@empty + \ifx\@pdfnumcopies\@empty \else - /PrintScaling\@pdfprintscaling + /NumCopies \@pdfnumcopies \fi }% \pdfcatalog{% @@ -307,9 +331,10 @@ \else /ViewerPreferences<<\Hy@temp>>% \fi - \ifx\pdf@pagelayout\@empty + \Hy@UseNameKey{PageLayout}\@pdfpagelayout + \ifx\@pdflang\@empty \else - /PageLayout/\pdf@pagelayout + /Lang(\@pdflang)% \fi }% } @@ -470,7 +495,10 @@ \pdfstartlink attr{% \Hy@setpdfborder - /H \@pdfhighlight + \ifx\@pdfhighlight\@empty + \else + /H\@pdfhighlight + \fi /C[\@menubordercolor]% }% user{ diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg index 083e9414806..2386eaa010d 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.cfg} - [2006/11/15 v6.75g + [2006/11/30 v6.75h 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 90a9be2d7f9..fc91c67e315 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.def} - [2006/11/15 v6.75g + [2006/11/30 v6.75h Hyperref driver for TeX4ht] \@ifpackageloaded{tex4ht} {\typeout{hyperref tex4ht: tex4ht already loaded}}% diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def index 40cdf6b840c..059e3a2bb8c 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htexture.def +++ b/Master/texmf-dist/tex/latex/hyperref/htexture.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htexture.def} - [2006/11/15 v6.75g + [2006/11/30 v6.75h Hyperref driver for Textures] \begingroup \obeylines % diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def index 255736fdbff..c609002476c 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtex.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtex.def} - [2006/11/15 v6.75g + [2006/11/30 v6.75h Hyperref driver for VTeX in PDF/PS mode] \edef\Hy@VTeXversion{% \ifx\VTeXversion\@undefined @@ -416,7 +416,7 @@ \special{!pdfinfo b=<\@pdfpagescrop>}% \fi \special{!onopen Page\@pdfstartpage}% - \special{!pdfinfo p=<\@pdfpagemode>}% + \special{!pdfinfo p=</\@pdfpagemode>}% \ifx\@baseurl\@empty \else \special{!pdfinfo u=<<</Base (\@baseurl)>>>}% @@ -428,18 +428,30 @@ \ifHy@fitwindow /FitWindow true\fi \ifHy@centerwindow /CenterWindow true\fi \ifHy@displaydoctitle /DisplayDocTitle true\fi - \ifx\@pdfnonfullscreenpagemode\@empty + \Hy@UseNameKey{NonFullScreenPageMode}\@pdfnonfullscreenpagemode + \Hy@UseNameKey{Direction}\@pdfdirection + \Hy@UseNameKey{ViewArea}\@pdfviewarea + \Hy@UseNameKey{ViewClip}\@pdfviewclip + \Hy@UseNameKey{PrintArea}\@pdfprintarea + \Hy@UseNameKey{PrintClip}\@pdfprintclip + \Hy@UseNameKey{PrintScaling}\@pdfprintscaling + \Hy@UseNameKey{Duplex}\@pdfduplex + \ifx\@pdfpicktraybypdfsize\@empty \else - /NonFullScreenPageMode\@pdfnonfullscreenpagemode + /PickTrayByPDFSize \@pdfpicktraybypdfsize \fi - \ifx\@pdfprintscaling\@empty + \ifx\@pdfprintpagerange\@empty \else - /PrintScaling\@pdfprintscaling + /PrintPageRange[\@pdfprintpagerange]% + \fi + \ifx\@pdfnumcopies\@empty + \else + /NumCopies \@pdfnumcopies \fi >>>}% - \ifx\pdf@pagelayout\@empty + \ifx\@pdfpagelayout\@empty \else - \special{!pdfinfo l=</\pdf@pagelayout\space>}% + \special{!pdfinfo l=</\@pdfpagelayout\space>}% \fi }% \def\PDF@FinishDoc{% diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def index 94d58578a4e..3c1dfce76f9 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexhtml.def} - [2006/11/15 v6.75g + [2006/11/30 v6.75h 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 322d232fddb..3b3554fd8d6 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexmrk.def} - [2006/11/15 v6.75g + [2006/11/30 v6.75h Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)] \input{pdfmark.def}% \ifx\@pdfproducer\relax diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index 224b058bbf1..192a17e954b 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hyperref} - [2006/11/15 v6.75g + [2006/11/30 v6.75h Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -1372,6 +1372,54 @@ setting the option has no effect% }% } +\def\Hy@CheckOptionValue#1#2#3{% + \begingroup + \edef\x{#1}% + \@onelevel@sanitize\x + \let\y=y% + \def\do##1##2{% + \def\z{##1}% + \@onelevel@sanitize\z + \ifx\x\z + \let\y=n% + \let\do\@gobbletwo + \fi + }% + #3% + \ifx\y y% + \def\do##1##2{% + * `##1'% + \ifx\\##2\\\else\space(##2)\fi + \MessageBreak + }% + \Hy@Warning{% + Values of option `#2':\MessageBreak + #3% + * An empty value disables the option.\MessageBreak + Unknown value `\x'% + }% + \fi + \endgroup +} +\def\Hy@DefNameKey#1{% + \expandafter\Hy@@DefNameKey\csname @#1\endcsname{#1}% +} +\def\Hy@@DefNameKey#1#2#3{% + \define@key{Hyp}{#2}{% + \edef#1{##1}% + \ifx#1\@empty + \else + \Hy@CheckOptionValue{##1}{#2}{#3}% + \fi + }% + \let#1\@empty +} +\def\Hy@UseNameKey#1#2{% + \ifx#2\@empty + \else + /#1/#2% + \fi +} \define@key{Hyp}{implicit}[true]{% \Hy@boolkey{implicit}{#1}% } @@ -1937,6 +1985,12 @@ \fi } \define@key{Hyp}{pdfhighlight}{\def\@pdfhighlight{#1}} +\Hy@DefNameKey{pdfhighlight}{% + \do{/I}{Invert}% + \do{/N}{None}% + \do{/O}{Outline}% + \do{/P}{Push}% +} \define@key{Hyp}{pdfborder}{\def\@pdfborder{#1}} \define@key{Hyp}{pdfborderstyle}{\def\@pdfborderstyle{#1}} \def\Hy@setpdfborder{% @@ -1949,29 +2003,75 @@ /BS<<\@pdfborderstyle>>% \fi } -\define@key{Hyp}{pdfpagemode}{% - \def\Hy@tempa{#1}% - \ifx\Hy@tempa\@empty - \let\@pdfpagemode\@empty - \else - \def\@pdfpagemode{/#1 }% - \fi -} -\define@key{Hyp}{pdfnonfullscreenpagemode}{% - \def\Hy@tempa{#1}% - \ifx\Hy@tempa\@empty - \let\@pdfnonfullscreenpagemode\@empty - \else - \def\@pdfnonfullscreenpagemode{/#1}% - \fi -} -\define@key{Hyp}{pdfprintscaling}{% - \def\Hy@tempa{#1}% - \ifx\Hy@tempa\@empty - \let\@pdfprintscaling\@empty - \else - \def\@pdfprintscaling{/#1}% - \fi +\Hy@DefNameKey{pdfpagemode}{% + \do{UseNone}{}% + \do{UseOutlines}{}% + \do{UseThumbs}{}% + \do{FullScreen}{}% + \do{UseOC}{PDF 1.5}% + \do{UseAttachments}{PDF 1.6}% +} +\Hy@DefNameKey{pdfnonfullscreenpagemode}{% + \do{UseNone}{}% + \do{UseOutlines}{}% + \do{UseThumbs}{}% + \do{FullScreen}{}% + \do{UseOC}{PDF 1.5}% + \do{UseAttachments}{PDF 1.6}% +} +\Hy@DefNameKey{pdfdirection}{% + \do{L2R}{Left to right}% + \do{R2L}{Right to left}% +} +\Hy@DefNameKey{pdfviewarea}{% + \do{MediaBox}{}% + \do{CropBox}{}% + \do{BleedBox}{}% + \do{TrimBox}{}% + \do{ArtBox}{}% +} +\Hy@DefNameKey{pdfviewclip}{% + \do{MediaBox}{}% + \do{CropBox}{}% + \do{BleedBox}{}% + \do{TrimBox}{}% + \do{ArtBox}{}% +} +\Hy@DefNameKey{pdfprintarea}{% + \do{MediaBox}{}% + \do{CropBox}{}% + \do{BleedBox}{}% + \do{TrimBox}{}% + \do{ArtBox}{}% +} +\Hy@DefNameKey{pdfprintclip}{% + \do{MediaBox}{}% + \do{CropBox}{}% + \do{BleedBox}{}% + \do{TrimBox}{}% + \do{ArtBox}{}% +} +\Hy@DefNameKey{pdfprintscaling}{% + \do{AppDefault}{}% + \do{None}{}% +} +\Hy@DefNameKey{pdfduplex}{% + \do{Simplex}{}% + \do{DuplexFlipShortEdge}{}% + \do{DuplexFlipLongEdge}{}% +} +\Hy@DefNameKey{pdfpicktraybypdfsize}{% + \do{true}{}% + \do{false}{}% +} +\define@key{Hyp}{pdfprintpagerange}{% + \def\@pdfprintpagerange{#1}% +} +\Hy@DefNameKey{pdfnumcopies}{% + \do{2}{two copies}% + \do{3}{three copies}% + \do{4}{four copies}% + \do{5}{five copies}% } \define@key{Hyp}{pdfusetitle}[true]{% \Hy@boolkey[pdfusetitle]{usetitle}{#1}% @@ -2025,8 +2125,17 @@ \define@key{Hyp}{pdfnewwindow}[true]{% \Hy@boolkey[pdfnewwindow]{newwindow}{#1}% } -\define@key{Hyp}{pdfpagelayout}{\def\pdf@pagelayout{#1}} -\def\pdf@pagelayout{} +\Hy@DefNameKey{pdfpagelayout}{% + \do{SinglePage}{}% + \do{OneColumn}{}% + \do{TwoColumnLeft}{}% + \do{TwoColumnRight}{}% + \do{TwoPageLeft}{PDF 1.5}% + \do{TwoPageRight}{PDF 1.5}% +} +\define@key{Hyp}{pdflang}{% + \def\@pdflang{#1}% +} \define@key{Hyp}{pdfpagelabels}[true]{% \Hy@boolkey[pdfpagelabels]{pagelabels}{#1}% } @@ -2041,9 +2150,6 @@ \def\@citebordercolor{0 1 0} \def\@pagebordercolor{1 1 0} \def\@pdfhighlight{/I} -\def\@pdfpagemode{} -\def\@pdfnonfullscreenpagemode{} -\def\@pdfprintscaling{} \def\@pdftitle{} \def\@pdfauthor{} \let\@pdfproducer\relax @@ -2055,6 +2161,8 @@ \def\@pdfpagescrop{} \def\@pdfstartview{ /Fit } \def\@pdfstartpage{1} +\def\@pdfprintpagerange{} +\def\@pdflang{} \let\PDF@SetupDoc\@empty \let\PDF@FinishDoc\@empty \let\phantomsection\@empty @@ -2172,7 +2280,7 @@ \AtBeginDocument{% \let\autoref\ref \ifx\@pdfpagemode\@empty - \gdef\@pdfpagemode{/UseNone}% + \gdef\@pdfpagemode{UseNone}% \fi \global\Hy@backreffalse }% @@ -2286,7 +2394,7 @@ \ifHy@bookmarks \Hy@Info{Bookmarks ON}% \ifx\@pdfpagemode\@empty - \def\@pdfpagemode{/UseOutlines }% + \def\@pdfpagemode{UseOutlines}% \fi \else \def\@bookmarkopenstatus#1{}% @@ -2296,7 +2404,7 @@ \global\let\WriteBookmarks\relax } \ifx\@pdfpagemode\@empty - \def\@pdfpagemode{/UseNone}% + \def\@pdfpagemode{UseNone}% \fi \fi \Hy@DisableOption{bookmarks} @@ -2951,7 +3059,16 @@ \Hy@DisableOption{pdfpagescrop}% \Hy@DisableOption{pdfpagemode}% \Hy@DisableOption{pdfnonfullscreenpagemode}% + \Hy@DisableOption{pdfdirection}% + \Hy@DisableOption{pdfviewarea}% + \Hy@DisableOption{pdfviewclip}% + \Hy@DisableOption{pdfprintarea}% + \Hy@DisableOption{pdfprintclip}% \Hy@DisableOption{pdfprintscaling}% + \Hy@DisableOption{pdfduplex}% + \Hy@DisableOption{pdfpicktraybypdfsize}% + \Hy@DisableOption{pdfprintpagerange}% + \Hy@DisableOption{pdfnumcopies}% \Hy@DisableOption{pdfstartview}% \Hy@DisableOption{pdfstartpage}% \Hy@DisableOption{pdftoolbar}% @@ -2961,6 +3078,7 @@ \Hy@DisableOption{pdfcenterwindow}% \Hy@DisableOption{pdfdisplaydoctitle}% \Hy@DisableOption{pdfpagelayout}% + \Hy@DisableOption{pdflang}% \Hy@DisableOption{baseurl}% \ifHy@texht\else\hyper@anchorstart{Doc-Start}\hyper@anchorend\fi \Hy@pdfstringfalse diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def index bac744122dc..48be5f06212 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hypertex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hypertex.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hypertex.def} - [2006/11/15 v6.75g + [2006/11/30 v6.75h Hyperref driver for HyperTeX specials] \def\PDF@FinishDoc{} \def\PDF@SetupDoc{% diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty index a24add7f645..ed05c1e8776 100644 --- a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{nohyperref} - [2006/11/15 v6.75g + [2006/11/30 v6.75h 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 48a41f49946..33bde84708d 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def +++ b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{pd1enc.def} - [2006/11/15 v6.75g + [2006/11/30 v6.75h Hyperref: PDFDocEncoding definition (HO)] \DeclareFontEncoding{PD1}{}{} \DeclareTextCommand{\textLF}{PD1}{\012} % line feed diff --git a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def index dbd4fe3a774..9afd0e7b9dd 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def +++ b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{pdfmark.def} - [2006/11/15 v6.75g + [2006/11/30 v6.75h Hyperref definitions for pdfmark specials] \def\Hy@PutCatalog#1{% \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} << #1 >>}}% @@ -319,7 +319,7 @@ pdfmark=/DOCVIEW,% Page=\@pdfstartpage,% View=\@pdfstartview,% - PageMode=\@pdfpagemode + PageMode=/\@pdfpagemode }% \ifx\@pdfpagescrop\@empty \else @@ -332,13 +332,25 @@ \ifHy@fitwindow /FitWindow true\fi \ifHy@centerwindow /CenterWindow true\fi \ifHy@displaydoctitle /DisplayDocTitle true\fi - \ifx\@pdfnonfullscreenpagemode\@empty + \Hy@UseNameKey{NonFullScreenPageMode}\@pdfnonfullscreenpagemode + \Hy@UseNameKey{Direction}\@pdfdirection + \Hy@UseNameKey{ViewArea}\@pdfviewarea + \Hy@UseNameKey{ViewClip}\@pdfviewclip + \Hy@UseNameKey{PrintArea}\@pdfprintarea + \Hy@UseNameKey{PrintClip}\@pdfprintclip + \Hy@UseNameKey{PrintScaling}\@pdfprintscaling + \Hy@UseNameKey{Duplex}\@pdfduplex + \ifx\@pdfpicktraybypdfsize\@empty \else - /NonFullScreenPageMode\@pdfnonfullscreenpagemode + /PickTrayByPDFSize \@pdfpicktraybypdfsize \fi - \ifx\@pdfprintscaling\@empty + \ifx\@pdfprintpagerange\@empty \else - /PrintScaling\@pdfprintscaling + /PrintPageRange[\@pdfprintpagerange]% + \fi + \ifx\@pdfnumcopies\@empty + \else + /NumCopies \@pdfnumcopies \fi }% \Hy@pstringdef\Hy@pstringB{\@baseurl}% @@ -350,9 +362,10 @@ \else /ViewerPreferences<<\Hy@temp>>% \fi - \ifx\pdf@pagelayout\@empty + \Hy@UseNameKey{PageLayout}\@pdfpagelayout + \ifx\@pdflang\@empty \else - /PageLayout /\pdf@pagelayout\space + /Lang(\@pdflang)% \fi \ifx\@baseurl\@empty \else @@ -481,7 +494,14 @@ \define@key{PDF}{Dir}{\pdf@addtoks{(#1)}{Dir}} \define@key{PDF}{File}{\pdf@addtoks{(#1)}{File}} \define@key{PDF}{Flags}{\pdf@addtoks{#1}{Flags}} -\define@key{PDF}{AcroHighlight}{\pdf@addtoks{#1}{H}} +\define@key{PDF}{AcroHighlight}{% + \begingroup + \edef\x{#1}% + \expandafter\endgroup\ifx\x\@empty + \else + \pdf@addtoks{#1}{H}% + \fi +} \define@key{PDF}{ID}{\pdf@addtoks{[#1]}{ID}} \define@key{PDF}{MacFile}{\pdf@addtoks{(#1)}{MacFile}} \define@key{PDF}{ModDate}{\pdf@addtoks{(#1)}{ModDate}} diff --git a/Master/texmf-dist/tex/latex/hyperref/puenc.def b/Master/texmf-dist/tex/latex/hyperref/puenc.def index ab5c8870808..8d824410a60 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puenc.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puenc.def} - [2006/11/15 v6.75g + [2006/11/30 v6.75h Hyperref: PDF Unicode definition (HO)] \DeclareFontEncoding{PU}{}{} \DeclareTextCommand{\textLF}{PU}{\80\012} % line feed diff --git a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def index 94ec4887f02..29c86e7db23 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puvnenc.def} - [2006/11/15 v6.75g + [2006/11/30 v6.75h Hyperref: Additions to puenc.def for VnTeX] \DeclareTextCommand{\abreve}{PU}{\81\003} \DeclareTextCommand{\acircumflex}{PU}{\80\342} |