summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def')
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def520
1 files changed, 306 insertions, 214 deletions
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
index 602b243bb2a..9da39dce159 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
@@ -22,20 +22,20 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hdvipdfm.def}
- [2007/02/27 v6.75t
+ [2007/05/29 v6.76g
Hyperref driver for dvipdfm]
\def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}}
\ifHy@pagelabels
\def\HyPL@StorePageLabel#1{%
\if@filesw
\begingroup
- \edef\Hy@tempa{\the\Hy@abspage\space<< #1 >> }%
+ \edef\Hy@tempa{\the\Hy@abspage<<#1>>}%
\immediate\write\@mainaux{%
\string\HyPL@Entry{\Hy@tempa}%
}%
\endgroup
\fi
- }
+ }%
\AfterBeginDocument{%
\if@filesw
\immediate\write\@mainaux{%
@@ -54,7 +54,7 @@
\HyPL@Labels
#1%
}%
- }
+ }%
\fi
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname pdfescapestring\endcsname\relax
@@ -71,7 +71,7 @@
}%
|def|Hy@ExchangeBackslash#1\#2|@nil{%
#1%
- |ifx|\#2|\%
+ |ifx|\#2|\%%
|else
\\%
|Hy@ReturnAfterFi{%
@@ -79,7 +79,7 @@
}%
|fi
}%
- }
+ }%
\def\Hy@ExchangeLeftParenthesis#1(#2\@nil{%
#1%
\ifx\\#2\\%
@@ -89,7 +89,7 @@
\Hy@ExchangeLeftParenthesis#2\@nil
}%
\fi
- }
+ }%
\def\Hy@ExchangeRightParenthesis#1)#2\@nil{%
#1%
\ifx\\#2\\%
@@ -99,7 +99,7 @@
\Hy@ExchangeRightParenthesis#2\@nil
}%
\fi
- }
+ }%
\else
\def\Hy@pstringdef#1#2{%
\edef#1{\pdfescapestring{#2}}%
@@ -181,16 +181,19 @@
\Hy@pstringdef\Hy@testname\Hy@testname
\fi
\@pdfm@mark{%
- bann <<
- /Type /Annot
- /Subtype /Link
+ bann<<%
+ /Type/Annot%
+ /Subtype/Link%
\Hy@setpdfborder
- /C [\csname @#1bordercolor\endcsname]
- /A <<
- /S /GoTo
- /D (\Hy@testname)
- >>
- >>
+ \expandafter\ifx\csname @#1bordercolor\endcsname\relax
+ \else
+ /C[\csname @#1bordercolor\endcsname]%
+ \fi
+ /A<<%
+ /S/GoTo%
+ /D(\Hy@testname)%
+ >>%
+ >>%
}%
\expandafter\Hy@colorlink\csname @#1color\endcsname
}
@@ -206,17 +209,20 @@
\Hy@pstringdef\Hy@pstringD{#3}%
\leavevmode
\@pdfm@mark{%
- bann <<
- /Type /Annot
- /Subtype /Link
+ bann<<%
+ /Type/Annot%
+ /Subtype/Link%
\Hy@setpdfborder
- /C [\@filebordercolor]
- /A <<
- /S /GoToR
- /F (\Hy@pstringF)
- /D \ifx\\#3\\[0 \@pdfstartview]\else(\Hy@pstringD)\fi\space
- \ifHy@newwindow /NewWindow true \fi
- >>
+ \ifx\@filebordercolor\relax
+ \else
+ /C[\@filebordercolor]%
+ \fi
+ /A<<%
+ /S/GoToR%
+ /F(\Hy@pstringF)%
+ /D\ifx\\#3\\[0 \@pdfstartview]\else(\Hy@pstringD)\fi
+ \ifHy@newwindow /NewWindow true\fi
+ >>%
>>%
}%
\Hy@colorlink\@filecolor#1\Hy@endcolorlink
@@ -227,38 +233,44 @@
\Hy@pstringdef\Hy@pstringP{#3}%
\leavevmode
\@pdfm@mark{%
- bann <<
- /Type /Annot
- /Subtype /Link
+ bann<<%
+ /Type/Annot%
+ /Subtype/Link%
\Hy@setpdfborder
- /C [\@filebordercolor]
- /A <<
- /S /Launch
- /F (\Hy@pstringF)
- \ifHy@newwindow /NewWindow true \fi
+ \ifx\@runbordercolor\relax
+ \else
+ /C[\@runbordercolor]%
+ \fi
+ /A<<%
+ /S/Launch%
+ /F(\Hy@pstringF)%
+ \ifHy@newwindow /NewWindow true\fi
\ifx\\#3\\%
\else
- /Win << /P (\Hy@pstringP) /F (\Hy@pstringF) >>
+ /Win<</P(\Hy@pstringP)/F(\Hy@pstringF)>>%
\fi
- >>
+ >>%
>>%
}%
- \Hy@colorlink\@filecolor#2\Hy@endcolorlink
+ \Hy@colorlink\@runcolor#2\Hy@endcolorlink
\@pdfm@mark{eann}%
}
\def\hyper@linkurl#1#2{%
\Hy@pstringdef\Hy@pstringURI{#2}%
\leavevmode
\@pdfm@mark{%
- bann <<
- /Type /Annot
- /Subtype /Link
+ bann<<%
+ /Type/Annot%
+ /Subtype/Link%
\Hy@setpdfborder
- /C [\@urlbordercolor]
- /A <<
- /S /URI
- /URI (\Hy@pstringURI)
- >>
+ \ifx\@urlbordercolor\relax
+ \else
+ /C[\@urlbordercolor]%
+ \fi
+ /A<<%
+ /S/URI%
+ /URI(\Hy@pstringURI)%
+ >>%
>>%
}%
\Hy@colorlink\@urlcolor#1\Hy@endcolorlink
@@ -267,44 +279,47 @@
\def\Acrobatmenu#1#2{%
\leavevmode
\@pdfm@mark{%
- bann <<
- /Type /Annot
- /Subtype /Link
- /A <<
- /S /Named
- /N /#1
- >>
+ bann<<%
+ /Type/Annot%
+ /Subtype/Link%
+ /A<<%
+ /S/Named%
+ /N/#1%
+ >>%
\Hy@setpdfborder
- /C [\@menubordercolor]
+ \ifx\@menubordercolor\relax
+ \relax
+ /C[\@menubordercolor]%
+ \fi
>>%
}%
\Hy@colorlink\@menucolor#2\Hy@endcolorlink
\@pdfm@mark{eann}%
}
\ifx\@pdfproducer\relax
- \def\@pdfproducer{dvipdfm}
+ \def\@pdfproducer{dvipdfm}%
\fi
\def\PDF@FinishDoc{%
\Hy@UseMaketitleInfos
\@pdfm@mark{%
- docinfo <<
- /Title (\@pdftitle)
- /Subject (\@pdfsubject)
- /Creator (\@pdfcreator)
+ docinfo<<%
+ /Title(\@pdftitle)%
+ /Subject(\@pdfsubject)%
+ /Creator(\@pdfcreator)%
\ifx\@pdfcreationdate\@empty
\else
- /CreationDate(\@pdfcreationdate) %
+ /CreationDate(\@pdfcreationdate)%
\fi
\ifx\@pdfmoddate\@empty
\else
- /ModDate(\@pdfmoddate) %
+ /ModDate(\@pdfmoddate)%
\fi
- /Author (\@pdfauthor)
+ /Author(\@pdfauthor)%
\ifx\@pdfproducer\relax
\else
- /Producer (\@pdfproducer)
+ /Producer(\@pdfproducer)%
\fi
- /Keywords (\@pdfkeywords)
+ /Keywords(\@pdfkeywords)%
>>%
}%
\Hy@DisableOption{pdfauthor}%
@@ -347,7 +362,7 @@
}%
\Hy@pstringdef\Hy@pstringB{\@baseurl}%
\@pdfm@mark{%
- docview <<%
+ docview<<%
\ifx\@pdfstartview\@empty
\else
/OpenAction[@page\@pdfstartpage\@pdfstartview]%
@@ -370,7 +385,7 @@
}%
\ifx\@pdfpagescrop\@empty
\else
- \@pdfm@mark{put @pages <</CropBox[\@pdfpagescrop]>>}
+ \@pdfm@mark{put @pages <</CropBox[\@pdfpagescrop]>>}%
\fi
}
\def\@Gauge[#1]#2#3#4{% parameters, label, minimum, maximum
@@ -379,18 +394,23 @@
\def\@Form[#1]{%
\@ifundefined{textcolor}{\let\textcolor\@gobble}{}%
\setkeys{Form}{#1}%
- \@pdfm@mark{obj @afields [ ]}%
- \@pdfm@mark{obj @corder [ ]}%
+ \@pdfm@mark{obj @afields []}%
+ \@pdfm@mark{obj @corder []}%
\@pdfm@mark{%
- obj @aform <<
- /Fields @afields
- /DR << /Font << /ZaDb @OBJZaDb /Helv @OBJHelv >> >>
- /DA (/Helv 10 Tf 0 g )
- /CO @corder
- /NeedAppearances true
+ obj @aform <<%
+ /Fields @afields%
+ /DR<<%
+ /Font<<%
+ /ZaDb @OBJZaDb%
+ /Helv @OBJHelv%
+ >>%
+ >>%
+ /DA(/Helv 10 Tf 0 g)%
+ /CO @corder%
+ /NeedAppearances true%
>>%
}%
- \@pdfm@mark{put @catalog << /AcroForm @aform >>}%
+ \@pdfm@mark{put @catalog <</AcroForm @aform>>}%
}
\def\@endForm{}
\def\dvipdfm@setdim{%
@@ -438,7 +458,7 @@
\def\Fld@width{\DefaultWidthofChoiceMenu}%
\def\Fld@height{\DefaultHeightofChoiceMenu}%
\bgroup
- \Fld@menulength=0
+ \Fld@menulength=0 %
\@tempdima\z@
\@for\@curropt:=#3\do{%
\expandafter\Fld@checkequals\@curropt==\\%
@@ -450,6 +470,9 @@
\Field@toks={ }%
\setkeys{Field}{#1}%
\ifFld@hidden\def\Fld@width{1sp}\fi
+ \ifx\Fld@value\relax
+ \let\Fld@value\Fld@default
+ \fi
\LayoutChoiceField{#2}{%
\ifFld@radio
\@@Radio{#3}%
@@ -464,8 +487,8 @@
\ifFld@popdown\def\Fld@flags{/Ff 131072}\fi
\ifx\Fld@flags\@empty
\@tempdima=\the\Fld@menulength\Fld@charsize
- \advance\@tempdima by \Fld@borderwidth bp
- \advance\@tempdima by \Fld@borderwidth bp
+ \advance\@tempdima by \Fld@borderwidth bp %
+ \advance\@tempdima by \Fld@borderwidth bp %
\edef\Fld@height{\the\@tempdima}%
\fi
\@@Listbox{#3}%
@@ -475,7 +498,7 @@
\egroup
}
\def\@@Radio#1{%
- \Fld@listcount=0
+ \Fld@listcount=0 %
\setbox\pdfm@box=\hbox{\MakeRadioField{\Fld@width}{\Fld@height}}%
\@for\@curropt:=#1\do{%
\expandafter\Fld@checkequals\@curropt==\\%
@@ -486,9 +509,9 @@
\@pdfm@mark{%
ann \ifnum\Fld@listcount=1 @\Fld@name\space\fi
\dvipdfm@setdim
- <<
- \PDFForm@Radio\space
- /AP << /N << /\@currValue /null >> >>
+ <<%
+ \PDFForm@Radio
+ /AP<</N<</\@currValue /null>>>>%
>>%
}%
\unhcopy\pdfm@box\space% deliberate space between radio buttons
@@ -498,7 +521,7 @@
\newcount\Fld@listcount
\def\@@Listbox#1{%
\Choice@toks={ }%
- \Fld@listcount=0
+ \Fld@listcount=0 %
\@for\@curropt:=#1\do{%
\expandafter\Fld@checkequals\@curropt==\\%
\Hy@StepCount\Fld@listcount
@@ -594,51 +617,54 @@
}%
\egroup
}
-\@pdfm@mark{obj @OBJpdfdocencoding << /Type /Encoding /Differences [%
- 24 /breve /caron /circumflex /dotaccent /hungarumlaut /ogonek /ring
- /tilde
- 39 /quotesingle
- 96 /grave
- 128 /bullet /dagger /daggerdbl /ellipsis /emdash /endash /florin
- /fraction /guilsinglleft /guilsinglright /minus /perthousand
- /quotedblbase /quotedblleft /quotedblright /quoteleft /quoteright
- /quotesinglbase /trademark /fi /fl /Lslash /OE /Scaron /Ydieresis
- /Zcaron /dotlessi /lslash /oe /scaron /zcaron
- 164 /currency
- 166 /brokenbar
- 168 /dieresis /copyright /ordfeminine
- 172 /logicalnot /.notdef /registered /macron /degree /plusminus
- /twosuperior /threesuperior /acute /mu
- 183 /periodcentered /cedilla /onesuperior /ordmasculine
- 188 /onequarter /onehalf /threequarters
- 192 /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE
- /Ccedilla /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute
- /Icircumflex /Idieresis /Eth /Ntilde /Ograve /Oacute /Ocircumflex
- /Otilde /Odieresis /multiply /Oslash /Ugrave /Uacute /Ucircumflex
- /Udieresis /Yacute /Thorn /germandbls /agrave /aacute /acircumflex
- /atilde /adieresis /aring /ae /ccedilla /egrave /eacute
- /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis
- /divide /oslash /ugrave /uacute /ucircumflex /udieresis /yacute
- /thorn /ydieresis%
- ] >>
+\@pdfm@mark{obj @OBJpdfdocencoding%
+ <<%
+ /Type/Encoding%
+ /Differences[%
+ 24/breve/caron/circumflex/dotaccent/hungarumlaut/ogonek/ring/tilde %
+ 39/quotesingle %
+ 96/grave %
+ 128/bullet/dagger/daggerdbl/ellipsis/emdash/endash/florin%
+ /fraction/guilsinglleft/guilsinglright/minus/perthousand%
+ /quotedblbase/quotedblleft/quotedblright/quoteleft/quoteright%
+ /quotesinglbase/trademark/fi/fl/Lslash/OE/Scaron/Ydieresis%
+ /Zcaron/dotlessi/lslash/oe/scaron/zcaron %
+ 164/currency %
+ 166/brokenbar %
+ 168/dieresis/copyright/ordfeminine %
+ 172/logicalnot/.notdef/registered/macron/degree/plusminus%
+ /twosuperior/threesuperior/acute/mu %
+ 183/periodcentered/cedilla/onesuperior/ordmasculine %
+ 188/onequarter/onehalf/threequarters %
+ 192/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE%
+ /Ccedilla/Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute%
+ /Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex%
+ /Otilde/Odieresis/multiply/Oslash/Ugrave/Uacute/Ucircumflex%
+ /Udieresis/Yacute/Thorn/germandbls/agrave/aacute/acircumflex%
+ /atilde/adieresis/aring/ae/ccedilla/egrave/eacute%
+ /ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis%
+ /eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis%
+ /divide/oslash/ugrave/uacute/ucircumflex/udieresis/yacute%
+ /thorn/ydieresis%
+ ]%
+ >>%
}
-\@pdfm@mark{obj @OBJZaDb
- <<
- /Type /Font
- /Subtype /Type1
- /Name /ZaDb
- /BaseFont /ZapfDingbats
- >>
+\@pdfm@mark{obj @OBJZaDb%
+ <<%
+ /Type/Font%
+ /Subtype/Type1%
+ /Name/ZaDb%
+ /BaseFont/ZapfDingbats%
+ >>%
}
-\@pdfm@mark{obj @OBJHelv
- <<
- /Type /Font
- /Subtype /Type1
- /Name /Helv
- /BaseFont /Helvetica
- /Encoding @OBJpdfdocencoding
- >>
+\@pdfm@mark{obj @OBJHelv%
+ <<%
+ /Type/Font%
+ /Subtype/Type1%
+ /Name/Helv%
+ /BaseFont/Helvetica%
+ /Encoding @OBJpdfdocencoding%
+ >>%
}
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname pdfescapestring\endcsname\relax
@@ -682,80 +708,99 @@
\Hy@escapeform{}%
\fi
\def\PDFForm@Check{%
- /Subtype /Widget
- \ifFld@hidden /F 6 \else /F 4 \fi
- /T (\Hy@escapestring{\Fld@name})
- /Q \Fld@align\space
- /BS << /W \Fld@borderwidth\space /S /\Fld@borderstyle\space >>
- /MK <<
- /BC [\Fld@bordercolor]
- \ifx\Fld@bcolor\@empty
+ /Subtype/Widget%
+ \ifFld@hidden /F 6\else /F 4\fi
+ /T(\Hy@escapestring{\Fld@name})%
+ /Q \Fld@align
+ /BS<</W \Fld@borderwidth /S/\Fld@borderstyle>>%
+ /MK<<%
+ \ifnum\Fld@rotation=\z@
+ \else
+ /R \Fld@rotation
+ \fi
+ \ifx\Fld@bordercolor\relax
\else
- /BG [\Fld@bcolor]
+ /BC[\Fld@bordercolor]%
+ \fi
+ \ifx\Fld@bcolor\relax
+ \else
+ /BG[\Fld@bcolor]%
\fi
- /CA (\Hy@escapestring{\Fld@cbsymbol})
- >>
- /DA (/ZaDb \strip@pt\Fld@charsize\space Tf \Fld@color\space rg)
- /FT /Btn
- /H /P
- \ifFld@checked /V /Yes \else /V /Off \fi
+ /CA(\Hy@escapestring{\Fld@cbsymbol})%
+ >>%
+ /DA(/ZaDb \strip@pt\Fld@charsize\space Tf%
+ \ifx\Fld@color\@empty\else\space\Fld@color\fi)%
+ /FT/Btn%
+ /H/P%
+ \ifFld@checked /V/Yes\else /V/Off\fi
}
\def\PDFForm@Push{%
- /Subtype/Widget
+ /Subtype/Widget%
\ifFld@hidden /F 6\else /F 4\fi
/T(\Hy@escapestring{\Fld@name})%
/FT/Btn%
- /Ff 65540
+ /Ff 65540%
/H/P%
/BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>%
/MK<<%
- /BC[\Fld@bordercolor]%
- >>%
- /A<</S/JavaScript/JS(\Hy@escapestring{\Fld@onclick})>>%
-}
-\def\Fld@additionalactions{%
- /AA <<
- \ifx\Fld@keystroke@code\@empty
- \else
- /K<</S/JavaScript/JS(\Hy@escapestring{\Fld@keystroke@code})>>%
- \fi
- \ifx\Fld@format@code\@empty
- \else
- /F<</S/JavaScript/JS(\Hy@escapestring{\Fld@format@code})>>%
- \fi
- \ifx\Fld@validate@code\@empty
- \else
- /V<</S/JavaScript/JS(\Hy@escapestring{\Fld@validate@code})>>%
- \fi
- \ifx\Fld@calculate@code\@empty
- \else
- /C<</S/JavaScript/JS(\Hy@escapestring{\Fld@calculate@code})>>%
- \fi
- \ifx\Fld@onfocus@code\@empty
- \else
- /Fo<</S/JavaScript/JS(\Hy@escapestring{\Fld@onfocus@code})>>%
- \fi
- \ifx\Fld@onblur@code\@empty
- \else
- /Bl<</S/JavaScript/JS(\Hy@escapestring{\Fld@onblur@code})>>%
- \fi
- \ifx\Fld@onmousedown@code\@empty
+ \ifnum\Fld@rotation=\z@
\else
- /D<</S/JavaScript/JS(\Hy@escapestring{\Fld@onmousedown@code})>>%
+ /R \Fld@rotation
\fi
- \ifx\Fld@onmouseup@code\@empty
+ \ifx\Fld@bordercolor\relax
\else
- /U<</S/JavaScript/JS(\Hy@escapestring{\Fld@onmouseup@code})>>%
- \fi
- \ifx\Fld@onenter@code\@empty
- \else
- /E<</S/JavaScript/JS(\Hy@escapestring{\Fld@onenter@code})>>%
- \fi
- \ifx\Fld@onexit@code\@empty
- \else
- /X<</S/JavaScript/JS(\Hy@escapestring{\Fld@onexit@code})>>%
+ /BC[\Fld@bordercolor]%
\fi
>>%
+ /A<</S/JavaScript/JS(\Hy@escapestring{\Fld@onclick})>>%
+}
+\def\Fld@@additionalactions{%
+ \ifx\Fld@keystroke@code\@empty
+ \else
+ /K<</S/JavaScript/JS(\Hy@escapestring{\Fld@keystroke@code})>>%
+ \fi
+ \ifx\Fld@format@code\@empty
+ \else
+ /F<</S/JavaScript/JS(\Hy@escapestring{\Fld@format@code})>>%
+ \fi
+ \ifx\Fld@validate@code\@empty
+ \else
+ /V<</S/JavaScript/JS(\Hy@escapestring{\Fld@validate@code})>>%
+ \fi
+ \ifx\Fld@calculate@code\@empty
+ \else
+ /C<</S/JavaScript/JS(\Hy@escapestring{\Fld@calculate@code})>>%
+ \fi
+ \ifx\Fld@onfocus@code\@empty
+ \else
+ /Fo<</S/JavaScript/JS(\Hy@escapestring{\Fld@onfocus@code})>>%
+ \fi
+ \ifx\Fld@onblur@code\@empty
+ \else
+ /Bl<</S/JavaScript/JS(\Hy@escapestring{\Fld@onblur@code})>>%
+ \fi
+ \ifx\Fld@onmousedown@code\@empty
+ \else
+ /D<</S/JavaScript/JS(\Hy@escapestring{\Fld@onmousedown@code})>>%
+ \fi
+ \ifx\Fld@onmouseup@code\@empty
+ \else
+ /U<</S/JavaScript/JS(\Hy@escapestring{\Fld@onmouseup@code})>>%
+ \fi
+ \ifx\Fld@onenter@code\@empty
+ \else
+ /E<</S/JavaScript/JS(\Hy@escapestring{\Fld@onenter@code})>>%
+ \fi
+ \ifx\Fld@onexit@code\@empty
+ \else
+ /X<</S/JavaScript/JS(\Hy@escapestring{\Fld@onexit@code})>>%
+ \fi
+}
+\def\Fld@additionalactions{%
+ \if-\Fld@@additionalactions-%
+ \else
+ /AA<<\Fld@@additionalactions>>%
+ \fi
}
\def\PDFForm@List{%
/Subtype/Widget%
@@ -765,13 +810,21 @@
/Q \Fld@align
/BS<</W \Fld@borderwidth /S/\Fld@borderstyle>>%
/MK<<%
- /BC[\Fld@bordercolor]%
- \ifx\Fld@bcolor\@empty
+ \ifnum\Fld@rotation=\z@
+ \else
+ /R \Fld@rotation
+ \fi
+ \ifx\Fld@bordercolor\relax
+ \else
+ /BC[\Fld@bordercolor]%
+ \fi
+ \ifx\Fld@bcolor\relax
\else
/BG[\Fld@bcolor]%
\fi
>>%
- /DA(/Helv \strip@pt\Fld@charsize\space Tf \Fld@color\space rg)%
+ /DA(/Helv \strip@pt\Fld@charsize\space Tf%
+ \ifx\Fld@color\@empty\else\space\Fld@color\fi)%
/Opt[\the\Choice@toks]%
\ifx\Fld@default\relax
\else
@@ -790,17 +843,25 @@
/T(\Hy@escapestring{\Fld@name})%
/FT/Btn%
/Ff 49152%
- /H/P
+ /H/P%
/BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>%
/MK<<%
- /BC[\Fld@bordercolor]%
- \ifx\Fld@bcolor\@empty
+ \ifnum\Fld@rotation=\z@
+ \else
+ /R \Fld@rotation
+ \fi
+ \ifx\Fld@bordercolor\relax
+ \else
+ /BC[\Fld@bordercolor]%
+ \fi
+ \ifx\Fld@bcolor\relax
\else
/BG[\Fld@bcolor]%
\fi
/CA(H)%
>>%
- /DA(/ZaDb \strip@pt\Fld@charsize\space Tf \Fld@color\space rg)%
+ /DA(/ZaDb \strip@pt\Fld@charsize\space Tf%
+ \ifx\Fld@color\@empty\else\space\Fld@color\fi)%
\ifx\@currValue\Fld@default
/V/\Fld@default
\else
@@ -811,18 +872,26 @@
\def\PDFForm@Text{%
/Subtype/Widget%
\ifFld@hidden /F 6\else /F 4\fi
- /T(\Hy@escapestring{\Fld@name})
+ /T(\Hy@escapestring{\Fld@name})%
/Q \Fld@align
/FT/Tx%
/BS<</W \Fld@borderwidth\space /S /\Fld@borderstyle>>%
/MK<<%
- /BC[\Fld@bordercolor]%
- \ifx\Fld@bcolor\@empty
+ \ifnum\Fld@rotation=\z@
+ \else
+ /R \Fld@rotation
+ \fi
+ \ifx\Fld@bordercolor\relax
+ \else
+ /BC[\Fld@bordercolor]%
+ \fi
+ \ifx\Fld@bcolor\relax
\else
/BG[\Fld@bcolor]%
\fi
>>%
- /DA(/Helv \strip@pt\Fld@charsize\space Tf \Fld@color\space rg)%
+ /DA(/Helv \strip@pt\Fld@charsize\space Tf%
+ \ifx\Fld@color\@empty\else\space\Fld@color\fi)%
/DV(\Hy@escapestring{\Fld@default})%
/V(\Hy@escapestring{\Fld@value})%
\Fld@additionalactions
@@ -835,7 +904,7 @@
\ifFld@readonly /Ff 1\fi
\fi
\fi
- \ifnum\Fld@maxlen>0/MaxLen \Fld@maxlen \fi
+ \ifnum\Fld@maxlen>\z@/MaxLen \Fld@maxlen \fi
}
\def\PDFForm@Submit{%
/Subtype/Widget%
@@ -846,7 +915,14 @@
/H/P%
/BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>%
/MK<<%
- /BC[\Fld@bordercolor]%
+ \ifnum\Fld@rotation=\z@
+ \else
+ /R \Fld@rotation
+ \fi
+ \ifx\Fld@bordercolor\relax
+ \else
+ /BC[\Fld@bordercolor]%
+ \fi
>>%
/A<<%
/S/SubmitForm%
@@ -866,7 +942,14 @@
/DA(/Helv \strip@pt\Fld@charsize\space Tf 0 0 1 rg)%
/Ff 65540%
/MK<<%
- /BC[\Fld@bordercolor]%
+ \ifnum\Fld@rotation=\z@
+ \else
+ /R \Fld@rotation
+ \fi
+ \ifx\Fld@bordercolor\relax
+ \else
+ /BC[\Fld@bordercolor]%
+ \fi
>>%
/BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>%
/A<</S/ResetForm>>%
@@ -878,7 +961,8 @@
\else
\@@writetorep{#1}{#2}{#3}{#4}{#5}%
\fi
- \fi}
+ \fi
+}
\def\Hy@currentbookmarklevel{0}
\def\Hy@numberline#1{#1 }
\def\@@writetorep#1#2#3#4#5{%
@@ -888,16 +972,16 @@
\edef\Hy@level{#4}%
\ifx\Hy@levelcheck Y%
\@tempcnta\Hy@level\relax
- \advance\@tempcnta by -1
+ \advance\@tempcnta by -1 %
\ifnum\Hy@currentbookmarklevel<\@tempcnta
\advance\@tempcnta by -\Hy@currentbookmarklevel\relax
- \advance\@tempcnta by 1
+ \advance\@tempcnta by 1 %
\Hy@Warning{%
Difference (\the\@tempcnta) between bookmark levels is %
greater \MessageBreak than one, level fixed%
}%
\@tempcnta\Hy@currentbookmarklevel
- \advance\@tempcnta by 1
+ \advance\@tempcnta by 1 %
\edef\Hy@level{\the\@tempcnta}%
\fi
\else
@@ -906,7 +990,7 @@
\global\let\Hy@currentbookmarklevel\Hy@level
\@tempcnta\Hy@level\relax
\expandafter\xdef\csname Parent\Hy@level\endcsname{#3}%
- \advance\@tempcnta by -1
+ \advance\@tempcnta by -1 %
\edef\Hy@tempa{#3}%
\edef\Hy@tempb{\csname Parent\the\@tempcnta\endcsname}%
\ifx\Hy@tempa\Hy@tempb
@@ -948,7 +1032,7 @@
\@tempcnta\Hy@currentbookmarklevel
\Hy@StepCount\@tempcnta
\expandafter\pdfbookmark\expandafter[\the\@tempcnta]{#1}{#2}%
- \advance\@tempcnta by -1
+ \advance\@tempcnta by -1 %
\xdef\Hy@currentbookmarklevel{\the\@tempcnta}%
}
\renewcommand\pdfbookmark[3][0]{%
@@ -970,13 +1054,21 @@
\def\Hy@temp{##4}%
\Hy@pstringdef\Hy@pstringName{##3}%
\@pdfm@mark{%
- outline ##1 <<
- /Title (\expandafter\strip@prefix\meaning\Hy@temp)
- /A <<
- /S /GoTo
- /D (\Hy@pstringName)
- >>
- >>
+ outline \ifHy@DvipdfmxOutlineOpen
+ [%
+ \ifnum##21>\z@
+ \else
+ -%
+ \fi
+ ] %
+ \fi
+ ##1<<%
+ /Title(\expandafter\strip@prefix\meaning\Hy@temp)%
+ /A<<%
+ /S/GoTo%
+ /D(\Hy@pstringName)%
+ >>%
+ >>%
}%
}%
{%
@@ -988,7 +1080,7 @@
\else
\if@filesw
\newwrite\@outlinefile
- \immediate\openout\@outlinefile=\jobname.out
+ \immediate\openout\@outlinefile=\jobname.out\relax
\ifHy@typexml
\immediate\write\@outlinefile{<relaxxml>\relax}%
\fi
@@ -1005,7 +1097,7 @@
}
\def\calc@bm@number#1{%
\@tempcnta=\check@bm@number{#1}\relax
- \advance\@tempcnta by1
+ \advance\@tempcnta by 1 %
\expandafter\xdef\csname B_#1\endcsname{\the\@tempcnta}%
}
\ifHy@implicit