diff options
author | Reinhard Kotucha <reinhard.kotucha@web.de> | 2006-11-25 02:47:53 +0000 |
---|---|---|
committer | Reinhard Kotucha <reinhard.kotucha@web.de> | 2006-11-25 02:47:53 +0000 |
commit | 3fb855993d6d0ee9af990996bf992779eacf6f06 (patch) | |
tree | 322c55873fc8a6c8d13850542b03d2c2a45ab8c5 /Master/texmf-dist/tex/latex/hyperref | |
parent | 8d4a45330da890439f235db469c686f076e3ff3f (diff) |
updated.
git-svn-id: svn://tug.org/texlive/trunk@2515 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/hyperref')
18 files changed, 119 insertions, 48 deletions
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def index 60b09fef316..a3a61c0eaf7 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/09/06 v6.75e + [2006/11/15 v6.75g Hyperref driver for dvipdfm] \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}} \ifHy@pagelabels @@ -282,6 +282,10 @@ \else /NonFullScreenPageMode\@pdfnonfullscreenpagemode \fi + \ifx\@pdfprintscaling\@empty + \else + /PrintScaling\@pdfprintscaling + \fi }% \Hy@pstringdef\Hy@pstringB{\@baseurl}% \@pdfm@mark{% @@ -847,8 +851,12 @@ \fi \ifHy@bookmarksnumbered \let\numberline\Hy@numberline + \let\partnumberline\Hy@numberline + \let\chapternumberline\Hy@numberline \else \let\numberline\@gobble + \let\partnumberline\@gobble + \let\chapternumberline\@gobble \fi \pdfstringdef\Hy@tempa{#2}% \if@filesw diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def index ab4db3e79d0..57864547898 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/09/06 v6.75e + [2006/11/15 v6.75g 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 de1dc873049..3b07f190cb8 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/09/06 v6.75e + [2006/11/15 v6.75g Hyperref driver for dvipsone] \providecommand\@pdfborder{0 0 65781} \providecommand*\@pdfborderstyle{} @@ -82,6 +82,10 @@ \else /NonFullScreenPageMode\@pdfnonfullscreenpagemode \fi + \ifx\@pdfprintscaling\@empty + \else + /PrintScaling\@pdfprintscaling + \fi }% \Hy@pstringdef\Hy@pstringB{\@baseurl}% \pdfmark{% diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def index b53735711f7..32607f5ff5d 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/09/06 v6.75e + [2006/11/15 v6.75g Hyperref driver for dviwindo] \def\Hy@PutCatalog#1{% \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} << #1 >>}}% @@ -284,6 +284,10 @@ \else /NonFullScreenPageMode\@pdfnonfullscreenpagemode \fi + \ifx\@pdfprintscaling\@empty + \else + /PrintScaling\@pdfprintscaling + \fi }% \pdfmark{pdfmark=/PUT, Raw={% diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def index fce78f422d9..075252877b8 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/09/06 v6.75e + [2006/11/15 v6.75g Hyperref driver for pdfTeX] \let\Hy@PutCatalog\pdfcatalog \ifHy@pagelabels @@ -297,6 +297,10 @@ \else /NonFullScreenPageMode\@pdfnonfullscreenpagemode \fi + \ifx\@pdfprintscaling\@empty + \else + /PrintScaling\@pdfprintscaling + \fi }% \pdfcatalog{% \ifx\Hy@temp\@empty @@ -1006,8 +1010,12 @@ \fi \ifHy@bookmarksnumbered \let\numberline\Hy@numberline + \let\partnumberline\Hy@numberline + \let\chapternumberline\Hy@numberline \else \let\numberline\@gobble + \let\partnumberline\@gobble + \let\chapternumberline\@gobble \fi \pdfstringdef\Hy@tempa{#2}% \if@filesw diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg index 2ed4ffad13a..083e9414806 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/09/06 v6.75e + [2006/11/15 v6.75g 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 b02f1445596..90a9be2d7f9 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/09/06 v6.75e + [2006/11/15 v6.75g 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 33ba6c4f57e..40cdf6b840c 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/09/06 v6.75e + [2006/11/15 v6.75g 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 96d48a48c51..255736fdbff 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/09/06 v6.75e + [2006/11/15 v6.75g Hyperref driver for VTeX in PDF/PS mode] \edef\Hy@VTeXversion{% \ifx\VTeXversion\@undefined @@ -432,6 +432,10 @@ \else /NonFullScreenPageMode\@pdfnonfullscreenpagemode \fi + \ifx\@pdfprintscaling\@empty + \else + /PrintScaling\@pdfprintscaling + \fi >>>}% \ifx\pdf@pagelayout\@empty \else @@ -505,8 +509,12 @@ \fi \ifHy@bookmarksnumbered \let\numberline\Hy@numberline + \let\partnumberline\Hy@numberline + \let\chapternumberline\Hy@numberline \else \let\numberline\@gobble + \let\partnumberline\@gobble + \let\chapternumberline\@gobble \fi \pdfstringdef\Hy@tempa{#2}% \if@filesw diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def index 625dfe3dfff..94d58578a4e 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/09/06 v6.75e + [2006/11/15 v6.75g 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 b1f00c32cb7..322d232fddb 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/09/06 v6.75e + [2006/11/15 v6.75g 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 06a25c32f74..224b058bbf1 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/09/06 v6.75e + [2006/11/15 v6.75g Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -186,6 +186,8 @@ \Hy@pagecounter0 \long\def\Hy@ReturnAfterElseFi#1\else#2\fi{\fi#1} \long\def\Hy@ReturnAfterFi#1\fi{\fi#1} +\def\Hy@safe@activestrue{\csname safe@activestrue\endcsname} +\def\Hy@safe@activesfalse{\csname safe@activesfalse\endcsname} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname dimexpr\endcsname\relax \def\hypercalcbpdef#1#2{% @@ -1223,6 +1225,9 @@ \fi }% \fi +\@ifclassloaded{memoir}{% + \AtEndOfPackage{\RequirePackage{memhfixc}}% +}{} \@ifpackageloaded{subfigure}{% \@ifundefined{sub@label}{% \Hy@hypertexnamesfalse @@ -1909,7 +1914,7 @@ } \def\Hy@bordercolor#1#2#3{% \begingroup - \csname @safe@activestrue\endcsname + \Hy@safe@activestrue \@ifundefined{XC@edef}{\edef}{\XC@edef}\x{#2}% \expandafter\Hy@CheckColorSpec\x#3#3\@nil{#1}{#2}% } @@ -1957,7 +1962,15 @@ \ifx\Hy@tempa\@empty \let\@pdfnonfullscreenpagemode\@empty \else - \def\@pdfnonfullscreenpagemode{/#1 }% + \def\@pdfnonfullscreenpagemode{/#1}% + \fi +} +\define@key{Hyp}{pdfprintscaling}{% + \def\Hy@tempa{#1}% + \ifx\Hy@tempa\@empty + \let\@pdfprintscaling\@empty + \else + \def\@pdfprintscaling{/#1}% \fi } \define@key{Hyp}{pdfusetitle}[true]{% @@ -2030,6 +2043,7 @@ \def\@pdfhighlight{/I} \def\@pdfpagemode{} \def\@pdfnonfullscreenpagemode{} +\def\@pdfprintscaling{} \def\@pdftitle{} \def\@pdfauthor{} \let\@pdfproducer\relax @@ -2326,14 +2340,14 @@ \providecommand*\@safe@activestrue{}% \providecommand*\@safe@activesfalse{}% \def\T@ref#1{% - \@safe@activestrue + \Hy@safe@activestrue \expandafter\@setref\csname r@#1\endcsname\@firstoffive{#1}% - \@safe@activesfalse + \Hy@safe@activesfalse }% \def\T@pageref#1{% - \@safe@activestrue + \Hy@safe@activestrue \expandafter\@setref\csname r@#1\endcsname\@secondoffive{#1}% - \@safe@activesfalse + \Hy@safe@activesfalse }% \else \ifHy@typexml\else\RequirePackage{nameref}\fi @@ -2384,7 +2398,7 @@ \let\textasciitilde\hyper@tilde \let\\\@backslashchar \edef${\string$} - \ifx\@safe@activestrue\@undefined\else\@safe@activestrue\fi + \Hy@safe@activestrue \hyper@n@rmalise } \catcode`\#=6 @@ -2441,7 +2455,7 @@ } \def\Hy@babelnormalise#1[#2]{% \begingroup - \csname @safe@activestrue\endcsname + \Hy@safe@activestrue \edef\Hy@tempa{% \endgroup \noexpand#1[{#2}]% @@ -2499,7 +2513,7 @@ \def\hyper@link@[#1]#2#3#4{% \begingroup \protected@edef\Hy@tempa{#2}% - \csname @safe@activestrue\endcsname + \Hy@safe@activestrue \edef\x{#3}% \ifx\Hy@tempa\@empty \toks0{\hyper@link{#1}}% @@ -2937,6 +2951,7 @@ \Hy@DisableOption{pdfpagescrop}% \Hy@DisableOption{pdfpagemode}% \Hy@DisableOption{pdfnonfullscreenpagemode}% + \Hy@DisableOption{pdfprintscaling}% \Hy@DisableOption{pdfstartview}% \Hy@DisableOption{pdfstartpage}% \Hy@DisableOption{pdftoolbar}% @@ -4506,49 +4521,65 @@ \fi } \def\@refstar#1{% - \@safe@activestrue + \Hy@safe@activestrue \expandafter\real@setref\csname r@#1\endcsname\@firstoffive{#1}% - \@safe@activesfalse + \Hy@safe@activesfalse } \def\@pagerefstar#1{% - \@safe@activestrue + \Hy@safe@activestrue \expandafter\real@setref\csname r@#1\endcsname\@secondoffive{#1}% - \@safe@activesfalse + \Hy@safe@activesfalse } -\DeclareRobustCommand\autoref[1]{% - \@safe@activestrue - \expandafter\auto@setref\csname r@#1\endcsname\@firstoffive{#1}% - \@safe@activesfalse +\DeclareRobustCommand\autoref{% + \@ifstar{\HyRef@autoref\@gobbletwo}{\HyRef@autoref\hyper@@link}% +} +\def\HyRef@autoref#1#2{% + \begingroup + \Hy@safe@activestrue + \expandafter\HyRef@autosetref\csname r@#2\endcsname{#2}{#1}% + \endgroup } -\def\auto@setref#1#2#3{% csname, extract group, refname +\def\HyRef@autosetref#1#2#3{% link command, csname, refname \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}% + \edef\HyRef@thisref{\expandafter\@fourthoffive#1\@empty\@empty\@empty}% + \expandafter\HyRef@testreftype\HyRef@thisref\\% + \Hy@safe@activesfalse + #3{% + \expandafter\@fifthoffive#1% + }{% + \expandafter\@fourthoffive#1\@empty\@empty\@empty + }{% + \HyRef@currentHtag + \expandafter\@firstoffive#1\@empty\@empty\@empty + \null + }% \else \protect\G@refundefinedtrue \nfss@text{\reset@font\bfseries ??}% \@latex@warning{% - Reference `#3' on page \thepage \space undefined% + Reference `#2' on page \thepage\space undefined% }% \fi } -\def\test@reftype#1.#2\\{% +\def\HyRef@testreftype#1.#2\\{% \@ifundefined{#1autorefname}{% \@ifundefined{#1name}{% - \def\@currentHtag{}% + \def\HyRef@currentHtag{}% \@latex@warning{no tag name for #1 at \the\inputlineno}% }{% - \def\@currentHtag{\csname#1name\endcsname~}% + \edef\HyRef@currentHtag{% + \expandafter\noexpand\csname#1name\endcsname + \noexpand~% + }% }% }{% - \def\@currentHtag{\csname#1autorefname\endcsname~}% + \edef\HyRef@currentHtag{% + \expandafter\noexpand\csname#1autorefname\endcsname + \noexpand~% + }% }% } -\def\@currentHtag{} +\def\HyRef@currentHtag{} \providecommand\AMSautorefname{\equationautorefname} \providecommand\Hfootnoteautorefname{\footnoteautorefname} \providecommand\Itemautorefname{\itemautorefname} diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def index 26782a47799..bac744122dc 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/09/06 v6.75e + [2006/11/15 v6.75g 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 e155c9cc20f..a24add7f645 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/09/06 v6.75e + [2006/11/15 v6.75g 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 b1f9f1c485c..48a41f49946 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/09/06 v6.75e + [2006/11/15 v6.75g 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 17a5704e774..dbd4fe3a774 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/09/06 v6.75e + [2006/11/15 v6.75g Hyperref definitions for pdfmark specials] \def\Hy@PutCatalog#1{% \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} << #1 >>}}% @@ -336,6 +336,10 @@ \else /NonFullScreenPageMode\@pdfnonfullscreenpagemode \fi + \ifx\@pdfprintscaling\@empty + \else + /PrintScaling\@pdfprintscaling + \fi }% \Hy@pstringdef\Hy@pstringB{\@baseurl}% \pdfmark{% @@ -1160,8 +1164,12 @@ \fi \ifHy@bookmarksnumbered \let\numberline\Hy@numberline + \let\partnumberline\Hy@numberline + \let\chapternumberline\Hy@numberline \else \let\numberline\@gobble + \let\partnumberline\@gobble + \let\chapternumberline\@gobble \fi \pdfstringdef\Hy@tempa{#2}% \if@filesw diff --git a/Master/texmf-dist/tex/latex/hyperref/puenc.def b/Master/texmf-dist/tex/latex/hyperref/puenc.def index a1cba42161e..ab5c8870808 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/09/06 v6.75e + [2006/11/15 v6.75g 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 03f78547c7c..94ec4887f02 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/09/06 v6.75e + [2006/11/15 v6.75g Hyperref: Additions to puenc.def for VnTeX] \DeclareTextCommand{\abreve}{PU}{\81\003} \DeclareTextCommand{\acircumflex}{PU}{\80\342} |