summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2006-12-08 00:19:37 +0000
committerKarl Berry <karl@freefriends.org>2006-12-08 00:19:37 +0000
commit8291b74ec6f858e3536a5919b74386a7df1dcc24 (patch)
tree3b269f2eaa9e01070636bc02be2cd16fad7d166d /Master/texmf-dist/source
parent2ba8265fe433c8c06277b7aa632f642b2597e99c (diff)
hyperref update (4dec06)
git-svn-id: svn://tug.org/texlive/trunk@2629 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/hyperref/doc/manual.tex24
-rw-r--r--Master/texmf-dist/source/latex/hyperref/doc/options.tex10
-rw-r--r--Master/texmf-dist/source/latex/hyperref/hyperref.dtx408
3 files changed, 361 insertions, 81 deletions
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 @@
%<pd1enc>\ProvidesFile{pd1enc.def}
%<puenc>\ProvidesFile{puenc.def}
%<puvnenc>\ProvidesFile{puvnenc.def}
-%<!none> [2006/11/15 v6.75g
+%<!none> [2006/11/30 v6.75h
%<package> Hypertext links for LaTeX]
%<nohyperref> Dummy hyperref (SR)]
%<driver> Hyperref documentation driver file]
@@ -113,7 +113,7 @@
\end{document}
%</driver>
% \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<</Base(\Hy@pstringB)>>%
@@ -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<</Base(\Hy@pstringB)>>%
\fi
- /PageMode \@pdfpagemode
+ /PageMode/\@pdfpagemode
\ifx\Hy@temp\@empty
\else
/ViewerPreferences<<\Hy@temp>>%
\fi
- \ifx\pdf@pagelayout\@empty
+ \Hy@UseNameKey{PageLayout}\@pdfpagelayout
+ \ifx\@pdflang\@empty
\else
- /PageLayout/\pdf@pagelayout\space
+ /Lang(\@pdflang)%
\fi
>>%
}%
@@ -9750,7 +9951,7 @@
\special{!pdfinfo b=<\@pdfpagescrop>}%
\fi
\special{!onopen Page\@pdfstartpage}%
- \special{!pdfinfo p=<\@pdfpagemode>}%
+ \special{!pdfinfo p=</\@pdfpagemode>}%
\ifx\@baseurl\@empty
\else
\special{!pdfinfo u=<<</Base (\@baseurl)>>>}%
@@ -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=</\pdf@pagelayout\space>}%
+ \special{!pdfinfo l=</\@pdfpagelayout\space>}%
\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