From 21d48443cf41d93582f2b299b10ed2edb65e5814 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 26 Sep 2012 22:30:07 +0000 Subject: hyperref (26sep12) git-svn-id: svn://tug.org/texlive/trunk@27817 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/hyperref/ChangeLog | 4 + Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf | Bin 173044 -> 173183 bytes Master/texmf-dist/doc/latex/hyperref/README | 17 ++- Master/texmf-dist/doc/latex/hyperref/README.pdf | Bin 114508 -> 115802 bytes Master/texmf-dist/doc/latex/hyperref/backref.pdf | Bin 169374 -> 169374 bytes Master/texmf-dist/doc/latex/hyperref/hyperref.pdf | Bin 2351777 -> 2356173 bytes Master/texmf-dist/doc/latex/hyperref/nameref.pdf | Bin 162450 -> 162450 bytes .../texmf-dist/source/latex/hyperref/hyperref.dtx | 127 +++++++++++++-------- Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def | 4 +- Master/texmf-dist/tex/latex/hyperref/hdvips.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hdvipson.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hdviwind.def | 4 +- Master/texmf-dist/tex/latex/hyperref/hpdftex.def | 2 +- Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg | 2 +- Master/texmf-dist/tex/latex/hyperref/htex4ht.def | 2 +- Master/texmf-dist/tex/latex/hyperref/htexture.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hvtex.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hxetex.def | 4 +- Master/texmf-dist/tex/latex/hyperref/hyperref.sty | 118 +++++++++++-------- Master/texmf-dist/tex/latex/hyperref/hypertex.def | 2 +- .../texmf-dist/tex/latex/hyperref/nohyperref.sty | 2 +- Master/texmf-dist/tex/latex/hyperref/pd1enc.def | 2 +- Master/texmf-dist/tex/latex/hyperref/pdfmark.def | 4 +- Master/texmf-dist/tex/latex/hyperref/psdextra.def | 2 +- Master/texmf-dist/tex/latex/hyperref/puarenc.def | 2 +- Master/texmf-dist/tex/latex/hyperref/puenc.def | 2 +- Master/texmf-dist/tex/latex/hyperref/puvnenc.def | 2 +- 29 files changed, 194 insertions(+), 120 deletions(-) diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog b/Master/texmf-dist/doc/latex/hyperref/ChangeLog index 33a443217ef..0471cdbc0b1 100644 --- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog +++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog @@ -1,3 +1,7 @@ +2012-09-26 6.83f Heiko Oberdiek + * 6.83f + * Option `customdriver' added. + 2012-09-24 6.83e Heiko Oberdiek * 6.83e * Fix for \hyper@link@. diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf index df9199a6bf8..e23c58810fd 100644 Binary files a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf and b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf differ diff --git a/Master/texmf-dist/doc/latex/hyperref/README b/Master/texmf-dist/doc/latex/hyperref/README index 443833347a6..8351e4f7c38 100644 --- a/Master/texmf-dist/doc/latex/hyperref/README +++ b/Master/texmf-dist/doc/latex/hyperref/README @@ -1,4 +1,4 @@ -README for hyperref bundle, 2012/08/20 +README for hyperref bundle, 2012/09/26 TABLE OF CONTENTS @@ -183,8 +183,19 @@ other packages: 5 NEW FEATURES ============== -Option `psdextra ----------------- +Option `customdriver' +--------------------- + The value of option `customdriver' is the name of an external + driver file without extension `.def'. The file must have + \ProvidesFile with a version date and number that match the + date and number of `hyperref', otherwise a warning is given. + + Because the interface, what needs to be defined in the driver, + is not well defined and quite messy, the option is mainly intended + to ease developing, testing, debugging the driver part. + +Option `psdextra' +----------------- LaTeX's NFSS is used to assist the conversion of arbitrary TeX strings to PDF strings (bookmarks, PDF information entries). Many math command names (\geq, \notin, ...) are not in control diff --git a/Master/texmf-dist/doc/latex/hyperref/README.pdf b/Master/texmf-dist/doc/latex/hyperref/README.pdf index 37a792bce7f..53ae508d50c 100644 Binary files a/Master/texmf-dist/doc/latex/hyperref/README.pdf and b/Master/texmf-dist/doc/latex/hyperref/README.pdf differ diff --git a/Master/texmf-dist/doc/latex/hyperref/backref.pdf b/Master/texmf-dist/doc/latex/hyperref/backref.pdf index f11797a3ea9..a6144e4ed27 100644 Binary files a/Master/texmf-dist/doc/latex/hyperref/backref.pdf and b/Master/texmf-dist/doc/latex/hyperref/backref.pdf differ diff --git a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf index b42e58bb5e9..6b454a8d110 100644 Binary files a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf and b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf differ diff --git a/Master/texmf-dist/doc/latex/hyperref/nameref.pdf b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf index d4b911dac5b..62ce7c4fc4f 100644 Binary files a/Master/texmf-dist/doc/latex/hyperref/nameref.pdf and b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf differ diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx index c8751aaecee..4c935817ce1 100644 --- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx @@ -45,7 +45,7 @@ %\ProvidesFile{puvnenc.def} %\ProvidesFile{puarenc.def} %\ProvidesFile{psdextra.def} -% [2012/09/24 v6.83e % +% [2012/09/26 v6.83f % % Hypertext links for LaTeX] % Dummy hyperref (SR)] % Hyperref documentation driver file] @@ -147,7 +147,7 @@ \end{document} % % \fi -% \CheckSum{39290} +% \CheckSum{39329} % % \MakeShortVerb{|} % \StopEventually{} @@ -670,11 +670,21 @@ \x{ }\z{#1}% \ifx\y\z \else - \Hy@Error{% - Version mismatch!\MessageBreak - * \y: hyperref.sty\MessageBreak - * \z: #1% - }\@ehd + \edef\a{#1}% + \edef\b{\HyOpt@CustomDriver.def}% + \ifx\a\b + \Hy@WarningNoLine{% + Version mismatch (custom driver)!\MessageBreak + * \y: hyperref.sty\MessageBreak + * \z: \a + }% + \else + \Hy@Error{% + Version mismatch!\MessageBreak + * \y: hyperref.sty\MessageBreak + * \z: \a + }\@ehd + \fi \fi }% }% @@ -5476,6 +5486,20 @@ } % \end{macrocode} % +% \begin{macrocode} +\let\HyOpt@CustomDriver\ltx@empty +\define@key{Hyp}{customdriver}{% + \IfFileExists{#1.def}{% + \def\HyOpt@CustomDriver{#1}% + }{% + \Hy@Warning{% + Missing driver file `#1.def',\MessageBreak + ignoring custom driver% + }% + }% +} +% \end{macrocode} +% % \section{Options to add extra features}\label{features} % Make included figures (assuming they use the standard graphics % package) be hypertext links. Off by default. Needs more work. @@ -7141,62 +7165,67 @@ % If the driver is not given, find the right driver or % use the default driver. % \begin{macrocode} - \def\HyOpt@DriverType{}% - \ifx\Hy@driver\@empty - \def\HyOpt@DriverType{ (autodetected)}% - \providecommand*{\Hy@defaultdriver}{hypertex}% - \ifpdf - \def\Hy@driver{hpdftex}% - \else - \ifxetex - \def\Hy@driver{hxetex}% + \let\HyOpt@DriverType\ltx@empty + \ifx\HyOpt@CustomDriver\ltx@empty + \ifx\Hy@driver\@empty + \def\HyOpt@DriverType{ (autodetected)}% + \providecommand*{\Hy@defaultdriver}{hypertex}% + \ifpdf + \def\Hy@driver{hpdftex}% \else - \ifvtexhtml - \def\Hy@driver{hvtexhtm}% - \def\MaybeStopEarly{% - \Hy@Message{Stopped early}% - \Hy@AtBeginDocument{% - \PDF@FinishDoc - \gdef\PDF@FinishDoc{}% - }% - \endinput - }% + \ifxetex + \def\Hy@driver{hxetex}% \else - \ifvtexpdf - \def\Hy@driver{hvtex}% + \ifvtexhtml + \def\Hy@driver{hvtexhtm}% + \def\MaybeStopEarly{% + \Hy@Message{Stopped early}% + \Hy@AtBeginDocument{% + \PDF@FinishDoc + \gdef\PDF@FinishDoc{}% + }% + \endinput + }% \else - \ifvtexps + \ifvtexpdf \def\Hy@driver{hvtex}% \else - \ifx\HyOpt@DriverFallback\ltx@empty - \let\Hy@driver\Hy@defaultdriver - \def\HyOpt@DriverType{ (default)}% + \ifvtexps + \def\Hy@driver{hvtex}% \else - \begingroup - \toks@\expandafter{\HyOpt@DriverFallback}% - \edef\x{\endgroup - \noexpand\kvsetkeys{Hyp}{\the\toks@}% - }% - \x - \ifx\Hy@driver\ltx@empty + \ifx\HyOpt@DriverFallback\ltx@empty \let\Hy@driver\Hy@defaultdriver \def\HyOpt@DriverType{ (default)}% \else - \def\HyOpt@DriverType{ (fallback)}% + \begingroup + \toks@\expandafter{\HyOpt@DriverFallback}% + \edef\x{\endgroup + \noexpand\kvsetkeys{Hyp}{\the\toks@}% + }% + \x + \ifx\Hy@driver\ltx@empty + \let\Hy@driver\Hy@defaultdriver + \def\HyOpt@DriverType{ (default)}% + \else + \def\HyOpt@DriverType{ (fallback)}% + \fi \fi \fi \fi \fi \fi \fi - \fi - \ifx\Hy@driver\Hy@defaultdriver - \def\Hy@temp{hdviwind}% - \ifx\Hy@temp\Hy@driver - \kvsetkeys{Hyp}{colorlinks}% - \PassOptionsToPackage{dviwindo}{color}% + \ifx\Hy@driver\Hy@defaultdriver + \def\Hy@temp{hdviwind}% + \ifx\Hy@temp\Hy@driver + \kvsetkeys{Hyp}{colorlinks}% + \PassOptionsToPackage{dviwindo}{color}% + \fi \fi \fi + \else + \def\HyOpt@DriverType{ (custom)}% + \let\Hy@driver\HyOpt@CustomDriver \fi \Hy@Message{Driver\HyOpt@DriverType: \Hy@driver}% \chardef\Hy@VersionChecked=0 % @@ -7223,6 +7252,8 @@ \Hy@DisableOption{latex2html}% \Hy@DisableOption{ps2pdf}% \Hy@DisableOption{xetex}% + \Hy@DisableOption{driverfallback}% + \Hy@DisableOption{customdriver}% \Hy@DisableOption{pdfversion}% } % \end{macrocode} @@ -10223,10 +10254,10 @@ % % \begin{macro}{\Hy@PutCatalog} % \begin{macrocode} -%\def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}} +%\def\Hy@PutCatalog#1{\@pdfm@mark{docview <<#1>>}} %<*pdfmarkbase> \def\Hy@PutCatalog#1{% - \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} << #1 >>}}% + \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} <<#1>>}}% } % % \end{macrocode} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def index bbed49f09e6..cb9b5345841 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def @@ -29,10 +29,10 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipdfm.def} - [2012/09/24 v6.83e % + [2012/09/26 v6.83f % Hyperref driver for dvipdfm] \Hy@VersionCheck{hdvipdfm.def} -\def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}} +\def\Hy@PutCatalog#1{\@pdfm@mark{docview <<#1>>}} \ifHy@pdfpagelabels \def\HyPL@StorePageLabel#1{% \if@filesw diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def index a4b5a24e886..b6b20be26e4 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvips.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvips.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvips.def} - [2012/09/24 v6.83e % + [2012/09/26 v6.83f % Hyperref driver for dvips] \Hy@VersionCheck{hdvips.def} \providecommand*{\XR@ext}{pdf} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def index efe5f197cbb..c5f40f9bb3e 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipson.def} - [2012/09/24 v6.83e % + [2012/09/26 v6.83f % Hyperref driver for dvipsone] \Hy@VersionCheck{hdvipson.def} \providecommand*{\XR@ext}{pdf} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def index cb35299bb56..0436ae099e8 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdviwind.def} - [2012/09/24 v6.83e % + [2012/09/26 v6.83f % Hyperref driver for dviwindo] \Hy@VersionCheck{hdviwind.def} \begingroup @@ -51,7 +51,7 @@ }% \endgroup \def\Hy@PutCatalog#1{% - \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} << #1 >>}}% + \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} <<#1>>}}% } \ifHy@pdfpagelabels \def\HyPL@StorePageLabel#1{% diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def index b85e949f008..028c836ddbf 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hpdftex.def} - [2012/09/24 v6.83e % + [2012/09/26 v6.83f % Hyperref driver for pdfTeX] \Hy@VersionCheck{hpdftex.def} \pdf@ifdraftmode{% diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg index ab259d2b658..1ff79531a2a 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.cfg} - [2012/09/24 v6.83e % + [2012/09/26 v6.83f % 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 23ba00aa1af..e536ff00a45 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.def} - [2012/09/24 v6.83e % + [2012/09/26 v6.83f % Hyperref driver for TeX4ht] \Hy@VersionCheck{htex4ht.def} \providecommand*{\XR@ext}{html} diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def index 31bdb78c678..368e0b08f05 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htexture.def +++ b/Master/texmf-dist/tex/latex/hyperref/htexture.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htexture.def} - [2012/09/24 v6.83e % + [2012/09/26 v6.83f % Hyperref driver for Textures] \Hy@VersionCheck{htexture.def} \providecommand*{\XR@ext}{pdf} diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def index ca73df30a96..3ec72e1a8ad 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtex.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtex.def} - [2012/09/24 v6.83e % + [2012/09/26 v6.83f % Hyperref driver for VTeX in PDF/PS mode] \Hy@VersionCheck{hvtex.def} \providecommand*{\XR@ext}{pdf} diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def index 6741be7597c..36e9bc43c4a 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexhtml.def} - [2012/09/24 v6.83e % + [2012/09/26 v6.83f % Hyperref driver for VTeX in HTML mode] \Hy@VersionCheck{hvtexhtm.def} \providecommand*{\XR@ext}{htm} diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def index bb0c07de6f8..0e8e233e210 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexmrk.def} - [2012/09/24 v6.83e % + [2012/09/26 v6.83f % Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)] \Hy@VersionCheck{hvtexmrk.def} \providecommand*{\XR@ext}{pdf} diff --git a/Master/texmf-dist/tex/latex/hyperref/hxetex.def b/Master/texmf-dist/tex/latex/hyperref/hxetex.def index 9edcff45528..e85547ad240 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hxetex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hxetex.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hxetex.def} - [2012/09/24 v6.83e % + [2012/09/26 v6.83f % Hyperref driver for XeTeX] \Hy@VersionCheck{hxetex.def} \HyPsd@LoadUnicode @@ -67,7 +67,7 @@ \fi } \let\HyXeTeX@CheckUnicode\relax -\def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}} +\def\Hy@PutCatalog#1{\@pdfm@mark{docview <<#1>>}} \ifHy@pdfpagelabels \def\HyPL@StorePageLabel#1{% \if@filesw diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index 068bc4e3ae2..51ccd75dcc1 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty @@ -30,7 +30,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{hyperref} - [2012/09/24 v6.83e % + [2012/09/26 v6.83f % Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -167,11 +167,21 @@ \x{ }\z{#1}% \ifx\y\z \else - \Hy@Error{% - Version mismatch!\MessageBreak - * \y: hyperref.sty\MessageBreak - * \z: #1% - }\@ehd + \edef\a{#1}% + \edef\b{\HyOpt@CustomDriver.def}% + \ifx\a\b + \Hy@WarningNoLine{% + Version mismatch (custom driver)!\MessageBreak + * \y: hyperref.sty\MessageBreak + * \z: \a + }% + \else + \Hy@Error{% + Version mismatch!\MessageBreak + * \y: hyperref.sty\MessageBreak + * \z: \a + }\@ehd + \fi \fi }% }% @@ -3078,6 +3088,17 @@ }% \fi } +\let\HyOpt@CustomDriver\ltx@empty +\define@key{Hyp}{customdriver}{% + \IfFileExists{#1.def}{% + \def\HyOpt@CustomDriver{#1}% + }{% + \Hy@Warning{% + Missing driver file `#1.def',\MessageBreak + ignoring custom driver% + }% + }% +} \define@key{Hyp}{hyperfigures}[true]{% \Hy@boolkey{hyperfigures}{#1}% } @@ -4390,62 +4411,67 @@ \fi \fi \fi - \def\HyOpt@DriverType{}% - \ifx\Hy@driver\@empty - \def\HyOpt@DriverType{ (autodetected)}% - \providecommand*{\Hy@defaultdriver}{hypertex}% - \ifpdf - \def\Hy@driver{hpdftex}% - \else - \ifxetex - \def\Hy@driver{hxetex}% + \let\HyOpt@DriverType\ltx@empty + \ifx\HyOpt@CustomDriver\ltx@empty + \ifx\Hy@driver\@empty + \def\HyOpt@DriverType{ (autodetected)}% + \providecommand*{\Hy@defaultdriver}{hypertex}% + \ifpdf + \def\Hy@driver{hpdftex}% \else - \ifvtexhtml - \def\Hy@driver{hvtexhtm}% - \def\MaybeStopEarly{% - \Hy@Message{Stopped early}% - \Hy@AtBeginDocument{% - \PDF@FinishDoc - \gdef\PDF@FinishDoc{}% - }% - \endinput - }% + \ifxetex + \def\Hy@driver{hxetex}% \else - \ifvtexpdf - \def\Hy@driver{hvtex}% + \ifvtexhtml + \def\Hy@driver{hvtexhtm}% + \def\MaybeStopEarly{% + \Hy@Message{Stopped early}% + \Hy@AtBeginDocument{% + \PDF@FinishDoc + \gdef\PDF@FinishDoc{}% + }% + \endinput + }% \else - \ifvtexps + \ifvtexpdf \def\Hy@driver{hvtex}% \else - \ifx\HyOpt@DriverFallback\ltx@empty - \let\Hy@driver\Hy@defaultdriver - \def\HyOpt@DriverType{ (default)}% + \ifvtexps + \def\Hy@driver{hvtex}% \else - \begingroup - \toks@\expandafter{\HyOpt@DriverFallback}% - \edef\x{\endgroup - \noexpand\kvsetkeys{Hyp}{\the\toks@}% - }% - \x - \ifx\Hy@driver\ltx@empty + \ifx\HyOpt@DriverFallback\ltx@empty \let\Hy@driver\Hy@defaultdriver \def\HyOpt@DriverType{ (default)}% \else - \def\HyOpt@DriverType{ (fallback)}% + \begingroup + \toks@\expandafter{\HyOpt@DriverFallback}% + \edef\x{\endgroup + \noexpand\kvsetkeys{Hyp}{\the\toks@}% + }% + \x + \ifx\Hy@driver\ltx@empty + \let\Hy@driver\Hy@defaultdriver + \def\HyOpt@DriverType{ (default)}% + \else + \def\HyOpt@DriverType{ (fallback)}% + \fi \fi \fi \fi \fi \fi \fi - \fi - \ifx\Hy@driver\Hy@defaultdriver - \def\Hy@temp{hdviwind}% - \ifx\Hy@temp\Hy@driver - \kvsetkeys{Hyp}{colorlinks}% - \PassOptionsToPackage{dviwindo}{color}% + \ifx\Hy@driver\Hy@defaultdriver + \def\Hy@temp{hdviwind}% + \ifx\Hy@temp\Hy@driver + \kvsetkeys{Hyp}{colorlinks}% + \PassOptionsToPackage{dviwindo}{color}% + \fi \fi \fi + \else + \def\HyOpt@DriverType{ (custom)}% + \let\Hy@driver\HyOpt@CustomDriver \fi \Hy@Message{Driver\HyOpt@DriverType: \Hy@driver}% \chardef\Hy@VersionChecked=0 % @@ -4472,6 +4498,8 @@ \Hy@DisableOption{latex2html}% \Hy@DisableOption{ps2pdf}% \Hy@DisableOption{xetex}% + \Hy@DisableOption{driverfallback}% + \Hy@DisableOption{customdriver}% \Hy@DisableOption{pdfversion}% } \newif\ifHy@DvipdfmxOutlineOpen diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def index a0c47d3e022..8c3a28f9033 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hypertex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hypertex.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hypertex.def} - [2012/09/24 v6.83e % + [2012/09/26 v6.83f % Hyperref driver for HyperTeX specials] \Hy@VersionCheck{hypertex.def} \providecommand*{\XR@ext}{dvi} diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty index 530ee64d2a2..7167dccdbde 100644 --- a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty @@ -30,7 +30,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{nohyperref} - [2012/09/24 v6.83e % + [2012/09/26 v6.83f % Dummy hyperref (SR)] \RequirePackage{letltxmacro}[2008/06/13] \let\hyper@@anchor\@gobble diff --git a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def index 93635e9e95b..3b78f65db92 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def +++ b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{pd1enc.def} - [2012/09/24 v6.83e % + [2012/09/26 v6.83f % Hyperref: PDFDocEncoding definition (HO)] \DeclareFontEncoding{PD1}{}{} \DeclareTextAccent{\`}{PD1}{\textasciigrave} diff --git a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def index ffafcfbf618..b25a0938911 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def +++ b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{pdfmark.def} - [2012/09/24 v6.83e % + [2012/09/26 v6.83f % Hyperref definitions for pdfmark specials] \Hy@VersionCheck{pdfmark.def} \begingroup @@ -51,7 +51,7 @@ }% \endgroup \def\Hy@PutCatalog#1{% - \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} << #1 >>}}% + \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} <<#1>>}}% } \ifHy@pdfpagelabels \def\HyPL@StorePageLabel#1{% diff --git a/Master/texmf-dist/tex/latex/hyperref/psdextra.def b/Master/texmf-dist/tex/latex/hyperref/psdextra.def index 30912c2c1a0..79299ff643e 100644 --- a/Master/texmf-dist/tex/latex/hyperref/psdextra.def +++ b/Master/texmf-dist/tex/latex/hyperref/psdextra.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{psdextra.def} - [2012/09/24 v6.83e % + [2012/09/26 v6.83f % Hyperref: Additions to PDF string support] \Hy@VersionCheck{psdextra.def} \newcommand*{\psdmapshortnames}{% diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def index 01ceb164664..9e1ec058949 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puarenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puarenc.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puarenc.def} - [2012/09/24 v6.83e % + [2012/09/26 v6.83f % Hyperref: Additions to puenc.def for Arabi] \DeclareTextCommand{\hamza}{PU}{\86\041}% U+0621 \DeclareTextCommand{\alefmadda}{PU}{\86\042}% U+0622 diff --git a/Master/texmf-dist/tex/latex/hyperref/puenc.def b/Master/texmf-dist/tex/latex/hyperref/puenc.def index 675bd605ba3..6d98fedacbf 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puenc.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puenc.def} - [2012/09/24 v6.83e % + [2012/09/26 v6.83f % Hyperref: PDF Unicode definition (HO)] \DeclareFontEncoding{PU}{}{} \DeclareTextCommand{\`}{PU}[1]{#1\83\000}% U+0300 diff --git a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def index b9f24b6f527..39064e58304 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puvnenc.def} - [2012/09/24 v6.83e % + [2012/09/26 v6.83f % Hyperref: Additions to puenc.def for VnTeX] \DeclareTextCommand{\abreve}{PU}{\81\003}% U+0103 \DeclareTextCommand{\acircumflex}{PU}{\80\342}% U+00E2 -- cgit v1.2.3