From 8291b74ec6f858e3536a5919b74386a7df1dcc24 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 8 Dec 2006 00:19:37 +0000 Subject: hyperref update (4dec06) git-svn-id: svn://tug.org/texlive/trunk@2629 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/hyperref/ChangeLog | 10 + Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf | Bin 265391 -> 266026 bytes Master/texmf-dist/doc/latex/hyperref/README | 15 + Master/texmf-dist/doc/latex/hyperref/README.pdf | Bin 250551 -> 252042 bytes Master/texmf-dist/doc/latex/hyperref/hyperref.pdf | Bin 2860351 -> 2914694 bytes Master/texmf-dist/doc/latex/hyperref/manual.html | 1082 ++++++++++++-------- Master/texmf-dist/doc/latex/hyperref/manual.pdf | Bin 443903 -> 444918 bytes Master/texmf-dist/doc/latex/hyperref/manual2.html | 2 +- Master/texmf-dist/doc/latex/hyperref/manual3.html | 2 +- Master/texmf-dist/doc/latex/hyperref/options.pdf | Bin 43157 -> 43452 bytes .../source/latex/hyperref/doc/manual.tex | 24 + .../source/latex/hyperref/doc/options.tex | 10 + .../texmf-dist/source/latex/hyperref/hyperref.dtx | 408 ++++++-- Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def | 29 +- Master/texmf-dist/tex/latex/hyperref/hdvips.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hdvipson.def | 29 +- Master/texmf-dist/tex/latex/hyperref/hdviwind.def | 38 +- Master/texmf-dist/tex/latex/hyperref/hpdftex.def | 54 +- 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 | 28 +- Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hyperref.sty | 182 +++- 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 | 38 +- Master/texmf-dist/tex/latex/hyperref/puenc.def | 2 +- Master/texmf-dist/tex/latex/hyperref/puvnenc.def | 2 +- Master/texmf-dist/tpm/hyperref.tpm | 8 +- 32 files changed, 1344 insertions(+), 637 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog b/Master/texmf-dist/doc/latex/hyperref/ChangeLog index 3efb16f8688..3bc2708ea86 100644 --- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog +++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog @@ -1,3 +1,13 @@ +2006-11-30 6.75h Heiko Oberdiek + * New options for pdf viewer preferences: + pdfdirection, pdfviewarea, pdfviewclip, + pdfprintarea, pdfprintclip, pdfduplex, pdfpicktraybypdfsize, + pdfprintpagerange, pdfnumcopies. + New option for pdf catalog: + pdflang (except VTeX) + * Internal change: \pdf@pagelayout renamed to \@pdfpagelayout. + * Internal change: \@pdfpagemode without slash. + 2006-11-15 6.75g Heiko Oberdiek * New option pdfprintscaling. * Star version of \autoref* analogous to \ref*. diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf index 840e0344a75..151ddd5d3a7 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 4d1c3f72da5..eb10af4835a 100644 --- a/Master/texmf-dist/doc/latex/hyperref/README +++ b/Master/texmf-dist/doc/latex/hyperref/README @@ -440,6 +440,21 @@ float * Anchor are set at top of the float object, if its style is controlled by float.sty. +foiltex +------- + Version 2002/10/29 v2.1.4a forgets adding \HyPL@EveryPage to + the code that is executed each page. This sabotages the page + labels (option pdfpagelabels) and a rerun warning can be shown + (depends on the used driver). + Workaround: + \documentclass{foils} + \usepackage{hyperref} + \makeatletter + \ifHy@pageanchor + \g@addto@macro\@hyperfixhead{\HyPL@EveryPage}% + \fi + \makeatother + footnote -------- This package is not supported, you have to disable hyperref's footnote diff --git a/Master/texmf-dist/doc/latex/hyperref/README.pdf b/Master/texmf-dist/doc/latex/hyperref/README.pdf index 7bac6446198..eba21c5f135 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/hyperref.pdf b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf index bcb2b01438e..d8cd90e97e3 100644 Binary files a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf and b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf differ diff --git a/Master/texmf-dist/doc/latex/hyperref/manual.html b/Master/texmf-dist/doc/latex/hyperref/manual.html index 8bff6d004e8..1c68aeb5de3 100644 --- a/Master/texmf-dist/doc/latex/hyperref/manual.html +++ b/Master/texmf-dist/doc/latex/hyperref/manual.html @@ -7,7 +7,7 @@ - + @@ -1284,7 +1284,7 @@ id="TBL-7-4"> baseurl baseurl URL @@ -1293,7 +1293,7 @@ class="td11"> pdfpagemode pdfpagemode text empty UseOutlines is used. pdftitle pdftitle text @@ -1322,7 +1322,7 @@ class="td11"> pdfauthor pdfauthor text @@ -1331,7 +1331,7 @@ class="td11"> pdfsubject pdfsubject text @@ -1340,7 +1340,7 @@ class="td11"> pdfcreator pdfcreator text @@ -1349,7 +1349,7 @@ class="td11"> pdfproducer pdfproducer text @@ -1358,7 +1358,7 @@ class="td11"> pdfkeywords pdfkeywords text @@ -1367,7 +1367,7 @@ class="td11"> pdfview pdfview text XYZ pdfstartpage pdfstartpage text 1 pdfstartview pdfstartview text Fit pdfpagescrop pdfpagescrop n n n n @@ -1408,7 +1408,7 @@ class="td11"> pdfcenterwindow pdfcenterwindow boolean false pdfdisplaydoctitle boolean pdfdirection text false empty -

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

direction setting pdffitwindow pdfdisplaydoctitle boolean false -

resize document window to fit - document size +

display document title instead of file + name in title bar pdfmenubar boolean pdfduplex text true empty -

make PDF viewer’s menu bar visible +

paper handling option for print dialog pdfnewwindow pdffitwindow boolean false -

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

resize document window to fit + document size pdfnonfullscreenpagemode boolean pdflang text empty -

page mode setting on exiting full-screen - mode +

PDF language identifier (RFC 3066) pdfpagelayout text pdfmenubar boolean empty true -

set layout of PDF pages +

make PDF viewer’s menu bar visible pdfpagelabels pdfnewwindow boolean true false -

set PDF page labels +

make links that open another PDF file + start a new window pdfpagetransition text pdfnonfullscreenpagemode boolean empty -

set PDF page transition style +

page mode setting on exiting full-screen + mode pdfprintscaling text pdfnumcopies integer empty -

page scaling option for print dialog; - valid values are None and AppDefault +

number of printed copies pdftoolbar boolean pdfpagelayout text true empty -

make PDF toolbar visible +

set layout of PDF pages pdfwindowui boolean pdfpagelabels boolean true -

make PDF user interface elements - visible +

set PDF page labels unicode boolean pdfpagetransition text false empty -

Unicode encoded PDF strings +

set PDF page transition style +class="td11"> pdfpicktrackbypdfsize text empty +

set option for print dialog +class="td11"> pdfprintarea text empty +

set /PrintArea of viewer preferences +class="td11"> pdfprintclip text empty +

set /PrintClip of viewer preferences +class="td11"> pdfprintpagerange n n (n n)* empty +

set /PrintPageRange of viewer + preferences + pdfprintscaling text empty +

page scaling option for print dialog; + valid values are None and AppDefault + pdftoolbar boolean true +

make PDF toolbar visible + pdfviewarea text empty +

set /ViewArea of viewer preferences + + + pdfviewclip text empty +

set /ViewClip of viewer preferences + pdfwindowui boolean true +

make PDF user interface elements + visible + unicode boolean false +

Unicode encoded PDF strings + + + + -

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

Each link in Acrobat carries its own magnification level, which is set using PDF coordinate space, which is not the same as TEX’s. The unit is bp and the origin is in the lower left corner. See also hyperref passes in a value of -32768, which causes Acro class="ectt-1000">pdfview and pdfstartview parameters. -

- +

XYZ +

Fits the page to the window.

+

Fits the width of the page to the window.

+

Fits the height of the page to the window.

+

Fits the page bounding box to the window.

class="td11"> -
left top zoom -

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

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

-

Fits the page to the window.

FitH top -

Fits the width of the page to the window.

FitV left -

Fits the height of the page to the window.

FitR left bottom right top -

Fits the rectangle specified by the four +

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

FitB -

Fits the page bounding box to the window.

FitBH top -

Fits the width of the page bounding box to +

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

FitBV left -

Fits the height of the page bounding box to +

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

-

The + +

The pdfpagelayout can be one of the following values. -

+

class="td11"> SinglePage +

Displays a single page; advancing flips the page

+

Displays the document in one column; continuous scrolling.

class="td11">
-

Displays a single page; advancing flips the page

OneColumn -

Displays the document in one column; continuous scrolling.

TwoColumnLeft -

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

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

TwoColumnRight -

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

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

-

Finally, the

Finally, the pdfpagetransition can be one of the following values, where /Di stands for direction of motion in degrees, generally in 90o steps, /Dm is a horizontal (/H) or vertical (/V) dimension - +class="ectt-1000">/V) dimension (e.g. Blinds /Dm /V), and /M is for motion, either in (/I) or out (/O). -

+

Blinds +

A box sweeps in or out.

+

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

/Dm -

Multiple lines distributed evenly across the screen sweep +

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

Box /M -

A box sweeps in or out.

Dissolve -

The page image dissolves in a piecemeal fashion to reveal +

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

Glitter /Di -

Similar to Dissolve, except the effect sweeps across the +

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

Split /Dm /M -

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

Wipe /Di -

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

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

-

+

3.7 Big alphabetical list

-

The following is a complete listing of available options for

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

+

a4paper +

use A4 paper

+

use A5 paper

+

set color of anchors

+

use B5 paper

+

do bibliographical back references

+

set base URL for document

+

make bookmarks

+

put section numbers in bookmarks

- - +

open up bookmark tree

+

level to which bookmarks are open

+

to specify which ‘toc’ file to mimic

+

allow links to break over lines

+

to produce CJK bookmarks

+

color of border around cites

+

color of citation links

+

color links

debug +

do not do any hyperlinking

+ + +

to set encap character for hyperindex

+

use executivepaper

+

suffix of linked files

+

color of border around file links

+

color of file links

+

opposite of option draft

+

use small caps instead of color for links

+

make figures hyper links

- - +

set up hyperlinked footnotes

+

set up hyperlinked indices

+

use guessable names for links

+

use legalpaper

@@ -2158,7 +2250,7 @@ class="td11"> letterpaper +

use letterpaper

+

color of border around links

+

color of links

+

color of border around menu links

+

color for menu links

+ + +

allow nesting of links

+

put an anchor on every page

+

backreference by page number

+

color of border around page links

+

color of page links, but currently unused

+

text for PDF Author field

+

width of PDF link border

- - +

text for PDF Creator field

+

+

@@ -2322,169 +2414,167 @@ class="td11"> +

direction setting

+

display document title instead of file + name in title bar

+

paper handling option for print dialog

+

resize document window to fit + document size

+

set highlighting of PDF links

+

text for PDF Keywords field

+

PDF language identifier (RFC 3066)

+

an alias for dvips

+

make PDF viewer’s menu bar visible

+

make links that open another PDF

+

file start a new window + +

+

page mode setting on exiting full-screen + mode

+

number of printed copies

+

set layout of PDF pages

+

set default mode of PDF display

+

set PDF page labels

+

set crop size of PDF document

+

set PDF page transition style

+

set option for print dialog

+

set /PrintArea of viewer preferences

@@ -2492,185 +2582,273 @@ class="td11"> - - +

set /PrintClip of viewer preferences

+

set /PrintPageRange of viewer + preferences

+

page scaling option for print dialog

+

text for PDF Producer field

+

page at which PDF document opens

+

starting view of PDF document

+ + + + + + + + + + + + +

color of border around ‘run’ links

+ + +

Unicode encoded pdf strings

+

color of border around URL links

+

color of URL links

+

be chatty

-

use A4 paper

a5paper -

use A5 paper

anchorcolor black -

set color of anchors

b5paper -

use B5 paper

backref false -

do bibliographical back references

baseurl empty -

set base URL for document

bookmarks true -

make bookmarks

bookmarksnumbered false -

put section numbers in bookmarks

bookmarksopen false -

open up bookmark tree

bookmarksopenlevel \maxdimen -

level to which bookmarks are open

bookmarkstype toc -

to specify which ‘toc’ file to mimic

breaklinks false -

allow links to break over lines

CJKbookmarks false -

to produce CJK bookmarks

citebordercolor 0 1 0 -

color of border around cites

citecolor green -

color of citation links

colorlinks false -

color links

true -

(

(tex4ht, dviwindo)

false -

provide details of anchors defined; same +

provide details of anchors defined; same as verbose

draft false -

do not do any hyperlinking

dvipdf -

use

use dvipdf backend (deprecated)

dvipdfm -

use

use dvipdfm backend

dvipdfmx -

use

use dvipdfmx backend

dvips -

use

use dvips backend

dvipsone -

use

use dvipsone backend

dviwindo -

use

use dviwindo backend

encap -

to set encap character for hyperindex

executivepaper -

use executivepaper

extension dvi -

suffix of linked files

filebordercolor 0 .5 .5 -

color of border around file links

filecolor cyan -

color of file links

final true -

opposite of option draft

frenchlinks false -

use small caps instead of color for links

hyperfigures false -

make figures hyper links

hyperfootnotes true -

set up hyperlinked footnotes

hyperindex true -

set up hyperlinked indices

hypertex -

use

use HyperThypertexnames

true -

use guessable names for links

implicit true -

redefine LAT

redefine LATEX internals

latex2html -

use

use LAT legalpaper

-

use legalpaper

-

use letterpaper

linkbordercolor 1 0 0 -

color of border around links

linkcolor red -

color of links

linktocpage false -

make page number, not text, be link on +

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

menubordercolor 1 0 0 -

color of border around menu links

menucolor red -

color for menu links

nativepdf false -

an alias for

an alias for dvips

naturalnames false -

use LAT

use LATEX-computed names for links

nesting false -

allow nesting of links

pageanchor true -

put an anchor on every page

pagebackref false -

backreference by page number

pagebordercolor 1 1 0 -

color of border around page links

pagecolor red -

color of page links, but currently unused

pdfauthor empty -

text for PDF Author field

pdfborder 0 0 1 -

width of PDF link border

0 0 0 -

(

(colorlinks)

pdfcenterwindow false -

position the document window in the +

position the document window in the center of the screen

pdfcreator LaTeX with -

text for PDF Creator field

hyperref -

package -

pdfdisplaydoctitle pdfdirection false empty -

display document title instead of file - name in title bar

pdffitwindow pdfdisplaydoctitle false -

resize document window to fit - document size

pdfhighlight pdfduplex /I empty -

set highlighting of PDF links

pdfkeywords pdffitwindow empty false -

text for PDF Keywords field

pdfmark pdfhighlight false /I -

an alias for dvips

pdfmenubar pdfkeywords true empty -

make PDF viewer’s menu bar visible

pdfnewwindow pdflang false empty -

make links that open another PDF

pdfmark false -

file start a new window

pdfnonfullscreenpagemode pdfmenubar empty true -

page mode setting on exiting full-screen - mode

pdfpagelayout pdfnewwindow empty false -

set layout of PDF pages

pdfpagemode empty -

set default mode of PDF display

pdfpagelabels pdfnonfullscreenpagemode true empty -

set PDF page labels

pdfpagescrop pdfnumcopies empty -

set crop size of PDF document

pdfpagetransition pdfpagelayout empty -

set PDF page transition style

pdfprintscaling pdfpagemode empty -

page scaling option for print dialog

pdfproducer pdfpagelabels empty true -

text for PDF Producer field

pdfstartpage pdfpagescrop 1 empty -

page at which PDF document opens

pdfstartview pdfpagetransition Fit empty -

starting view of PDF document

pdfsubject pdfpicktrackbypdfsize empty -

text for PDF Subject field

pdftex pdfprintarea empty -

use pdfTEX backend

pdftitle pdfprintclip empty empty -

text for PDF Title field

pdftoolbar pdfprintpagerange true empty -

make PDF toolbar visible

pdfview pdfprintscaling XYZ empty -

PDF ‘view’ when on link traversal

pdfwindowui pdfproducer true empty -

make PDF user interface elements - visible

plainpages pdfstartpage false 1 -

do page number anchors as plain arabic

ps2pdf pdfstartview Fit -

use ps2pdf backend

raiselinks pdfsubject empty +

text for PDF Subject field

pdftex +

use pdfTEX backend

pdftitle false empty -

raise up links (for

text for PDF Title field

pdftoolbar true +

make PDF toolbar visible

pdfview XYZ +

PDF ‘view’ when on link traversal

pdfviewarea empty +

set /ViewArea of viewer preferences

pdfviewclip empty +

set /ViewClip of viewer preferences

pdfwindowui true +

make PDF user interface elements + visible

plainpages false +

do page number anchors as plain arabic

ps2pdf +

use ps2pdf backend

raiselinks false +

raise up links (for HyperTEX backend)

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

color of border around ‘run’ links

setpagesize setpagesize true true -

set page size by special driver +

set page size by special driver commands

tex4ht tex4ht -

use

use TEX4ht backend

textures textures -

use

use Textures backend

unicode unicode false false -

Unicode encoded pdf strings

urlbordercolor urlbordercolor 0 1 1 0 1 1 -

color of border around URL links

urlcolor urlcolor magenta magenta -

color of URL links

verbose verbose false false -

be chatty

vtex vtex -

use

use VTeX backend

-

+

4 Additional user macros

-

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

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

+

\href{URL}{text} -

The

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

+class="ecti-1000">not need to be escaped in any way. +

\url{URL} -

Similar to

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

+ + +

\nolinkurl{URL} -

Write

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

+

\hyperbaseurl{URL} -

A base

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

+

\hyperimage{imageURL}{text} -

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

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

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

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

+

\hyperdef{categoryname}{text} -

A target area of the document (the

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

+

\hyperref{URLname}{text} -

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

+

\hyperlink{name}{text} -

+

\hypertarget{name}{text} -

A simple internal link is created with

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

Note that in HTML parlance, the

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

- - +

\phantomsection -

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

This sets an anchor at this location. It works similar to \hypertarget{}{} with an automatically choosen anchor name. Often it is used in conjunction with \addcontentsline for sectionlike things @@ -2786,19 +2964,19 @@ class="verbatim">

 
\printindex
-

-

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

+

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

+

\autoref{label} -

This is a replacement for the usual

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

The label is worked out from the context of the original

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

For each macro below,

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

+

class="td11"> Macro +

Figure

+

Table

+

Part

+

Appendix

+

Equation

+

item

+

chapter

+

section

+

subsection

class="td11"> \subsubsectionname +

subsubsection

+

paragraph

+

footnote

+

Equation

+

Theorem

@@ -2927,19 +3105,19 @@ class="td11"> class="td11">
-

Default

\figurename -

Figure

\tablename -

Table

\partname -

Part

\appendixname -

Appendix

\equationname -

Equation

\Itemname -

item

\chaptername -

chapter

\sectionname -

section

\subsectionname -

subsection

-

subsubsection

\paragraphname -

paragraph

\Hfootnotename -

footnote

\AMSname -

Equation

\theoremname -

Theorem

-

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

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

+

\ref*{label} -

+

\pageref*{label} -

A typical use would be to write +

A typical use would be to write
\hyperref[other]{that nice section (\ref*{other}) we read before}
-

-

We want

+

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

+

\pdfstringdef{macroname}{TEXstring} -

\pdfstringdef returns a macro containing the PDF string. (Currently this is done globally, but do not rely on it.) All the following tasks, definitions and redefinitions are made in a group to keep them local: -

+

-

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

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

+

4.1 Replacement macros

-

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

+

\texorpdfstring{TEXstring}{PDFstring} -

For example, +

For example,
 
\section{\texorpdfstring{\textcolor{red}}{}{Red} Mars}
-

-

+

\pdfstringdef executes the hook before it expands the string. Therefore, you can use this hook to perform additional tasks or to disable additional commands. @@ -3058,8 +3236,8 @@ class="verbatim">

 
}
-

-

However, for disabling commands, an easier way is via

+

However, for disabling commands, an easier way is via \pdfstringdefDisableCommands, which adds its argument to the definition of \pdfstringdefPreHook (‘@’ can here be used as letter in command @@ -3076,16 +3254,16 @@ class="verbatim">

 
}
-

-

+

+

4.2 Utility macros

-

+

\hypercalcbp{dimen specification} -

\hypercalcbp takes a TEX dimen specification and converts it to bp and returns the number without the unit. This is useful for options

 
}
-

-

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

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

+

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

Note, for calculations you need either package |calc| or e-TEX. Nowadays the latter should @@ -3116,7 +3294,7 @@ src="cmmi10-22.gif" alt="e" class="10x-x-22" />-TEX, please, look in the source documentation hyperref.dtx for further limitations. -

Also

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

+

5 Acrobat-specific behavior

-

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

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

+

\Acrobatmenu{menuoption}{text} -

The

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

+

valign="baseline" id="TBL-13-1-"> +

ImportImage, ImportNotes, AcroForm:ImportFDF

+

ExportNotes, AcroForm:ExportFDF

@@ -3191,7 +3369,7 @@ class="td11"> valign="baseline" id="TBL-13-6-"> @@ -3199,19 +3377,19 @@ class="td11"> valign="baseline" id="TBL-13-7-"> +

Properties

+

AcroForm:Duplicate, AcroForm:TabOrder

@@ -3219,7 +3397,7 @@ class="td11"> valign="baseline" id="TBL-13-10-"> @@ -3238,28 +3416,28 @@ class="td11"> Tools-->Search +

About

@@ -3274,29 +3452,29 @@ class="td11"> class="td11">
File -

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

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

File-->Import -

ImportImage, ImportNotes, AcroForm:ImportFDF

File-->Export -

ExportNotes, AcroForm:ExportFDF

File-->DocumentInfo -

GeneralInfo, OpenInfo, FontsInfo, SecurityInfo, +

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

File-->Preferences -

GeneralPrefs, NotePrefs, FullScreenPrefs, Weblink:Prefs, +

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

Edit -

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

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

-

Properties

Edit-->Fields -

AcroForm:Duplicate, AcroForm:TabOrder

Document -

Cpt:CapturePages, +

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

View -

ActualSize, FitVisible, FitWidth, FitPage, ZoomTo, +

ActualSize, FitVisible, FitWidth, FitPage, ZoomTo, FullScreen, FirstPage, PrevPage, NextPage, LastPage, GoToPage, GoBack, GoForward, SinglePage, OneColumn, TwoColumns, ArticleThreads, PageOnly, ShowBookmarks, @@ -3228,7 +3406,7 @@ class="td11"> valign="baseline" id="TBL-13-11-">

Tools -

Hand, ZoomIn, ZoomOut, SelectText, SelectGraphics, +

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

-

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

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

Window -

ShowHideToolBar, ShowHideMenuBar, +

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

Help -

HelpUserGuide, HelpTutorial, HelpExchange, HelpScan, +

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

Help(Windows) -

About

-

+

6 PDF and HTML forms

-

You must put your fields inside a

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

There are six macros to prepare fields: +

There are six macros to prepare fields: -

+

\TextField[parameters]{label} -

+

\CheckBox[parameters]{label} -

+

\ChoiceMenu[parameterslabel}{choices} -

+

\PushButton[parameters]{label} -

+

\Submit[parameters]{label} -

+

\Reset[parameters]{label} -

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

+

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

\LayoutTextField{label}{field} -

+

\LayoutChoiceField{label}{field} -

+

\LayoutCheckField{label}{field} -

These macros default to #1 #2 -

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

+

These macros default to #1 #2 +

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

\MakeRadioField{width}{height} -

+

\MakeCheckField{width}{height} -

+

width}{height} -

+

\MakeChoiceField{width}{height} -

+

\MakeButtonField{text} -

These macros default to

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

You may also want to redefine the following macros: +

You may also want to redefine the following macros:
 
\def\DefaultWidthofText{3cm}
-

-

+

+

6.1 Forms environment parameters

-

+

action encoding method @@ -3473,16 +3651,16 @@ class="td11">
URL -

The URL that will receive the form data if a

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

name -

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

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

name -

Used only when generating HTML; values can be

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

-

+

6.2 Forms optional parameters

-

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

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

+

-

+

7 Defining a new driver

-

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

1.

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

1. \hyper@anchor -

2.

2. \hyper@link -

3.

3. \hyper@linkfile -

4.

4. \hyper@linkurl -

5.

5. \hyper@anchorstart -

6.

6. \hyper@anchorend -

7.

7. \hyper@linkstart -

8.

8. \hyper@linkend -

The draft option defines the macros as follows +

The draft option defines the macros as follows
 
\let\hyper@linkend\@empty
-

-

+

+

8 Special support for other packages

-

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

+

-

The

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

+

9 History and acknowledgments

-

The original authors of

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

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

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

Berthold Horn provided help, encouragement and sponsorship for the

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

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

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

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

Especial extra thanks to David Carlisle for the

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

Especial extra thanks to David Carlisle for the backref module, the ps2pdf and dviwindo support, frequent general rewrites of my bad code, and for working on changes to the xr package to suit diff --git a/Master/texmf-dist/doc/latex/hyperref/manual.pdf b/Master/texmf-dist/doc/latex/hyperref/manual.pdf index d5ddea24ac1..f75526d384c 100644 Binary files a/Master/texmf-dist/doc/latex/hyperref/manual.pdf and b/Master/texmf-dist/doc/latex/hyperref/manual.pdf differ diff --git a/Master/texmf-dist/doc/latex/hyperref/manual2.html b/Master/texmf-dist/doc/latex/hyperref/manual2.html index ece2d163479..b8c0a1d4572 100644 --- a/Master/texmf-dist/doc/latex/hyperref/manual2.html +++ b/Master/texmf-dist/doc/latex/hyperref/manual2.html @@ -7,7 +7,7 @@ - + diff --git a/Master/texmf-dist/doc/latex/hyperref/manual3.html b/Master/texmf-dist/doc/latex/hyperref/manual3.html index 1975dd9fe38..a7a0ac6f2bd 100644 --- a/Master/texmf-dist/doc/latex/hyperref/manual3.html +++ b/Master/texmf-dist/doc/latex/hyperref/manual3.html @@ -7,7 +7,7 @@ - + diff --git a/Master/texmf-dist/doc/latex/hyperref/options.pdf b/Master/texmf-dist/doc/latex/hyperref/options.pdf index 8a7020910c9..adb1834052b 100644 Binary files a/Master/texmf-dist/doc/latex/hyperref/options.pdf and b/Master/texmf-dist/doc/latex/hyperref/options.pdf differ diff --git a/Master/texmf-dist/source/latex/hyperref/doc/manual.tex b/Master/texmf-dist/source/latex/hyperref/doc/manual.tex index f0192ffe632..a2f9077bed0 100644 --- a/Master/texmf-dist/source/latex/hyperref/doc/manual.tex +++ b/Master/texmf-dist/source/latex/hyperref/doc/manual.tex @@ -478,21 +478,33 @@ pdfstartpage & text & 1 & Determines on which page the PDF file is pdfstartview & text & Fit & Set the startup page view \\ pdfpagescrop & n n n n & & Sets the default PDF crop box for pages. This should be a set of four numbers \\ pdfcenterwindow & boolean & false & position the document window in the center of the screen \\ +pdfdirection & text & empty & direction setting \\ pdfdisplaydoctitle & boolean & false & display document title instead of file name in title bar\\ +pdfduplex & text & empty & paper handling option for print dialog\\ pdffitwindow & boolean & false & resize document window to fit document size \\ +pdflang & text & empty & PDF language identifier (RFC 3066)\\ pdfmenubar & boolean & true & make PDF viewer's menu bar visible \\ pdfnewwindow & boolean & false & make links that open another PDF file start a new window \\ pdfnonfullscreenpagemode & boolean & empty & page mode setting on exiting full-screen mode\\ +pdfnumcopies & integer & empty & number of printed copies \\ pdfpagelayout & text & empty & set layout of PDF pages \\ pdfpagelabels & boolean & true & set PDF page labels \\ pdfpagetransition & text & empty & set PDF page transition style \\ +pdfpicktrackbypdfsize & text & empty & set option for print dialog \\ +pdfprintarea & text & empty & set /PrintArea of viewer preferences \\ +pdfprintclip & text & empty & set /PrintClip of viewer preferences \\ +pdfprintpagerange & n n (n n)* + & empty & set /PrintPageRange of viewer + preferences\\ pdfprintscaling & text & empty & page scaling option for print dialog; valid values are \texttt{None} and \texttt{AppDefault} \\ pdftoolbar & boolean & true & make PDF toolbar visible \\ +pdfviewarea & text & empty & set /ViewArea of viewer preferences \\ +pdfviewclip & text & empty & set /ViewClip of viewer preferences \\ pdfwindowui & boolean & true & make PDF user interface elements visible \\ unicode & boolean & false & Unicode encoded PDF strings \end{longtable} @@ -614,11 +626,15 @@ pdfcenterwindow & \textit{false} & position the document window in th pdfcreator & \textit{LaTeX with} & text for PDF Creator field \\ & \textit{hyperref} & \\ & \textit{package} & \\ +pdfdirection & \textit{empty} & direction setting \\ pdfdisplaydoctitle & \textit{false} & display document title instead of file name in title bar\\ +pdfduplex & \textit{empty} & paper handling option for + print dialog\\ pdffitwindow & \textit{false} & resize document window to fit document size \\ pdfhighlight & \textit{/I} & set highlighting of PDF links \\ pdfkeywords & \textit{empty} & text for PDF Keywords field \\ +pdflang & \textit{empty} & PDF language identifier (RFC 3066) \\ pdfmark & \textit{false} & an alias for \textsf{dvips} \\ pdfmenubar & \textit{true} & make PDF viewer's menu bar visible \\ pdfnewwindow & \textit{false} & make links that open another PDF \\ @@ -626,11 +642,17 @@ pdfnewwindow & \textit{false} & make links that open another PDF \ pdfnonfullscreenpagemode & \textit{empty} & page mode setting on exiting full-screen mode\\ +pdfnumcopies & \textit{empty} & number of printed copies\\ pdfpagelayout & \textit{empty} & set layout of PDF pages \\ pdfpagemode & \textit{empty} & set default mode of PDF display \\ pdfpagelabels & \textit{true} & set PDF page labels \\ pdfpagescrop & \textit{empty} & set crop size of PDF document \\ pdfpagetransition & \textit{empty} & set PDF page transition style \\ +pdfpicktrackbypdfsize + & \textit{empty} & set option for print dialog \\ +pdfprintarea & \textit{empty} & set /PrintArea of viewer preferences \\ +pdfprintclip & \textit{empty} & set /PrintClip of viewer preferences \\ +pdfprintpagerange & \textit{empty} & set /PrintPageRange of viewer preferences \\ pdfprintscaling & \textit{empty} & page scaling option for print dialog \\ pdfproducer & \textit{empty} & text for PDF Producer field \\ pdfstartpage & \textit{1} & page at which PDF document opens \\ @@ -640,6 +662,8 @@ pdftex & & use \textsf{pdf\TeX} backend \\ pdftitle & \textit{empty} & text for PDF Title field \\ pdftoolbar & \textit{true} & make PDF toolbar visible \\ pdfview & \textit{XYZ} & PDF `view' when on link traversal \\ +pdfviewarea & \textit{empty} & set /ViewArea of viewer preferences \\ +pdfviewclip & \textit{empty} & set /ViewClip of viewer preferences \\ pdfwindowui & \textit{true} & make PDF user interface elements visible \\ plainpages & \textit{false} & do page number anchors as plain arabic \\ ps2pdf & & use \textsf{ps2pdf} backend \\ diff --git a/Master/texmf-dist/source/latex/hyperref/doc/options.tex b/Master/texmf-dist/source/latex/hyperref/doc/options.tex index 2de1187aaab..9d91b36a785 100644 --- a/Master/texmf-dist/source/latex/hyperref/doc/options.tex +++ b/Master/texmf-dist/source/latex/hyperref/doc/options.tex @@ -75,18 +75,26 @@ pdfborder &width of PDF link border&0 0 1\\ &&0 0 0 \for{colorlinks}\\ pdfcenterwindow &position the document window center of the screen&false\\ pdfcreator &text for PDF Creator field&LaTeX with hyperref package\\ +pdfdirection & direction setting & \optempty\\ pdfdisplaydoctitle &display document title instead of file name in title bar&false\\ +pdfduplex &paper handling option for print dialog& \optempty\\ pdffitwindow &resize document window to fit document size&false\\ pdfhighlight &set highlighting of PDF links& /I\\ pdfkeywords &text for PDF Keywords field&\optempty\\ +pdflang &PDF language identifier (RFC 3066)&\optempty\\ pdfmenubar &make PDF viewer's menu bar visible&true\\ pdfnewwindow &make links that open another PDF file start a new window&false\\ pdfnonfullscreenpagemode &page mode setting on exiting full-screen mode&\optempty\\ +pdfnumcopies &number of printed copies&\optempty\\ pdfpagelayout &set layout of PDF pages&\optempty\\ pdfpagemode &set default mode of PDF display&\optempty\\ pdfpagelabels &set PDF page labels&false\\ pdfpagescrop &set crop size of PDF document&\optempty\\ pdfpagetransition &set PDF page transition style&\optempty\\ +pdfpicktrackbypdfsize &set option for print dialog&\optempty\\ +pdfprintarea &set /PrintArea of viewer preferences&\optempty\\ +pdfprintclip &set /PrintClip of viewer preferences&\optempty\\ +pdfprintpagerange &set /PrintPageRange of viewer preferences&\optempty\\ pdfprintscaling &page scaling option for print dialog&\optempty\\ pdfproducer &text for PDF Producer field&\optempty\\ pdfstartpage &page at which PDF document opens&1\\ @@ -96,6 +104,8 @@ pdftex &use pdf\TeX\ backend\\ pdftitle &text for PDF Title field&\optempty\\ pdftoolbar &make PDF toolbar visible&true\\ pdfview &PDF `view' when on link traversal&\optempty\\ +pdfviewarea &set /ViewArea of viewer preferences&\optempty\\ +pdfviewclip &set /ViewClip of viewer preferences&\optempty\\ pdfwindowui &make PDF user interface elements visible&true\\ plainpages &do page number anchors as plain arabic&true\\ ps2pdf &use ps2pdf backend\\ diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx index 4a969eee631..2769450701a 100644 --- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx @@ -37,7 +37,7 @@ %\ProvidesFile{pd1enc.def} %\ProvidesFile{puenc.def} %\ProvidesFile{puvnenc.def} -% [2006/11/15 v6.75g +% [2006/11/30 v6.75h % Hypertext links for LaTeX] % Dummy hyperref (SR)] % Hyperref documentation driver file] @@ -113,7 +113,7 @@ \end{document} % % \fi -% \CheckSum{19119} +% \CheckSum{19396} % % \MakeShortVerb{|} % \StopEventually{} @@ -3293,6 +3293,83 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\Hy@CheckOptionValue} +% Some options take a string value out of a limited set of values. +% Macro \cs{Hy@CheckOptionValue} checks whether the given value |#1| +% for option |#2| is a member of the value list |#3|. +% \begin{macrocode} +\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 +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\Hy@DefNameKey} +% \noindent +% |#1|: option name\\ +% |#2|: \cs{do} list with known values, first +% argument of \cs{do} is value, second argument is a comment. +% \begin{macrocode} +\def\Hy@DefNameKey#1{% + \expandafter\Hy@@DefNameKey\csname @#1\endcsname{#1}% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\Hy@@DefNameKey} +% \noindent +% |#1|: macro for value storage\\ +% |#2|: option name\\ +% |#3|: \cs{do} list with known values. +% \begin{macrocode} +\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 +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\Hy@UseNameKey} +% \begin{macrocode} +\def\Hy@UseNameKey#1#2{% + \ifx#2\@empty + \else + /#1/#2% + \fi +} +% \end{macrocode} +% \end{macro} +% % \subsection{Defining the options} % \begin{macrocode} \define@key{Hyp}{implicit}[true]{% @@ -4034,6 +4111,12 @@ % % \begin{macrocode} \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{% @@ -4046,29 +4129,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}% @@ -4122,8 +4251,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}% } @@ -4141,9 +4279,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 @@ -4155,6 +4290,8 @@ \def\@pdfpagescrop{} \def\@pdfstartview{ /Fit } \def\@pdfstartpage{1} +\def\@pdfprintpagerange{} +\def\@pdflang{} \let\PDF@SetupDoc\@empty \let\PDF@FinishDoc\@empty \let\phantomsection\@empty @@ -4326,7 +4463,7 @@ \AtBeginDocument{% \let\autoref\ref \ifx\@pdfpagemode\@empty - \gdef\@pdfpagemode{/UseNone}% + \gdef\@pdfpagemode{UseNone}% \fi \global\Hy@backreffalse }% @@ -4453,7 +4590,7 @@ \ifHy@bookmarks \Hy@Info{Bookmarks ON}% \ifx\@pdfpagemode\@empty - \def\@pdfpagemode{/UseOutlines }% + \def\@pdfpagemode{UseOutlines}% \fi \else \def\@bookmarkopenstatus#1{}% @@ -4463,7 +4600,7 @@ \global\let\WriteBookmarks\relax } \ifx\@pdfpagemode\@empty - \def\@pdfpagemode{/UseNone}% + \def\@pdfpagemode{UseNone}% \fi \fi \Hy@DisableOption{bookmarks} @@ -5302,7 +5439,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}% @@ -5312,6 +5458,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 @@ -8149,7 +8296,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 @@ -8178,7 +8328,10 @@ \pdfstartlink attr{% \Hy@setpdfborder - /H\@pdfhighlight + \ifx\@pdfhightlight\@empty + \else + /H\@pdfhighlight + \fi /C[\@urlbordercolor]% }% user{% @@ -8202,7 +8355,10 @@ \pdfstartlink attr{% \Hy@setpdfborder - /H\@pdfhighlight + \ifx\@pdfhighlight\@empty + \else + /H\@pdfhighlight + \fi /C[\@filebordercolor]% }% user {% @@ -8245,7 +8401,10 @@ \pdfstartlink attr{% \Hy@setpdfborder - /H\@pdfhighlight + \ifx\@pdfhighlight\@empty + \else + /H\@pdfhighlight + \fi /C[\@runbordercolor]% }% user {% @@ -8325,7 +8484,7 @@ \fi \Hy@pstringdef\Hy@pstringB{\@baseurl}% \pdfcatalog{% - /PageMode\@pdfpagemode + /PageMode/\@pdfpagemode \ifx\@baseurl\@empty \else /URI<>% @@ -8342,13 +8501,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 }% \pdfcatalog{% @@ -8356,9 +8527,10 @@ \else /ViewerPreferences<<\Hy@temp>>% \fi - \ifx\pdf@pagelayout\@empty + \Hy@UseNameKey{PageLayout}\@pdfpagelayout + \ifx\@pdflang\@empty \else - /PageLayout/\pdf@pagelayout + /Lang(\@pdflang)% \fi }% } @@ -8590,7 +8762,10 @@ \pdfstartlink attr{% \Hy@setpdfborder - /H \@pdfhighlight + \ifx\@pdfhighlight\@empty + \else + /H\@pdfhighlight + \fi /C[\@menubordercolor]% }% user{ @@ -8927,7 +9102,7 @@ \pdfmark{pdfmark=/DOCVIEW, Page=\@pdfstartpage, View=\@pdfstartview, - PageMode=\@pdfpagemode + PageMode=/\@pdfpagemode }% \ifx\@pdfpagescrop\@empty \else @@ -8940,13 +9115,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, @@ -8956,9 +9143,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 >>% }% @@ -9145,13 +9333,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}% @@ -9165,14 +9365,15 @@ \else /URI<>% \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 >>% }% @@ -9750,7 +9951,7 @@ \special{!pdfinfo b=<\@pdfpagescrop>}% \fi \special{!onopen Page\@pdfstartpage}% - \special{!pdfinfo p=<\@pdfpagemode>}% + \special{!pdfinfo p=}% \ifx\@baseurl\@empty \else \special{!pdfinfo u=<<>>}% @@ -9762,18 +9963,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 + /PickTrayByPDFSize \@pdfpicktraybypdfsize + \fi + \ifx\@pdfprintpagerange\@empty \else - /NonFullScreenPageMode\@pdfnonfullscreenpagemode + /PrintPageRange[\@pdfprintpagerange]% \fi - \ifx\@pdfprintscaling\@empty + \ifx\@pdfnumcopies\@empty \else - /PrintScaling\@pdfprintscaling + /NumCopies \@pdfnumcopies \fi >>>}% - \ifx\pdf@pagelayout\@empty + \ifx\@pdfpagelayout\@empty \else - \special{!pdfinfo l=}% + \special{!pdfinfo l=}% \fi }% \def\PDF@FinishDoc{% @@ -10113,7 +10326,7 @@ pdfmark=/DOCVIEW,% Page=\@pdfstartpage,% View=\@pdfstartview,% - PageMode=\@pdfpagemode + PageMode=/\@pdfpagemode }% \ifx\@pdfpagescrop\@empty \else @@ -10126,13 +10339,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 }% \Hy@pstringdef\Hy@pstringB{\@baseurl}% @@ -10144,9 +10369,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 @@ -10347,7 +10573,14 @@ % parameter is a int \define@key{PDF}{Flags}{\pdf@addtoks{#1}{Flags}} % parameter is a name -\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 +} % parameter is a string \define@key{PDF}{ID}{\pdf@addtoks{[#1]}{ID}} % parameter is a string @@ -11117,7 +11350,7 @@ pdfmark=/DOCVIEW, Page=\@pdfstartpage, View=\@pdfstartview, - PageMode=\@pdfpagemode + PageMode=/\@pdfpagemode }% \ifx\@pdfpagescrop\@empty \else @@ -11130,13 +11363,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 }% \Hy@pstringdef\Hy@pstringB{\@baseurl}% @@ -11148,9 +11393,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/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<>% \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<>% @@ -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=}% \ifx\@baseurl\@empty \else \special{!pdfinfo u=<<>>}% @@ -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=}% + \special{!pdfinfo l=}% \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} diff --git a/Master/texmf-dist/tpm/hyperref.tpm b/Master/texmf-dist/tpm/hyperref.tpm index 269b65e9f00..6fb399ae728 100644 --- a/Master/texmf-dist/tpm/hyperref.tpm +++ b/Master/texmf-dist/tpm/hyperref.tpm @@ -3,7 +3,7 @@ hyperref Package - 2006/11/25 02:47:53 + 2006/11/30 09:10:05 rahtz Extensive support for hypertext in LaTeX. @@ -23,7 +23,7 @@ backends. Sebastian Rahtz 5893175 - + texmf-dist/tex/latex/hyperref/backref.sty texmf-dist/tex/latex/hyperref/hdvipdfm.def texmf-dist/tex/latex/hyperref/hdvips.def @@ -50,7 +50,7 @@ texmf-dist/tex/latex/hyperref/puvnenc.def texmf-dist/tex/latex/hyperref/xr-hyper.sty texmf-dist/tpm/hyperref.tpm - + texmf-dist/doc/latex/hyperref/ChangeLog texmf-dist/doc/latex/hyperref/ChangeLog.pdf texmf-dist/doc/latex/hyperref/README @@ -67,7 +67,7 @@ texmf-dist/doc/latex/hyperref/options.pdf texmf-dist/doc/latex/hyperref/paper.pdf texmf-dist/doc/latex/hyperref/slides.pdf - + texmf-dist/source/latex/hyperref/backref.dtx texmf-dist/source/latex/hyperref/bmhydoc.sty texmf-dist/source/latex/hyperref/doc/fdl.tex -- cgit v1.2.3