From 24c6a0e65a786c5ca1533f07dcc4b202928487ae Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 9 Jun 2019 11:33:49 +0900 Subject: acrotex (20190609) --- texmf-dist/tex/latex/acrotex/edvipdfm.def | 129 +++--- texmf-dist/tex/latex/acrotex/eforms.sty | 710 ++++++++++++++++------------- texmf-dist/tex/latex/acrotex/epdfmark.def | 178 ++++---- texmf-dist/tex/latex/acrotex/epdftex.def | 125 ++--- texmf-dist/tex/latex/acrotex/pdfdochex.def | 2 +- texmf-dist/tex/latex/acrotex/setcorder.def | 2 +- texmf-dist/tex/latex/acrotex/uieforms.def | 2 +- 7 files changed, 610 insertions(+), 538 deletions(-) (limited to 'texmf-dist/tex') diff --git a/texmf-dist/tex/latex/acrotex/edvipdfm.def b/texmf-dist/tex/latex/acrotex/edvipdfm.def index a10fdde7..8f013a62 100644 --- a/texmf-dist/tex/latex/acrotex/edvipdfm.def +++ b/texmf-dist/tex/latex/acrotex/edvipdfm.def @@ -8,7 +8,7 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% eForms package, %% -%% Copyright (C) 2002-2018 D. P. Story %% +%% Copyright (C) 2002-2019 D. P. Story %% %% dpstory@uakron.edu %% %% %% %% This program can redistributed and/or modified under %% @@ -21,42 +21,45 @@ \let\ef@adjHWxetex\relax \def\eq@choice@driver{\ef@adjHWxetex \Hy@pdfstringtrue - \if\@vertRotate1\let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% - \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH - \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi - \leavevmode\setbox\pdfm@box=% - \hbox{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% - \@pdfm@mark{ann @\Fld@name\space\dvipdfm@setdim - <<\common@choiceCode>>}\unhbox\pdfm@box\relax% - \@pdfm@mark{put @afields @\Fld@name}% record in @afields array - \ifisCalculate\@pdfm@mark{put @corder @\Fld@name}\fi - \dl@restorespcs - \endgroup + \ifx\@vertRotate\ef@One + \let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% + \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH + \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi + \leavevmode\setbox\pdfm@box=% + \hbox{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% + \@pdfm@mark{ann @\Fld@name\space\dvipdfm@setdim + <<\common@choiceCode>>}\unhbox\pdfm@box\relax% + \@pdfm@mark{put @afields @\Fld@name}% record in @afields array + \ifisCalculate\@pdfm@mark{put @corder @\Fld@name}\fi + \dl@restorespcs + \endgroup } \def\eq@Button@driver{\Hy@pdfstringtrue - \ifx\eq@rectW\@empty\def\eq@rectW{\wd\eq@tmpbox}\ef@djXPD\fi % 12/22 - \if\@vertRotate1\let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% - \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH - \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi - \setbox\pdfm@box=% - \hbox{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% - \@pdfm@mark{ann @\Fld@name\space\dvipdfm@setdim - << \common@pushButtonCode >>}\unhbox\pdfm@box\relax% - \@pdfm@mark{put @afields @\Fld@name}% record in @afields array - \endgroup - \dl@restorespcs + \ifx\eq@rectW\@empty\def\eq@rectW{\wd\eq@tmpbox}\ef@djXPD\fi + \ifx\@vertRotate\ef@One + \let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% + \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH + \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi + \setbox\pdfm@box=% + \hbox{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% + \@pdfm@mark{ann @\Fld@name\space\dvipdfm@setdim + << \common@pushButtonCode >>}\unhbox\pdfm@box\relax% + \@pdfm@mark{put @afields @\Fld@name}% record in @afields array + \endgroup + \dl@restorespcs } \def\eq@RadioCheck@driver{\ef@adjHWxetex\Hy@pdfstringtrue - \if\@vertRotate1\let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% - \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH - \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi - \ifx\eq@rectW\@empty\def\eq@rectW{\wd\eq@tmpbox}\fi - \setbox\pdfm@box=% - \hbox{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% - \@pdfm@mark{ann \dvipdfm@setdim - <<\common@RadioCheckCode>>}\unhbox\pdfm@box\relax% - \endgroup - \dl@restorespcs + \ifx\@vertRotate\ef@One + \let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% + \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH + \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi + \ifx\eq@rectW\@empty\def\eq@rectW{\wd\eq@tmpbox}\fi + \setbox\pdfm@box=% + \hbox{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% + \@pdfm@mark{ann \dvipdfm@setdim + <<\common@RadioCheckCode>>}\unhbox\pdfm@box\relax% + \endgroup + \dl@restorespcs } \def\eq@l@check@driver{% \setbox\pdfm@box=% @@ -65,41 +68,43 @@ \unhbox\pdfm@box\relax\endgroup } \def\eq@TextField{\ef@adjHWxetex\Hy@pdfstringtrue - \if\@vertRotate1\let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% - \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH - \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi - \leavevmode\setbox\pdfm@box=% - \hbox{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% - \@pdfm@mark{ann @\Fld@name\space\dvipdfm@setdim - << \common@TextFieldCode >>}\unhbox\pdfm@box\relax% - \@pdfm@mark{put @afields @\Fld@name}% record in @afields array - \ifisCalculate\@pdfm@mark{put @corder @\Fld@name}\fi - \endgroup - \dl@restorespcs + \ifx\@vertRotate\ef@One + \let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% + \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH + \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi + \leavevmode\setbox\pdfm@box=% + \hbox{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% + \@pdfm@mark{ann @\Fld@name\space\dvipdfm@setdim + << \common@TextFieldCode >>}\unhbox\pdfm@box\relax% + \@pdfm@mark{put @afields @\Fld@name}% record in @afields array + \ifisCalculate\@pdfm@mark{put @corder @\Fld@name}\fi + \endgroup + \dl@restorespcs } \def\eq@SigField{\ef@adjHWxetex\Hy@pdfstringtrue - \if\@vertRotate1\let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% - \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH - \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi - \leavevmode\setbox\pdfm@box=% - \hbox{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% - \@pdfm@mark{ann @\Fld@name\space\dvipdfm@setdim - << \common@SigFieldCode >>}\unhbox\pdfm@box\relax% - \endgroup - \dl@restorespcs + \ifx\@vertRotate\ef@One + \let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% + \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH + \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi + \leavevmode\setbox\pdfm@box=% + \hbox{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% + \@pdfm@mark{ann @\Fld@name\space\dvipdfm@setdim + << \common@SigFieldCode >>}\unhbox\pdfm@box\relax% + \endgroup + \dl@restorespcs } \def\setLink@driver{% - \@eqBS{}\leavevmode - \@pdfm@mark{bann - <>}% - \Hy@colorlink{\@linkcolor}\link@@Box\Hy@endcolorlink - \@pdfm@mark{eann}% - \endgroup - \dl@restorespcs + \@eqBS{}\leavevmode + \@pdfm@mark{bann + <>}% + \Hy@colorlink{\@linkcolor}\link@@Box\Hy@endcolorlink + \@pdfm@mark{eann}% + \endgroup + \dl@restorespcs } \def\ef@setTabOrder{\ifx\ef@taborder\@empty\else - \@pdfm@mark{ put @thispage << /Tabs/\ef@taborder >> }% - \fi\endgroup + \@pdfm@mark{ put @thispage << /Tabs/\ef@taborder >> }% + \fi\endgroup } \endinput %% diff --git a/texmf-dist/tex/latex/acrotex/eforms.sty b/texmf-dist/tex/latex/acrotex/eforms.sty index b0ff4b6b..3184371f 100644 --- a/texmf-dist/tex/latex/acrotex/eforms.sty +++ b/texmf-dist/tex/latex/acrotex/eforms.sty @@ -8,7 +8,7 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% eForms package, %% -%% Copyright (C) 2002-2018 D. P. Story %% +%% Copyright (C) 2002-2019 D. P. Story %% %% dpstory@uakron.edu %% %% %% %% This program can redistributed and/or modified under %% @@ -19,54 +19,54 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eforms} - [2019/03/16 v2.10 Provides general eforms support (dps)] + [2019/05/24 v2.11 Provides general eforms support (dps)] \RequirePackage{ifpdf}[2006/02/20] \RequirePackage{ifxetex}[2006/08/21] \RequirePackage{ifluatex} \RequirePackage{calc} \let\ef@driver\@empty \DeclareOption{dvipsone}{\def\eq@drivernum{0}% - \def\eq@drivername{0}\def\ef@driver{dvipsone}% - \def\eq@drivercode{epdfmark.def}% - \PassOptionsToPackage{dvipsone}{insdljs}% - \PassOptionsToPackage{dvipsone}{hyperref}% + \def\eq@drivername{0}\def\ef@driver{dvipsone}% + \def\eq@drivercode{epdfmark.def}% + \PassOptionsToPackage{dvipsone}{insdljs}% + \PassOptionsToPackage{dvipsone}{hyperref}% } \def\eq@drivername{2} \DeclareOption{dvips}{\def\eq@drivernum{0}% - \def\eq@drivername{1}\def\ef@driver{dvips}% - \def\eq@drivercode{epdfmark.def}% - \PassOptionsToPackage{dvips}{insdljs}% - \PassOptionsToPackage{dvips}{hyperref}% + \def\eq@drivername{1}\def\ef@driver{dvips}% + \def\eq@drivercode{epdfmark.def}% + \PassOptionsToPackage{dvips}{insdljs}% + \PassOptionsToPackage{dvips}{hyperref}% } \DeclareOption{pdftex}{% - \def\eq@drivernum{1}\def\eq@driver{pdftex}% - \def\eq@drivercode{epdftex.def}\def\ef@driver{pdftex}% + \def\eq@drivernum{1}\def\eq@driver{pdftex}% + \def\eq@drivercode{epdftex.def}\def\ef@driver{pdftex}% } \DeclareOption{luatex}{% - \def\eq@drivernum{1}\def\eq@driver{luatex}% - \def\eq@drivercode{epdftex.def}\def\ef@driver{luatex}% + \def\eq@drivernum{1}\def\eq@driver{luatex}% + \def\eq@drivercode{epdftex.def}\def\ef@driver{luatex}% } \DeclareOption{dvipdfm}{% - \def\eq@drivernum{2}\def\eq@driver{dvipdfm}% - \def\eq@drivercode{edvipdfm.def}\def\ef@driver{dvipdfm}% - \PassOptionsToPackage{dvipdfm}{insdljs} - \PassOptionsToPackage{dvipdfm}{hyperref} + \def\eq@drivernum{2}\def\eq@driver{dvipdfm}% + \def\eq@drivercode{edvipdfm.def}\def\ef@driver{dvipdfm}% + \PassOptionsToPackage{dvipdfm}{insdljs} + \PassOptionsToPackage{dvipdfm}{hyperref} } \DeclareOption{dvipdfmx}{% - \def\eq@drivernum{2}\def\eq@driver{dvipdfmx}% - \def\eq@drivercode{edvipdfm.def}\def\ef@driver{dvipdfmx}% - \PassOptionsToPackage{dvipdfmx}{insdljs} - \PassOptionsToPackage{dvipdfmx}{hyperref} + \def\eq@drivernum{2}\def\eq@driver{dvipdfmx}% + \def\eq@drivercode{edvipdfm.def}\def\ef@driver{dvipdfmx}% + \PassOptionsToPackage{dvipdfmx}{insdljs} + \PassOptionsToPackage{dvipdfmx}{hyperref} } \DeclareOption{xetex}{% - \def\eq@drivernum{2}\def\eq@driver{xetex}% - \def\eq@drivercode{edvipdfm.def}\def\ef@driver{xetex}% + \def\eq@drivernum{2}\def\eq@driver{xetex}% + \def\eq@drivercode{edvipdfm.def}\def\ef@driver{xetex}% } \DeclareOption{textures}{% - \def\eq@drivernum{3}\def\eq@driver{textures}% - \def\eq@drivercode{epdfmark.def}\def\ef@driver{textures}% - \PassOptionsToPackage{textures}{insdljs}% - \PassOptionsToPackage{textures}{hyperref} + \def\eq@drivernum{3}\def\eq@driver{textures}% + \def\eq@drivercode{epdfmark.def}\def\ef@driver{textures}% + \PassOptionsToPackage{textures}{insdljs}% + \PassOptionsToPackage{textures}{hyperref} } \def\eq@driver{dvipsone/dvips} \def\eq@drivercode{epdfmark.def} @@ -78,14 +78,14 @@ \providecommand{\previewOff}{\previewfalse} \DeclareOption{useui}{\AtEndOfPackage{\ef@InputUIeForms}} \def\ef@InputUIeForms{\InputIfFileExists{uieforms.def}% - {\PackageInfo{eforms}{Inputting code for useui option}}% - {\PackageInfo{eforms}{Cannot find uieforms.def.\MessageBreak - Reinstall or refresh your file name database.}}} + {\PackageInfo{eforms}{Inputting code for useui option}}% + {\PackageInfo{eforms}{Cannot find uieforms.def.\MessageBreak + Reinstall or refresh your file name database.}}} \DeclareOption{setcorder}{\def\inputCalcOrderJS{% - \InputIfFileExists{setcorder.def}% - {\PackageInfo{eforms}{Inputting code for setcorder option}}% - {\PackageWarning{eforms}{Cannot find setcorder.def.\MessageBreak - Reinstall or refresh your file name database.}}}} + \InputIfFileExists{setcorder.def}% + {\PackageInfo{eforms}{Inputting code for setcorder option}}% + {\PackageWarning{eforms}{Cannot find setcorder.def.\MessageBreak + Reinstall or refresh your file name database.}}}} \let\inputCalcOrderJS\relax \@ifpackageloaded{web}{% \ExecuteOptions{\eq@driver@name}% @@ -102,13 +102,13 @@ } \ProcessOptions \ifx\ef@driver\@empty - \PackageError{eforms}% - {You have not specified dvips, dvipsone, pdftex,\MessageBreak - dvipdfm, dvipdfmx, or xetex in the option list of\MessageBreak - the eforms package} - {Place one of the drivers dvips, dvipsone, pdftex, dvipdfm, - dvipdfmx, or xetex - \MessageBreak in the option list of the eforms package.}% + \PackageError{eforms}% + {You have not specified dvips, dvipsone, pdftex,\MessageBreak + dvipdfm, dvipdfmx, or xetex in the option list of\MessageBreak + the eforms package} + {Place one of the drivers dvips, dvipsone, pdftex, dvipdfm, + dvipdfmx, or xetex + \MessageBreak in the option list of the eforms package.}% }{} \fi \newlength\eflength @@ -125,11 +125,11 @@ \AtEndDocument{\csname endForm\endcsname} } \@ifpackageloaded{aeb_pro}{}{% - \newcommand{\taggedPDF}{% - \ifnum\eq@drivernum=0\relax - \literalps@out{[{Catalog} <<% - /MarkInfo<>% - >> /PUT pdfmark}\fi}% + \newcommand{\taggedPDF}{% + \ifnum\eq@drivernum=0\relax + \literalps@out{\AEB@psMrk{Catalog} <<% + /MarkInfo<>% + >> /PUT pdfmark}\fi}% } \let\ef@YES=y \let\ef@NO=n \let\ef@One=1 \let\ef@Zero=0 @@ -144,7 +144,7 @@ \@ifundefined{eq@tmpdimb}{\newdimen\eq@tmpdimb}{} \newlength\ef@dimena \newtoks\ef@scratchtoks -\newif\ifmakeXasPD \makeXasPDtrue % 12/22 +\newif\ifmakeXasPD \makeXasPDtrue \newif\ifmakePDasX \makePDasXfalse \def\makeXasPDOn{\makeXasPDtrue\makePDasXfalse} \def\makeXasPDOff{\makeXasPDfalse} @@ -154,9 +154,11 @@ \let\ckbox@Color\relax\else \def\ckbox@Color{\color{#1}}\fi}\let\ckbox@Color\relax \def\efPreviewOnRule{0.4pt} -\def\PMCA#1{\def\@rgi{#1}\ifx\@rgi\@empty - \let\@PMCA\@empty\else\def\@PMCA{\hb@xt@\z@{\hss#1\hss}}\fi} -\let\@PMCA\@empty +\def\PMPV#1{\def\@rgi{#1}\ifx\@rgi\@empty + \let\@PMPV\@empty\else\edef\@PMPV{\noexpand + \hb@xt@\noexpand\z@{\hss#1\hss}}\fi} +\let\@PMPV\@empty +\let\pmpvFmt\@empty \def\ef@Bbox#1#2{\hbox{\ifpreview \setlength\fboxrule{\efPreviewOnRule}\setlength\fboxsep{0pt}% \@tempdima=#1\relax @@ -166,7 +168,7 @@ \ifdim\@tempdimb<2\fboxrule\else \advance\@tempdimb by-2\fboxrule\fi \ckbox@Color\fbox{\parbox[b][\@tempdimb][c]{\@tempdima}% - {\vfil\hfil\@PMCA\hfil\vfil}}\else + {\vfil\hfil\pmpvFmt{\@PMPV}\hfil\vfil}}\else \parbox[b][#2][c]{#1}{\vfil\hfil\hfil\vfil}\fi}% } \let\Bbox\ef@Bbox @@ -203,12 +205,18 @@ \else \@getCmdName{\F}\edef\arg@F{\@CmdName}% \@getCmdName{#1}% - \ifx\arg@F\@CmdName % if \Ff, let's add arguments + \ifx\arg@F\@CmdName % if \F, let's add arguments \ifx\eq@F\@empty\def\eq@FValue{0}\else \expandafter\getFValue\eq@F\@nil\fi \@tempcnta=\eq@FValue \def\eq@arg{#2}% \ifx\eq@arg\@empty\else + \ifnum#2=2\relax % dpstoday + \let\ef@isHidden\ef@YES\else + \ifnum#2=32\relax + \let\ef@isHidden\ef@YES\else + \let\ef@isHidden\ef@NO + \fi\fi \advance\@tempcnta by#2\fi \edef\eq@F{/F \the\@tempcnta}% \def\ef@next{\processAppArgs}% @@ -218,6 +226,7 @@ \ifx\arg@presets\@CmdName \def\ef@next{\expandafter\processAppArgs#2}% \else +%% \nameuse is expanded within the argument below, where it is defined \@getCmdName{\epresets}% \edef\arg@epresets{\@CmdName}\@getCmdName{#1}% \ifx\arg@epresets\@CmdName @@ -279,30 +288,30 @@ \def\@eqF#1{\def\eq@arg{#1}\ifx\eq@arg\@empty \let\eq@F\@empty\else\def\eq@F{/F #1}\fi}\def\eq@F{} \def\@eqBS#1{% - \let\eq@BS=0\relax - \ifx\eq@W\@empty\else\let\eq@BS=1\fi - \ifx\eq@S\@empty\else\let\eq@BS=1\fi - \ifx\eq@D\@empty\else\let\eq@BS=1\fi - \edef\link@BS{\if\eq@BS1/BS<<\eq@W\eq@S\eq@D>>\fi}% - \ifx\eq@W\@empty\let\link@BS\@empty\fi + \let\eq@BS=0\relax + \ifx\eq@W\@empty\else\let\eq@BS=1\fi + \ifx\eq@S\@empty\else\let\eq@BS=1\fi + \ifx\eq@D\@empty\else\let\eq@BS=1\fi + \edef\link@BS{\if\eq@BS1/BS<<\eq@W\eq@S\eq@D>>\fi}% + \ifx\eq@W\@empty\let\link@BS\@empty\fi }\def\link@BS{} \def\@eqpresets#1{#1}% \def\@eqepresets#1{#1} \def\@eqW#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@W\@empty\def\eq@W@value{0}\else - \def\eq@W@value{#1}\def\eq@W{/W #1}\fi - \xdef\g@eq@W@value@bp{\eq@W@value bp}} + \let\eq@W\@empty\def\eq@W@value{0}\else + \def\eq@W@value{#1}\def\eq@W{/W #1}\fi + \xdef\g@eq@W@value@bp{\eq@W@value bp}} \def\eq@W{}\def\eq@W@value{0} \def\g@eq@W@valu@bp{0bp} % dps 12/22 \def\@eqS#1{\def\eq@S@value{#1}\ifx\eq@S@value\@empty - \let\eq@S\@empty\else - \def\eq@S{/S/#1}\def\eq@temp{D}% - \ifx\eq@S@value\eq@temp - \ifx\eq@D\@empty\def\eq@D{/D [3]}\fi - \fi\fi}\def\eq@S{} + \let\eq@S\@empty\else + \def\eq@S{/S/#1}\def\eq@temp{D}% + \ifx\eq@S@value\eq@temp + \ifx\eq@D\@empty\def\eq@D{/D [3]}\fi + \fi\fi}\def\eq@S{} \def\@eqD#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@D\@empty\else - \def\eq@D{/D [#1]}\fi}\def\eq@D{} + \let\eq@D\@empty\else + \def\eq@D{/D [#1]}\fi}\def\eq@D{} \def\@eqBorder#1{\def\eq@arg{#1}\ifx\eq@arg\@empty \let\eq@Border\@empty\else\def\eq@Border{/Border [#1]}\fi}% \def\eq@Border{/Border [0 0 0]} @@ -328,103 +337,103 @@ \def\ef@rPage#1{\@tempcnta=#1\relax\advance\@tempcnta-1 \edef\rPage##1{\the\@tempcnta}} \long\def\ef@searchrPage#1\rPage#2#3\@nil{\def\ef@argii{#2}% - \ifx\ef@argii\ef@end\else\rPage{#2}\fi} + \ifx\ef@argii\ef@end\else\rPage{#2}\fi} \def\ef@searchmlLink#1\mlLink#2#3\@nil{\def\ef@argii{#2}% - \ifx\ef@argii\ef@end\let\ef@mlLink\ef@Zero\else - \ifx\ef@argii\ef@true\let\ef@mlLink\ef@One\else - \let\ef@mlLink\ef@Zero\fi\fi} + \ifx\ef@argii\ef@end\let\ef@mlLink\ef@Zero\else + \ifx\ef@argii\ef@true\let\ef@mlLink\ef@One\else + \let\ef@mlLink\ef@Zero\fi\fi} \def\ef@searchGoToR#1/GoToR#2\@nil{\def\ef@argii{#2}% - \ifx\ef@argii\ef@end\else\ifx\ef@linktxtcolor@set0% - \def\ef@thislinkcolor{\@filecolor}\fi - \expandafter\ef@gobbleToendmarker\fi} + \ifx\ef@argii\ef@end\else\ifx\ef@linktxtcolor@set0% + \def\ef@thislinkcolor{\@filecolor}\fi + \expandafter\ef@gobbleToendmarker\fi} \def\ef@searchURI#1/URI#2\@nil{\def\ef@argii{#2}% - \ifx\ef@argii\ef@end\else\ifx\ef@linktxtcolor@set0% - \def\ef@thislinkcolor{\@urlcolor}\fi - \expandafter\ef@gobbleToendmarker\fi} + \ifx\ef@argii\ef@end\else\ifx\ef@linktxtcolor@set0% + \def\ef@thislinkcolor{\@urlcolor}\fi + \expandafter\ef@gobbleToendmarker\fi} \def\ef@searchCmdURI#1\URI#2\@nil{\def\ef@argii{#2}% - \ifx\ef@argii\ef@end\else\ifx\ef@linktxtcolor@set0% - \def\ef@thislinkcolor{\@urlcolor}\fi - \expandafter\ef@gobbleToendmarker\fi} + \ifx\ef@argii\ef@end\else\ifx\ef@linktxtcolor@set0% + \def\ef@thislinkcolor{\@urlcolor}\fi + \expandafter\ef@gobbleToendmarker\fi} \def\ef@searchNamed#1/Named#2\@nil{\def\ef@argii{#2}% - \ifx\ef@argii\ef@end\else\ifx\ef@linktxtcolor@set0% - \def\ef@thislinkcolor{\@menucolor}\fi - \expandafter\ef@gobbleToendmarker\fi} + \ifx\ef@argii\ef@end\else\ifx\ef@linktxtcolor@set0% + \def\ef@thislinkcolor{\@menucolor}\fi + \expandafter\ef@gobbleToendmarker\fi} \def\ef@searchCmdNamed#1\Named#2\@nil{\def\ef@argii{#2}% - \ifx\ef@argii\ef@end\else\ifx\ef@linktxtcolor@set0% - \def\ef@thislinkcolor{\@menucolor}\fi - \expandafter\ef@gobbleToendmarker\fi} + \ifx\ef@argii\ef@end\else\ifx\ef@linktxtcolor@set0% + \def\ef@thislinkcolor{\@menucolor}\fi + \expandafter\ef@gobbleToendmarker\fi} \def\ef@searchLaunch#1/Launch#2\@nil{\def\ef@argii{#2}% - \ifx\ef@argii\ef@end\else\ifx\ef@linktxtcolor@set0% - \def\ef@thislinkcolor{\@runcolor}\fi - \expandafter\ef@gobbleToendmarker\fi} + \ifx\ef@argii\ef@end\else\ifx\ef@linktxtcolor@set0% + \def\ef@thislinkcolor{\@runcolor}\fi + \expandafter\ef@gobbleToendmarker\fi} \def\ef@preprocessA#1{% - \let\rPage\relax\edef\ef@argi{#1}% - \ifx\annot@type\annot@type@link - \expandafter\ef@searchGoToR\ef@argi/GoToR\end\@nil - \expandafter\ef@searchURI\ef@argi/URI\end\@nil - \expandafter\ef@searchCmdURI\ef@argi\URI\end\@nil - \expandafter\ef@searchNamed\ef@argi/Named\end\@nil - \expandafter\ef@searchCmdNamed\ef@argi\Named\end\@nil - \expandafter\ef@searchLaunch\ef@argi/Launch\end\@nil - \ef@endmarker\fi - \let\rPage\ef@rPage - \expandafter\ef@searchrPage\ef@argi\rPage\end\@nil + \let\rPage\relax\edef\ef@argi{#1}% + \ifx\annot@type\annot@type@link + \expandafter\ef@searchGoToR\ef@argi/GoToR\end\@nil + \expandafter\ef@searchURI\ef@argi/URI\end\@nil + \expandafter\ef@searchCmdURI\ef@argi\URI\end\@nil + \expandafter\ef@searchNamed\ef@argi/Named\end\@nil + \expandafter\ef@searchCmdNamed\ef@argi\Named\end\@nil + \expandafter\ef@searchLaunch\ef@argi/Launch\end\@nil + \ef@endmarker\fi + \let\rPage\ef@rPage + \expandafter\ef@searchrPage\ef@argi\rPage\end\@nil } \def\@eqA#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@A\@empty\else\ef@preprocessA{#1}% - \def\eq@A{/A <<#1>>}\fi}\def\eq@A{} + \let\eq@A\@empty\else\ef@preprocessA{#1}% + \def\eq@A{/A <<#1>>}\fi}\def\eq@A{} \def\@eqmlLink#1{\def\eq@arg{#1}\ifx\eq@arg\ef@true - \let\ef@mlLink\ef@One\else\let\ef@mlLink\ef@Zero\fi} + \let\ef@mlLink\ef@One\else\let\ef@mlLink\ef@Zero\fi} \def\@eqLock#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@Lock\@empty\else\def\eq@Lock{/Lock <<#1>>}\fi} - \def\eq@Lock{} + \let\eq@Lock\@empty\else\def\eq@Lock{/Lock <<#1>>}\fi} +\def\eq@Lock{} \newif\ifisCalculate\isCalculatefalse \def\ef@searchCalc#1\AACalculate#2\@nil{% - \ifx#2\end\else\aftergroup\isCalculatetrue\fi + \ifx#2\end\else\aftergroup\isCalculatetrue\fi } \def\@eqAA#1{\def\eq@arg{#1}\ifx\eq@arg\@empty\let\eq@AA\@empty - \else\begingroup\ef@searchCalc#1\AACalculate\end\@nil\endgroup - \def\eq@AA{/AA <<#1>>}\fi} + \else\begingroup\ef@searchCalc#1\AACalculate\end\@nil\endgroup + \def\eq@AA{/AA <<#1>>}\fi} \def\eq@AA{/AA <<\eq@AAmouseup\eq@AAmousedown\eq@AAmouseenter% - \eq@AAmouseexit\eq@AAonfocus\eq@AAonblur\eq@AAformat% - \eq@AAkeystroke\eq@AAvalidate\eq@AAcalculate\eq@AApageopen% - \eq@AApageclose\eq@AApagevisible\eq@AApageinvisible>>} + \eq@AAmouseexit\eq@AAonfocus\eq@AAonblur\eq@AAformat% + \eq@AAkeystroke\eq@AAvalidate\eq@AAcalculate\eq@AApageopen% + \eq@AApageclose\eq@AApagevisible\eq@AApageinvisible>>} \def\@eqAAmouseup#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@AAmouseup\@empty\else\def\eq@AAmouseup{/U<<\JS{#1}>>}\fi} + \let\eq@AAmouseup\@empty\else\def\eq@AAmouseup{/U<<\JS{#1}>>}\fi} \let\eq@AAmouseup\@empty \def\@eqAAmousedown#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@AAmousedown\@empty\else - \def\eq@AAmousedown{/D<<\JS{#1}>>}\fi} + \let\eq@AAmousedown\@empty\else + \def\eq@AAmousedown{/D<<\JS{#1}>>}\fi} \let\eq@AAmousedown\@empty \def\@eqAAmouseenter#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@AAmouseenter\@empty\else - \def\eq@AAmouseenter{/E<<\JS{#1}>>}\fi} + \let\eq@AAmouseenter\@empty\else + \def\eq@AAmouseenter{/E<<\JS{#1}>>}\fi} \let\eq@AAmouseenter\@empty \def\@eqAAmouseexit#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@AAmouseexit\@empty\else - \def\eq@AAmouseexit{/X<<\JS{#1}>>}\fi} + \let\eq@AAmouseexit\@empty\else + \def\eq@AAmouseexit{/X<<\JS{#1}>>}\fi} \let\eq@AAmouseexit\@empty \def\@eqAAonfocus#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@AAonfocus\@empty\else - \def\eq@AAonfocus{/Fo<<\JS{#1}>>}\fi} + \let\eq@AAonfocus\@empty\else + \def\eq@AAonfocus{/Fo<<\JS{#1}>>}\fi} \def\@eqAAmousefocus{\@eqAAonfocus} \let\eq@AAonfocus\@empty \def\@eqAAonblur#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@AAonblur\@empty\else - \def\eq@AAonblur{/Bl<<\JS{#1}>>}\fi} + \let\eq@AAonblur\@empty\else + \def\eq@AAonblur{/Bl<<\JS{#1}>>}\fi} \def\@eqAAmouseblur{\def\@eqAAonblur} \let\eq@AAonblur\@empty \def\@eqAAformat#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@AAformat\@empty\else - \def\eq@AAformat{/F<<\JS{#1}>>}\fi} + \let\eq@AAformat\@empty\else + \def\eq@AAformat{/F<<\JS{#1}>>}\fi} \let\eq@AAformat\@empty \def\@eqAAkeystroke#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@AAkeystroke\@empty\else - \def\eq@AAkeystroke{/K<<\JS{#1}>>}\fi} + \let\eq@AAkeystroke\@empty\else + \def\eq@AAkeystroke{/K<<\JS{#1}>>}\fi} \let\eq@AAkeystroke\@empty \def\@eqAAvalidate#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@AAvalidate\@empty\else - \def\eq@AAvalidate{/V<<\JS{#1}>>}\fi} + \let\eq@AAvalidate\@empty\else + \def\eq@AAvalidate{/V<<\JS{#1}>>}\fi} \let\eq@AAvalidate\@empty \def\@eqAddAAcalculate#1{\def\eq@arg{#1}\ifx\eq@arg\@empty \else\def\eq@AAcalculate{;}\fi\def\eq@AddAAcalculate{#1}} @@ -437,20 +446,20 @@ } \let\eq@AAcalculate\@empty \def\@eqAApageopen#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@AApageopen\@empty\else - \def\eq@AApageopen{/PO<<\JS{#1}>>}\fi} + \let\eq@AApageopen\@empty\else + \def\eq@AApageopen{/PO<<\JS{#1}>>}\fi} \let\eq@AApageopen\@empty \def\@eqAApageclose#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@AApageclose\@empty\else - \def\eq@AApageclose{/PC<<\JS{#1}>>}\fi} + \let\eq@AApageclose\@empty\else + \def\eq@AApageclose{/PC<<\JS{#1}>>}\fi} \let\eq@AApageclose\@empty \def\@eqAApagevisible#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@AApagevisible\@empty\else - \def\eq@AApagevisible{/PV<<\JS{#1}>>}\fi} + \let\eq@AApagevisible\@empty\else + \def\eq@AApagevisible{/PV<<\JS{#1}>>}\fi} \let\eq@AApagevisible\@empty \def\@eqAApageinvisible#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@AApageinvisible\@empty\else - \def\eq@AApageinvisible{/PI<<\JS{#1}>>}\fi} + \let\eq@AApageinvisible\@empty\else + \def\eq@AApageinvisible{/PI<<\JS{#1}>>}\fi} \let\eq@AApageinvisible\@empty \def\@eqDA#1{\def\eq@DA{#1}} \def\eq@DA{\eq@textFont\space\eq@textSize\space Tf \eq@textColor}% @@ -460,133 +469,165 @@ \def\eq@textSizeDefault{9} \edef\eq@textSize{\eq@textSizeDefault} \def\eq@RV@Body{} + xfa:APIVersion="Acroform:2.7.0.0" % + xfa:contentType="text/html" % + xfa:spec="2.1" xmlns="http://www.w3.org/1999/xhtml" % + xmlns:xfa="http://www.xfa.org/schema/xfa-data/1.0/">} \def\eq@RV@endBody{} \def\@eqRV#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@RV\@empty\else\def\eq@RV{/RV(\eq@RV@Body#1% - \eq@RV@endBody)\fi}}\def\eq@RV{} + \let\eq@RV\@empty\else\def\eq@RV{/RV(\eq@RV@Body#1% + \eq@RV@endBody)\fi}}\def\eq@RV{} \def\@eqDS#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@DS\@empty\else\def\eq@DS{/DS(#1)\fi}}\def\eq@DS{} + \let\eq@DS\@empty\else\def\eq@DS{/DS(#1)\fi}}\def\eq@DS{} \def\@eqtextColor#1{\ef@parsePDFColor{#1}% - \HyColor@IfXcolor{% - \expandafter\HyColor@FieldColor% - \expandafter{\ef@colorSpec@out}{\eq@textColor}{}{}% - }{\edef\eq@textColor{\ef@colorSpec@out}}% + \HyColor@IfXcolor{% + \expandafter\HyColor@FieldColor% + \expandafter{\ef@colorSpec@out}{\eq@textColor}{}{}% + }{\edef\eq@textColor{\ef@colorSpec@out}}% } \def\eq@textColor{0 g} \def\@eqQ#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@Q\@empty\else\def\eq@Q{/Q #1}\fi}\def\eq@Q{} + \let\eq@Q\@empty\else\def\eq@Q{/Q #1}\fi}\def\eq@Q{} \def\ef@isunicode#1\unicodeStr#2\@nil{\def\argi{#1}% - \ifx\argi\@empty\def\ifbool@ef{iftrue}\else - \def\ifbool@ef{iffalse}\fi} + \ifx\argi\@empty\def\ifbool@ef{iftrue}\else + \def\ifbool@ef{iffalse}\fi} \def\@eqDV#1{\ef@isunicode#1\unicodeStr\@nil - \expandafter\csname\ifbool@ef\endcsname\@equDV{#1}\else - \def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@DV\@empty\else - \ef@pdfCRLFTABDefns\pdfstringdef\ef@uni@temp{#1}% - \edef\eq@DV{/DV(\ef@uni@temp)}\makespecialJS\fi\fi}\def\eq@DV{} + \expandafter\csname\ifbool@ef\endcsname\@equDV{#1}\else + \def\eq@arg{#1}\ifx\eq@arg\@empty + \let\eq@DV\@empty\else + \ef@pdfCRLFTABDefns\pdfstringdef\ef@uni@temp{#1}% + \edef\eq@DV{/DV(\ef@uni@temp)}% + \makespecialJS\fi\fi}\def\eq@DV{} \def\ef@pdfCRLFTABDefns{% - \def\r{\textCR}\def\t{\textHT}\def\n{\textLF}} + \def\r{\textCR}\def\t{\textHT}\def\n{\textLF}} \def\@eqnuDV#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@DV\@empty\else\def\eq@DV{/DV(#1)}\fi} + \let\eq@DV\@empty\else\def\eq@DV{/DV(#1)}\fi} \def\@equDV#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@DV\@empty\else\def\eq@DV{/DV<#1>}\fi} -\def\@eqV#1{\ef@isunicode#1\unicodeStr\@nil - \expandafter\csname\ifbool@ef\endcsname\@equV{#1}\else - \def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@V\@empty\else - \ef@pdfCRLFTABDefns\pdfstringdef\ef@uni@temp{#1}% - \edef\eq@V{/V(\ef@uni@temp)}\makespecialJS\fi\fi}\def\eq@V{} + \let\eq@DV\@empty\else\def\eq@DV{/DV<#1>}\fi} +\let\pmpvV\@empty +\let\eq@VSAVE\@empty +\def\@eqV#1{\Hy@pdfstringfalse + \edef\pmpvV{#1}% + \let\unicodeStrSAVE\unicodeStr + \Hy@pdfstringtrue\let\unicodeStr\relax + \edef\x{#1}\let\unicodeStr\unicodeStrSAVE + \expandafter\ef@isunicode\x\unicodeStr\@nil + \expandafter\csname\ifbool@ef\endcsname\Hy@pdfstringtrue + \ifefpmpv\def\x{FEFF}\let\eq@V\@empty\else\edef\x{#1}\fi + \@equV{\x}% + \else + \def\eq@arg{#1}% + \ifx\eq@arg\@empty + \let\eq@V\@empty + \else + \Hy@pdfstringtrue + \ef@pdfCRLFTABDefns\pdfstringdef\ef@uni@temp{#1}% + \Hy@pdfstringtrue\edef\eq@V{/V(\ef@uni@temp)}% + \let\eq@VSAVE\eq@V + \ifefpmpv\let\eq@V\@empty\fi + \makespecialJS + \fi + \fi +}\def\eq@V{} \def\@eqnuV#1{\def\eq@arg{#1}\ifx\eq@arg\@empty \let\eq@V\@empty\else\def\eq@V{/V(#1)}\fi} \def\@equV#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@V\@empty\else\def\eq@V{/V<#1>}\fi}% + \let\eq@V\@empty\else\edef\eq@V{/V<#1>}\fi}% \def\@eqTU#1{\ef@isunicode#1\unicodeStr\@nil - \expandafter\csname\ifbool@ef\endcsname\@equTU{#1}\else - \def\eq@arg{#1}\let\r@save\r\let\r\textCR - \ifx\eq@arg\@empty\let\eq@TU\@empty\else - \ef@pdfCRLFTABDefns\pdfstringdef\ef@uni@temp{#1}% - \edef\eq@TU{/TU(\ef@uni@temp)}\makespecialJS\fi\fi - \let\r\r@save}\def\eq@TU{} + \expandafter\csname\ifbool@ef\endcsname\@equTU{#1}\else + \def\eq@arg{#1}\let\r@save\r\let\r\textCR + \ifx\eq@arg\@empty\let\eq@TU\@empty\else + \ef@pdfCRLFTABDefns\pdfstringdef\ef@uni@temp{#1}% + \edef\eq@TU{/TU(\ef@uni@temp)}\makespecialJS\fi\fi + \let\r\r@save}\def\eq@TU{} \def\@equTU#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@TU\@empty\else\def\eq@TU{/TU<#1>}\fi} + \let\eq@TU\@empty\else\def\eq@TU{/TU<#1>}\fi} \def\@eqFf#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@Ff\@empty\else\def\eq@Ff{/Ff #1}\fi} - \def\eq@Ff{} + \let\eq@Ff\@empty\else\def\eq@Ff{/Ff #1}\fi} +\def\eq@Ff{} \def\@eqMaxLen#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@MaxLen\@empty\else\def\eq@MaxLen{/MaxLen #1}\fi}% - \def\eq@MaxLen{} + \let\eq@MaxLen\@empty\else\def\eq@MaxLen{/MaxLen #1}\fi}% + \def\eq@MaxLen{} \def\@eqH#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@H\@empty\else\def\eq@H{/H/#1}\fi}\def\eq@H{} + \let\eq@H\@empty\else\def\eq@H{/H/#1}\fi}\def\eq@H{} \def\@eqMK#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@MK\@empty\else\def\eq@MK{/MK << #1 >> }\fi}% - \def\eq@MK{} - \let\@vertRotate=0 - \def\@eqR#1{\def\eq@R@value{#1}\ifx\eq@R@value\@empty - \let\eq@R\@empty\else - \@tempcnta=\eq@R@value\relax - \ifnum\@tempcnta<0 \@tempcnta=-\@tempcnta\fi - \ifnum\@tempcnta=0 \else\ifnum\@tempcnta=180 \else - \let\@vertRotate=1\fi\fi - \def\eq@R{/R #1}\fi} - \def\eq@R{} - \def\@eqBC#1{\edef\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@BC\@empty\else % 2010/07/23 - \expandafter\ef@isitnamed\eq@arg\ef@nil - \ifx\ef@latex@color\ef@y\expandafter - \HyColor@XZeroOneThreeFour\expandafter{\eq@arg}{\eq@BC}{}{}% - \edef\eq@BC{/BC [\eq@BC]}\else - \def\eq@BC{/BC [#1]}\fi - \fi} - \def\eq@BC{} - \def\@eqBG#1{\edef\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@BG\@empty\else % 2010/07/23 - \expandafter\ef@isitnamed\eq@arg\ef@nil - \ifx\ef@latex@color\ef@y\expandafter - \HyColor@XZeroOneThreeFour\expandafter{\eq@arg}{\eq@BG}{}{}% - \edef\eq@BG{/BG [\eq@BG]}\else - \def\eq@BG{/BG [#1]}\fi - \fi} - \def\eq@BG{} - \def\@eqCA#1{\ef@isunicode#1\unicodeStr\@nil - \expandafter\csname\ifbool@ef\endcsname\@equCA{#1}\else - \def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@CA\@empty\let\ef@kvCA\@empty - \else\ef@pdfCRLFTABDefns - \pdfstringdef\ef@uni@temp{#1}% - \def\eq@CA{#1}\edef\ef@kvCA{/CA(\ef@uni@temp)}% - \makespecialJS\fi\fi} - \def\eq@CA{}\def\ef@kvCA{} - \def\@equCA#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@CA\@empty\let\ef@kvCA\@empty - \else\def\eq@CA{#1}\def\ef@kvCA{/CA<#1>}\fi} - \def\@eqRC#1{\ef@isunicode#1\unicodeStr\@nil - \expandafter\csname\ifbool@ef\endcsname\@equRC{#1}\else - \def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@RC\@empty\let\ef@kvRC\@empty - \else\ef@pdfCRLFTABDefns - \pdfstringdef\ef@uni@temp{#1}% - \def\eq@RC{#1}\edef\ef@kvRC{/RC(\ef@uni@temp)}% - \makespecialJS\fi\fi} - \def\eq@RC{}\def\ef@kvRC{} - \def\@equRC#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@RC\@empty\let\ef@kvRC\@empty - \else\def\eq@RC{#1}\def\ef@kvRC{/RC<#1>}\fi} - \def\@eqAC#1{\ef@isunicode#1\unicodeStr\@nil - \expandafter\csname\ifbool@ef\endcsname\@equAC{#1}\else - \def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@AC\@empty\let\ef@kvAC\@empty - \else\ef@pdfCRLFTABDefns - \pdfstringdef\ef@uni@temp{#1}% - \def\eq@AC{#1}\edef\ef@kvAC{/AC(\ef@uni@temp)}% - \makespecialJS\fi\fi} - \def\eq@AC{}\def\ef@kvAC{} - \def\@equAC#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@AC\@empty\let\ef@kvAC\@empty - \else\def\eq@AC{#1}\def\ef@kvAC{/AC<#1>}\fi} + \let\eq@MK\@empty\else\def\eq@MK{/MK << #1 >> }\fi}% +\def\eq@MK{} +\let\@vertRotate=0 +\def\@eqR#1{\def\eq@R@value{#1}\ifx\eq@R@value\@empty + \let\eq@R\@empty\else + \@tempcnta=\eq@R@value\relax + \ifnum\@tempcnta<0 \@tempcnta=-\@tempcnta\fi + \ifnum\@tempcnta=0 \else\ifnum\@tempcnta=180 \else + \let\@vertRotate\ef@One\fi\fi + \def\eq@R{/R #1}\fi} +\def\eq@R{} +\def\@eqBC#1{\edef\eq@arg{#1}\ifx\eq@arg\@empty + \let\eq@BC\@empty\else + \expandafter\ef@isitnamed\eq@arg\ef@nil + \ifx\ef@latex@color\ef@y\expandafter + \HyColor@XZeroOneThreeFour\expandafter{\eq@arg}{\eq@BC}{}{}% + \edef\eq@BC{/BC [\eq@BC]}\else + \def\eq@BC{/BC [#1]}\fi + \fi +}\def\eq@BC{} +\def\@eqBG#1{\edef\eq@arg{#1}\ifx\eq@arg\@empty + \let\eq@BG\@empty\let\ef@isBGtransparent\ef@YES + \else\let\ef@isBGtransparent\ef@NO + \expandafter\ef@isitnamed\eq@arg\ef@nil + \ifx\ef@latex@color\ef@y\expandafter + \HyColor@XZeroOneThreeFour\expandafter{\eq@arg}{\eq@BG}{}{}% + \edef\eq@BG{/BG [\eq@BG]}\else + \def\eq@BG{/BG [#1]}\fi + \fi +}\def\eq@BG{} +\let\pmpvCA\@empty +\def\@eqCA#1{\let\unicodeStrSAVE\unicodeStr + \Hy@pdfstringtrue\let\unicodeStr\relax + \edef\x{#1}\let\unicodeStr\unicodeStrSAVE + \expandafter\ef@isunicode\x\unicodeStr\@nil + \expandafter\csname\ifbool@ef\endcsname\@equCA{#1}\else + \def\eq@arg{#1}\ifx\eq@arg\@empty + \let\eq@CA\@empty\let\ef@kvCA\@empty + \else\ef@pdfCRLFTABDefns + \pdfstringdef\ef@uni@temp{#1}\Hy@pdfstringfalse + \edef\pmpvCA{#1}\def\eq@CA{#1}% + \edef\ef@kvCA{/CA(\ef@uni@temp)}% + \makespecialJS + \fi + \fi +}\def\eq@CA{}\def\ef@kvCA{} +\def\@equCA#1{\def\eq@arg{#1}\ifx\eq@arg\@empty + \let\eq@CA\@empty\let\ef@kvCA\@empty + \else\def\eq@CA{#1}\def\ef@kvCA{/CA<#1>}\fi} +\def\@eqRC#1{\ef@isunicode#1\unicodeStr\@nil + \expandafter\csname\ifbool@ef\endcsname\@equRC{#1}\else + \def\eq@arg{#1}\ifx\eq@arg\@empty + \let\eq@RC\@empty\let\ef@kvRC\@empty + \else + \ef@pdfCRLFTABDefns\pdfstringdef\ef@uni@temp{#1}% + \def\eq@RC{#1}\edef\ef@kvRC{/RC(\ef@uni@temp)}% + \makespecialJS + \fi + \fi +}\def\eq@RC{}\def\ef@kvRC{} +\def\@equRC#1{\def\eq@arg{#1}\ifx\eq@arg\@empty + \let\eq@RC\@empty\let\ef@kvRC\@empty + \else\def\eq@RC{#1}\def\ef@kvRC{/RC<#1>}\fi} +\def\@eqAC#1{\ef@isunicode#1\unicodeStr\@nil + \expandafter\csname\ifbool@ef\endcsname\@equAC{#1}\else + \def\eq@arg{#1}\ifx\eq@arg\@empty + \let\eq@AC\@empty\let\ef@kvAC\@empty + \else\ef@pdfCRLFTABDefns + \pdfstringdef\ef@uni@temp{#1}% + \def\eq@AC{#1}\edef\ef@kvAC{/AC(\ef@uni@temp)}% + \makespecialJS + \fi + \fi +}\def\eq@AC{}\def\ef@kvAC{} +\def\@equAC#1{\def\eq@arg{#1}\ifx\eq@arg\@empty + \let\eq@AC\@empty\let\ef@kvAC\@empty + \else\def\eq@AC{#1}\def\ef@kvAC{/AC<#1>}\fi} \def\eq@define@IconMK{\def\eq@IconMK{\eq@I\eq@RI\eq@IX\eq@TP /IF<<\eq@SW\eq@ST\eq@PA\eq@FB>>}} \let\eq@IconMK\@empty @@ -611,8 +652,7 @@ \fi \eq@define@IconMK \fi -} -\def\eq@I{} +}\def\eq@I{} \def\@eqRI#1{% \ifx\annot@type\annot@type@button \def\eq@arg{#1}% @@ -625,8 +665,7 @@ \fi \eq@define@IconMK \fi -} -\def\eq@RI{} +}\def\eq@RI{} \def\@eqIX#1{% \ifx\annot@type\annot@type@button \def\eq@arg{#1}% @@ -639,95 +678,94 @@ \fi \eq@define@IconMK \fi -} -\def\eq@IX{} +}\def\eq@IX{} \def\@eqTP#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@TP\@empty\else\def\eq@TP{/TP #1}\fi} + \let\eq@TP\@empty\else\def\eq@TP{/TP #1}\fi} \def\eq@TP{/TP 0} % default 0 \def\@eqSW#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@SW\@empty\else\def\eq@SW{/SW/#1}\fi} + \let\eq@SW\@empty\else\def\eq@SW{/SW/#1}\fi} \def\eq@SW{/SW/A} % the default, always scale \def\@eqST#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@ST\@empty\else\def\eq@ST{/S/#1}\fi} + \let\eq@ST\@empty\else\def\eq@ST{/S/#1}\fi} \def\eq@ST{/S/P} % the default, proportional scaling \def\@eqPA#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@PA\@empty\else\def\eq@PA{/A [#1]}\fi} + \let\eq@PA\@empty\else\def\eq@PA{/A [#1]}\fi} \def\eq@PA{/A [0.5 0.5]} % the default \def\@eqFB#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@PA\@empty\else\def\eq@FB{/FB #1}\fi} + \let\eq@PA\@empty\else\def\eq@FB{/FB #1}\fi} \def\eq@FB{/FB false} % the default \def\@eqmkIns#1{\def\eq@mkIns{#1}}\def\eq@mkIns{} \def\@eqOpt#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@Opt\@empty\else\def\eq@Opt{/Opt [#1]}\fi} - \def\eq@Opt{} + \let\eq@Opt\@empty\else\ifefpmpv\let\eq@Opt\@empty\else + \def\eq@Opt{/Opt [#1]}\fi\fi}\def\eq@Opt{} \def\@eqTI#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@TI\@empty\else\def\eq@TI{/TI #1}\fi} - \def\eq@TI{} + \let\eq@TI\@empty\else\def\eq@TI{/TI #1}\fi} +\def\eq@TI{} \def\@eqrawPDF#1{\def\eq@rawPDF{#1}}\def\eq@rawPDF{} \def\@eqcmd#1{#1} \def\@eqQuadPoints#1{\def\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@QuadPoints\@empty\else - \def\eq@QuadPoints{/QuadPoints {#1}}\fi} + \let\eq@QuadPoints\@empty\else + \def\eq@QuadPoints{/QuadPoints {#1}}\fi} \def\eq@QuadPoints{} \def\@eqColor#1{\edef\eq@arg{#1}\ifx\eq@arg\@empty - \let\eq@Color\@empty\else - \HyColor@XZeroOneThreeFour{#1}{\eq@Color}{}{}% - \edef\eq@Color{/C[\eq@Color]}\fi} + \let\eq@Color\@empty\else + \HyColor@XZeroOneThreeFour{#1}{\eq@Color}{}{}% + \edef\eq@Color{/C[\eq@Color]}\fi} \def\eq@Color{} \def\@eqlinktxtcolor#1{% - \def\ef@argi{#1}\ifHy@colorlinks - \ifx\ef@argi\@empty\let\ef@colorthislink\normalcolor\else - \let\ef@linktxtcolor@set=1\def\ef@thislinkcolor{#1}\fi\fi + \def\ef@argi{#1}\ifHy@colorlinks + \ifx\ef@argi\@empty\let\ef@colorthislink\normalcolor\else + \let\ef@linktxtcolor@set=1\def\ef@thislinkcolor{#1}\fi\fi }\let\ef@linktxtcolor@set=0 \def\@eqrectH#1{\def\eq@rectH{#1}\ifx\eq@rectH\@empty\else - \setlength\eflength\eq@rectH\edef\eq@rectH{\the\eflength}\fi} + \setlength\eflength\eq@rectH\edef\eq@rectH{\the\eflength}\fi} \def\@eqrectW#1{\def\eq@rectW{#1}\ifx\eq@rectW\@empty\else - \setlength\eflength\eq@rectW\edef\eq@rectW{\the\eflength}\fi} + \setlength\eflength\eq@rectW\edef\eq@rectW{\the\eflength}\fi} \def\@eqobjdef#1{\def\ef@arg{#1}\ifx\ef@arg\@empty - \let\eq@objdef\@empty\else\def\eq@objdefName{#1}% - \def\eq@objdef{/_objdef {#1}}\fi + \let\eq@objdef\@empty\else\def\eq@objdefName{#1}% + \def\eq@objdef{/_objdef {#1}}\fi } \let\eq@objdef\@empty \def\@eqtaborder#1{\def\ef@arg{#1}\ifx\ef@arg\@empty - \let\eq@taborder\@empty\else - \def\eq@taborder{#1}\fi + \let\eq@taborder\@empty\else + \def\eq@taborder{#1}\fi } \let\eq@taborder\@empty \def\ef@y{y}\def\ef@n{n} \def\@eqautoCenter#1{\def\ef@arg{#1}\ifx\ef@arg\ef@y - \let\autoCenter\ef@y\else\ifx\ef@arg\ef@n - \let\autoCenter\ef@n\else\let\autoCenter\ef@y - \PackageWarning{eforms}{The value of '#1' is not a - supported value\MessageBreak for \string\autoCenter.\MessageBreak - Using the default of 'y'}% - \fi\fi} + \let\autoCenter\ef@y\else\ifx\ef@arg\ef@n + \let\autoCenter\ef@n\else\let\autoCenter\ef@y + \PackageWarning{eforms}{The value of '#1' is not a + supported value\MessageBreak for \string\autoCenter.\MessageBreak + Using the default of 'y'}\fi +\fi} \let\autoCenter\ef@y \newif\ifeq@inlineCenter \eq@inlineCenterfalse \let\inlineCenter=n \def\@eqinline#1{\eq@inlineCenterfalse - \def\ef@arg{#1}\ifx\ef@arg\ef@y - \let\inlineCenter\ef@y\eq@inlineCentertrue\else - \ifx\ef@arg\ef@n\let\inlineCenter\ef@n\else\let\inlineCenter\ef@n - \PackageWarning{eforms}{The value of '#1' is not a - supported value\MessageBreak for \string\inline.\MessageBreak - Using the default of 'n'}% - \fi\fi} + \def\ef@arg{#1}\ifx\ef@arg\ef@y + \let\inlineCenter\ef@y\eq@inlineCentertrue\else + \ifx\ef@arg\ef@n\let\inlineCenter\ef@n\else\let\inlineCenter\ef@n + \PackageWarning{eforms}{The value of '#1' is not a + supported value\MessageBreak for \string\inline.\MessageBreak + Using the default of 'n'}\fi +\fi} \def\@eqsymbolchoice#1{\expandafter\ifx\csname eq@#1\endcsname\relax - \typeout{exerquiz: `#1' is not an acceptable option - for \string\symbolechoice, inserting default, `check'.} - \edef\symbol@choice{\eq@check}\else - \edef\symbol@choice{\csname eq@#1\endcsname}\fi + \typeout{exerquiz: `#1' is not an acceptable option + for \string\symbolechoice, inserting default, `check'.} + \edef\symbol@choice{\eq@check}\else + \edef\symbol@choice{\csname eq@#1\endcsname}\fi } \newif\iffixmlinks \fixmlinkstrue \def\mlfixOn{\fixmlinkstrue} \def\mlfixOff{\fixmlinksfalse} \def\@eqmlfix#1{\def\ef@arg{#1}\ifx\ef@arg\ef@y - \mlfixOn\else\ifx\ef@arg\ef@n - \mlfixOff\else\mlfixOn - \PackageWarning{eforms}{The value of '#1' is not a - supported value\MessageBreak for \string\mlfix.\MessageBreak - Using the default of 'y'}% - \fi\fi} + \mlfixOn\else\ifx\ef@arg\ef@n + \mlfixOff\else\mlfixOn + \PackageWarning{eforms}{The value of '#1' is not a + supported value\MessageBreak for \string\mlfix.\MessageBreak + Using the default of 'y'}\fi +\fi} \newbox\mlstrutbox \def\@eqmlstrut#1{\setbox\mlstrutbox\hbox{#1}% \def\ml@strut{\vrule \@height\ht\mlstrutbox @@ -739,18 +777,19 @@ \def\@eqmlcrackat#1{\def\eq@mlcrackat{#1}} \let\eq@mlcrackat\@empty \def\@eqmlhyph#1{\def\ef@arg{#1}\ifx\ef@arg\ef@y - \def\eq@mlhyph{-}\else\ifx\ef@arg\ef@n - \let\eq@mlhyph\@empty\else\let\eq@mlhyph\@empty - \PackageWarning{eforms}{The value of '#1' is not a - supported value\MessageBreak for \string\mlhyph.\MessageBreak - Using the default of 'n'}\fi\fi} -\let\eq@mlhyph\@empty + \def\eq@mlhyph{-}\else\ifx\ef@arg\ef@n + \let\eq@mlhyph\@empty\else\let\eq@mlhyph\@empty + \PackageWarning{eforms}{The value of '#1' is not a + supported value\MessageBreak for \string\mlhyph.\MessageBreak + Using the default of 'n'}\fi +\fi}\let\eq@mlhyph\@empty \def\@eqmlignore#1{\def\eq@mlchunk{#1}\ifx\eq@mlchunk\@empty \def\eq@mlchunk{0}\fi\let\eq@mlignore\ef@YES} \def\eq@mlchunk{0} \let\eq@mlignore\ef@NO \def\@eqmlcrackinsat#1{\def\eq@mlcrackinsat{#1}} \let\eq@mlcrackinsat\@empty +\def\@eqprotect#1{\eq@protect{#1}} \def\eq@protect#1{\let#1\@empty} \def\ef@stop{\relax} %\def\ef@relax{\relax} \def\protectedKeys#1#2{\ef@scratchtoks={}% @@ -761,8 +800,7 @@ \def\protectedKeys@gettwo#1#2{% \ifx#1\ef@stop\else\ef@scratchtoks=\expandafter {\the\ef@scratchtoks\protect#1{#2}}\expandafter - \protectedKeys@gettwo - \fi} + \protectedKeys@gettwo\fi} \begingroup\catcode`\#=12 \catcode`*=6 \ifpdfmarkup \gdef\ef@Hx*1*2{\@nameuse{efHex*1*2}}\else @@ -771,10 +809,10 @@ \def\efHxError{\PackageError{eforms}{The glyph is not supported}{}} \def\HGERROR{efHxError} \ifpdfmarkup - \def\HexGlyph#1#2{\def\arg@ii{#2}\ifx\arg@ii\HGERROR - \global\@namedef{efHex#1}{\csname#2\endcsname}\else - \global\@namedef{efHex#1}{\expandafter - \string\csname#2\endcsname}\fi} + \def\HexGlyph#1#2{\def\arg@ii{#2}\ifx\arg@ii\HGERROR + \global\@namedef{efHex#1}{\csname#2\endcsname}\else + \global\@namedef{efHex#1}{\expandafter + \string\csname#2\endcsname}\fi} \else \begingroup\catcode`\#=12 \catcode`*=6 \gdef\HexGlyph*1*2{\def\arg@ii{*2}\ifx\arg@ii\HGERROR @@ -955,9 +993,11 @@ \def\ef@djXPD{\ifxetex\ifmakeXasPD\ef@adjrectWH{2bp}\fi \else\ifmakePDasX\ef@adjrectWH{-2bp}\fi\fi} \def\ef@btnspcr{} -\@ifundefined{ifefpmca}{\newif\ifefpmca\efpmcafalse}{} -\def\pmcaOn{\efpmcatrue} -\def\pmcaOff{\efpmcafalse} +\@ifundefined{ifefpmpv}{\newif\ifefpmpv\efpmpvfalse}{} +\def\pmpvOn{\efpmpvtrue\PackageInfo{eforms} + {Turning on enhanced preview (\string\pmpvOn)}}\let\pmcaOn\pmpvOn +\def\pmpvOff{\efpmpvfalse\PackageInfo{eforms} + {Turning off enhanced preview (\string\pvpmOff)}}\let\pmcaOff\pmpvOff \def\eq@setButtonProps#1#2{\makeJSspecials \processAppArgs#2\end\@nil % set widget properties \ifx\eq@BC\@empty\@eqW{}\else @@ -976,6 +1016,7 @@ \else \def\eq@btn@sp{\hbox to\dimen@{\hfill}}% \fi + \Hy@pdfstringtrue \expandafter\def\expandafter \ef@btnspcr\expandafter{\ef@btnspcr\eq@btn@sp}% \sbox{\eq@tmpbox}{\ef@btnspcr\eq@CA\ef@btnspcr}% @@ -991,7 +1032,11 @@ \else % if \eq@rectW is not \@empty \wd\eq@tmpbox=\eq@rectW \fi - \ifefpmca\PMCA{\eq@CA}\fi\ef@djXPD#1% + \ifefpmpv\Hy@pdfstringfalse + \ifx\ef@isBGtransparent\ef@YES + \let\ef@kvCA\@empty\fi + \PMPV{\eq@CA}\fi + \ef@djXPD#1% } \def\eq@setWidgetProps#1#2{\makeJSspecials \processAppArgs#2\end\@nil % set widget properties @@ -999,6 +1044,11 @@ \ifx\eq@BC\@empty\@eqW{}\else \if\eq@W@value0\let\eq@BC\@empty\fi\fi \fi + \ifefpmpv\Hy@pdfstringfalse + \ifx\ef@isHidden\ef@YES + \let\eq@V\eq@VSAVE\else + \PMPV{\pmpvV}\fi + \fi \ef@djXPD#1% } \def\ef@sanitize@toks{\@makeother\~\@makeother\#\@makeother\&% @@ -1079,10 +1129,11 @@ \ef@pdfstrCLOpti} \def\annot@type@listbox{listbox} \newcommand\list@@Box[8]{\begingroup - \let\nameuse\@nameuse + \let\nameuse\@nameuse\let\tops\texorpdfstring \edef\annot@type{\annot@type@listbox}% \pdfstringdef\Fld@name{#2}\dl@paramlocal \expandafter\ef@pdfstrCLOpt#5\ef@@nil + \ifefpmpv\let\eq@Opt\@empty\fi \eqf@setDimens{#3}{#4}% \def\eq@DA{\eq@textFont\space\eq@textSize\space Tf \eq@textColor}% \@processEvery#8\end\noindent#6#7{#1}} @@ -1097,10 +1148,11 @@ \eq@choice@driver}{\listBoxDefaults\every@listBox}}} \def\annot@type@combobox{combobox} \newcommand\combo@@Box[8]{\begingroup - \let\nameuse\@nameuse + \let\nameuse\@nameuse\let\tops\texorpdfstring \edef\annot@type{\annot@type@combobox}% \@eqFf{\FfCombo}\pdfstringdef\Fld@name{#2}\dl@paramlocal \expandafter\ef@pdfstrCLOpt#5\ef@@nil + \ifefpmpv\let\eq@Opt\@empty\fi \eqf@setDimens{#3}{#4}% \def\eq@DA{\eq@textFont\space\eq@textSize\space Tf \eq@textColor}% \@processEvery#8\end\noindent#6#7{#1}} @@ -1152,7 +1204,7 @@ } \def\annot@type@button{pushbtn} \newcommand\push@@Button[7]{\begingroup - \let\nameuse\@nameuse + \let\nameuse\@nameuse\let\tops\texorpdfstring \edef\annot@type{\annot@type@button}% \pdfstringdef\Fld@name{#2}\dl@paramlocal \makeJSspecials\ef@preProcDefns @@ -1170,17 +1222,21 @@ \mbox{\push@@Button{#1}{#2}{#3}{#4}{}{% \eq@setButtonProps\eq@Button@driver}% {\pushButtonDefaults\every@PushButton}}} +\def\pmpvMrk#1{\def\pmpv@mrk{#1}} +\pmpvMrk{X} \def\annot@type@checkbox{checkbox} \newcommand\check@@Box[8]{\begingroup - \let\nameuse\@nameuse + \let\nameuse\@nameuse\let\tops\texorpdfstring \let\#\ef@Hx\edef\annot@type{\annot@type@checkbox}% \pdfstringdef\Fld@name{#2}\@eqAS{Off}\dl@paramlocal \def\@eqDV##1{\def\eq@arg{##1}\ifx\eq@arg\@empty\let\eq@DV\@empty - \else\ifpdfmarkup\def\eq@DV{/DV(##1) cvn }\else - \def\eq@DV{/DV/##1}\fi\fi}% + \else\ifpdfmarkup\def\eq@DV{/DV(##1) cvn }\else + \def\eq@DV{/DV/##1}\fi\fi}% \def\@eqV##1{\def\eq@arg{##1}\ifx\eq@arg\@empty - \let\eq@V\@empty\else\ifpdfmarkup\def\eq@V{/V(##1) cvn }\else - \def\eq@V{/V/##1}\fi\@eqAS{##1}\fi}% + \let\eq@V\@empty\else\def\pmpvV{\pmpv@mrk}\ifpdfmarkup + \def\eq@V{/V(##1) cvn }\else + \def\eq@V{/V/##1}\fi\@eqAS{##1}\fi + \ifefpmpv\let\eq@V\@empty\fi}% \eqf@setDimens{#3}{#4}% \ifpdfmarkup\def\eq@On{(#5) cvn }\else \def\eq@On{/#5}\fi\@eqtextFont{ZaDb}% @@ -1196,15 +1252,17 @@ \eq@RadioCheck@driver}{\checkBoxDefaults\every@CheckBox}}} \def\annot@type@radio{radiobtn} \newcommand\radio@@Button[8]{\begingroup\let\#\ef@Hx - \let\nameuse\@nameuse + \let\nameuse\@nameuse\let\tops\texorpdfstring \edef\annot@type{\annot@type@radio}% \pdfstringdef\Fld@name{#2}\@eqAS{Off}\dl@paramlocal \def\@eqDV##1{\def\eq@arg{##1}\ifx\eq@arg\@empty\let\eq@DV\@empty \else\ifpdfmarkup\def\eq@DV{/DV(##1) cvn }\else \def\eq@DV{/DV/##1}\fi\fi}% \def\@eqV##1{\def\eq@arg{##1}\ifx\eq@arg\@empty - \let\eq@V\@empty\else\ifpdfmarkup\def\eq@V{/V(##1) cvn }\else - \def\eq@V{/V/##1}\fi\@eqAS{##1}\fi}% + \let\eq@V\@empty\else\def\pmpvV{\pmpv@mrk}\ifpdfmarkup + \def\eq@V{/V(##1) cvn }\else + \def\eq@V{/V/##1}\fi\@eqAS{##1}\fi + \ifefpmpv\let\eq@V\@empty\fi}% \eqf@setDimens{#3}{#4}% \ifpdfmarkup\def\eq@On{(#5) cvn }\else\def\eq@On{/#5}\fi \def\eq@Ff{/Ff \FfRadio}\@eqtextFont{ZaDb}% @@ -1238,7 +1296,7 @@ } \def\annot@type@text{textfld} \newcommand\text@@Field[7]{\begingroup - \let\nameuse\@nameuse + \let\nameuse\@nameuse\let\tops\texorpdfstring \edef\annot@type{\annot@type@text}% \pdfstringdef\Fld@name{#2}\dl@paramlocal \def\eq@Title{#2}\eqf@setDimens{#3}{#4}% @@ -1270,7 +1328,7 @@ } \def\annot@type@sig{sigfld} \newcommand\sig@@Field[7]{\begingroup - \let\nameuse\@nameuse + \let\nameuse\@nameuse\let\tops\texorpdfstring \edef\annot@type{\annot@type@sig}% \pdfstringdef\Fld@name{#2}\dl@paramlocal \def\eq@Title{#2}\eqf@setDimens{#3}{#4}% @@ -1293,7 +1351,7 @@ } \def\annot@type@link{link} \newcommand\set@@Link[7]{\begingroup - \let\nameuse\@nameuse + \let\nameuse\@nameuse\let\tops\texorpdfstring \dl@paramlocal \makeJSspecials \edef\annot@type{\annot@type@link}% diff --git a/texmf-dist/tex/latex/acrotex/epdfmark.def b/texmf-dist/tex/latex/acrotex/epdfmark.def index cac5bc72..7e5a8068 100644 --- a/texmf-dist/tex/latex/acrotex/epdfmark.def +++ b/texmf-dist/tex/latex/acrotex/epdfmark.def @@ -8,7 +8,7 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% eForms package, %% -%% Copyright (C) 2002-2018 D. P. Story %% +%% Copyright (C) 2002-2019 D. P. Story %% %% dpstory@uakron.edu %% %% %% %% This program can redistributed and/or modified under %% @@ -19,116 +19,120 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \def\Rect#1{\pdf@rect{\textcolor{\@linkcolor}{#1}}} \def\noPeek#1#2{\literalps@out{% - [ {ThisPage} << \noPeekAction{#1}{#2} >> /PUT pdfmark}} + \AEB@psMrk{ThisPage} << \noPeekAction{#1}{#2} >> /PUT pdfmark}} \def\eq@choice@driver {% - \Hy@pdfstringtrue - \if\@vertRotate1\let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% - \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH - \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi - \pdf@rect{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% - \literalps@out{% - [ \ifisCalculate/_objdef {\Fld@name}\else\eq@objdef\fi - /Rect [pdf@llx pdf@lly pdf@urx pdf@ury] - \common@choiceCode - /ANN pdfmark - \ifisCalculate[ {corder} {\Fld@name} /APPEND pdfmark\fi - }\to@insertStrucTabOrder{Form}\endgroup - \dl@restorespcs + \Hy@pdfstringtrue + \ifx\@vertRotate\ef@One + \let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% + \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH + \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi + \pdf@rect{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% + \literalps@out{\AEB@psMrk + \ifisCalculate/_objdef {\Fld@name}\else\eq@objdef\fi + /Rect [pdf@llx pdf@lly pdf@urx pdf@ury] + \common@choiceCode + /ANN pdfmark + \ifisCalculate\AEB@psMrk{corder} {\Fld@name} /APPEND pdfmark\fi + }\to@insertStrucTabOrder{Form}\endgroup + \dl@restorespcs } \def\eq@Button@driver {% - \Hy@pdfstringtrue - \ifx\eq@rectW\@empty\def\eq@rectW{\wd\eq@tmpbox}\ef@djXPD\fi - \if\@vertRotate1\let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% - \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH - \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi - \pdf@rect{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% - \literalps@out{% - [ \eq@objdef/Rect [pdf@llx pdf@lly pdf@urx pdf@ury] - \common@pushButtonCode - /ANN pdfmark}\to@insertStrucTabOrder{Form}\endgroup - \dl@restorespcs + \Hy@pdfstringtrue + \ifx\eq@rectW\@empty\def\eq@rectW{\wd\eq@tmpbox}\ef@djXPD\fi + \ifx\@vertRotate\ef@One\let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% + \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH + \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi + \pdf@rect{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% + \literalps@out{\AEB@psMrk + \eq@objdef/Rect [pdf@llx pdf@lly pdf@urx pdf@ury] + \common@pushButtonCode + /ANN pdfmark}\to@insertStrucTabOrder{Form}\endgroup + \dl@restorespcs } \def\eq@RadioCheck@driver {% - \Hy@pdfstringtrue - \if\@vertRotate1\let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% - \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH - \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi - \ifx\eq@rectW\@empty\def\eq@rectW{\wd\eq@tmpbox}\fi - \pdf@rect{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% - \literalps@out{% - [ \eq@objdef/Rect [pdf@llx pdf@lly pdf@urx pdf@ury] - \common@RadioCheckCode - /ANN pdfmark}\to@insertStrucTabOrder{Form}\endgroup - \dl@restorespcs + \Hy@pdfstringtrue + \ifx\@vertRotate\ef@One + \let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% + \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH + \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi + \ifx\eq@rectW\@empty\def\eq@rectW{\wd\eq@tmpbox}\fi + \pdf@rect{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% + \literalps@out{\AEB@psMrk + \eq@objdef/Rect [pdf@llx pdf@lly pdf@urx pdf@ury] + \common@RadioCheckCode + /ANN pdfmark}\to@insertStrucTabOrder{Form}\endgroup + \dl@restorespcs } \def\eq@l@check@driver {% - \pdf@rect{\makebox[\eq@tmpdima]{\phantom{\link@@Content}}}% - \literalps@out{% - [ \eq@objdef/Rect [pdf@llx pdf@lly pdf@urx pdf@ury] - \common@RadioCheckCode - /ANN pdfmark}\endgroup - \dl@restorespcs + \pdf@rect{\makebox[\eq@tmpdima]{\phantom{\link@@Content}}}% + \literalps@out{\AEB@psMrk + \eq@objdef/Rect [pdf@llx pdf@lly pdf@urx pdf@ury] + \common@RadioCheckCode + /ANN pdfmark}\endgroup + \dl@restorespcs } \def\eq@TextField{\Hy@pdfstringtrue - \if\@vertRotate1\let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% - \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH - \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi - \pdf@rect{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% - \literalps@out{% - [ \ifisCalculate/_objdef {\Fld@name}\else\eq@objdef\fi - /Rect [pdf@llx pdf@lly pdf@urx pdf@ury] - \common@TextFieldCode - /ANN pdfmark - \ifisCalculate[ {corder} {\Fld@name} /APPEND pdfmark\fi - }\to@insertStrucTabOrder{Form}\endgroup - \dl@restorespcs + \ifx\@vertRotate\ef@One + \let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% + \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH + \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi + \pdf@rect{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% + \literalps@out{\AEB@psMrk + \ifisCalculate/_objdef {\Fld@name}\else\eq@objdef\fi + /Rect [pdf@llx pdf@lly pdf@urx pdf@ury] + \common@TextFieldCode + /ANN pdfmark + \ifisCalculate\AEB@psMrk{corder} {\Fld@name} /APPEND pdfmark\fi + }\to@insertStrucTabOrder{Form}\endgroup + \dl@restorespcs } \def\eq@SigField{\Hy@pdfstringtrue - \if\@vertRotate1\let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% - \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH - \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi - \pdf@rect{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% - \literalps@out{% - [ \eq@objdef/Rect [pdf@llx pdf@lly pdf@urx pdf@ury] - \common@SigFieldCode - /ANN pdfmark - }\to@insertStrucTabOrder{Form}\endgroup - \dl@restorespcs + \ifx\@vertRotate\ef@One + \let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% + \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH + \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi + \pdf@rect{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% + \literalps@out{\AEB@psMrk + \eq@objdef/Rect [pdf@llx pdf@lly pdf@urx pdf@ury] + \common@SigFieldCode + /ANN pdfmark + }\to@insertStrucTabOrder{Form}\endgroup + \dl@restorespcs } \def\convertAToAction/A#1\@nil{\def\eq@A{/Action#1}} \def\setLink@driver {% - \ifx\eq@A\@empty\else\expandafter\convertAToAction\eq@A\@nil\fi - \@eqBS{}% - \pdf@rect{\link@@Box}% - \literalps@out{% - [ \eq@objdef/Rect [pdf@llx pdf@lly pdf@urx pdf@ury] - \eq@Border - \common@LinkCode - /Subtype /Link - /ANN pdfmark}% - \to@insertStrucTabOrder{Link}\endgroup - \dl@restorespcs + \ifx\eq@A\@empty\else\expandafter\convertAToAction\eq@A\@nil\fi + \@eqBS{}% + \pdf@rect{\link@@Box}% + \literalps@out{\AEB@psMrk + \eq@objdef/Rect [pdf@llx pdf@lly pdf@urx pdf@ury] + \eq@Border + \common@LinkCode + /Subtype /Link + /ANN pdfmark}% + \to@insertStrucTabOrder{Link}\endgroup + \dl@restorespcs } \def\pboxRect{/Rect [\par@@Rect]} \def\mllnkcontainer#1{#1} \def\setLinkPbox@driver {% - \ifx\eq@A\@empty\else\expandafter\convertAToAction\eq@A\@nil\fi - \@eqBS{}% - \literalps@out{\mllnkcontainer{% - [ \eq@objdef\pboxRect - \eq@Border - \eq@QuadPoints % QuadPoints - \common@LinkCode - /Subtype /Link - /ANN pdfmark}}% - \to@insertStrucTabOrder{Link}\endgroup - \dl@restorespcs + \ifx\eq@A\@empty\else\expandafter\convertAToAction\eq@A\@nil\fi + \@eqBS{}% + \literalps@out{\mllnkcontainer{% + \AEB@psMrk\eq@objdef\pboxRect + \eq@Border + \eq@QuadPoints % QuadPoints + \common@LinkCode + /Subtype /Link + /ANN pdfmark}}% + \to@insertStrucTabOrder{Link}\endgroup + \dl@restorespcs } \endinput %% diff --git a/texmf-dist/tex/latex/acrotex/epdftex.def b/texmf-dist/tex/latex/acrotex/epdftex.def index 0c36ec23..d235584d 100644 --- a/texmf-dist/tex/latex/acrotex/epdftex.def +++ b/texmf-dist/tex/latex/acrotex/epdftex.def @@ -8,7 +8,7 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% eForms package, %% -%% Copyright (C) 2002-2018 D. P. Story %% +%% Copyright (C) 2002-2019 D. P. Story %% %% dpstory@uakron.edu %% %% %% %% This program can redistributed and/or modified under %% @@ -30,83 +30,88 @@ }% \def\eq@choice@driver {% - \Hy@pdfstringtrue - \if\@vertRotate1\let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% - \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH - \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi - \hbox{\pdfstartlink user{\common@choiceCode}% - \lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}\pdfendlink}% - \HyField@AddToFields - \endgroup - \dl@restorespcs + \Hy@pdfstringtrue + \ifx\@vertRotate\ef@One + \let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% + \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH + \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi + \hbox{\pdfstartlink user{\common@choiceCode}% + \lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}\pdfendlink}% + \HyField@AddToFields + \endgroup + \dl@restorespcs } \def\eq@Button@driver {% - \Hy@pdfstringtrue - \ifx\eq@rectW\@empty\def\eq@rectW{\wd\eq@tmpbox}\ef@djXPD\fi - \if\@vertRotate1\let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% - \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH - \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi - \ifx\eq@rectW\@empty\def\eq@rectW{\wd\eq@tmpbox}\fi - \hbox{\pdfstartlink user{\common@pushButtonCode}% - \lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}\pdfendlink}% - \endgroup - \dl@restorespcs + \Hy@pdfstringtrue + \ifx\eq@rectW\@empty\def\eq@rectW{\wd\eq@tmpbox}\ef@djXPD\fi + \ifx\@vertRotate\ef@One + \let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% + \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH + \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi + \ifx\eq@rectW\@empty\def\eq@rectW{\wd\eq@tmpbox}\fi + \hbox{\pdfstartlink user{\common@pushButtonCode}% + \lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}\pdfendlink}% + \endgroup + \dl@restorespcs } \def\eq@RadioCheck@driver {% - \Hy@pdfstringtrue - \if\@vertRotate1\let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% - \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH - \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi - \ifx\eq@rectW\@empty\def\eq@rectW{\wd\eq@tmpbox}\fi - \hbox{\pdfstartlink user{\common@RadioCheckCode}% - \lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}\pdfendlink}% - \endgroup - \dl@restorespcs + \Hy@pdfstringtrue + \ifx\@vertRotate\ef@One + \let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% + \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH + \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi + \ifx\eq@rectW\@empty\def\eq@rectW{\wd\eq@tmpbox}\fi + \hbox{\pdfstartlink user{\common@RadioCheckCode}% + \lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}\pdfendlink}% + \endgroup + \dl@restorespcs } \def\eq@l@check@driver {% - \pdfstartlink user{\common@RadioCheckCode}% - \makebox[\eq@tmpdima]{\phantom{\link@@Content}}% - \pdfendlink\endgroup - \dl@restorespcs + \pdfstartlink user{\common@RadioCheckCode}% + \makebox[\eq@tmpdima]{\phantom{\link@@Content}}% + \pdfendlink\endgroup + \dl@restorespcs } \def\eq@TextField{\Hy@pdfstringtrue - \if\@vertRotate1\let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% - \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH - \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi - \leavevmode - \hbox{\pdfstartlink user{\common@TextFieldCode}% - \lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}\pdfendlink}% - \HyField@AddToFields - \endgroup - \dl@restorespcs + \ifx\@vertRotate\ef@One + \let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% + \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH + \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi + \leavevmode + \hbox{\pdfstartlink user{\common@TextFieldCode}% + \lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}\pdfendlink}% + \HyField@AddToFields + \endgroup + \dl@restorespcs } \def\eq@SigField{\Hy@pdfstringtrue - \if\@vertRotate1\let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% - \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH - \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi - \leavevmode\hbox{\pdfstartlink user{\common@SigFieldCode}% - \lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}\pdfendlink}% - \endgroup - \dl@restorespcs + \ifx\@vertRotate\ef@One + \let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% + \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH + \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi + \leavevmode\hbox{\pdfstartlink user{\common@SigFieldCode}% + \lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}\pdfendlink}% + \endgroup + \dl@restorespcs } \def\setLink@driver {% - \@eqBS{}% - \leavevmode\pdfstartlink - attr {\eq@Border}% - user{/Subtype/Link \common@LinkCode}% - \Hy@colorlink{\@linkcolor}\link@@Box - \close@pdflink - \endgroup - \dl@restorespcs + \@eqBS{}% + \leavevmode\pdfstartlink + attr {\eq@Border}% + user{/Subtype/Link \common@LinkCode}% + \Hy@colorlink{\@linkcolor}\link@@Box + \close@pdflink + \endgroup + \dl@restorespcs } \def\ef@setTabOrder{\ifx\ef@taborder\@empty\else - \edef\ef@tmp@toks{\the\pdfpageattr\space/Tabs/\ef@taborder}% - \global\pdfpageattr=\expandafter{\ef@tmp@toks}% - \fi\endgroup + \edef\ef@tmp@toks{\the\pdfpageattr\space/Tabs/\ef@taborder}% + \global\pdfpageattr=\expandafter{\ef@tmp@toks}% + \fi\endgroup } \endinput %% diff --git a/texmf-dist/tex/latex/acrotex/pdfdochex.def b/texmf-dist/tex/latex/acrotex/pdfdochex.def index 758789df..14ff0a80 100644 --- a/texmf-dist/tex/latex/acrotex/pdfdochex.def +++ b/texmf-dist/tex/latex/acrotex/pdfdochex.def @@ -8,7 +8,7 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% eForms package, %% -%% Copyright (C) 2002-2018 D. P. Story %% +%% Copyright (C) 2002-2019 D. P. Story %% %% dpstory@uakron.edu %% %% %% %% This program can redistributed and/or modified under %% diff --git a/texmf-dist/tex/latex/acrotex/setcorder.def b/texmf-dist/tex/latex/acrotex/setcorder.def index 3826d623..6f215b0a 100644 --- a/texmf-dist/tex/latex/acrotex/setcorder.def +++ b/texmf-dist/tex/latex/acrotex/setcorder.def @@ -8,7 +8,7 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% eForms package, %% -%% Copyright (C) 2002-2018 D. P. Story %% +%% Copyright (C) 2002-2019 D. P. Story %% %% dpstory@uakron.edu %% %% %% %% This program can redistributed and/or modified under %% diff --git a/texmf-dist/tex/latex/acrotex/uieforms.def b/texmf-dist/tex/latex/acrotex/uieforms.def index 28a40bba..b441ba55 100644 --- a/texmf-dist/tex/latex/acrotex/uieforms.def +++ b/texmf-dist/tex/latex/acrotex/uieforms.def @@ -8,7 +8,7 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% eForms package, %% -%% Copyright (C) 2002-2018 D. P. Story %% +%% Copyright (C) 2002-2019 D. P. Story %% %% dpstory@uakron.edu %% %% %% %% This program can redistributed and/or modified under %% -- cgit v1.2.3