From a979a969ee8a924408ebeb767035b9e4f48f7efa Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 1 Feb 2021 13:14:30 +0900 Subject: acrotex (2021-02-01) --- texmf-dist/tex/latex/acrotex/aebdocfmt.def | 14 +- texmf-dist/tex/latex/acrotex/aebjs.def | 62 +- texmf-dist/tex/latex/acrotex/aebrandom.def | 201 +- texmf-dist/tex/latex/acrotex/aebsumrytbls.def | 178 +- texmf-dist/tex/latex/acrotex/altadbfncs.def | 2 +- texmf-dist/tex/latex/acrotex/dljscc.def | 2 +- texmf-dist/tex/latex/acrotex/edvipdfm.def | 4 +- texmf-dist/tex/latex/acrotex/eforms.sty | 324 ++- texmf-dist/tex/latex/acrotex/epdfmark.def | 4 +- texmf-dist/tex/latex/acrotex/epdftex.def | 4 +- texmf-dist/tex/latex/acrotex/eqbr.def | 3 + texmf-dist/tex/latex/acrotex/eqcat.def | 3 + texmf-dist/tex/latex/acrotex/eqcolor.def | 90 +- texmf-dist/tex/latex/acrotex/eqcz.def | 3 + texmf-dist/tex/latex/acrotex/eqda.def | 3 + texmf-dist/tex/latex/acrotex/eqde.def | 2 +- texmf-dist/tex/latex/acrotex/eqes.def | 3 + texmf-dist/tex/latex/acrotex/eqfin.def | 3 + texmf-dist/tex/latex/acrotex/eqfr.def | 3 + texmf-dist/tex/latex/acrotex/eqit.def | 3 + texmf-dist/tex/latex/acrotex/eqnl.def | 2 + texmf-dist/tex/latex/acrotex/eqno.def | 3 + texmf-dist/tex/latex/acrotex/eqpo.def | 3 + texmf-dist/tex/latex/acrotex/eqru.def | 2 - texmf-dist/tex/latex/acrotex/eqtr.def | 2 + texmf-dist/tex/latex/acrotex/exerquiz.sty | 3009 ++++++++++++------------- texmf-dist/tex/latex/acrotex/insdljs.sty | 836 ++++--- texmf-dist/tex/latex/acrotex/pdfdochex.def | 2 +- texmf-dist/tex/latex/acrotex/setcorder.def | 68 +- texmf-dist/tex/latex/acrotex/template.def | 2 +- texmf-dist/tex/latex/acrotex/uieforms.def | 376 +-- texmf-dist/tex/latex/acrotex/usemcfi.def | 55 +- texmf-dist/tex/latex/acrotex/web.sty | 2620 +++++++++++---------- texmf-dist/tex/latex/acrotex/webpro.def | 946 ++++---- texmf-dist/tex/latex/acrotex/websec.def | 248 +- 35 files changed, 4564 insertions(+), 4521 deletions(-) (limited to 'texmf-dist/tex') diff --git a/texmf-dist/tex/latex/acrotex/aebdocfmt.def b/texmf-dist/tex/latex/acrotex/aebdocfmt.def index 8e1af134..73e27201 100644 --- a/texmf-dist/tex/latex/acrotex/aebdocfmt.def +++ b/texmf-dist/tex/latex/acrotex/aebdocfmt.def @@ -15,16 +15,16 @@ %% to him for starting me off. %%--------------------------------------------------------- \newcommand{\setupFullwidth}{% - \setlength{\textwidth}{\paperwidth}% - \advance\textwidth-2in - \setlength{\linewidth}{\textwidth}% - \setlength{\columnseprule}{0pt}% - \setlength{\oddsidemargin}{0in}% - \setlength{\evensidemargin}{0in}% + \setlength{\textwidth}{\paperwidth}% + \advance\textwidth-2in + \setlength{\linewidth}{\textwidth}% + \setlength{\columnseprule}{0pt}% + \setlength{\oddsidemargin}{0in}% + \setlength{\evensidemargin}{0in}% } \makeatletter \def\clindx{\ifcodeline@index\expandafter\@firstoftwo\else - \expandafter\@secondoftwo\fi} + \expandafter\@secondoftwo\fi} \GlossaryPrologue{\section{Change History}} \IndexPrologue{\section{Index}\hfuzz\linewidth \parbox{\linewidth}{Numbers written in italic diff --git a/texmf-dist/tex/latex/acrotex/aebjs.def b/texmf-dist/tex/latex/acrotex/aebjs.def index 2d01029f..9be63c22 100644 --- a/texmf-dist/tex/latex/acrotex/aebjs.def +++ b/texmf-dist/tex/latex/acrotex/aebjs.def @@ -18,7 +18,7 @@ %% License, or (at your option) any later version. %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ProvidesFile{aebjs.def} - [2020/03/14 v8.5.10 % + [2021/01/20 v8.6.2 % Exerquiz document level JavaScript (dps)] \def\aeb@array{new Array} \def\refac#1{\\(#1\\)}\def\regrp#1{(#1)}\def\rechrclass#1{[#1]} @@ -28,7 +28,7 @@ \def\preDenyForm{\Array(denyForm,\@gobble} \def\postDenyForm{\Array(requireFormNot,\@gobble} \newcommand{\noPeekArgs}[1]{% - \def\NoPeekAlert{eqAppAlert(#1)}}\def\newNoPeekArgs{} + \def\NoPeekAlert{eqAppAlert(#1)}}\def\newNoPeekArgs{} \def\NoPeekAlert{eqAppAlert(\noPeekMsg,3)} \newcommand{\dlLibSpecRespJS}{"none","undefined","empty"} \newif\ifSubstVars\SubstVarsfalse % dps17 @@ -777,6 +777,23 @@ function eqFilter(filterMethod) { return this.toString(); } } +function checkTheSpelling(targetFieldName) { + var spellChkCnt=0; + var f=this.getField(targetFieldName); + var value=f.value; + var valueStrip = value.replace(/\s+/g,""); + if ( valueStrip != "" ) { + aBrk=value.split(/\s+/); + for (var i=0; i3 \@tempcntb=3 \fi - \edef\smrytbl@ntables{\the\@tempcntb}% + \@tempcntb=#1 + \ifnum\@tempcntb<\@ne\@tempcntb=\@ne\fi + \ifnum\@tempcntb>\thr@@\@tempcntb=\thr@@\fi + \edef\smrytbl@ntables{\the\@tempcntb}% } \def\smrytbl@ntables{2} \define@key{smrytbl}{showmarkup}[true]{% - \csname if#1\endcsname\eqshowmarkuptrue - \else\eqshowmarkupfalse\fi + \csname if#1\endcsname\eqshowmarkuptrue + \else\eqshowmarkupfalse\fi } \newif\ifsmrytbl@corrections\smrytbl@correctionstrue \define@key{smrytbl}{nocorrections}[true]{% - \csname if#1\endcsname\smrytbl@correctionsfalse - \else\smrytbl@correctionstrue\fi + \csname if#1\endcsname\smrytbl@correctionsfalse + \else\smrytbl@correctionstrue\fi } \define@key{smrytbl}{showOutOf}[true]{% - \csname if#1\endcsname\eqshowOutOftrue\def\stfmtType{OO}% - \gdef\showOutOfinSmryTbl{true}\let\stmarkupbox\relax - \else - \eqshowOutOffalse\let\stfmtType\@empty - \gdef\showOutOfinSmryTbl{false}% - \fi + \csname if#1\endcsname\eqshowOutOftrue\def\stfmtType{OO}% + \gdef\showOutOfinSmryTbl{true}\let\stmarkupbox\relax + \else + \eqshowOutOffalse\let\stfmtType\@empty + \gdef\showOutOfinSmryTbl{false}% + \fi } \let\stfmtType\@empty \define@key{smrytbl}{setDimens}[]{#1} \def\showOutOfinSmryTbl{false} \def\stmarkupbox{\makebox[0pt][l]} \newcommand{\displaySumryTbl}[2][]{% - \begingroup\edef\currQuiz{#2}\edef\oField{#2}\edef\curr@quiz{#2}% - \setkeys{smrytbl}{#1}% - \eqtmpcnta\smrytbl@ntables\relax - \eq@rowcnt\z@\@tempcntb=\value{questionno}% - \ifnum\eqtmpcnta=\tw@ - \divide\@tempcntb\tw@ - \advance\@tempcntb\ifodd\value{questionno}2\else1\fi - \xdef\@beginSecCol{\the\@tempcntb}% - \advance\@tempcntb-1\relax - \fi - \ifnum\eqtmpcnta=\thr@@ - \edef\eq@n{\the\@tempcntb}% - \divide\@tempcntb\eqtmpcnta - \edef\eq@q{\the\@tempcntb}% - \@tempcnta=\@tempcntb\multiply\@tempcnta3 - \edef\eq@p{\the\@tempcnta}% - \@tempcnta=\eq@n - \advance\@tempcnta-\eq@p\relax - \ifnum\@tempcnta=\z@ - \@tempcntb=\eq@q \advance\@tempcntb\@ne - \xdef\@beginSecCol{\the\@tempcntb}% - \advance\@tempcntb\eq@q\relax - \xdef\@beginThrdCol{\the\@tempcntb}% - \else\ifnum\@tempcnta=\@ne - \@tempcntb=\eq@q \advance\@tempcntb\@ne - \edef\nB@lCols{\the\@tempcntb}% - \advance\@tempcntb\@ne - \xdef\@beginSecCol{\the\@tempcntb}% - \advance\@tempcntb\eq@q\relax - \xdef\@beginThrdCol{\the\@tempcntb}% - \else\ifnum\@tempcnta=2\relax - \@tempcntb=\eq@q \advance\@tempcntb1 - \edef\nB@lCols{\the\@tempcntb}% - \advance\@tempcntb\@ne - \xdef\@beginSecCol{\the\@tempcntb}% - \advance\@tempcntb\nB@lCols - \xdef\@beginThrdCol{\the\@tempcntb}% - \fi\fi\fi - \@tempcntb=\eq@n - \fi + \begingroup\edef\currQuiz{#2}\edef\oField{#2}\edef\curr@quiz{#2}% + \setkeys{smrytbl}{#1}% + \eqtmpcnta\smrytbl@ntables\relax + \eq@rowcnt\z@\@tempcntb=\value{questionno}% + \ifnum\eqtmpcnta=\tw@ + \divide\@tempcntb\tw@ + \advance\@tempcntb\ifodd\value{questionno}\tw@\else\@ne\fi + \xdef\@beginSecCol{\the\@tempcntb}\advance + \@tempcntb\m@ne + \fi + \ifnum\eqtmpcnta=\thr@@ + \edef\eq@n{\the\@tempcntb}% + \divide\@tempcntb\eqtmpcnta + \edef\eq@q{\the\@tempcntb}% + \@tempcnta=\@tempcntb\multiply\@tempcnta3 + \edef\eq@p{\the\@tempcnta}% + \@tempcnta=\eq@n + \advance\@tempcnta-\eq@p\relax + \ifnum\@tempcnta=\z@ + \@tempcntb=\eq@q \advance\@tempcntb\@ne + \xdef\@beginSecCol{\the\@tempcntb}% + \advance\@tempcntb\eq@q\relax + \xdef\@beginThrdCol{\the\@tempcntb}% + \else\ifnum\@tempcnta=\@ne + \@tempcntb=\eq@q \advance\@tempcntb\@ne + \edef\nB@lCols{\the\@tempcntb}% + \advance\@tempcntb\@ne + \xdef\@beginSecCol{\the\@tempcntb}% + \advance\@tempcntb\eq@q\relax + \xdef\@beginThrdCol{\the\@tempcntb}% + \else\ifnum\@tempcnta=\tw@ + \@tempcntb=\eq@q \advance\@tempcntb\@ne + \edef\nB@lCols{\the\@tempcntb}% + \advance\@tempcntb\@ne + \xdef\@beginSecCol{\the\@tempcntb}% + \advance\@tempcntb\nB@lCols + \xdef\@beginThrdCol{\the\@tempcntb}% + \fi\fi\fi + \@tempcntb=\eq@n + \fi \let\@eqListExp\@@eqListExp \eqQzQuesList \endgroup } \def\eq@begintab{% - \begin{tabular}[t]{lcc}\sumryTblQ&\sumryTblR&\sumryTblP\\\sthline - {\Large\strut}} + \begin{tabular}[t]{lcc}\sumryTblQ&\sumryTblR&\sumryTblP\\\sthline + {\Large\strut}} \def\sthline{\hline} \def\eq@endtab{\end{tabular}} \def\sumrytblCkMUsep{\kern3bp} @@ -115,44 +115,46 @@ \newcommand{\sumrytablesep}{\space} \def\stmarkupWidth{12bp}\def\stmarkupHeight{9bp}\def\stmarkupTextSize{0} \def\st@scndclmn{% - \checkBox[\Ff{\FfReadOnly}]% - {\ccatCurrQzWith(SanityCheck).\the\eq@rowcnt}% - {\markupHeight}{\markupHeight}{Yes}\ifeqshowmarkup - \stmarkupbox{\sumrytblCkMUsep\textField[% - \Ff\FfReadOnly\BC{}\textColor{\pcMarkupColor}% - \textSize{\stmarkupTextSize}\autoCenter{n}% - ]{\ccatCurrQzWith(SanityCheck\stfmtType Pts).\the\eq@rowcnt}% - {\stmarkupWidth}{\stmarkupHeight}}\fi + \checkBox[\Ff{\FfReadOnly}] + {\ccatCurrQzWith(SanityCheck).\the\eq@rowcnt} + {\markupHeight}{\markupHeight}{Yes}% + \ifeqshowmarkup + \stmarkupbox{\sumrytblCkMUsep\textField[% + \Ff\FfReadOnly\BC{}\textColor{\pcMarkupColor} + \textSize{\stmarkupTextSize}\autoCenter{n}] + {\ccatCurrQzWith(SanityCheck\stfmtType Pts).\the\eq@rowcnt}% + {\stmarkupWidth}{\stmarkupHeight}}% + \fi } \def\st@thrdclmn#1{% - \setLink[\linktxtcolor{\@linkcolor} - \A{\JS{this.pageNum=(#1-1)}}]{\sumrytbllinkHook{#1}}} + \setLink[\linktxtcolor{\@linkcolor} + \A{\JS{this.pageNum=(#1-1)}}]{\sumrytbllinkHook{#1}}} \def\@@eqListExp#1#2{\global\advance\eq@rowcnt\@ne - \ifnum\eq@rowcnt=\@ne - \pbPopulateSumTable\ifsmrytbl@corrections\else - \pbDoNoCorrectSumryTbl\fi\expandafter\eq@begintab\fi - \ifnum\eqtmpcnta>\@ne\ifnum\eq@rowcnt=\@beginSecCol\relax - \eq@endtab\expandafter\sumrytablesep\expandafter\eq@begintab - \fi\fi - \ifnum\eqtmpcnta=\thr@@\ifnum\eq@rowcnt=\@beginThrdCol\relax - \eq@endtab\expandafter\sumrytablesep\expandafter\eq@begintab - \fi\fi + \ifnum\eq@rowcnt=\@ne + \pbPopulateSumTable\ifsmrytbl@corrections\else + \pbDoNoCorrectSumryTbl\fi\expandafter\eq@begintab\fi + \ifnum\eqtmpcnta>\@ne\ifnum\eq@rowcnt=\@beginSecCol\relax + \eq@endtab\expandafter\sumrytablesep\expandafter\eq@begintab + \fi\fi + \ifnum\eqtmpcnta=\thr@@\ifnum\eq@rowcnt=\@beginThrdCol\relax + \eq@endtab\expandafter\sumrytablesep\expandafter\eq@begintab + \fi\fi \sumryTblProbFmt{#1}&\st@scndclmn&\st@thrdclmn{#2}\\[1bp] - \ifnum\eq@rowcnt=\thequestionno\relax\expandafter\eq@endtab\fi + \ifnum\eq@rowcnt=\value{questionno}\expandafter\eq@endtab\fi } \def\writeProListAux{% - \eq@IWAuxOut{\string - \csarg\string\gdef{\currQuiz QzQuesList}{\eqQzQuesList}}% - \eq@IWAuxOut{\string - \csarg\string\gdef{\currQuiz nQuestions}{\thequestionno}}% + \eq@IWAuxOut{\string + \csarg\string\gdef{\currQuiz QzQuesList}{\eqQzQuesList}}% + \eq@IWAuxOut{\string + \csarg\string\gdef{\currQuiz nQuestions}{\thequestionno}}% } \def\setParamSumryTblAux{% - \edef\eqQzQuesList{\@nameuse{\currQuiz QzQuesList}}% - \@ifundefined{\currQuiz nQuestions}{}{% - \value{questionno}=\@nameuse{\currQuiz nQuestions}}% + \edef\eqQzQuesList{\@nameuse{\currQuiz QzQuesList}}% + \@ifundefined{\currQuiz nQuestions}{}{% + \value{questionno}=\@nameuse{\currQuiz nQuestions}}% } \newenvironment{sumryTblAux}[1]{% - \DeclareQuiz{#1}\setParamSumryTblAux}{}% + \DeclareQuiz{#1}\setParamSumryTblAux}{}% \begin{insDLJS}[correctSumryTbl]{sumtbljs}{Eq: Populate Summary Table} function correctSumryTbl(qtfield,nQuestions) { var oQName=eval(qtfield); diff --git a/texmf-dist/tex/latex/acrotex/altadbfncs.def b/texmf-dist/tex/latex/acrotex/altadbfncs.def index b852cdfa..09d07923 100644 --- a/texmf-dist/tex/latex/acrotex/altadbfncs.def +++ b/texmf-dist/tex/latex/acrotex/altadbfncs.def @@ -8,7 +8,7 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% insdljs.sty package, %% -%% Copyright (C) 2001-2019 D. P. Story %% +%% Copyright (C) 2001-2020 D. P. Story %% %% dpstory@uakron.edu %% %% %% %% This program can redistributed and/or modified under %% diff --git a/texmf-dist/tex/latex/acrotex/dljscc.def b/texmf-dist/tex/latex/acrotex/dljscc.def index 96e5de80..2ec99172 100644 --- a/texmf-dist/tex/latex/acrotex/dljscc.def +++ b/texmf-dist/tex/latex/acrotex/dljscc.def @@ -8,7 +8,7 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% insdljs.sty package, %% -%% Copyright (C) 2001-2019 D. P. Story %% +%% Copyright (C) 2001-2020 D. P. Story %% %% dpstory@uakron.edu %% %% %% %% This program can redistributed and/or modified under %% diff --git a/texmf-dist/tex/latex/acrotex/edvipdfm.def b/texmf-dist/tex/latex/acrotex/edvipdfm.def index 16c21749..7ed8ef58 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-2019 D. P. Story %% +%% Copyright (C) 2002-2020 D. P. Story %% %% dpstory@uakron.edu %% %% %% %% This program can redistributed and/or modified under %% @@ -83,7 +83,7 @@ \fi \fi \fi - \ef@NewRadiosLateOpts + \ifuseNewRadios\expandafter\ef@NewRadiosLateOpts\fi \ifx\eq@rectW\@empty\def\eq@rectW{\wd\eq@tmpbox}\fi \HyField@AdvanceAnnotCount \setbox\pdfm@box=% diff --git a/texmf-dist/tex/latex/acrotex/eforms.sty b/texmf-dist/tex/latex/acrotex/eforms.sty index 325f0dc3..bc67416c 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-2019 D. P. Story %% +%% Copyright (C) 2002-2020 D. P. Story %% %% dpstory@uakron.edu %% %% %% %% This program can redistributed and/or modified under %% @@ -19,7 +19,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eforms} - [2019/10/23 v2.3.2 Provides general eforms support (dps)] + [2020/12/14 v2.4.1 Provides general eforms support (dps)] \RequirePackage{ifpdf}[2006/02/20] \RequirePackage{ifxetex}[2006/08/21] \RequirePackage{ifluatex} @@ -115,16 +115,20 @@ \@makeother\$\relax \newlength\eflength \@ifundefined{ifpdfmarkup}{\newif\ifpdfmarkup}{}\pdfmarkupfalse -\ifpdf\else\ifxetex\else\pdfmarkuptrue\fi\fi +\ifpdf\else\ifnum\eq@drivernum=2\relax\else\pdfmarkuptrue\fi\fi \RequirePackage{hyperref} -\ifxetex\else\ifpdf\pdflinkmargin1bp\relax\else +\ifnum\eq@drivernum=2\relax +\else + \ifpdf\pdflinkmargin1bp\relax + \else \g@addto@macro\Hy@FirstPageHook{% \headerps@out{/HyperBorder {1.00375 PDFToDvips} def}} -\fi\fi + \fi +\fi \RequirePackage{insdljs}[2019/02/11] % incl conv-xkv \@ifpackageloaded{exerquiz}{}{% - \AtBeginDocument{\Form} - \AtEndDocument{\csname endForm\endcsname} + \AtBeginDocument{\Form}% + \AtEndDocument{\@nameuse{endForm}} } \@ifpackageloaded{aeb_pro}{}{% \newcommand{\taggedPDF}{% @@ -145,6 +149,7 @@ \@ifundefined{eq@tmpbox}{\newsavebox{\eq@tmpbox}}{} \@ifundefined{eq@tmpdima}{\newdimen\eq@tmpdima}{} \@ifundefined{eq@tmpdimb}{\newdimen\eq@tmpdimb}{} +\newdimen\b@ \b@=1bp \newlength\ef@dimena \newtoks\ef@scratchtoks \newif\ifmakeXasPD \makeXasPDtrue @@ -185,9 +190,7 @@ \ifx\end#1% if #1=\end, #2=\@nil. \let\ef@next\relax \else - \ifx#1\@empty - \def\ef@next{\processAppArgs}% - \else + \ifx#1\@empty\def\ef@next{\processAppArgs}\else \@getCmdName{\ui}\edef\arg@ui{\@CmdName}% \@getCmdName{#1}% \ifx\arg@ui\@CmdName @@ -243,7 +246,7 @@ \ifx\arg@epresets\@CmdName \def\ef@next{\let\protect\noexpand \edef\x{#2}\set@typeset@protect\expandafter - \processAppArgs\x}% dps27 + \processAppArgs\x}% \else \csname @eq% \expandafter\@gobble\string#1\endcsname{#2}% @@ -257,44 +260,68 @@ \fi \ef@next } -\def\@processEvery{\edef\eqtemp{}\toks0={}\@@processEvery} -\def\@@processEvery#1{% - \ifx#1\end\def\ef@next{\the\toks0 }% - \else - \edef\eqtemp{\the\toks0 }% - \toks0=\expandafter{\eqtemp - \expandafter\processAppArgs#1\end\@nil}% - \def\ef@next{\@@processEvery}% - \fi - \ef@next +\def\@processEvery{\edef\eqtemp{}\toks@={}\@@processEvery} +\def\@@processEvery#1{\ifx#1\end + \def\ef@next{\the\toks@}\else + \edef\eqtemp{\the\toks@}% + \toks@=\expandafter{\eqtemp\expandafter + \processAppArgs#1\end\@nil}% + \def\ef@next{\@@processEvery}\fi\ef@next } \newdimen\eqcenterWidget \def\centerWidget#1{% - \ifeq@inlineCenter - \eqcenterWidget=#1\relax - \eqcenterWidget=.5\eqcenterWidget - \ifnum\eq@textSize=0\relax - \dimen@=-\eq@textSizeDefault bp\else - \dimen@=-\eq@textSize bp\fi - \dimen@=0.9167\dimen@ % 11/12 - \dimen@=.5\dimen@ - \advance\dimen@\eq@W@value bp - \ifx\eq@S\@empty\else - \def\eq@S@cmp{B}% - \ifx\eq@S@value\eq@S@cmp - \advance\dimen@ by \eq@W@value bp - \else - \def\eq@S@cmp{I}% - \ifx\eq@S@value\eq@S@cmp - \advance\dimen@ by \eq@W@value bp - \else\advance\dimen@ by 1bp - \fi\fi\fi - \advance\eqcenterWidget by \dimen@ + \ifeq@inlineCenter + \eqcenterWidget=#1\relax + \eqcenterWidget=.5\eqcenterWidget + \ifnum\eq@textSize=0\relax + \dimen@=-\eq@textSizeDefault\b@\else + \dimen@=-\eq@textSize\b@\fi + \dimen@=0.9167\dimen@ % 11/12 + \dimen@=.5\dimen@ + \advance\dimen@\eq@W@value\b@ + \ifx\eq@S\@empty\else + \def\eq@S@cmp{B}% + \ifx\eq@S@value\eq@S@cmp + \advance\dimen@ by \eq@W@value\b@ + \else + \def\eq@S@cmp{I}% + \ifx\eq@S@value\eq@S@cmp + \advance\dimen@ by \eq@W@value\b@ + \else\advance\dimen@\b@ + \fi\fi\fi + \advance\eqcenterWidget\dimen@ + \else + \eqcenterWidget=#1\relax + \eqcenterWidget=.5\eqcenterWidget + \advance\eqcenterWidget-4\b@ + \fi +} +\def\ef@optscale{% + \ifx\eq@width\@empty + \ifx\eq@height\@empty + \ifx\eq@scalefactor\@empty + \else + \@tempdima\eq@scalefactor\p@ + \ifdim\@tempdima<\z@\edef\eq@scalefactor{-\eq@scalefactor}\fi + \setlength{\eflength}{\eq@rectH*\real{\eq@scalefactor}}% + \edef\eq@rectH{\the\eflength}% + \setlength{\eflength}{\eq@rectW*\real{\eq@scalefactor}}% + \xdef\eq@rectW{\the\eflength}% + \fi \else - \eqcenterWidget=#1\relax - \eqcenterWidget=.5\eqcenterWidget - \advance\eqcenterWidget by -4bp + \setlength{\eflength}{\eq@rectH}% + \ifdim\eflength>\z@ + \setlength{\eflength}{\eq@height*\ratio{\eq@rectW}{\eq@rectH}}% + \edef\eq@rectW{\the\eflength}\edef\eq@rectH{\eq@height}% + \fi + \fi + \else + \setlength{\eflength}{\eq@rectW}% + \ifdim\eflength>\z@ + \setlength{\eflength}{\eq@width*\ratio{\eq@rectH}{\eq@rectW}}% + \edef\eq@rectH{\the\eflength}\edef\eq@rectW{\eq@width}% \fi + \fi } \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{} @@ -306,14 +333,14 @@ \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\@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}} + \xdef\g@eq@W@value@bp{\eq@W@value\b@}} \def\eq@W{}\def\eq@W@value{0} -\def\g@eq@W@valu@bp{0bp} % dps 12/22 +\def\g@eq@W@valu@bp{0bp} \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}% @@ -395,9 +422,38 @@ \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} +\def\ef@searchAction#1/Action#2\@nil{\def + \ef@argii{#2}\ifx\ef@argii\ef@end\let\ef@Action\ef@One\else + \let\ef@Action\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\lckArgs{#1}% + \ef@searchAction#1/Action\end\@nil + \ifx\ef@Action\ef@One\def\ef@next{\let\Action\lckAction#1}\else + \let\ef@next\relax\fi\ef@next + \def\eq@Lock{/Lock <<\lckArgs>>}\fi} +\let\eq@Lock\@empty +\def\lckAll{\All} +\def\lckIncludeFields{\IncludeFields} +\def\lckExcludeFields{\ExcludeFields} +\def\lckActionTst#1{\let\X\ef@Yes#1}% +\def\lckAction#1{\def\@rgi{#1}\ifx\@rgi\lckAll + \def\lckArgs{/Action/All}\let\ef@next\relax\else + \ifx\@rgi\lckIncludeFields + \def\ef@next{\lckGetFieldsFor{Include}}\else + \ifx\@rgi\lckExcludeFields + \def\ef@next{\lckGetFieldsFor{Exclude}}\else + \PackageWarning{eforms}% + {The argument of the \string\Lock key\MessageBreak + is not correctly expressed. Review the documentation}% + \fi + \fi +\fi\ef@next +} +\def\lckGetFieldsFor#1#2{\@temptokena={}\@for\@fld:={#2}\do + {\edef\@etmp{\the\@temptokena(\@fld)}% + \@temptokena=\expandafter{\@etmp}% + }\edef\lckArgs{/Action/#1/Fields[\the\@temptokena]}% +} \newif\ifisCalculate\isCalculatefalse \def\ef@searchCalc#1\AACalculate#2\@nil{% \ifx#2\end\else\aftergroup\isCalculatetrue\fi @@ -475,10 +531,13 @@ \def\@eqDA#1{\def\eq@DA{#1}} \def\eq@DA{\eq@textFont\space\eq@textSize\space Tf \eq@textColor}% \def\@eqtextFont#1{\def\eq@textFont{/#1}} -\def\eq@textFont{/Helv} +\def\textFontDefault#1{\def\eq@textFontDefault{#1} + \def\eq@textFont{/#1}} +\textFontDefault{Helv} \def\@eqtextSize#1{\def\eq@textSize{#1}} -\def\eq@textSizeDefault{9} -\edef\eq@textSize{\eq@textSizeDefault} +\def\textSizeDefault#1{\def\eq@textSizeDefault{#1} + \def\eq@textSize{#1}} +\textSizeDefault{9} \def\eq@RV@Body{>} \providecommand{\toggleAttachmentsPanel}[2]{% @@ -1013,27 +1082,34 @@ \edef\eq@rectH{\the\eflength}% \fi } -\def\ef@djXPD{\ifxetex\ifmakeXasPD\ef@adjrectWH{2bp}\fi - \else\ifmakePDasX\ef@adjrectWH{-2bp}\fi\fi} +\def\ef@djXPD{\ifxetex\ifmakeXasPD\ef@adjrectWH{2\b@}\fi + \else\ifmakePDasX\ef@adjrectWH{-2\b@}\fi\fi} +\def\btnSpcr#1{\def\ef@btnspcr{#1}} \def\ef@btnspcr{} \@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\ef@adjcapfont{% + \dimen@=\eq@textSize\b@ + \dimen@1.00375\dimen@ + \edef\eq@textSize@pt{\strip@pt\dimen@}% + \fontsize{\eq@textSize@pt}{0}\selectfont +} \def\eq@setButtonProps#1#2{\makeJSspecials \processAppArgs#2\end\@nil % set widget properties + \ifx\eq@rectW\@empty\else + \ifdim\eq@rectW>0pt \else\let\eq@rectW\@empty\fi\fi + \ifx\eq@rectW\@empty\else\expandafter\ef@optscale\fi \ifx\eq@BC\@empty\@eqW{}\else \if\eq@W@value0\let\eq@BC\@empty\fi\fi \Hy@pdfstringfalse \ifx\eq@rectW\@empty \ifnum\eq@textSize=0 \else - \dimen@=\eq@textSize bp - \dimen@1.00375\dimen@ - \edef\eq@textSize@pt{\strip@pt\dimen@}% - \fontsize{\eq@textSize@pt}{0}\selectfont + \ef@adjcapfont \fi - \dimen@\eq@W@value bp + \dimen@\eq@W@value\b@ \def\eq@S@B{B}\ifx\eq@S@value\eq@S@B \def\eq@btn@sp{\hbox to2\dimen@{\hfill}}% \else @@ -1050,7 +1126,7 @@ \sbox{\eq@tmpbox}{\ef@btnspcr\eq@AC\ef@btnspcr}% \ifdim\eq@tmpdima>\wd\eq@tmpbox\else \eq@tmpdima=\wd\eq@tmpbox\fi - \ifmakePDasX\advance\eq@tmpdima2bp\fi + \ifmakePDasX\advance\eq@tmpdima2\b@\fi \wd\eq@tmpbox=\eq@tmpdima \else % if \eq@rectW is not \@empty \wd\eq@tmpbox=\eq@rectW @@ -1058,12 +1134,13 @@ \ifefpmpv\Hy@pdfstringfalse \ifx\ef@isBGtransparent\ef@YES \let\ef@kvCA\@empty\fi - \ifx\ef@CApv\ef@YES\PMPV{\eq@CA}\fi\fi + \ifx\ef@CApv\ef@YES\ef@adjcapfont\PMPV{\eq@CA}\fi\fi \ef@djXPD#1% } \def\eq@setWidgetProps#1#2{\makeJSspecials \processAppArgs#2\end\@nil % set widget properties \ifx\annot@type@link\annot@type\else + \ef@optscale \ifx\eq@BC\@empty\@eqW{}\else \if\eq@W@value0\let\eq@BC\@empty\fi\fi \fi @@ -1080,18 +1157,18 @@ \@makeother\"\@makeother\_} \newcommand\efKern[2]{\ifxetex\kern#2\else\kern#1\fi} \newcommand\olBdry{\bgroup\ifxetex - \@tempdima-\g@eq@W@value@bp\relax - \edef\@mtkern{\the\@tempdima}\else - \@tempdima2bp\relax\advance\@tempdima-\g@eq@W@value@bp\relax % 12/26 - \edef\@mtkern{\the\@tempdima}\fi\kern\@mtkern\egroup + \@tempdima-\g@eq@W@value@bp + \edef\@mtkern{\the\@tempdima}\else + \@tempdima2\b@\advance\@tempdima-\g@eq@W@value@bp + \edef\@mtkern{\the\@tempdima}\fi\kern\@mtkern\egroup } -\newcommand\cgBdry[1][0bp]{\bgroup\def\ef@rgi{#1}\ifx\ef@rgi\@empty - \def\ef@rgi{0bp}\fi\setlength{\@tempdima}{\ef@rgi}% - \ifxetex\else\addtolength{\@tempdima}{2bp}\fi - \kern\@tempdima\egroup\ignorespaces} -\newcommand{\efSupprIndent}{\ef@scratchtoks=\expandafter{\the\everypar}% +\newcommand\cgBdry[1][0\b@]{\bgroup\def\ef@rgi{#1}\ifx\ef@rgi\@empty + \def\ef@rgi{0\b@}\fi\setlength{\@tempdima}{\ef@rgi}% + \ifxetex\else\addtolength{\@tempdima}{2\b@}\fi + \kern\@tempdima\egroup\ignorespaces} +\newcommand{\efSupprIndent}{\toks@=\expandafter{\the\everypar}% \everypar{{\setbox\z@\lastbox}\clubpenalty\@M - \everypar=\expandafter{\the\ef@scratchtoks}}} + \everypar=\expandafter{\the\toks@}}} \newcommand\volBdry{\bgroup\parskip0pt\relax\@@par\nointerlineskip \olBdry\egroup\efSupprIndent} \newcommand\vcgBdry{\@ifstar{\edef\ef@offset{\the\parskip}\vcgBdry@i} @@ -1153,7 +1230,10 @@ \g@addto@macro\eq@Opt{)}% \ef@pdfstrCLOpti} \def\annot@type@listbox{listbox} -\newcommand\list@@Box[8]{\begingroup +\bgroup\obeyspaces +\gdef\list@@Box{\begingroup\global\let =\pdfSP +\ef@sanitize@toks\list@@@Box}\egroup +\newcommand\list@@@Box[8]{\endgroup\begingroup \let\nameuse\@nameuse\let\tops\texorpdfstring \edef\annot@type{\annot@type@listbox}% \pdfstringdef\Fld@name{#2}\dl@paramlocal @@ -1172,7 +1252,10 @@ \mbox{\list@@Box{#1}{#2}{#3}{#4}{#5}{}{\eq@setWidgetProps \eq@choice@driver}{\listBoxDefaults\every@listBox}}} \def\annot@type@combobox{combobox} -\newcommand\combo@@Box[8]{\begingroup +\bgroup\obeyspaces +\gdef\combo@@Box{\begingroup\global\let =\pdfSP +\ef@sanitize@toks\combo@@@Box}\egroup +\newcommand\combo@@@Box[8]{\endgroup\begingroup \let\nameuse\@nameuse\let\tops\texorpdfstring \edef\annot@type{\annot@type@combobox}% \@eqFf{\FfCombo}\pdfstringdef\Fld@name{#2}\dl@paramlocal @@ -1268,15 +1351,19 @@ \eq@rawPDF } \def\annot@type@button{pushbtn} -\newcommand\push@@Button[7]{\begingroup - \let\nameuse\@nameuse\let\tops\texorpdfstring +\bgroup\obeyspaces +\gdef\push@@Button{\begingroup\global\let =\pdfSP +\ef@sanitize@toks\push@@@Button}\egroup +\newcommand\push@@@Button[7]{\endgroup\begingroup + \let\nameuse\@nameuse\let\tops\texorpdfstring% \edef\annot@type{\annot@type@button}% - \pdfstringdef\Fld@name{#2}\dl@paramlocal - \makeJSspecials\ef@preProcDefns + \pdfstringdef\Fld@name{#2}\dl@paramlocal% + \makeJSspecials\ef@preProcDefns% \def\eq@Ff{/Ff \FfPushButton}% \def\eq@DA{\eq@textFont\space\eq@textSize\space Tf \eq@textColor}% \eqf@setDimens{#3}{#4}% \@processEvery#7\end\noindent#5#6{#1}} + \def\pushButtonDefaults{% \W{1}\S{B}\F{\FPrint}\BC{0 0 0} \H{P}\BG{.7529 .7529 .7529}} @@ -1290,7 +1377,10 @@ \def\pmpvMrk#1{\def\pmpv@mrk{#1}} \pmpvMrk{X} \def\annot@type@checkbox{checkbox} -\newcommand\check@@Box[8]{\begingroup +\bgroup\obeyspaces +\gdef\check@@Box{\begingroup\global\let =\pdfSP +\ef@sanitize@toks\check@@@Box}\egroup +\newcommand\check@@@Box[8]{\endgroup\begingroup \let\nameuse\@nameuse\let\tops\texorpdfstring \let\#\ef@Hx\edef\annot@type{\annot@type@checkbox}% \pdfstringdef\Fld@name{#2}\@eqAS{Off}\dl@paramlocal @@ -1323,28 +1413,26 @@ \let\ef@lateWidgetOpts\relax \def\annot@type@radio{radiobtn} \def\ef@NewRadiosLateOpts{% - \ifuseNewRadios - \@nameuse{multigroup@\Fld@name}% - \ifx\ef@multigroupradios\ef@YES - \ifpdfmarkup - \def\eq@On{(\@nameuse{radioindex@\Fld@name}) cvn }\else - \def\eq@On{/\@nameuse{radioindex@\Fld@name}}\fi - \expandafter\ifx\csname OnVal@\Fld@name\endcsname\relax - \@eqAS{Off}\else % today - \ifnum\@nameuse{OnVal@\Fld@name}=% - \@nameuse{radioindex@\Fld@name}\relax - \@eqAS{\@nameuse{radioindex@\Fld@name}}\else\@eqAS{Off}\fi\fi - \else - \edef\x{\@nameuse{OnVal@\Fld@name}}% - \ifx\x\ef@thisChoice\@eqAS{\@nameuse{OnVal@\Fld@name}}\else - \@eqAS{Off}\fi - \fi - \@nameuse{uniradios@\Fld@name}% - \ifx\isRadiosInUnison\ef@YES - \edef\x{\@nameuse{value@\Fld@name}}% - \ifx\x\ef@thisChoice\expandafter\@eqAS - \expandafter{\ef@thisChoice}\else\@eqAS{Off}\fi - \fi + \@nameuse{multigroup@\Fld@name}% + \ifx\ef@multigroupradios\ef@YES + \ifpdfmarkup + \def\eq@On{(\@nameuse{radioindex@\Fld@name}) cvn }\else + \def\eq@On{/\@nameuse{radioindex@\Fld@name}}\fi + \expandafter\ifx\csname OnVal@\Fld@name\endcsname\relax + \@eqAS{Off}\else % today + \ifnum\@nameuse{OnVal@\Fld@name}=% + \@nameuse{radioindex@\Fld@name}\relax + \@eqAS{\@nameuse{radioindex@\Fld@name}}\else\@eqAS{Off}\fi\fi + \else + \edef\x{\@nameuse{OnVal@\Fld@name}}% + \ifx\x\ef@thisChoice\@eqAS{\@nameuse{OnVal@\Fld@name}}\else + \@eqAS{Off}\fi + \fi + \@nameuse{uniradios@\Fld@name}% + \ifx\isRadiosInUnison\ef@YES + \edef\x{\@nameuse{value@\Fld@name}}% + \ifx\x\ef@thisChoice\expandafter\@eqAS + \expandafter{\ef@thisChoice}\else\@eqAS{Off}\fi \fi } \def\ef@advanceRadioIndex#1{\bgroup @@ -1367,7 +1455,10 @@ \@ifundefined{parent@\Fld@name} {\ef@radioWarning\global\let\ef@radioWarning\relax}{}\fi } -\newcommand\radio@@Button[8]{\begingroup\let\#\ef@Hx +\bgroup\obeyspaces +\gdef\radio@@Button{\begingroup\global\let =\pdfSP +\ef@sanitize@toks\radio@@@Button}\egroup +\newcommand\radio@@@Button[8]{\endgroup\begingroup\let\#\ef@Hx \let\nameuse\@nameuse\let\tops\texorpdfstring \edef\annot@type{\annot@type@radio}% \pdfstringdef\Fld@name{#2}% @@ -1448,7 +1539,10 @@ \eq@rawPDF } \def\annot@type@text{textfld} -\newcommand\text@@Field[7]{\begingroup +\bgroup\obeyspaces +\gdef\text@@Field{\begingroup\global\let =\pdfSP +\ef@sanitize@toks\text@@@Field}\egroup +\newcommand\text@@@Field[7]{\endgroup\begingroup \let\nameuse\@nameuse\let\tops\texorpdfstring \edef\annot@type{\annot@type@text}% \pdfstringdef\Fld@name{#2}\dl@paramlocal @@ -1480,7 +1574,10 @@ \eq@rawPDF } \def\annot@type@sig{sigfld} -\newcommand\sig@@Field[7]{\begingroup +\bgroup\obeyspaces +\gdef\sig@@Field{\begingroup\global\let =\pdfSP +\ef@sanitize@toks\sig@@@Field}\egroup +\newcommand\sig@@@Field[7]{\endgroup\begingroup \let\nameuse\@nameuse\let\tops\texorpdfstring \edef\annot@type{\annot@type@sig}% \pdfstringdef\Fld@name{#2}\dl@paramlocal @@ -1503,7 +1600,10 @@ \eq@rawPDF % everything else } \def\annot@type@link{link} -\newcommand\set@@Link[7]{\begingroup +\bgroup\obeyspaces +\gdef\set@@Link{\begingroup\global\let =\pdfSP +\ef@sanitize@toks\set@@@Link}\egroup +\newcommand\set@@@Link[7]{\endgroup\begingroup \let\nameuse\@nameuse\let\tops\texorpdfstring \dl@paramlocal \makeJSspecials diff --git a/texmf-dist/tex/latex/acrotex/epdfmark.def b/texmf-dist/tex/latex/acrotex/epdfmark.def index 1f1e04ad..e6313949 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-2019 D. P. Story %% +%% Copyright (C) 2002-2020 D. P. Story %% %% dpstory@uakron.edu %% %% %% %% This program can redistributed and/or modified under %% @@ -103,7 +103,7 @@ \fi \fi \fi - \ef@NewRadiosLateOpts + \ifuseNewRadios\expandafter\ef@NewRadiosLateOpts\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 diff --git a/texmf-dist/tex/latex/acrotex/epdftex.def b/texmf-dist/tex/latex/acrotex/epdftex.def index 7022a519..a2a9a1dc 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-2019 D. P. Story %% +%% Copyright (C) 2002-2020 D. P. Story %% %% dpstory@uakron.edu %% %% %% %% This program can redistributed and/or modified under %% @@ -91,7 +91,7 @@ \fi \fi \fi - \ef@NewRadiosLateOpts + \ifuseNewRadios\expandafter\ef@NewRadiosLateOpts\fi \ifx\eq@rectW\@empty\def\eq@rectW{\wd\eq@tmpbox}\fi \hbox{\pdfstartlink user{\common@RadioCode}% \lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}\pdfendlink}% diff --git a/texmf-dist/tex/latex/acrotex/eqbr.def b/texmf-dist/tex/latex/acrotex/eqbr.def index f9b841f0..cff4f16b 100644 --- a/texmf-dist/tex/latex/acrotex/eqbr.def +++ b/texmf-dist/tex/latex/acrotex/eqbr.def @@ -78,6 +78,9 @@ \renewcommand\eq@local@CA{Corretas} \renewcommand\eq@local@RC{Minhas Respostas!} \renewcommand\eq@local@AC{Por Favor!} +\dlJSStr*[noquotes]{\limSelWarningMsg}{"Pro tuto ot\string\341zku + m\u016F\u017Eete prov\'{e}st maxim\'{a}ln\u011B " + + n + " v\u00FDb\u0115ry."} \endinput %% %% End of file `eqbr.def'. diff --git a/texmf-dist/tex/latex/acrotex/eqcat.def b/texmf-dist/tex/latex/acrotex/eqcat.def index b13f4666..505f7a6e 100644 --- a/texmf-dist/tex/latex/acrotex/eqcat.def +++ b/texmf-dist/tex/latex/acrotex/eqcat.def @@ -72,6 +72,9 @@ \renewcommand\eq@local@CA{Correctes} \renewcommand\eq@local@RC{Les meves Respostes!} \renewcommand\eq@local@AC{Si us plau!} +\dlJSStr*[noquotes]{\limSelWarningMsg}{"Per a aquesta pregunta, + se li permet fer com a m\`{a}xim " + + n + " seleccions."} \endinput %% %% End of file `eqcat.def'. diff --git a/texmf-dist/tex/latex/acrotex/eqcolor.def b/texmf-dist/tex/latex/acrotex/eqcolor.def index ebe460fb..2c5f59ac 100644 --- a/texmf-dist/tex/latex/acrotex/eqcolor.def +++ b/texmf-dist/tex/latex/acrotex/eqcolor.def @@ -20,65 +20,65 @@ \def\eq@getCmdName#1#2{\edef#1{\expandafter\@gobble\string#2}} \def\eq@getfirst#1#2\@nil{\def\eq@argi{#1}} \def\eq@checkValidityModel#1{% - \if#1g\else\if#1r\else\if#1c\else - \PackageError{exerquiz} - {JavaScript does not support this model} - {Use a named color from one of the models gray, rgb, or cmyk.} - \fi\fi\fi + \if#1g\else\if#1r\else\if#1c\else + \PackageError{exerquiz} + {JavaScript does not support this model} + {Use a named color from one of the models gray, rgb, or cmyk.} + \fi\fi\fi } \def\eq@jsSetColorMsg#1#2{\PackageWarning{exerquiz} - {The argument `#2' of \string#1\MessageBreak - is not of the right form.\MessageBreak Using the default}} + {The argument `#2' of \string#1\MessageBreak + is not of the right form.\MessageBreak Using the default}} \def\eqModelInfo#1#2{% - \uppercase{\def\eq@ucmodel{#1}}\def\eq@modelspec{#2}% - \eq@getfirst#1\@nil\eq@ResetModelForGray{\eq@argi}% - \eq@checkValidityModel{\eq@argi}% + \uppercase{\def\eq@ucmodel{#1}}\def\eq@modelspec{#2}% + \eq@getfirst#1\@nil\eq@ResetModelForGray{\eq@argi}% + \eq@checkValidityModel{\eq@argi}% } \def\eq@ResetModelForGray#1{\if#1g\def\eq@ucmodel{G}\fi} \def\eq@checkRawJSColor#1{% - \edef\eq@argi{#1}\ifx\eq@argi\@empty - \def\eq@next{\let\eq@rawJSCol\eq@YES}\else - \def\eq@next{\expandafter\eq@@checkRawJSColor#1\@nil}\fi\eq@next + \edef\eq@argi{#1}\ifx\eq@argi\@empty + \def\eq@next{\let\eq@rawJSCol\eq@YES}\else + \def\eq@next{\expandafter\eq@@checkRawJSColor#1\@nil}\fi\eq@next } \def\eq@@checkRawJSColor#1#2#3\@nil{\let\eq@rawJSCol\eq@NO - \let\eqpredefineJSCol\eq@NO - \if[#1\if#2"\let\eq@rawJSCol\eq@YES\fi\fi - \ifx\eq@rawJSCol\eq@NO\if#1c\if#2o\let\eq@rawJSCol\eq@YES - \let\eqpredefineJSCol\eq@YES\fi\fi\fi + \let\eqpredefineJSCol\eq@NO + \if[#1\if#2"\let\eq@rawJSCol\eq@YES\fi\fi + \ifx\eq@rawJSCol\eq@NO\if#1c\if#2o\let\eq@rawJSCol\eq@YES + \let\eqpredefineJSCol\eq@YES\fi\fi\fi } \def\eq@jsColorWXColori#1#2{\edef\eq@colorDefn{#2}% - \ifx\eq@colorDefn\@empty - \ifx\is@Defined\eq@YES - \edef\eq@colorDefn{\csname\cmdName Def\endcsname}\else - \PackageError{exerquiz}{JS color \string#1 has an - empty definition}{}\fi - \fi - \eq@checkRawJSColor{\eq@colorDefn}% - \ifx\eq@rawJSCol\eq@NO - \extractcolorspec{\eq@colorDefn}{\eq@tmp@color}% - \expandafter\eqModelInfo\eq@tmp@color - \edef#1{["\eq@ucmodel",\eq@modelspec]}% - \else\edef#1{\eq@colorDefn}\fi + \ifx\eq@colorDefn\@empty + \ifx\is@Defined\eq@YES + \edef\eq@colorDefn{\csname\cmdName Def\endcsname}\else + \PackageError{exerquiz}{JS color \string#1 has an + empty definition}{}\fi + \fi + \eq@checkRawJSColor{\eq@colorDefn}% + \ifx\eq@rawJSCol\eq@NO + \extractcolorspec{\eq@colorDefn}{\eq@tmp@color}% + \expandafter\eqModelInfo\eq@tmp@color + \edef#1{["\eq@ucmodel",\eq@modelspec]}% + \else\edef#1{\eq@colorDefn}\fi } \def\eq@jsColorWOXColori#1#2{\def\eq@colorDefn{#2}% - \ifx\eq@colorDefn\@empty - \ifx\is@Defined\eq@YES - \edef\eq@colorDefn{\csname cmdName Def\endcsname}\else - \PackageError{exerquiz}{JS color \string#1 has an - empty definition}{}\fi - \fi - \eq@checkRawJSColor{\eq@colorDefn}% - \ifx\eq@rawJSCol\eq@YES\edef#1{\eq@colorDefn}\else - \eq@jsSetColorMsg{#1}{#2}\fi + \ifx\eq@colorDefn\@empty + \ifx\is@Defined\eq@YES + \edef\eq@colorDefn{\csname cmdName Def\endcsname}\else + \PackageError{exerquiz}{JS color \string#1 has an + empty definition}{}\fi + \fi + \eq@checkRawJSColor{\eq@colorDefn}% + \ifx\eq@rawJSCol\eq@YES\edef#1{\eq@colorDefn}\else + \eq@jsSetColorMsg{#1}{#2}\fi } \def\jsColor#1#2{\eq@getCmdName{\cmdName}{#1}% - \let\is@Defined\eq@YES - \expandafter\ifx\csname\cmdName\endcsname\relax - \PackageWarning{exerquiz}{\string#1 is not a command used by - exerquiz.\MessageBreak Will define it anyway}% - \let\is@Defined\eq@NO\fi - \HyColor@IfXcolor{\eq@jsColorWXColori{#1}{#2}}% - {\eq@jsColorWOXColori{#1}{#2}}% + \let\is@Defined\eq@YES + \expandafter\ifx\csname\cmdName\endcsname\relax + \PackageWarning{exerquiz}{\string#1 is not a command used by + exerquiz.\MessageBreak Will define it anyway}% + \let\is@Defined\eq@NO\fi + \HyColor@IfXcolor{\eq@jsColorWXColori{#1}{#2}}% + {\eq@jsColorWOXColori{#1}{#2}}% } \endinput %% diff --git a/texmf-dist/tex/latex/acrotex/eqcz.def b/texmf-dist/tex/latex/acrotex/eqcz.def index ffccdeff..db454eee 100644 --- a/texmf-dist/tex/latex/acrotex/eqcz.def +++ b/texmf-dist/tex/latex/acrotex/eqcz.def @@ -108,6 +108,9 @@ + "Kliknete-li na \\"Yes\\", uvidite spravnou odpoved, ale svou stavajici odpoved na tuto otazku uz nebudete moct zmenit." } +\dlJSStr*[noquotes]{\limSelWarningMsg}{"Pro tuto ot\string\341zku + m\u016F\u017Eete prov\'{e}st maxim\'{a}ln\u011B " + + n + " v\u00FDb\u0115ry."} \endinput %% %% End of file `eqcz.def'. diff --git a/texmf-dist/tex/latex/acrotex/eqda.def b/texmf-dist/tex/latex/acrotex/eqda.def index 18b79444..97b7d8f8 100644 --- a/texmf-dist/tex/latex/acrotex/eqda.def +++ b/texmf-dist/tex/latex/acrotex/eqda.def @@ -77,6 +77,9 @@ \renewcommand\eq@local@AC{% V\texorpdfstring{\ae}{\string\346}r s\texorpdfstring{\r}{\string\345}god!} +\dlJSStr*[noquotes]{\limSelWarningMsg}{"Til dette sp\string\370rgsm\string\345l, + er du lov til at g\string\370re h\string\370jst " + + n + " valg."} \endinput %% %% End of file `eqda.def'. diff --git a/texmf-dist/tex/latex/acrotex/eqde.def b/texmf-dist/tex/latex/acrotex/eqde.def index 7e1177cd..f582fced 100644 --- a/texmf-dist/tex/latex/acrotex/eqde.def +++ b/texmf-dist/tex/latex/acrotex/eqde.def @@ -100,7 +100,7 @@ + " sonst wird diese Antwort als falsch gewertet."} \dlJSStr*[noquotes]{\limSelWarningMsg}{"F\"{u}r diese Aufgabe k\"{o}nnen sie h\"{o}chstens " + n + " ausw\string\344hlen."} -\fieldJSStr*[noquotes]{\promptButtonMsg}{% +\flJSStr*[noquotes]{\promptButtonMsg}{% "M\"{o}chten Sie die richtige Antwort jetzt sehen?" + " Ihre derzeitige Antwort ist diejenige, die gewertet wird." + " Wenn Sie auf \\"Yes\\" klicken, k\"{o}nnen Sie ihre Antwort diff --git a/texmf-dist/tex/latex/acrotex/eqes.def b/texmf-dist/tex/latex/acrotex/eqes.def index e3a74487..b15f19a3 100644 --- a/texmf-dist/tex/latex/acrotex/eqes.def +++ b/texmf-dist/tex/latex/acrotex/eqes.def @@ -72,6 +72,9 @@ \renewcommand\eq@local@CA{Correctas} \renewcommand\eq@local@RC{Mis Respuestas!} \renewcommand\eq@local@AC{Por Favor!} +\dlJSStr*[noquotes]{\limSelWarningMsg}{"Para esta pregunta, + se le permite hacer como m\'{a}ximo " + + n + " selecciones."} \endinput %% %% End of file `eqes.def'. diff --git a/texmf-dist/tex/latex/acrotex/eqfin.def b/texmf-dist/tex/latex/acrotex/eqfin.def index 00d54589..51a5dd31 100644 --- a/texmf-dist/tex/latex/acrotex/eqfin.def +++ b/texmf-dist/tex/latex/acrotex/eqfin.def @@ -73,6 +73,9 @@ \renewcommand\eq@local@CA{Oikein} \renewcommand\eq@local@RC{Omat vastaukset!} \renewcommand\eq@local@AC{Ole hyv\string\344!}} +\dlJSStr*[noquotes]{\limSelWarningMsg}{"T\string\344h\string\344n + kysymykseen, voit tehd\string\344 enint\string\344\string\344n " + + n + " valintoja."} \endinput %% %% End of file `eqfin.def'. diff --git a/texmf-dist/tex/latex/acrotex/eqfr.def b/texmf-dist/tex/latex/acrotex/eqfr.def index 86c4ae89..5f8b6e67 100644 --- a/texmf-dist/tex/latex/acrotex/eqfr.def +++ b/texmf-dist/tex/latex/acrotex/eqfr.def @@ -70,6 +70,9 @@ R\texorpdfstring{\'}{\string\351}ponses} \renewcommand\eq@local@RC{Correctes} \renewcommand\eq@local@AC{SVP !} +\dlJSStr*[noquotes]{\limSelWarningMsg}{"Pour cette question, + vous \u00EAtes autoris\'{e} \`{a} faire au plus " + + n + " s\'{e}lections."} \endinput %% %% End of file `eqfr.def'. diff --git a/texmf-dist/tex/latex/acrotex/eqit.def b/texmf-dist/tex/latex/acrotex/eqit.def index a05d545d..27b50080 100644 --- a/texmf-dist/tex/latex/acrotex/eqit.def +++ b/texmf-dist/tex/latex/acrotex/eqit.def @@ -58,6 +58,9 @@ \renewcommand\eq@local@CA{Correggere} \renewcommand\eq@local@RC{Le mie risposte!} \renewcommand\eq@local@AC{Per favore!} +\dlJSStr*[noquotes]{\limSelWarningMsg}{"Per questa domanda, + \`{e} possibile effettuare al massimo " + + n + " selezioni."} \endinput %% %% End of file `eqit.def'. diff --git a/texmf-dist/tex/latex/acrotex/eqnl.def b/texmf-dist/tex/latex/acrotex/eqnl.def index 9896c588..df166e03 100644 --- a/texmf-dist/tex/latex/acrotex/eqnl.def +++ b/texmf-dist/tex/latex/acrotex/eqnl.def @@ -74,6 +74,8 @@ \renewcommand\eq@local@CA{Corrigeer} \renewcommand\eq@local@RC{Mijn Antwoorden!} \renewcommand\eq@local@AC{AUB!} +\dlJSStr*[noquotes]{\limSelWarningMsg}{"Voor deze vraag mag je maximaal " + + n + " selecties maken."} \endinput %% %% End of file `eqnl.def'. diff --git a/texmf-dist/tex/latex/acrotex/eqno.def b/texmf-dist/tex/latex/acrotex/eqno.def index 21742094..91146268 100644 --- a/texmf-dist/tex/latex/acrotex/eqno.def +++ b/texmf-dist/tex/latex/acrotex/eqno.def @@ -75,6 +75,9 @@ \renewcommand\eq@local@AC{% V\texorpdfstring{\ae}{\string\346}r s\texorpdfstring{\r}{\string\345}snill!} +\dlJSStr*[noquotes]{\limSelWarningMsg}{"For dette sp\string\370rsm\string\345let + har du lov til \string\345 gj\string\370re p\string\345 det meste " + + n + " valg."} \endinput %% %% End of file `eqno.def'. diff --git a/texmf-dist/tex/latex/acrotex/eqpo.def b/texmf-dist/tex/latex/acrotex/eqpo.def index a9f8d0e4..71c57c89 100644 --- a/texmf-dist/tex/latex/acrotex/eqpo.def +++ b/texmf-dist/tex/latex/acrotex/eqpo.def @@ -84,6 +84,9 @@ \renewcommand\eq@local@CA{Popraw} \renewcommand\eq@local@RC{Moje odpowiedzi!} \renewcommand\eq@local@AC{Prosze!} +\dlJSStr*[noquotes]{\limSelWarningMsg}{"Na to pytanie, + mo\u017Cesz dokona\u0107 co najwy\u017Cej " + + n + " wybor\string\363w."} \endinput %% %% End of file `eqpo.def'. diff --git a/texmf-dist/tex/latex/acrotex/eqru.def b/texmf-dist/tex/latex/acrotex/eqru.def index a0616bd2..306b94eb 100644 --- a/texmf-dist/tex/latex/acrotex/eqru.def +++ b/texmf-dist/tex/latex/acrotex/eqru.def @@ -75,11 +75,9 @@ \renewcommand\eq@sqslrtnlabel{\^{a}{\aa}ð\'{\i}\'{o}\`{o}\"{u}\~{n}\"{y}} \renewcommand\sqslrtnlabel{\eq@sqslrtnlabel} - \cyrCommand\eqsqslrtnlabel{\^{E} \^{o}\^{\i}ð\`{\i}\'{o}\"{e}% \`{e}ð\^{\i}\^{a}\^{e}{\aa} \c{c}\`{a}\"{a}\`{a}\'{\i}\`{e}\"{y}} \renewcommand\eq@sqslrtnlabel{\eqsqslrtnlabel} - \renewcommand\eq@bqlabel{CTAPT} \renewcommand\bqlabel{\eq@bqlabel} \renewcommand\eq@bqlabelISO{\eq@bqlabel} diff --git a/texmf-dist/tex/latex/acrotex/eqtr.def b/texmf-dist/tex/latex/acrotex/eqtr.def index e6788cf3..e4a1c58a 100644 --- a/texmf-dist/tex/latex/acrotex/eqtr.def +++ b/texmf-dist/tex/latex/acrotex/eqtr.def @@ -100,6 +100,8 @@ \renewcommand\eq@local@CA{Dogru} \renewcommand\eq@local@RC{Benim Cevaplar\protect\u0131m!} \renewcommand\eq@local@AC{L\protect\374tfen!} +\dlJSStr*[noquotes]{\limSelWarningMsg}{"Bu soru i\u00E7in, en fazla " + + n + " se\u00E7im yapmak i\u00E7in izin verilir."} \endinput %% %% End of file `eqtr.def'. diff --git a/texmf-dist/tex/latex/acrotex/exerquiz.sty b/texmf-dist/tex/latex/acrotex/exerquiz.sty index 5993a465..06db5760 100644 --- a/texmf-dist/tex/latex/acrotex/exerquiz.sty +++ b/texmf-dist/tex/latex/acrotex/exerquiz.sty @@ -19,7 +19,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{exerquiz} - [2020/03/14 v8.5.10 % + [2021/01/20 v8.6.2 % Exerquiz: Exercises and Quizzes for LaTeX/PDF package (dps)] \usepackage{keyval} \RequirePackage{ifpdf}[2006/02/20] @@ -27,9 +27,9 @@ \RequirePackage{ifluatex} \@ifundefined{exqtable}{\def\exqtable{table}}{} \IfFileExists{xcolor.sty}{% - \def\eq@ColorPackage{xcolor}% - \PassOptionsToPackage{\exqtable,hyperref}{xcolor}} - {\def\eq@ColorPackage{color}} + \def\eq@ColorPackage{xcolor}% + \PassOptionsToPackage{\exqtable,hyperref}{xcolor}} + {\def\eq@ColorPackage{color}} \DeclareOption{noxcolor}{\def\eq@ColorPackage{color}} \DeclareOption{forpaper}{% \eqforpapertrue\PassOptionsToPackage{monochrome}{\eq@ColorPackage} @@ -269,8 +269,11 @@ \expandafter#2\fi} \newif\ifeq@randomizeChoices \eq@randomizeChoicesfalse \newif\ifeq@randomizeallChoices \eq@randomizeallChoicesfalse +\newif\if@DoNotRandomize \@DoNotRandomizefalse \def\turnOnRandomize{\eq@randomizeallChoicestrue} \def\obeyLocalRandomize{\eq@randomizeallChoicesfalse} +\def\doNotRandomizeChoices{\@DoNotRandomizetrue} +\def\allowRandomizedChoices{\@DoNotRandomizefalse} \let\saveRandomSeed\relax \let\inputRandomSeed\relax \def\CorrectionsOn{\global\nocorrectionsfalse} @@ -1641,45 +1644,44 @@ \let\propQ@labelwidth\@empty \define@key{props@ques}{topsep}[\the\topsep]{\edef\propQ@topsep{#1}} \define@key{props@ques}{partopsep}[\the\partopsep]% - {\edef\propQ@partopsep{#1}} + {\edef\propQ@partopsep{#1}} \define@key{props@ques}{parsep}[\the\parsep]{\edef\propQ@parsep{#1}} \define@key{props@ques}{itemsep}[\the\itemsep]{\edef\propQ@itemsep{#1}} \define@key{props@ques}{labelsepTo}[\normalsize\normalfont\ ]% - {\def\propQ@labelsepTo{#1}} + {\def\propQ@labelsepTo{#1}} \define@key{props@ques}{labelsep}[\@empty]{\def\propQ@labelsep{#1}} \let\propQ@labelsep\@empty \define@key{props@ques}{color}[blue]{\quesNumColor{#1}} \setkeys{props@ques}{labelwidthTo,topsep,partopsep,parsep,% itemsep,labelsepTo,color}% -\newenvironment{questions}[1][] -{% - \ifnum\@eqquestiondepth>\tw@\@toodeep\else - \advance\@eqquestiondepth\@ne\fi - \def\@quesctr{eqquestionno\romannumeral\the\@eqquestiondepth}% - \toks@=\expandafter\expandafter\expandafter{#1}\expandafter - \xdef\csname quesOpts\@quesctr\endcsname{\the\toks@}% - \edef\tempexp{\noexpand\setkeys{props@ques}{\the\toks@}}\tempexp - \list{\qMark@Hook\prior@questionsHook - \insE@rlyAtQues\gdef\eqPTs{1}% - \global\let\eqQT\eq@na% - {\@tempcnta=0 \let\@thispr@b\@empty - \@whilenum\@tempcnta<\@eqquestiondepth\do{\advance\@tempcnta\@ne - \ifx\@thispr@b\@empty\edef\@thispr@b{% - \csname theeqquestionno\romannumeral\the\@tempcnta\endcsname}\else - \edef\@thispr@b{\@thispr@b% - \csname theeqquestionno\romannumeral\the\@tempcnta\endcsname}\fi - }\xdef\@currentQues{\@thispr@b}}% - \makebox[\labelwidth][r]{\normalfont\@nameuse{label\@quesctr}}% - \xdef\eq@pageThisQ{\the\c@page}% - \post@questionsHook}{\usecounter{\@quesctr}% +\newenvironment{questions}[1][]{% + \ifnum\@eqquestiondepth>\tw@\@toodeep\else + \advance\@eqquestiondepth\@ne\fi + \def\@quesctr{eqquestionno\romannumeral\the\@eqquestiondepth}% + \toks@=\expandafter\expandafter\expandafter{#1}\expandafter + \xdef\csname quesOpts\@quesctr\endcsname{\the\toks@}% + \edef\tempexp{\noexpand\setkeys{props@ques}{\the\toks@}}\tempexp + \list{\qMark@Hook\prior@questionsHook + \insE@rlyAtQues\gdef\eqPTs{1}% + \global\let\eqQT\eq@na% + {\@tempcnta=0 \let\@thispr@b\@empty + \@whilenum\@tempcnta<\@eqquestiondepth\do{\advance\@tempcnta\@ne + \ifx\@thispr@b\@empty\edef\@thispr@b{% + \csname theeqquestionno\romannumeral\the\@tempcnta\endcsname}\else + \edef\@thispr@b{\@thispr@b% + \csname theeqquestionno\romannumeral\the\@tempcnta\endcsname}\fi + }\xdef\@currentQues{\@thispr@b}}% + \makebox[\labelwidth][r]{\normalfont\@nameuse{label\@quesctr}}% + \xdef\eq@pageThisQ{\the\c@page}% + \post@questionsHook}{\usecounter{\@quesctr}% \ifx\propQ@labelsep\@empty - \settowidth{\labelsep}{\propQ@labelsepTo}\else - \setlength{\labelsep}{\propQ@labelsep}\fi + \settowidth{\labelsep}{\propQ@labelsepTo}\else + \setlength{\labelsep}{\propQ@labelsep}\fi \ifx\propQ@labelwidth\@empty - \settowidth{\labelwidth}% - {\propQ@labelwidthTo\hspace{\labelsep}}\else - \settowidth{\labelwidth}{\hspace{\propQ@labelwidth}% - \hspace{\labelsep}}\fi + \settowidth{\labelwidth}% + {\propQ@labelwidthTo\hspace{\labelsep}}\else + \settowidth{\labelwidth}{\hspace{\propQ@labelwidth}% + \hspace{\labelsep}}\fi \setlength{\topsep}{\propQ@topsep}% \setlength{\partopsep}{\propQ@partopsep}% \ifdim\parskip>\z@\addtolength{\topsep}{-\parskip}\fi @@ -1717,45 +1719,48 @@ }{\aeb@endshortquiz} \newenvironment{shortquiz*} {% - \xdef\eq@pageThisQ{\the\c@page}% - {\eqtmpcnta\@shortquizCnt\relax\advance\eqtmpcnta\@ne - \xdef\@shortquizCnt{\the\eqtmpcnta}}% - \sqForms\@shortquiz + \xdef\eq@pageThisQ{\the\c@page}% + {\eqtmpcnta\@shortquizCnt\relax\advance\eqtmpcnta\@ne + \xdef\@shortquizCnt{\the\eqtmpcnta}}% + \sqForms\@shortquiz }{\aeb@endshortquiz} \def\@shortquiz{\@ifnextchar[% - {\@@shortquiz}{\@@shortquiz[\@sqGenBaseName]}} + {\@@shortquiz}{\@@shortquiz[\@sqGenBaseName]}} \def\sq@setCLN#1{\ifx\aebTitleQuiz\@empty - \protected@edef\@currentlabelname{#1}\else - \protected@edef\@currentlabelname{\@currentlabelname}\fi + \protected@edef\@currentlabelname{#1}\else + \protected@edef\@currentlabelname{\@currentlabelname}\fi } \let\isQZ=q \let\isSQZ=s -\def\sq@IDTxtField{\makebox[0pt][l]{\textField[\autoCenter{n}\BC{}\BG{} - \S{S}\textSize{0}\Ff{\FfReadOnly} - \AA{\AAFormat{% - if (typeof \oField=="undefined")\r\t - var \oField=new Object;\r - \oField.Grp={}; - \ifx\defaultColorJSLoc\@empty\else\r - \oField.DefaultColorJSLoc=\defaultColorJSLoc;\fi - \ifx\rghtColorJSLoc\@empty\else\r - \oField.RightColorJSLoc=\rghtColorJSLoc;\fi - \ifx\wrngColorJSLoc\@empty\else\r - \oField.WrongColorJSLoc=\wrngColorJSLoc;\fi - \ifx\rghtAnsSymbJSLoc\@empty\else\r - \oField.RightAnsSymbJSLoc=\rghtAnsSymbJSLoc;\fi - \ifx\wrngAnsSymbJSLoc\@empty\else\r - \oField.WrongAnsSymbJSLoc=\wrngAnsSymbJSLoc;\fi -}}]{sqID\oField}{2bp}{2bp}}% -} -\def\qz@IDTxtField{\makebox[0pt][l]{\textField[\autoCenter{n}\BC{}\BG{} +\def\sq@IDTxtField{\makebox[0pt][l]{% + \textField[\autoCenter{n}\BC{}\BG{} \S{S}\textSize{0}\Ff{\FfReadOnly} - \AA{\AAFormat{if(typeof aQuizzesInDoc=="undefined")\r\t - var aQuizzesInDoc=new Array();\r - if (aQuizzesInDoc.indexOf("\oField")) - aQuizzesInDoc.push("\oField");\r - if (typeof \oField=="undefined")\r\t - var \oField=new Object;\r - }}]{qzID\oField}{2bp}{2bp}}} + \AA{\AAFormat{% + if\eqSP(typeof\eqSP\oField=="undefined")\eqSP + var\eqSP\oField=new\eqSP Object;\r + \oField.Grp={};% + \ifx\defaultColorJSLoc\@empty\else\r + \oField.DefaultColorJSLoc=\defaultColorJSLoc;\fi + \ifx\rghtColorJSLoc\@empty\else\r + \oField.RightColorJSLoc=\rghtColorJSLoc;\fi + \ifx\wrngColorJSLoc\@empty\else\r + \oField.WrongColorJSLoc=\wrngColorJSLoc;\fi + \ifx\rghtAnsSymbJSLoc\@empty\else\r + \oField.RightAnsSymbJSLoc=\rghtAnsSymbJSLoc;\fi + \ifx\wrngAnsSymbJSLoc\@empty\else\r + \oField.WrongAnsSymbJSLoc=\wrngAnsSymbJSLoc;\fi + }}]{sqID\oField}{2bp}{2bp}}% +} +\begin{defineJS}[\makeesc\!\makecmt\%]{\qzIDFmt} +if(typeof aQuizzesInDoc=="undefined") + var aQuizzesInDoc=new Array(); +if (aQuizzesInDoc.indexOf("!oField")) + aQuizzesInDoc.push("!oField"); +if (typeof !oField=="undefined") + var !oField=new Object; +\end{defineJS} +\def\qz@IDTxtField{\makebox[0pt][l]{\textField[\autoCenter{n}\BC{}\BG{} + \S{S}\textSize{0}\Ff{\FfReadOnly} + \AA{\AAFormat{\qzIDFmt}}]{qzID\oField}{2bp}{2bp}}} \let\eqQuizType\relax \def\@@shortquiz[#1]{%\begingroup \gdef\oField{#1}\gdef\curr@quiz{#1}\gdef\currQuiz{#1}% @@ -1770,7 +1775,7 @@ \let\@Ans\Ans@sq@f \ifx\oField\@empty \typeout{^^JExerquiz: Base field name required when using - shortquiz with '*' option}% + shortquiz with '*' option}% \PackageInfo{exerquiz}{Assuming link style^^J}% \let\@Ans\Ans@sq@l \fi @@ -1786,16 +1791,16 @@ \let\endsolution\endsolution@sq \let\ifstaroption\eq@ifstaroption \if\eq@tq@star*% - \def\sqlabel{\aebtitleQuiz\@gobbletwo}% + \def\sqlabel{\aebtitleQuiz\@gobbletwo}% \fi - \sq@aboveskip\sq@priorhook - \@ifundefined{PointsOnLeft}% - {\sq@setCLN{\eq@defaultShortQuizLabelName}% - \ifx\sqlabel\@empty\else\noindent\fi - \hypertarget{sqH\@currentHref}{}\sq@IDTxtField - \ifx\sqlabel\@empty\else\expandafter - \sqlabel\expandafter\sqhspace\fi - {\set@typeset@protect\aebtitleQuiz}}{}\ignorespaces + \sq@aboveskip\sq@priorhook + \@ifundefined{PointsOnLeft}% + {\sq@setCLN{\eq@defaultShortQuizLabelName}% + \ifx\sqlabel\@empty\else\noindent\fi + \hypertarget{sqH\@currentHref}{}\sq@IDTxtField + \ifx\sqlabel\@empty\else\expandafter + \sqlabel\expandafter\sqhspace\fi + {\set@typeset@protect\aebtitleQuiz}}{}\ignorespaces } \newcommand\belowsqskip[1]{\def\aftershortquizskip{#1}} \belowsqskip{\medskip} @@ -1915,29 +1920,29 @@ \let\endeqQt\relax \let\prior@quizSolnHeaderHook\@empty \newcommand\quizSolnHeader[3][]{% - \prior@quizSolnHeaderHook - \ifeqforpaper\else\webnewpage\fi\noindent - \def\eq@argi{#1}% - \ifx\eq@argi\@empty\else\noPeek#1\fi - \hypertarget{#2}{#3}\relax - \solnspace + \prior@quizSolnHeaderHook + \ifeqforpaper\else\webnewpage\fi\noindent + \def\eq@argi{#1}% + \ifx\eq@argi\@empty\else\noPeek#1\fi + \hypertarget{#2}{#3}\relax + \solnspace } \def\AllowPeeking{\global\let\allow@peek\eq@YES}\AllowPeeking \def\NoPeeking{\global\let\allow@peek\eq@NO} \def\noPeekAction#1#2{% - /AA <> >> + /AA <> >> } \newif\iftherearequizsolutions \therearequizsolutionsfalse \let\aeb@FLOverride\relax \def\includequizsolutions{\@ifstar - {\let\resetQZtsolns\relax\includequizsolutionsi} - {\def\resetQZtsolns{\global\let\include@quizsolutions\relax}% - \includequizsolutionsi}} + {\let\resetQZtsolns\relax\includequizsolutionsi} + {\def\resetQZtsolns{\global\let\include@quizsolutions\relax}% + \includequizsolutionsi}} \newcommand{\includequizsolutionsi}[1][]{% - \filterFor{#1}\includequizsolutionsii} + \filterFor{#1}\includequizsolutionsii} \def\includequizsolutionsii{\include@quizsolutions - \resetQZtsolns - \let\eqFilterArg\@empty} + \resetQZtsolns + \let\eqFilterArg\@empty} \let\eqqzsolutionshook\@empty \let\priorsqslsectitle\@empty \let\priorsqslinput\@empty @@ -1964,22 +1969,22 @@ } \newcommand{\quizSolnInput} {% - \global\let\webnewpage\relax - \bgroup\OKToWriteExamDatatrue - \writeT@QzSolns{\string\endinput}\egroup - \immediate\closeout\quiz@solns - \ifeq@noquizsolutions\else - \iftherearequizsolutions\newpage\markright{}% - \eq@normallheader\markright{\sqslsecrunhead}% - \ifx\webnewpage\relax - \def\webnewpage{\global\let\webnewpage\newpage}\fi - \priorsqslsectitle\quizSolnsHeadnToc\priorsqslinput - \InputIfFileExists{\jobname.qsl}{}% - {!!! Solutions to quizzes not found} - \eqqzsolutionshook - \newpage\eq@defaultlheader - \fi + \global\let\webnewpage\relax + \bgroup\OKToWriteExamDatatrue + \writeT@QzSolns{\string\endinput}\egroup + \immediate\closeout\quiz@solns + \ifeq@noquizsolutions\else + \iftherearequizsolutions\newpage\markright{}% + \eq@normallheader\markright{\sqslsecrunhead}% + \ifx\webnewpage\relax + \def\webnewpage{\global\let\webnewpage\newpage}\fi + \priorsqslsectitle\quizSolnsHeadnToc\priorsqslinput + \InputIfFileExists{\jobname.qsl}{}% + {!!! Solutions to quizzes not found} + \eqqzsolutionshook + \newpage\eq@defaultlheader \fi + \fi } \def\include@quizsolutions{\quizSolnInput} \newcommand{\priorqhook}[1]{\def\q@priorhook{#1}} @@ -1994,31 +1999,31 @@ \def\belowqskip{\belowqHooknSkip} \let\eq@initializeServerSubmit\@empty \newcommand{\quiztype}[1]{% - \def\@quiztype{#1}\def\aeb@FLOverride{#1}} + \def\@quiztype{#1}\def\aeb@FLOverride{#1}} \let\@quiztype\@empty \newcommand{\defaultquiztype}{\let\@quiztype\@empty - \let\aeb@FLOverride\relax} + \let\aeb@FLOverride\relax} \let\aeb@FLOverride\relax \def\@setFormLinkType{% - \if\qstar*% - \ifx\aeb@FLOverride\relax% - \def\@@quiztype{f}% - \else - \if\aeb@FLOverride l\def\@@quiztype{l}\else - \def\@@quiztype{f}\fi - \fi + \if\qstar*% + \ifx\aeb@FLOverride\relax% + \def\@@quiztype{f}% \else - \ifx\aeb@FLOverride\relax - \def\@@quiztype{l}% - \else - \if\aeb@FLOverride f\def\@@quiztype{f}\else - \def\@@quiztype{l}\fi - \fi + \if\aeb@FLOverride l\def\@@quiztype{l}\else + \def\@@quiztype{f}\fi + \fi + \else + \ifx\aeb@FLOverride\relax + \def\@@quiztype{l}% + \else + \if\aeb@FLOverride f\def\@@quiztype{f}\else + \def\@@quiztype{l}\fi \fi + \fi } \def\setdefault@Ans{\@setFormLinkType - \expandafter\global\expandafter - \let\expandafter\@Ans\expandafter=\csname Ans@\@@quiztype\endcsname + \expandafter\global\expandafter + \let\expandafter\@Ans\expandafter=\csname Ans@\@@quiztype\endcsname } \newcommand\useForms{\def\aeb@FLOverride{f}} \newcommand\useLinks{\def\aeb@FLOverride{l}} @@ -2030,38 +2035,39 @@ \def\@quizCnt{0} \let\ListOfQuizNames\@empty \def\@quiz*#1#2{% - \xdef\eq@pageThisQ{\the\c@page}% - \let\@currentQues\@empty - \global\let\eqQzQuesList\@empty - \global\let\pointValuesArray\@empty - \global\let\ptypeArray\@empty - \global\let\corrAnsArray\@empty - {\eqtmpcnta\@quizCnt\advance\eqtmpcnta\@ne - \xdef\@quizCnt{\the\eqtmpcnta}}% - \edef\@currentlabel{\@quizCnt}% - \edef\@currentHref{quiz.\@quizCnt}% - \sq@setCLN{\eq@defaultQuizLabelName}% - \setcounter{eqpointvalue}{0}\setcounter{questionno}{0}% - \eq@initializeServerSubmit - \global\let\eqQuizType\isQZ %\tabcolsep=0pt - \gdef\eqPTs{1}\global\let\eqQT\eq@na - \g@addto@macro\ListOfQuizNames{,#2}% - \gdef\quiz@total{#2}\xdef\curr@quiz{#2}\xdef\oField{#2}% - \xdef\currQuiz{#2}\xdef\currQuizStartPage{\thepage}% - \xdef\aPointType{0}% - \def\fieldJSStr@CMD{\fieldJSStr*[noquotes]\bqlabelISO}% - \expandafter\fieldJSStr@CMD\expandafter{\bqlabelISO}% - \ifx\@quiztype\@empty\gdef\@@quiztype{#1}\else - \xdef\@@quiztype{\@quiztype}\fi - \let\@qzsolndest\@empty - \let\answers\answers@q\let\endanswers\endanswers@q - \let\manswers\manswers@q\let\endmanswers\endanswers@q - \let\solution\solution@sq\let\endsolution\endsolution@sq - \expandafter% - \xdef\csname titleOf\currQuiz\endcsname{\aebTitleQuiz}% - \q@aboveskip\q@priorhook\noindent\hypertarget{qzH\@currentHref}{}% - \eq@beginQuiz\qhspace{\set@typeset@protect\aebtitleQuiz}% - \ignorespaces} + \xdef\eq@pageThisQ{\the\c@page}% + \let\@currentQues\@empty + \global\let\eqQzQuesList\@empty + \global\let\pointValuesArray\@empty + \global\let\ptypeArray\@empty + \global\let\corrAnsArray\@empty + {\eqtmpcnta\@quizCnt\advance\eqtmpcnta\@ne + \xdef\@quizCnt{\the\eqtmpcnta}}% + \edef\@currentlabel{\@quizCnt}% + \edef\@currentHref{quiz.\@quizCnt}% + \sq@setCLN{\eq@defaultQuizLabelName}% + \setcounter{eqpointvalue}{0}\setcounter{questionno}{0}% + \eq@initializeServerSubmit + \global\let\eqQuizType\isQZ %\tabcolsep=0pt + \gdef\eqPTs{1}\global\let\eqQT\eq@na + \g@addto@macro\ListOfQuizNames{,#2}% + \gdef\quiz@total{#2}\xdef\curr@quiz{#2}\xdef\oField{#2}% + \xdef\currQuiz{#2}\xdef\currQuizStartPage{\thepage}% + \xdef\aPointType{0}% + \def\fieldJSStr@CMD{\flJSStr*[noquotes]\bqlabelISO}% + \expandafter\fieldJSStr@CMD\expandafter{\bqlabelISO}% + \ifx\@quiztype\@empty\gdef\@@quiztype{#1}\else + \xdef\@@quiztype{\@quiztype}\fi + \let\@qzsolndest\@empty + \let\answers\answers@q\let\endanswers\endanswers@q + \let\manswers\manswers@q\let\endmanswers\endanswers@q + \let\solution\solution@sq\let\endsolution\endsolution@sq + \expandafter + \xdef\csname titleOf\currQuiz\endcsname{\aebTitleQuiz}% + \q@aboveskip\q@priorhook\noindent\hypertarget{qzH\@currentHref}{}% + \eq@beginQuiz\qhspace{\set@typeset@protect\aebtitleQuiz}% + \ignorespaces +} \def\aeb@endquiz {% \eq@prior@endQuiz\noindent\eq@endQuiz @@ -2079,101 +2085,76 @@ \newcommand\eq@beginQuiz{\eq@BeginQuizLink} \newcommand\eq@endQuiz{\eq@EndQuizLink} \newcommand\useBeginQuizButton[1][] - {\renewcommand\eq@beginQuiz{\eq@BeginQuizButton[#1]}} + {\renewcommand\eq@beginQuiz{\eq@BeginQuizButton[#1]}} \newcommand\useEndQuizButton[1][] - {\renewcommand\eq@endQuiz{\eq@EndQuizButton[#1]}} + {\renewcommand\eq@endQuiz{\eq@EndQuizButton[#1]}} \newcommand\useBeginQuizLink - {\renewcommand\eq@beginQuiz{\eq@BeginQuizLink}} + {\renewcommand\eq@beginQuiz{\eq@BeginQuizLink}} \newcommand\useEndQuizLink - {\renewcommand\eq@endQuiz{\eq@EndQuizLink}} + {\renewcommand\eq@endQuiz{\eq@EndQuizLink}} \newcommand\@initQuiz{% - var \curr@quiz=new Object();\jsR - lstOfQuizzes["\curr@quiz"]=\curr@quiz;\jsR - \curr@quiz.oAlertCheck={bAfterValue:false};\jsR - \curr@quiz.Grp={}; - \ifx\defaultColorJSLoc\@empty\else\jsR - \oField.DefaultColorJSLoc=\defaultColorJSLoc;\fi - \ifx\rghtColorJSLoc\@empty\else\jsR - \oField.RightColorJSLoc=\rghtColorJSLoc;\fi - \ifx\wrngColorJSLoc\@empty\else\jsR - \oField.WrongColorJSLoc=\wrngColorJSLoc;\fi - \ifx\partialColorJSLoc\@empty\else\jsR - \oField.PartialColorJSLoc=\partialColorJSLoc;\fi - \ifx\rghtAnsSymbJSLoc\@empty\else\jsR - \oField.RightAnsSymbJSLoc=\rghtAnsSymbJSLoc;\fi - \ifx\wrngAnsSymbJSLoc\@empty\else\jsR - \oField.WrongAnsSymbJSLoc=\wrngAnsSymbJSLoc;\fi - \ifx\corrAnsSymbJSLoc\@empty\else\jsR - \oField.CorrAnsSymbJSLoc=\corrAnsSymbJSLoc;\fi - \ifx\eqGradeScaleLoc\@empty\else\jsR - \oField.GradeScaleLoc=new Array(\eqGradeScaleLoc);\fi - \ifx\eqCorrLocalChoiceFully\@empty\else\jsR % dpsf07 - \oField.fullyCorrectLoc=\eqCorrLocalChoiceFully;\fi - \ifx\priorInitQuiz\@empty\else\jsR\priorInitQuiz\fi %\jsR - InitializeQuiz("\curr@quiz",\ifnocorrections0\else1\fi); - \ifx\eq@CGI\@empty\jsR\curr@quiz.isSubmitted=false;\else - \jsR\curr@quiz.isSubmitted=true;\fi - \jsR\curr@quiz.initializeWith=% -'InitializeQuiz("\curr@quiz",\ifnocorrections0\else1\fi);' - \ifx\postInitQuiz\@empty\else\jsR\postInitQuiz\fi + var\eqSP\curr@quiz=new Object();\jsR + lstOfQuizzes["\curr@quiz"]=\curr@quiz;\jsR + \curr@quiz.oAlertCheck={bAfterValue:false};\jsR + \curr@quiz.Grp={};% + \ifx\defaultColorJSLoc\@empty\else\jsR + \oField.DefaultColorJSLoc=\defaultColorJSLoc;\fi + \ifx\rghtColorJSLoc\@empty\else\jsR + \oField.RightColorJSLoc=\rghtColorJSLoc;\fi + \ifx\wrngColorJSLoc\@empty\else\jsR + \oField.WrongColorJSLoc=\wrngColorJSLoc;\fi + \ifx\partialColorJSLoc\@empty\else\jsR + \oField.PartialColorJSLoc=\partialColorJSLoc;\fi + \ifx\rghtAnsSymbJSLoc\@empty\else\jsR + \oField.RightAnsSymbJSLoc=\rghtAnsSymbJSLoc;\fi + \ifx\wrngAnsSymbJSLoc\@empty\else\jsR + \oField.WrongAnsSymbJSLoc=\wrngAnsSymbJSLoc;\fi + \ifx\corrAnsSymbJSLoc\@empty\else\jsR + \oField.CorrAnsSymbJSLoc=\corrAnsSymbJSLoc;\fi + \ifx\eqGradeScaleLoc\@empty\else\jsR + \oField.GradeScaleLoc=new Array(\eqGradeScaleLoc);\fi + \ifx\eqCorrLocalChoiceFully\@empty\else\jsR + \oField.fullyCorrectLoc=\eqCorrLocalChoiceFully;\fi + \if$\priorInitQuiz$\else\jsR\priorInitQuiz\fi\jsR + InitializeQuiz("\curr@quiz",\ifnocorrections0\else1\fi);% + \ifx\eq@CGI\@empty\jsR\curr@quiz.isSubmitted=false;\else + \jsR\curr@quiz.isSubmitted=true;\fi + \jsR\curr@quiz.initializeWith=% + 'InitializeQuiz("\curr@quiz",\ifnocorrections0\else1\fi);';% + \if$\postInitQuiz$\else\jsR\postInitQuiz\fi% } \newcommand{\priorInitQuiz}{} \newcommand{\postInitQuiz}{} \let\eq@submitURL\@empty \let\eq@insertHiddenFields\@empty +\newcommand\priorSubmitQuiz{} +\newcommand\postSubmitQuiz{} \def\eq@@BeginQuizLinkActions{\A{\JS{\@initQuiz}}} \def\eq@BeginQuizLinkDefaults{\Border{0 0 0}} \let\bqlabelFmt\@empty -\def\eq@BeginQuizLink{% - \qz@IDTxtField +\def\eq@BeginQuizLink{\qz@IDTxtField \set@@Link{}{}{}{\color{\@linkcolor}\bqlabelFmt\bqlabel}{}% {\eq@setWidgetProps\setLink@driver}% {\eq@BeginQuizLinkDefaults\eq@@BeginQuizLinkActions\every@Link}% \space\ignorespaces} -\newcommand\priorSubmitQuiz{} -\newcommand\postSubmitQuiz{} -\def\eq@@EndQuizLinkActions{\A{\JS{% - if (!isQuizInitialized("\curr@quiz"))\jsR\jsT - eqAppAlert(InitMsg("\bqlabelISO"),3);\jsR - else {\jsR\jsT - if (\minQuizResp(\thequestionno)) {\jsR\jsT\jsT - \curr@quiz.PtValues=new % - Array(\pointValuesArray);\jsR\jsT\jsT - ProbType = [\ptypeArray];\jsR\jsT\jsT -\if@inclkey - \curr@quiz.CorrAns=(new % - Array(\corrAnsArray));\jsR\jsT\jsT -\fi - DisplayQuizResults("\curr@quiz",\theeqpointvalue,% - \thequestionno);\jsR\jsT\jsT - var h=this.getField("ScoreData.\curr@quiz");\jsR\jsT\jsT - h.value=Score+";"+NQuestions+";"% - +ptScore+";"+NPointTotal;\jsR\jsT\jsT - \eq@submitURL - \postSubmitQuiz - \jsT\jsT resetQuiz("\curr@quiz");\jsR\jsT - }\jsR - }}}% -} +\def\eq@@EndQuizLinkActions{\A{\JS{\eQzBtnActns}}} \def\eq@EndQuizLinkDefaults{\Border{0 0 0}} \let\eqlabelFmt\@empty -\def\eq@EndQuizLink -{% - \ifx\eq@CGI\@empty - \let\eq@submitURL\@empty - \let\eq@insertHiddenFields\@empty - \fi - \set@@Link{}{}{}{\color{\@linkcolor}\eqlabelFmt\eqlabel}{}% - {\eq@setWidgetProps\setLink@driver}% - {\eq@EndQuizLinkDefaults\eq@@EndQuizLinkActions\every@Link}% - \makebox[0pt][r]{\textField[\BC{}\autoCenter{n}]% - {htxtfld.\curr@quiz}{2bp}{2bp}}% - \makebox[0pt][r]{\eq@hiddenScoreData\eq@insertHiddenFields}% - \global\let\eq@CGI\@empty\ignorespaces +\def\eq@EndQuizLink{% + \ifx\eq@CGI\@empty + \let\eq@submitURL\@empty + \let\eq@insertHiddenFields\@empty\fi + \set@@Link{}{}{}{\color{\@linkcolor}\eqlabelFmt\eqlabel}{}% + {\eq@setWidgetProps\setLink@driver}% + {\eq@EndQuizLinkDefaults\eq@@EndQuizLinkActions\every@Link}% + \makebox[0pt][r]{\textField[\BC{}\autoCenter{n}]% + {htxtfld.\curr@quiz}{2bp}{2bp}}% + \makebox[0pt][r]{\eq@hiddenScoreData\eq@insertHiddenFields}% + \global\let\eq@CGI\@empty\ignorespaces } \def\BeginQuizButtonDefaults{% - \CA{\bqlabel}\H{P}\F{\FPrint} - \BC{1 0 0}\BG{.7529 .7529 .7529}\W{1}\S{B}} + \CA{\bqlabel}\H{P}\F{\FPrint} + \BC{1 0 0}\BG{.7529 .7529 .7529}\W{1}\S{B}} \def\eq@@BeginQuizButtonActions{\A{\JS{\@initQuiz}}} \newcommand\eq@BeginQuizButton[1][]{% \mbox{\qz@IDTxtField\push@@Button{#1}{beginQuiz.\curr@quiz}{}% @@ -2181,39 +2162,39 @@ {\eq@setButtonProps\eq@Button@driver}% {\BeginQuizButtonDefaults\eq@@BeginQuizButtonActions \every@ButtonField\every@BeginQuizButton}}} -\def\EndQuizButtonDefaults{% - \CA{\eqlabel}\F{\FPrint}\BC{1 0 0} - \BG{.7529 .7529 .7529}\W{1}\S{B}\H{P}} -\def\eq@@EndQuizButtonActions{\A{\JS{% - if (!isQuizInitialized("\curr@quiz"))\jsR\jsT - eqAppAlert(InitMsg("\bqlabelISO"),3);\jsR - else {\jsR\jsT - if (\minQuizResp(\thequestionno)&&_ModalNotOn){\jsR\jsT\jsT - \curr@quiz.PtValues=(new % - Array(\pointValuesArray));\jsR\jsT\jsT - ProbType=[\ptypeArray];\jsR\jsT\jsT -\if@inclkey - \curr@quiz.CorrAns=(new % - Array(\corrAnsArray));\jsR\jsT\jsT -\fi - DisplayQuizResults("\curr@quiz",\theeqpointvalue,% - \thequestionno);\jsR\jsT\jsT - var h=this.getField("ScoreData.\curr@quiz");\jsR\jsT\jsT - h.value=Score+";"+NQuestions+";"% - +ptScore+";"+NPointTotal;\jsR\jsT\jsT - \eq@submitURL - \postSubmitQuiz - \jsT\jsT resetQuiz("\curr@quiz");\jsR\jsT - }\jsR - }}}% +\begin{defineJS}[\makeesc\*\makecmt\%]{\eQzBtnActns} +if (!isQuizInitialized("*curr@quiz")) + eqAppAlert(InitMsg("*bqlabelISO"),3); +else { + if (*minQuizResp(*thequestionno)&&_ModalNotOn){ + *curr@quiz.PtValues=new Array(*pointValuesArray); + ProbType=[*ptypeArray];% +*if@inclkey + *curr@quiz.CorrAns=new Array(*corrAnsArray);*fi + DisplayQuizResults("*curr@quiz",*theeqpointvalue,% +*thequestionno); + var h=this.getField("ScoreData.*curr@quiz"); + h.value=Score+";"+NQuestions+";"% ++ptScore+";"+NPointTotal;% +*ifx*eq@submitURL*empty*else + *eq@submitURL*fi% +*if$*postSubmitQuiz$*else + *postSubmitQuiz*fi + resetQuiz("*curr@quiz"); + } } +\end{defineJS} +\def\EndQuizButtonDefaults{% + \CA{\eqlabel}\F{\FPrint}\BC{1 0 0} + \BG{.7529 .7529 .7529}\W{1}\S{B}\H{P}} +\def\eq@@EndQuizButtonActions{% + \A{\JS{\eQzBtnActns}}} \newcommand{\eq@hiddenScoreData}{\makebox[0pt][r]{% \textField[\BC{}\F{\FHidden}]{ScoreData.\curr@quiz}{2bp}{2bp}}} \newcommand\eq@EndQuizButton[1][]{% \ifx\eq@CGI\@empty \let\eq@submitURL\@empty - \let\eq@insertHiddenFields\@empty - \fi + \let\eq@insertHiddenFields\@empty\fi \mbox{\push@@Button{#1}{endQuiz.\curr@quiz}{}% {\DefaultHeightOfWidget}{\eq@protect\A}% {\eq@setButtonProps\eq@Button@driver}% @@ -2639,24 +2620,22 @@ if (isEndQuizPushed("@eqBaseName")){ \vspace{\aboveanswersSkip}\@endpetrue\fi } \def\popiiictm{\special{CTM: pop pop pop}} -\def\sqWrongRespJS{OnBlurRespBox( false, "\oField" );} -\def\sqRightRespJS{OnBlurRespBox( true, "\oField" );} +\def\sqWrongRespJS{OnBlurRespBox(false,"\oField");} +\def\sqRightRespJS{OnBlurRespBox(true,"\oField");} \def\Ans@sq@l@Actions {% - \A{\if\Ans@choice1 - \JS{\sqRightRespJS} - \ifx\@qzsolndest\@empty\else - \ifeq@solutionsafter\else - /Next <> - \fi + \A{\if\Ans@choice\eq@One\JS{\sqRightRespJS} + \ifx\@qzsolndest\@empty\else + \ifeq@solutionsafter\else + /Next <> \fi + \fi \else \JS{\sqWrongRespJS\jsR \ifx\oField\@empty\else - updateTally("\oField.\thequestionno"); - \fi}% + updateTally("\oField.\thequestionno");\fi}% \fi - }% + }% } \def\linkContentFormat{\alph{quizno}} \def\aebChoiceAltFmt{\noexpand\ifaebshowgrayletters @@ -2689,39 +2668,49 @@ if (isEndQuizPushed("@eqBaseName")){ \def\sqNoCorrections{\let\@sqAlertsOnly\eq@One} \def\sqCorrections{\let\@sqAlertsOnly\eq@Zero} \sqNoCorrections -\def\Ans@sq@f@ActionsTrue{% - \if\@sqTurnOffAlerts1OnBlurRespBox(true,"\oField");\jsR\fi - \ifx\@qzsolndest\@empty\else\ifeq@solutionsafter\else - jmpToNamedDest("\oField","\@qzsolndest",% - \if\@sqTurnOffAlerts00\else1\fi);\fi - \fi\eqAddAAMouseUpMC} -\def\Ans@sq@f@ActionsFalse{% - \if\@sqTurnOffAlerts1OnBlurRespBox(false,"\oField" );\jsR\fi - \ifx\oField\@empty\else - updateTally("\oField.\thequestionno"); - \fi\jsR\eqAddAAMouseUpMC} -\def\Ans@sq@f@Actions{\A{\if\Ans@choice\eq@One - \JS{\Ans@sq@f@ActionsTrue}\else - \JS{\Ans@sq@f@ActionsFalse}\fi}% - \AAmousedown{updateTally.downState=!!event.target.isBoxChecked% - (\arabic{quizno}-1);}} +\begin{defineJS}[\makeesc\*\makecmt\%]{\Ans@sq@f@ActionsTrue} +*ifx*@sqTurnOffAlerts*eq@One% +OnBlurRespBox(true,"*oField"); +*fi% +var qzSolnDest="*@qzsolndest"; +var solnAfter=*ifeq@solutionsafter% +true*else% +false*fi; +if ((qzSolnDest!="") && !solnAfter) % +jmpToNamedDest("*oField","*@qzsolndest",% +*ifx*@sqTurnOffAlerts*eq@Zero0*else1*fi);% +*ifx*eqAddAAMouseUpMC*empty*else +*eqAddAAMouseUpMC*fi +\end{defineJS} +\begin{defineJS}[\makeesc\*\makecmt\%]{\Ans@sq@f@ActionsFalse} +*ifx*@sqTurnOffAlerts*eq@One% +OnBlurRespBox(false,"*oField"); +*fi% +var qzSolnDest="*@qzsolndest"; +if( qzSolnDest!="") updateTally("*oField.*thequestionno");% +*ifx*eqAddAAMouseUpMC*empty*else +*eqAddAAMouseUpMC*fi +\end{defineJS} +\def\Ans@sq@f@Actions{\AAmouseup{\if\Ans@choice\eq@One + \Ans@sq@f@ActionsTrue\else\Ans@sq@f@ActionsFalse\fi} + \AAmousedown{updateTally.downState=!!event.target.isBoxChecked% + (\arabic{quizno}-1);}} \def\Ans@proofing#1{\ifeq@proofing\if\Ans@choice1\relax - \llap{\@proofingsymbol\,\hskip#1\relax}% - \fi\fi} + \llap{\@proofingsymbol\,\hskip#1\relax}\fi\fi} \def\sqRghtSymbChoice#1{\chooseJSsymbol*{#1}% - \ifx\eq@retnStyle\@empty - \edef\sq@corrsymch{\sqRghtSymbChoiceDef}\else - \edef\sq@corrsymch{#1}\fi} + \ifx\eq@retnStyle\@empty + \edef\sq@corrsymch{\sqRghtSymbChoiceDef}\else + \edef\sq@corrsymch{#1}\fi} \def\sqRghtSymbColor#1{\edef\eq@arg{#1}\ifx\eq@arg\@empty - \edef\sq@corrsymcol{\sqRghtSymbColorDef}\else - \edef\sq@corrsymcol{#1}\fi} + \edef\sq@corrsymcol{\sqRghtSymbColorDef}\else + \edef\sq@corrsymcol{#1}\fi} \def\sqWrngSymbChoice#1{\chooseJSsymbol*{#1}% - \ifx\eq@retnStyle\@empty - \edef\sq@wrgsymch{\sqWrngSymbChoiceDef}\else - \edef\sq@wrgsymch{#1}\fi} + \ifx\eq@retnStyle\@empty + \edef\sq@wrgsymch{\sqWrngSymbChoiceDef}\else + \edef\sq@wrgsymch{#1}\fi} \def\sqWrngSymbColor#1{\edef\eq@arg{#1}\ifx\eq@arg\@empty - \edef\sq@wrgsymcol{\sqWrngSymbColorDef}\else - \edef\sq@wrgsymcol{#1}\fi} + \edef\sq@wrgsymcol{\sqWrngSymbColorDef}\else + \edef\sq@wrgsymcol{#1}\fi} \def\sqRghtSymbChoiceDef{check} \def\sqRghtSymbColorDef{0 .6 0 rg} \def\sqWrngSymbChoiceDef{cross} @@ -2731,118 +2720,125 @@ if (isEndQuizPushed("@eqBaseName")){ \edef\sq@wrgsymch{\sqWrngSymbChoiceDef} \edef\sq@wrgsymcol{\sqWrngSymbColorDef} \def\sqResetSymbToDef{% - \sqRghtSymbChoice{}\sqRghtSymbColor{}% - \sqWrngSymbChoice{}\sqWrngSymbColor{}% + \sqRghtSymbChoice{}\sqRghtSymbColor{}% + \sqWrngSymbChoice{}\sqWrngSymbColor{}% } \def\qChoiceSymb#1{\chooseJSsymbol*{#1}% - \ifx\eq@retnStyle\@empty - \edef\qz@chksymb{\qChoiceSymbDef}\else - \edef\qz@chksymb{#1}\fi} + \ifx\eq@retnStyle\@empty + \edef\qz@chksymb{\qChoiceSymbDef}\else + \edef\qz@chksymb{#1}\fi} \def\qChoiceColor#1{\edef\eq@arg{#1}\ifx\eq@arg\@empty - \edef\qz@chksymbcol{\qChoiceColorDef}\else - \edef\qz@chksymbcol{#1}\fi} + \edef\qz@chksymbcol{\qChoiceColorDef}\else + \edef\qz@chksymbcol{#1}\fi} \def\qChoiceSymbDef{check} \def\qChoiceColorDef{0 0 0 rg} \edef\qz@chksymb{\qChoiceSymbDef} \edef\qz@chksymbcol{\qChoiceColorDef} \let\rbf@Opts\@empty -\def\Ans@sq@f{% - \if\eq@listType\eq@One\stepcounter{quizno}\else - \@ifundefined{ifwithinsoldoc}{\refstepcounter{quizno}} - {\ifwithinsoldoc\stepcounter{quizno}\else - \refstepcounter{quizno}\fi}\fi\PBS\raggedright - \if\Ans@choice\eq@One - \def\rbf@Opts{\symbolchoice{\sq@corrsymch}% - \textColor{\sq@corrsymcol}}\else - \def\rbf@Opts{\symbolchoice{\sq@wrgsymch}% - \textColor{\sq@wrgsymcol}}\fi - \settowidth{\eq@tmplength}{\eq@lw@f}% - \eq@tmpdima=\wd\eq@tmpbox% - \hangindent=\eq@tmplength\hangafter=1\relax - \insertGrayLetters % 6.3d - \mbox{\expandafter\radio@@Button\expandafter{\rbf@Opts}% - {mc.\oField.\thequestionno}% - {\RadioFieldSize}{\RadioFieldSize}% - {\Ans@choice\alph{quizno}}{\eq@protect\A}% - {\eq@setWidgetProps\eq@Radio@driver}% - {\@@Ans@sq@f@Defaults\Ans@sq@f@Actions\every@RadioButton - \every@sqRadioButton}}% - \Ans@proofing{\RadioFieldSize}% -\eq@hspanner\ignorespaces} -\def\@@Ans@ck@sq@f@Defaults -{% - \BC{0 0 0}\Ff{\FfNoToggleToOff} - \F{\FPrint}\textSize{12}\textColor{0 g}\W{1} +\def\Ans@sq@f{\if\eq@listType\eq@One + \stepcounter{quizno}\else + \@ifundefined{ifwithinsoldoc}{\refstepcounter{quizno}} + {\ifwithinsoldoc\stepcounter{quizno}\else + \refstepcounter{quizno}\fi}\fi + \PBS\raggedright + \if\Ans@choice\eq@One + \def\rbf@Opts{\symbolchoice{\sq@corrsymch}% + \textColor{\sq@corrsymcol}}\else + \def\rbf@Opts{\symbolchoice{\sq@wrgsymch}% + \textColor{\sq@wrgsymcol}}\fi + \settowidth{\eq@tmplength}{\eq@lw@f}% + \eq@tmpdima=\wd\eq@tmpbox% + \hangindent=\eq@tmplength\hangafter=1\relax + \insertGrayLetters + \mbox{\expandafter\radio@@Button\expandafter{\rbf@Opts}% + {mc.\oField.\thequestionno}% + {\RadioFieldSize}{\RadioFieldSize}% + {\Ans@choice\alph{quizno}}{\eq@protect\A}% + {\eq@setWidgetProps\eq@Radio@driver}% + {\@@Ans@sq@f@Defaults\Ans@sq@f@Actions\every@RadioButton + \every@sqRadioButton}}% + \Ans@proofing{\RadioFieldSize}% + \eq@hspanner\ignorespaces} +\def\@@Ans@ck@sq@f@Defaults{% + \BC{0 0 0}\Ff{\FfNoToggleToOff} + \F{\FPrint}\textSize{12}\textColor{0 g}\W{1} } \begingroup \catcode`\&=12 \gdef\eq@AND{&&} \endgroup -\def\Ans@ck@sq@f@ActionsTrue{% - var fName=event.target.name;\jsR - var g=this.getField("mc.\oField.\thequestionno");\jsR - var a=g.getArray();\jsR - for (var i=0; i=a.length) jmpToNamedDest("\oField","\@qzsolndest",% - \if\@sqTurnOffAlerts00\else1\fi); - \fi - \fi\eqAddAAMouseUpMS} -\def\Ans@ck@sq@f@ActionsFalse{% - var fName=event.target.name;\jsR - var g=this.getField("mc.\oField.\thequestionno");\jsR - var a=g.getArray();\jsR - for (var i=0; i=a.length) jmpToNamedDest("*oField","*@qzsolndest",% +*ifx*@sqTurnOffAlerts*eq@Zero0*else1*fi);% +*ifx*eqAddAAMouseUpMS*empty*else +*eqAddAAMouseUpMS*fi +\end{defineJS} +\begin{defineJS}[\makeesc\*\makecmt\%]{\Ans@ck@sq@f@ActionsFalse} +var fName=event.target.name; +var g=this.getField("mc.*oField.*thequestionno"); +var a=g.getArray(); +for (var i=0; i> + /S/GoTo/D(\@qzsolndest)/Next<<\JS{this.resetForm(% + ["mcq.\curr@quiz.\thequestionno.\arabic{quizno}"]);}>> } -\def\Ans@c@f@Defaults -{% - \BC{0 0 0}\S{S}\W{1}\F{\FHidden}\textSize{12} - \textColor{0 g}\symbolchoice{circle} +\def\Ans@c@f@Defaults{% + \BC{0 0 0}\S{S}\W{1}\F{\FHidden}\textSize{12} + \textColor{0 g}\symbolchoice{circle} } \let\bottomOfAnsfStack\relax \providecommand\graylettersColor{gray} \def\insertGrayLetters{\ifaebshowgrayletters - \rlap{\makebox[\RadioFieldSize]% - {\textcolor{\graylettersColor}{\Alph{quizno}}}}\else\relax\fi} -\def\Ans@@f -{% - \settowidth{\eq@tmplength}{\eq@lw@f}% - \hangindent=\eq@tmplength\hangafter=1 - \bottomOfAnsfStack\insertGrayLetters - \edef\rbf@Opts{\ifaeb@usecircles\else - \noexpand\symbolchoice{\qz@chksymb}\fi - \noexpand\textColor{\qz@chksymbcol}}% - \if\Ans@choice1\eq@recordAnsChoice\fi - \mbox{\expandafter\radio@@Button\expandafter{\rbf@Opts}% - {mc.\curr@quiz.\thequestionno}% - {\RadioFieldSize}{\RadioFieldSize}{\Ans@choice\alph{quizno}}% - {\eq@protect\A}{\eq@setWidgetProps\eq@Radio@driver}% - {\Ans@r@f@Defaults\Ans@r@f@Actions\every@RadioButton - \every@qRadioButton\insert@circlesymbol}}% - \let\late@options\@empty - \ifnocorrections\else - \if\Ans@choice1\relax - \edef\Ans@c@f@Choice{\noexpand\DV{Yes}% - \ifx\@qzsolndest\@empty\noexpand\Ff{\FfReadOnly}% - \else - \ifeq@noquizsolutions - \noexpand\Ff{\FfReadOnly}% - \else - \noexpand\A{\noexpand\quiz@SolutionActionHook}% - \fi - \fi - }% - \else - \def\Ans@c@f@Choice{\Ff{\FfReadOnly}}% + \rlap{\makebox[\RadioFieldSize]% + {\textcolor{\graylettersColor}{\Alph{quizno}}}}\else\relax\fi} +\def\Ans@@f{% + \settowidth{\eq@tmplength}{\eq@lw@f}% + \hangindent=\eq@tmplength\hangafter=1 + \bottomOfAnsfStack\insertGrayLetters + \edef\rbf@Opts{\ifaeb@usecircles\else + \noexpand\symbolchoice{\qz@chksymb}\fi + \noexpand\textColor{\qz@chksymbcol}}% + \if\Ans@choice\eq@One\eq@recordAnsChoice\fi + \mbox{\expandafter\radio@@Button\expandafter{\rbf@Opts}% + {mc.\curr@quiz.\thequestionno}% + {\RadioFieldSize}{\RadioFieldSize}{\Ans@choice\alph{quizno}}% + {\eq@protect\A}{\eq@setWidgetProps\eq@Radio@driver}% + {\Ans@r@f@Defaults\Ans@r@f@Actions\every@RadioButton + \every@qRadioButton\insert@circlesymbol}}% + \let\late@options\@empty + \ifnocorrections\else + \if\Ans@choice\eq@One + \edef\Ans@c@f@Choice{\noexpand\DV{Yes}% + \ifx\@qzsolndest\@empty\noexpand\Ff{\FfReadOnly}\else + \ifeq@noquizsolutions + \noexpand\Ff{\FfReadOnly}\else + \noexpand\A{\noexpand\quiz@SolutionActionHook}\fi \fi - \ifaeb@usecircles\def\late@options{\BC{}}\fi - \if\Ans@choice1\relax - \ifx\@qzsolndest\@empty\else - \ifeq@noquizsolutions\else - \edef\late@options{\noexpand\BC{\solution@Color}}% - \fi - \fi + }% + \else + \def\Ans@c@f@Choice{\Ff{\FfReadOnly}}% + \fi + \ifaeb@usecircles\def\late@options{\BC{}}\fi + \if\Ans@choice\eq@One + \ifx\@qzsolndest\@empty\else + \ifeq@noquizsolutions\else + \edef\late@options{\noexpand\BC{\solution@Color}}% \fi - \makebox[0pt][r]{\check@@Box{}% - {mcq.\curr@quiz.\thequestionno.\arabic{quizno}}% - {\RadioFieldSize}{\RadioFieldSize}{Yes}{}% - {\eq@setWidgetProps\eq@Check@driver}% - {\Ans@c@f@Defaults\Ans@c@f@Choice\every@CheckBox - \every@qCheckBox\late@options}}% + \fi \fi - \Ans@proofing{\RadioFieldSize}% -\eq@hspanner\ignorespaces} + \makebox[0pt][r]{\check@@Box{}% + {mcq.\curr@quiz.\thequestionno.\arabic{quizno}}% + {\RadioFieldSize}{\RadioFieldSize}{Yes}{}% + {\eq@setWidgetProps\eq@Check@driver}% + {\Ans@c@f@Defaults\Ans@c@f@Choice\every@CheckBox + \every@qCheckBox\late@options}}% + \fi + \Ans@proofing{\RadioFieldSize}\eq@hspanner + \ignorespaces +} \def\limitSelectionTo#1{\def\eqlimselTo{#1}} \let\eqlimselTo\@empty -\def\Ans@ck@f{\leavevmode\if\eq@listType1\stepcounter{quizno}% - \else\refstepcounter{quizno}\fi - \if\Ans@choice1\eq@recordAnsChoice\fi - \PBS\raggedright\Ans@@ck@f} -\def\Ans@ck@f@Defaults -{% - \BC{0 0 0}\S{S}\W{1}\Ff{\FfNoToggleToOff} - \textSize{12}\textColor{0 g} -} -\def\Ans@ck@f@Actions -{% - \A{\JS{% - var _bOK=true;\jsR -\ifx\eqlimselTo\@empty\else _bOK = LimitSelection(\eqlimselTo,% -"mck.\curr@quiz.\thequestionno","\arabic{quizno}");\jsR\fi -if (_bOK) {\jsR\jsT - var aPMSretn=ProcessMultiSelection(\Ans@choice,"\alph{quizno}",% -\thequestionno,\arabic{quizno},"\curr@quiz",\eqPTs,\eq@pPTs);\jsR\jsT - RecordProblemType("\eqQT",\thequestionno);\jsR\jsT - ProcessQuestion(aPMSretn[0],aPMSretn[1],\thequestionno,% -\arabic{quizno},"\curr@quiz",0,\ifnocorrections0\else1\fi,% -"\bqlabelISO"\if\eqQuizType\isQZ\ifx\eq@online\eq@YES -\ifeq@noquizsolutions\else,1\fi\fi\fi);\jsR -}}}% +\def\Ans@ck@f{\leavevmode + \if\eq@listType1\stepcounter{quizno}% + \else\refstepcounter{quizno}\fi + \if\Ans@choice\eq@One\eq@recordAnsChoice\fi + \PBS\raggedright\Ans@@ck@f} +\def\Ans@ck@f@Defaults{% + \BC{0 0 0}\S{S}\W{1}\Ff{\FfNoToggleToOff} + \textSize{12}\textColor{0 g} +} +\def\Ans@ck@f@Actions{% + \A{\JS{% + var\eqSP_bOK=true;\jsR +\ifx\eqlimselTo\@empty\else + _bOK\eqSP=\eqSP LimitSelection(\eqlimselTo,% + "mck.\curr@quiz.\thequestionno","\arabic{quizno}");\jsR\fi + if(_bOK)\eqSP{\jsR\jsT + var aPMSretn=ProcessMultiSelection(\Ans@choice,"\alph{quizno}",% + \thequestionno,\arabic{quizno},"\curr@quiz",% + \eqPTs,\eq@pPTs);\jsR\jsT + RecordProblemType("\eqQT",\thequestionno);\jsR\jsT + ProcessQuestion(aPMSretn[0],aPMSretn[1],\thequestionno,% + \arabic{quizno},"\curr@quiz",0,\ifnocorrections0\else1\fi,% + "\bqlabelISO"\if\eqQuizType\isQZ\ifx\eq@online\eq@YES + \ifeq@noquizsolutions\else,1\fi\fi\fi);\jsR + }}}% } -\def\quiz@SolutionActionHook{% - /S/GoTo/D(\@qzsolndest)/Next<<\JS{this.resetForm(% -["mcq.\curr@quiz.\thequestionno.\arabic{quizno}"]);}>> +\def\quiz@SolutionActionHook{/S/GoTo/D(\@qzsolndest)% + /Next<<\JS{this.resetForm([% + "mcq.\curr@quiz.\thequestionno.\arabic{quizno}"]);}>> } -\def\Ans@@ck@f -{% - \settowidth{\eq@tmplength}{\eq@lw@f}% - \hangindent=\eq@tmplength\hangafter=1 - \bottomOfAnsfStack\insertGrayLetters - \bottomOfAnsfStack\insertGrayLetters -\def\cbf@Opts{\symbolchoice{\qz@chksymb}% +\def\Ans@@ck@f{% + \settowidth{\eq@tmplength}{\eq@lw@f}% + \hangindent\eq@tmplength\hangafter\@ne + \bottomOfAnsfStack\insertGrayLetters + \bottomOfAnsfStack\insertGrayLetters + \def\cbf@Opts{\symbolchoice{\qz@chksymb}% \textColor{\qz@chksymbcol}}% - \mbox{\expandafter\check@@Box\expandafter{\cbf@Opts}% - {mck.\curr@quiz.\thequestionno.\arabic{quizno}}% - {\RadioFieldSize}{\RadioFieldSize}{\Ans@choice\alph{quizno}}% - {\eq@protect\A}{\eq@setWidgetProps\eq@Check@driver}% - {\Ans@ck@f@Defaults\Ans@ck@f@Actions\every@RadioButton - \every@qckCheckbox}}% - \ifnocorrections\else - \if\Ans@choice1\relax - \edef\Ans@c@f@Choice{\noexpand\DV{Yes}% - \ifx\@qzsolndest\@empty\noexpand\Ff{\FfReadOnly}% - \else - \ifeq@noquizsolutions - \noexpand\Ff{\FfReadOnly}% - \else - \noexpand\A{\noexpand\quiz@SolutionActionHook}% - \fi - \fi - }% - \else - \def\Ans@c@f@Choice{\Ff{\FfReadOnly}}% - \fi - \let\late@options\@empty - \if\Ans@choice1\relax - \ifx\@qzsolndest\@empty\else - \ifeq@noquizsolutions\else - \edef\late@options{\noexpand\BC{\solution@Color}}% - \fi - \fi + \mbox{\expandafter\check@@Box\expandafter{\cbf@Opts}% + {mck.\curr@quiz.\thequestionno.\arabic{quizno}}% + {\RadioFieldSize}{\RadioFieldSize}{\Ans@choice\alph{quizno}}% + {\eq@protect\A}{\eq@setWidgetProps\eq@Check@driver}% + {\Ans@ck@f@Defaults\Ans@ck@f@Actions\every@RadioButton + \every@qckCheckbox}}% + \ifnocorrections\else + \if\Ans@choice\eq@One + \edef\Ans@c@f@Choice{\noexpand\DV{Yes}% + \ifx\@qzsolndest\@empty\noexpand\Ff{\FfReadOnly}\else + \ifeq@noquizsolutions + \noexpand\Ff{\FfReadOnly}\else + \noexpand\A{\noexpand\quiz@SolutionActionHook}\fi \fi - \makebox[0pt][r]{\check@@Box{}% - {mcq.\curr@quiz.\thequestionno.\arabic{quizno}}% - {\RadioFieldSize}{\RadioFieldSize}{Yes}{}% - {\eq@setWidgetProps\eq@Check@driver}% - {\Ans@c@f@Defaults\Ans@c@f@Choice\every@CheckBox - \every@qCheckBox\late@options}}% + }% + \else + \def\Ans@c@f@Choice{\Ff{\FfReadOnly}}% \fi - \Ans@proofing{\RadioFieldSize}% -\eq@hspanner\ignorespaces} + \let\late@options\@empty + \if\Ans@choice\eq@One + \ifx\@qzsolndest\@empty\else + \ifeq@noquizsolutions\else + \edef\late@options{\noexpand\BC{\solution@Color}}\fi + \fi + \fi + \makebox[0pt][r]{\check@@Box{}% + {mcq.\curr@quiz.\thequestionno.\arabic{quizno}}% + {\RadioFieldSize}{\RadioFieldSize}{Yes}{}% + {\eq@setWidgetProps\eq@Check@driver}% + {\Ans@c@f@Defaults\Ans@c@f@Choice\every@CheckBox + \every@qCheckBox\late@options}}% + \fi + \Ans@proofing{\RadioFieldSize}\eq@hspanner + \ignorespaces +} \newcount\eq@tabColCnt \define@key{bchoice}{nCols}{\def\bChoiceNumCols{#1}} \@for\eqi:=1,2,3,4,5,6,7,8,9,10 \do{\edef\temp@expand@def{% - \noexpand\define@key{bchoice}{\eqi}[\eqi]{% - \noexpand\def\noexpand\bChoiceNumCols{\eqi}}% - }\temp@expand@def + \noexpand\define@key{bchoice}{\eqi}[\eqi]{% + \noexpand\def\noexpand\bChoiceNumCols{\eqi}}% + }\temp@expand@def } \def\bChoiceNumCols{\aeb@numCols} \define@key{bchoice}{random}[true]{% - \csname if#1\endcsname\eq@randomizeChoicestrue - \else\eq@randomizeChoicesfalse\fi + \csname if#1\endcsname\eq@randomizeChoicestrue + \else\eq@randomizeChoicesfalse\fi } \define@key{bchoice}{label}[]{\xdef\bChoiceLabel{#1}} \def\bChoices{\@ifnextchar[{\@ansChoices}{\@ansChoices[\aeb@numCols]}} -\def\@ansChoices[#1]% -{% - \global\let\@tempholdSaveAns\@empty %4/5 - \global\let\@tempholdSaveChoice\@empty %4/5 - \global\let\bChoiceLabel\@empty %4/5 - \setkeys{bchoice}{#1}% - \global\eq@tabColCnt=0 - \ifnum\aeb@numCols=1 % list mode - \def\eq@next{\@layoutListAns}\else % tabular mode - \def\eq@next{\@layoutTabularAns{\bChoiceNumCols}}\fi - \eq@next +\def\@ansChoices[#1]{% + \global\let\@tempholdSaveAns\@empty %4/5 + \global\let\@tempholdSaveChoice\@empty %4/5 + \global\let\bChoiceLabel\@empty %4/5 + \setkeys{bchoice}{#1}% + \global\eq@tabColCnt=\z@ + \ifnum\aeb@numCols=\@ne % list mode + \def\eq@next{\@layoutListAns}\else % tabular mode + \def\eq@next{\@layoutTabularAns{\bChoiceNumCols}}\fi + \eq@next } \let\eChoices\relax \def\@layoutListAns{\@ifnextchar\Ans{\@getListAns}% - {\@lookforendansChoices{\@layoutListAns}}% + {\@lookforendansChoices{\@layoutListAns}}% } \newcommand{\eq@saveAns}[2][]{% - \let\eq@next\@@@SaveAnsGobbleAns - \ifx\bChoiceLabel\@empty\else - \def\eq@savedAnsOpt{#1}\def\eq@savedAnsZO{#2}% - \if\eq@savedAnsZO1 \let\eq@next\@@@SaveAns\fi - \fi\eq@next + \let\eq@next\@@@SaveAnsGobbleAns + \ifx\bChoiceLabel\@empty\else + \def\eq@savedAnsOpt{#1}\def\eq@savedAnsZO{#2}% + \if\eq@savedAnsZO1\let\eq@next\@@@SaveAns\fi + \fi\eq@next } \long\def\@@@SaveAns#1\eAns{% 4/5 - \g@addto@macro\@tempholdSaveAns{\\{\ignorespaces#1}}% - \addtocounter{quizno}{1}% - \edef\temp@expand{\noexpand\g@addto@macro\noexpand + \g@addto@macro\@tempholdSaveAns{\\{\ignorespaces#1}}% + \addtocounter{quizno}{1}% + \edef\temp@expand{\noexpand\g@addto@macro\noexpand \@tempholdSaveChoice{% - \noexpand\\{\ifx\sqstar\@empty\aebChoiceAltFmt\else - \ifaebshowgrayletters\Alph{quizno}\else - \linkContentFormat\fi\fi}}}\temp@expand - \addtocounter{quizno}{-1}% + \noexpand\\{\ifx\sqstar\@empty\aebChoiceAltFmt\else + \ifaebshowgrayletters\Alph{quizno}\else + \linkContentFormat\fi\fi}}}\temp@expand + \addtocounter{quizno}{-1}% } \newif\ifoxfordcomma \oxfordcommatrue \def\oxfordCommaOn{\oxfordcommatrue} \def\oxfordCommaOff{\oxfordcommafalse} \def\eq@insertComma{% - \ifx\eq@comma\@empty - \ifnum\@nameuse{NumAns\eq@namearg}>2\relax - \def\eq@comma{,}\fi - \else\ifx\eq@insertAnd\@empty\eq@comma\space - \else\ifnum\@tempcnta=\@nameuse{NumAns\eq@namearg}% - \ifoxfordcomma\eq@comma\fi\else\eq@comma\fi\space - \fi + \ifx\eq@comma\@empty + \ifnum\@nameuse{NumAns\eq@namearg}>\tw@ + \def\eq@comma{,}\fi + \else\ifx\eq@insertAnd\@empty\eq@comma\space + \else\ifnum\@tempcnta=\@nameuse{NumAns\eq@namearg}% + \ifoxfordcomma\eq@comma\fi\else\eq@comma\fi\space \fi + \fi } \newcommand\eqAnd{and}\def\eq@insertAnd{% - \ifnum\@nameuse{NumAns\eq@namearg}<2\relax\else - \ifnum\@nameuse{NumAns\eq@namearg}>2\relax - \else\leavevmode\space\fi\eqAnd\space\fi} -\long\def\eq@displayAns#1{\advance\@tempcnta1\relax - \eq@insertComma - \ifnum\@tempcnta=\@nameuse{NumAns\eq@namearg}\eq@insertAnd\fi#1} + \ifnum\@nameuse{NumAns\eq@namearg}<\tw@\else + \ifnum\@nameuse{NumAns\eq@namearg}>\tw@\relax + \else\leavevmode\space\fi\eqAnd\space\fi +} +\long\def\eq@displayAns#1{\advance\@tempcnta\@ne + \eq@insertComma + \ifnum\@tempcnta=\@nameuse{NumAns\eq@namearg}\eq@insertAnd\fi#1} \def\eq@displayAlts#1{\advance\@tempcnta1 - \eq@insertComma - \ifnum\@tempcnta=\@nameuse{NumAns\eq@namearg}\eq@insertAnd\fi - \savedAltFmt{#1}} + \eq@insertComma + \ifnum\@tempcnta=\@nameuse{NumAns\eq@namearg}\eq@insertAnd\fi + \savedAltFmt{#1}} \def\eq@displayAltsAns#1{\advance\@tempcnta1\relax - \eq@insertComma - \ifnum\@tempcnta=\@nameuse{NumAns\eq@namearg}\eq@insertAnd\fi#1} + \eq@insertComma + \ifnum\@tempcnta=\@nameuse{NumAns\eq@namearg}\eq@insertAnd\fi#1} \newcommand{\savedAltFmt}[1]{(#1)} \newcommand{\useSavedAns}{\bgroup\@ifstar{\useSavedAns@i} - {\let\eq@insertAnd\@empty\useSavedAns@i}} + {\let\eq@insertAnd\@empty\useSavedAns@i}} \newcommand{\useSavedAns@i}[2][]{\@tempcnta=0\relax - \def\eq@namearg{#2}\let\label\@gobble - \def\eq@argi{#1}\ifx\eq@argi\@empty - \let\eq@comma\@empty - \let\\\eq@displayAns\@nameuse{SavedAns#2}\else - \@nameuse{SavedAns#2-Idx#1}\fi - \egroup + \def\eq@namearg{#2}\let\label\@gobble + \def\eq@argi{#1}\ifx\eq@argi\@empty + \let\eq@comma\@empty + \let\\\eq@displayAns\@nameuse{SavedAns#2}\else + \@nameuse{SavedAns#2-Idx#1}\fi + \egroup } \newcommand{\useSavedAlts}{\bgroup\@ifstar{\useSavedAlts@i} - {\let\eq@insertAnd\@empty\useSavedAlts@i}} + {\let\eq@insertAnd\@empty\useSavedAlts@i}} \newcommand{\useSavedAlts@i}[2][]{\@tempcnta=0\relax - \def\eq@namearg{#2}\@nameuse{caseFor#2}% - \def\eq@argi{#1}\ifx\eq@argi\@empty - \let\eq@comma\@empty - \let\\\eq@displayAlts\@nameuse{SavedAlts#2}\else - \savedAltFmt{\@nameuse{SavedAlts#2-Idx#1}}\fi - \egroup + \def\eq@namearg{#2}\@nameuse{caseFor#2}% + \def\eq@argi{#1}\ifx\eq@argi\@empty + \let\eq@comma\@empty + \let\\\eq@displayAlts\@nameuse{SavedAlts#2}\else + \savedAltFmt{\@nameuse{SavedAlts#2-Idx#1}}\fi + \egroup } \newcommand{\useSavedAltsAns}{\bgroup\@ifstar{\useSavedAltsAns@i} - {\let\eq@insertAnd\@empty\useSavedAltsAns@i}} + {\let\eq@insertAnd\@empty\useSavedAltsAns@i}} \newcommand{\useSavedAltsAns@i}[2][]{\@tempcnta=0\relax - \def\eq@namearg{#2}\@nameuse{caseFor#2}\let\label\@gobble - \def\eq@argi{#1}\ifx\eq@argi\@empty - \let\eq@comma\@empty - \let\\\eq@displayAltsAns\@nameuse{SavedAltsAns#2}\else - \savedAltFmt{\@nameuse{SavedAlts#2-Idx#1}} - \@nameuse{SavedAns#2-Idx#1}\fi - \egroup + \def\eq@namearg{#2}\@nameuse{caseFor#2}\let\label\@gobble + \def\eq@argi{#1}\ifx\eq@argi\@empty + \let\eq@comma\@empty + \let\\\eq@displayAltsAns\@nameuse{SavedAltsAns#2}\else + \savedAltFmt{\@nameuse{SavedAlts#2-Idx#1}} + \@nameuse{SavedAns#2-Idx#1}\fi + \egroup } \newcommand{\useSavedNumAns}[1]{\@nameuse{NumAns#1}} -\long\def\@@@SaveAnsGobbleAns#1\eAns{} % 4/5 -\long\def\@getListAns\Ans#1\eAns{%\@@par %start new paragraph - \eq@saveAns#1\eAns % 4/5 - \Ans#1\vspace{\@rowskip}% - \@layoutListAns +\long\def\@@@SaveAnsGobbleAns#1\eAns{} +\long\def\@getListAns\Ans#1\eAns{%\@@par + \eq@saveAns#1\eAns + \Ans#1\vspace{\@rowskip}% + \@layoutListAns } \long\def\@lookforendansChoices#1{% - \@ifnextchar\eChoices{\rowsep{\rowsep@default}% - \expandafter\@findendans\@gobble}{\expandafter#1\@gobble}% + \@ifnextchar\eChoices{\rowsep{\rowsep@default}% + \expandafter\@findendans\@gobble}{\expandafter#1\@gobble}% } \def\@layoutTabularAns#1{% - \let\eq@tabSep\@empty - \xdef\numShortCols{#1}% - \ifnum#1>\aeb@numCols \xdef\numShortCols{\aeb@numCols}\fi - \@@layoutTabularAns + \let\eq@tabSep\@empty + \xdef\numShortCols{#1}% + \ifnum#1>\aeb@numCols \xdef\numShortCols{\aeb@numCols}\fi + \@@layoutTabularAns } \def\@@layoutTabularAns{% - \@ifnextchar\Ans{\@getTabAns}% - {\@lookforendansChoices{\@@layoutTabularAns}}% + \@ifnextchar\Ans{\@getTabAns}% + {\@lookforendansChoices{\@@layoutTabularAns}}% } \def\rowsep#1{\gdef\@rowsep{[#1]}\gdef\@rowskip{#1}}% \rowsep{\rowsep@default} \def\rowsepDefault#1{\def\rowsep@default{#1}} \def\rowsep@default{0pt} \long\def\@getTabAns\Ans#1\eAns{% - \eq@saveAns#1\eAns - \global\advance\eq@tabColCnt1 - \let\@save@tabSep=\eq@tabSep - \ifnum\eq@tabColCnt=\numShortCols - \global\eq@tabColCnt=0 - \xdef\eq@tabSep{\noexpand\\\noalign{\kern\@rowskip\relax}}% - \else - \gdef\eq@tabSep{&}% - \fi - \@ifnextchar\eChoices{\@save@tabSep\Ans#1\rowsep{\rowsep@default} - \expandafter\@findendans\@gobble}% - {\@save@tabSep\Ans#1\@@layoutTabularAns}% -} -\def\@findendans{\@ifnextchar\end{% 4/5 - \ifx\bChoiceLabel\@empty\else - \processLabeledAns\fi - }{\expandafter\@findendans\@gobble}}% + \eq@saveAns#1\eAns + \global\advance\eq@tabColCnt1 + \let\@save@tabSep=\eq@tabSep + \ifnum\eq@tabColCnt=\numShortCols + \global\eq@tabColCnt=0 + \xdef\eq@tabSep{\noexpand\\\noalign{\kern\@rowskip\relax}}% + \else + \gdef\eq@tabSep{&}% + \fi + \@ifnextchar\eChoices{\@save@tabSep\Ans#1\rowsep{\rowsep@default} + \expandafter\@findendans\@gobble}% + {\@save@tabSep\Ans#1\@@layoutTabularAns}% +} +\def\@findendans{\@ifnextchar\end{% + \ifx\bChoiceLabel\@empty\else + \processLabeledAns\fi + }{\expandafter\@findendans\@gobble}}% \def\defineEachAns#1{\advance\eqtmpcnta\@ne - \@temptokena={#1}\csarg\xdef - {SavedAns\bChoiceLabel-Idx\the\eqtmpcnta}{\the\@temptokena}% - \ifsolutionsonly\else - {\let\\\relax\eq@IWDefs{\string - \csarg\string\gdef{SavedAns\bChoiceLabel-Idx\the\eqtmpcnta}% - {\the\@temptokena}}}\fi + \@temptokena={#1}\csarg\xdef + {SavedAns\bChoiceLabel-Idx\the\eqtmpcnta}{\the\@temptokena}% + \ifsolutionsonly\else + {\let\\\relax\eq@IWDefs{\string + \csarg\string\gdef{SavedAns\bChoiceLabel-Idx\the\eqtmpcnta}% + {\the\@temptokena}}}% + \fi } \def\defineEachChoice#1{\advance\eqtmpcnta\@ne - \@temptokena={#1}\csarg\xdef - {SavedAlts\bChoiceLabel-Idx\the\eqtmpcnta}% - {\the\@temptokena}\ifsolutionsonly\else - {\let\\\relax\eq@IWDefs{\string - \csarg\string - \gdef{SavedAlts\bChoiceLabel-Idx\the\eqtmpcnta}% - {\the\@temptokena}}}\fi + \@temptokena={#1}\csarg\xdef + {SavedAlts\bChoiceLabel-Idx\the\eqtmpcnta}% + {\the\@temptokena}\ifsolutionsonly\else + {\let\\\relax\eq@IWDefs{\string + \csarg\string + \gdef{SavedAlts\bChoiceLabel-Idx\the\eqtmpcnta}% + {\the\@temptokena}}}\fi } \def\processLabeledAns{% - \bgroup - \let\label\@gobble -\if\aeb@FLOverride\eq@l - \global\@namedef{caseFor\bChoiceLabel}{\graylettersOff}\else - \ifaebshowgrayletters + \bgroup + \let\label\@gobble + \if\aeb@FLOverride\eq@l + \global\@namedef{caseFor\bChoiceLabel}{\graylettersOff}\else + \ifaebshowgrayletters \global\@namedef{caseFor\bChoiceLabel}{\graylettersOn}\else \global\@namedef{caseFor\bChoiceLabel}{\graylettersOff}\fi -\fi - \toks@=\expandafter{\@tempholdSaveAns}\csarg - \xdef{SavedAns\bChoiceLabel}{\the\toks@}% - \ifsolutionsonly\else{\let\\\relax\eq@IWDefs{\string - \csarg\string\gdef{SavedAns\bChoiceLabel}{\the\toks@}}}\fi - \eqtmpcnta\z@\let\\\defineEachAns\the\toks@ - \xdef\@currNCntAns{\the\eqtmpcnta}\csarg - \xdef{NumAns\bChoiceLabel}{\@currNCntAns}% - \ifsolutionsonly\else{\eq@IWDefs{\string - \csarg\string\gdef{NumAns\bChoiceLabel}{\the\eqtmpcnta}}}\fi - \toks@=\expandafter{\@tempholdSaveChoice}\csarg - \xdef{SavedAlts\bChoiceLabel}{\the\toks@}% - \ifsolutionsonly\else{\let\\\relax\eq@IWDefs{\string - \csarg\string\gdef{SavedAlts\bChoiceLabel}{\the\toks@}}}\fi - \eqtmpcnta\z@\relax\let\\\defineEachChoice\the\toks@ - \eqtmpcnta\@ne\toks@={}%{\ignorespaces\@gobble}% - \loop - \edef\temp@exp{\the\toks@\noexpand\\{% - \noexpand\useSavedAlts[\the\eqtmpcnta]{\bChoiceLabel} - \noexpand\useSavedAns[\the\eqtmpcnta]{\bChoiceLabel}}}% - \toks@=\expandafter{\temp@exp}% - \ifnum\eqtmpcnta<\@currNCntAns\relax - \advance\eqtmpcnta\@ne - \repeat - \csarg\xdef{SavedAltsAns\bChoiceLabel}{\the\toks@}% - \ifsolutionsonly\else{\let\\\relax\eq@IWDefs{\string - \csarg\string\gdef{SavedAltsAns\bChoiceLabel}{\the\toks@}}}\fi - \egroup + \fi + \toks@=\expandafter{\@tempholdSaveAns}\csarg + \xdef{SavedAns\bChoiceLabel}{\the\toks@}% + \ifsolutionsonly\else{\let\\\relax\eq@IWDefs{\string + \csarg\string\gdef{SavedAns\bChoiceLabel}{\the\toks@}}}\fi + \eqtmpcnta\z@\let\\\defineEachAns\the\toks@ + \xdef\@currNCntAns{\the\eqtmpcnta}\csarg + \xdef{NumAns\bChoiceLabel}{\@currNCntAns}% + \ifsolutionsonly\else{\eq@IWDefs{\string + \csarg\string\gdef{NumAns\bChoiceLabel}{\the\eqtmpcnta}}}\fi + \toks@=\expandafter{\@tempholdSaveChoice}\csarg + \xdef{SavedAlts\bChoiceLabel}{\the\toks@}% + \ifsolutionsonly\else{\let\\\relax\eq@IWDefs{\string + \csarg\string\gdef{SavedAlts\bChoiceLabel}{\the\toks@}}}\fi + \eqtmpcnta\z@\relax\let\\\defineEachChoice\the\toks@ + \eqtmpcnta\@ne\toks@={}%{\ignorespaces\@gobble}% + \loop + \edef\temp@exp{\the\toks@\noexpand\\{% + \noexpand\useSavedAlts[\the\eqtmpcnta]{\bChoiceLabel} + \noexpand\useSavedAns[\the\eqtmpcnta]{\bChoiceLabel}}}% + \toks@=\expandafter{\temp@exp}% + \ifnum\eqtmpcnta<\@currNCntAns\relax + \advance\eqtmpcnta\@ne + \repeat + \csarg\xdef{SavedAltsAns\bChoiceLabel}{\the\toks@}% + \ifsolutionsonly\else{\let\\\relax\eq@IWDefs{\string + \csarg\string\gdef{SavedAltsAns\bChoiceLabel}{\the\toks@}}}\fi + \egroup } \def\graylettersOn{\aebshowgrayletterstrue} \def\graylettersOff{\aebshowgraylettersfalse} \def\aeb@exiii{\expandafter\expandafter\expandafter} \def\REF{\@ifstar{\let\isREFstar\eq@One\aeb@REFstar} - {\let\isREFstar\eq@Zero\aeb@REF}} + {\let\isREFstar\eq@Zero\aeb@REF}} \def\aeb@REFstar#1{\@ifundefined{r@#1}{\hbox{\reset@font\bfseries ??}} - {\ifaebshowgrayletters\aeb@buildUpperCaseRef{#1}% - \else\ref*{#1}\fi}% + {\ifaebshowgrayletters\aeb@buildUpperCaseRef{#1}% + \else\ref*{#1}\fi}% } \def\aeb@REF#1{\@ifundefined{r@#1}{\hbox{\reset@font\bfseries ??}} - {\ifaebshowgrayletters\aeb@buildUpperCaseRef{#1}% - \else\ref{#1}\fi}% + {\ifaebshowgrayletters\aeb@buildUpperCaseRef{#1}% + \else\ref{#1}\fi}% } \def\aeb@buildUpperCaseRef#1{% - \xdef\tmp@expand{\aeb@exiii\@firstoffive\csname r@#1\endcsname}% - \xdef\tmp@expand{\uppercase{\tmp@expand}}% - \if\isREFstar\eq@One\tmp@expand\else\hyperref[#1]{\tmp@expand}\fi + \xdef\tmp@expand{\aeb@exiii\@firstoffive\csname r@#1\endcsname}% + \xdef\tmp@expand{\uppercase{\tmp@expand}}% + \if\isREFstar\eq@One\tmp@expand\else\hyperref[#1]{\tmp@expand}\fi } \newif\ifaeb@usecircles\aeb@usecirclesfalse \let\insert@circlesymbol\@empty \def\useMCCircles{\useForms - \ifaeb@usecircles\else - \global\aeb@usecirclestrue - \gdef\insert@circlesymbol{\symbolchoice{circle}}% - \fi + \ifaeb@usecircles\else + \global\aeb@usecirclestrue + \gdef\insert@circlesymbol{\symbolchoice{circle}}% + \fi } \def\useMCRects{\useForms - \ifaeb@usecircles\global\aeb@usecirclesfalse - \global\let\insert@circlesymbol\@empty - \fi + \ifaeb@usecircles\global\aeb@usecirclesfalse + \global\let\insert@circlesymbol\@empty + \fi } \let\useMCCRects\useMCRects \let\oqpriorhook\@empty \newenvironment{oQuestion}[1]{% - \let\@currentQues\@empty - \xdef\eq@pageThisQ{\the\c@page}% - \global\let\eqQzQuesList\@empty - \xdef\oField{#1}\xdef\curr@quiz{#1}\xdef\currQuiz{#1}% - \g@addto@macro\ListOfSQuizNames{,#1}\let\@qzsolndest\@empty - \let\eqQuizType\isSQZ\gdef\eqPTs{1}\global\let\eqQT\eq@na - \let\answers\answers@sq - \let\endanswers\endanswers@sq - \let\manswers\manswers@sq - \let\endmanswers\endmanswers@sq - \let\solution\solution@sq - \let\endsolution\endsolution@sq - \noindent\oqpriorhook\sq@IDTxtField\ifx\aebTitleQuiz\@empty - \else\aebtitleQuiz\fi\ignorespaces + \let\@currentQues\@empty + \xdef\eq@pageThisQ{\the\c@page}\global + \let\eqQzQuesList\@empty + \xdef\oField{#1}\xdef\curr@quiz{#1}\xdef\currQuiz{#1}% + \g@addto@macro\ListOfSQuizNames{,#1}\let\@qzsolndest\@empty + \let\eqQuizType\isSQZ\gdef\eqPTs{1}\global\let\eqQT\eq@na + \let\answers\answers@sq + \let\endanswers\endanswers@sq + \let\manswers\manswers@sq + \let\endmanswers\endmanswers@sq + \let\solution\solution@sq + \let\endsolution\endsolution@sq + \noindent\oqpriorhook\sq@IDTxtField\ifx\aebTitleQuiz\@empty + \else\aebtitleQuiz\fi\ignorespaces }{% - \global\let\aebtitleQuiz\@empty - \global\let\aebTitleQuiz\@empty - \global\let\eq@tq@star\relax - \aftergroup\ignorespaces + \global\let\aebtitleQuiz\@empty + \global\let\aebTitleQuiz\@empty + \global\let\eq@tq@star\relax + \aftergroup\ignorespaces } \def\oSolution#1{\edef\@qzsolndest{#1}} \def\replaceExclPt#1{\def\replaceexclaim{#1}} @@ -3531,11 +3522,11 @@ if (_bOK) {\jsR\jsT \newcommand\RespBoxMath{\def\rbFlag{0}\begingroup\Hy@unicodefalse \eqsanitize\@RespBox} \def\eq@rpl#1#2{_rplVarsBy('#1','#2')@} % dps17 -\ifnum\eq@drivernum=0\def\RorRT{\r\t}\else\def\RorRT{\r}\fi +\ifnum\eq@drivernum=\z@ + \def\RorRT{\r\t}\else\def\RorRT{\r}\fi \def\toAltApprCnt{0}\def\toAltApprVar{_toAltAppr\toAltApprCnt} \def\toAltApprCntInc{{\@tempcnta=\toAltApprCnt\relax - \advance\@tempcnta1\relax - \xdef\toAltApprCnt{\the\@tempcnta}}} + \advance\@tempcnta\@ne\xdef\toAltApprCnt{\the\@tempcnta}}} \def\setCoreInitAltAppr{% var\eqSP_substVars=\indepVars;\RorRT var\eqSP_mathVars=processMathVars(_substVars);\RorRT @@ -3545,8 +3536,8 @@ var\eqSP_substValue=getSubstValue(_substVars,event.value);\RorRT } \def\bInitAltAppr{\ifShowAppr \def\ShowApprSAVE{true}\toAltApprCntInc\ShowApprfalse - \def\eqAddAAFormat{\ifnum\eq@drivernum=0try\eqLBr\RorRT\fi - \setCoreInitAltAppr\ifnum\eq@drivernum=0 \r\eqRBr catch(e){\RorRT + \def\eqAddAAFormat{\ifnum\eq@drivernum=\z@ try\eqLBr\RorRT\fi + \setCoreInitAltAppr\ifnum\eq@drivernum=\z@\r\eqRBr catch(e){\RorRT var\eqSP\toAltApprVar=% app.setTimeOut('this.resetForm("'+event.target.name+'");% app.clearTimeOut(\toAltApprVar);',250);\r}\fi}\else @@ -3554,72 +3545,71 @@ var\eqSP_substValue=getSubstValue(_substVars,event.value);\RorRT } \def\eInitAltAppr{\@nameuse{ShowAppr\ShowApprSAVE}% \ifShowAppr\altApprOn\let\eqAddAAFormat\@empty\fi} -\def\AAKqRespBoxMath{% - if(event.willCommit){\r\t - RecordPointValue(\eqPTs,\thequestionno\ifx\grpquestions1,% -\thegrpquestionno,\grpPointValue,\grpTotalWeight,% -"\grpEvalFunction"\fi);\r\t - RecordProblemType("\eqQT",\thequestionno);\r\t -\ifSubstVars % dps17 - var\eqSP_substVars=\indepVars;\r\t - var\eqSP_mathVars=processMathVars(_substVars);\r\t - var\eqSP_substValue=getSubstValue(_substVars,event.value);\r\t - var\eqSP_substAns=getSubstValue(_substVars,"\eqCorrectAns");\r\t - var\eqSP retn=\processJSfunc(\rbArgs,% - \compareJSfunc,_substValue);\r\t -\else - var\eqSP_mathVars=\indepVars;\r\t - var\eqSP retn=\processJSfunc(\rbArgs,\compareJSfunc);\r\t -\fi - ProcUserResp(retn,event.value,\thequestionno,% -0\ifx\grpquestions1,\thegrpquestionno\fi);\r - }\r - if (!isQuizInitialized("\currQuiz")) {\r\t - \eqObjAlert eqAppAlert(InitMsg("\bqlabelISO"),3);\r\t - event.rc = false;\r - } +\begin{defineJS}[\makeesc\*\makecmt\%]{\AAKqRespBoxMath} +if(event.willCommit){ + RecordPointValue(*eqPTs,*thequestionno*ifx*grpquestions*eq@One,% +*thegrpquestionno,*grpPointValue,*grpTotalWeight,% +"*grpEvalFunction"*fi); + RecordProblemType("*eqQT",*thequestionno); +*ifSubstVars% + var _substVars=*indepVars; + var _mathVars=processMathVars(_substVars); + var _substValue=getSubstValue(_substVars,event.value); + var _substAns=getSubstValue(_substVars,"*eqCorrectAns"); + var retn=*processJSfunc(*rbArgs,% + *compareJSfunc,_substValue);*else% + var _mathVars=*indepVars; + var retn=*processJSfunc(*rbArgs,*compareJSfunc);*fi + ProcUserResp(retn,event.value,*thequestionno,0% +*ifx*grpquestions*eq@One,*thegrpquestionno*fi); +} +if (!isQuizInitialized("*currQuiz")) { + *eqObjAlert*eqAppAlert(InitMsg("*bqlabelISO"),3); + event.rc = false;% +*ifx*eqAddAAKeystroke*@empty*else +*eqAddAAKeystroke*fi } -\def\RespBoxMathDefaults -{% - \BC{0 0 0}\S{S}\textColor{0 g}\F{\FPrint}\W{1} +\end{defineJS} +\def\RespBoxMathDefaults{% + \BC{0 0 0}\S{S}\textColor{0 g}\F{\FPrint}\W{1} } -\def\moreRespBoxMathDefaults -{% - \edef\@moreRespBoxMathDefaults{% - \if\eqQuizType\isQZ\ifx\eq@online\eq@YES - \ifeq@noquizsolutions - \else\noexpand\Ff{\FfReadOnly}\fi\fi\fi - }% +\def\moreRespBoxMathDefaults{% + \edef\@moreRespBoxMathDefaults{% + \if\eqQuizType\isQZ\ifx\eq@online\eq@YES + \ifeq@noquizsolutions + \else\noexpand\Ff{\FfReadOnly}\fi\fi\fi + }% } \let\eqAddAAFormat\@empty -\def\eqSP{\string\040} % dps17 +\def\eqSP{\string\040} \def\eqLBr{\string\173} \def\eqRBr{\string\175} +\begin{defineJS}[\makeesc\!\makecmt\%]{\rbmAAKey} +if(event.willCommit) { +!ifSubstVars% + var _substVars=!indepVars; + var _mathVars=processMathVars(_substVars); + var _substValue=getSubstValue(_substVars,event.value); + var _substAns=getSubstValue(_substVars,"!eqCorrectAns"); + var retn=!processJSfunc(!rbArgs,% +!compareJSfunc,_substValue);!else% + var _mathVars=!indepVars; + var retn=!processJSfunc(!rbArgs,!compareJSfunc);!fi% +!ifx!@sqTurnOffAlerts!eq@One + OnBlurRespBox(retn,"!curr@quiz");!fi% +!ifx!eqAddAAKeystroke!@empty!else +!eqAddAAKeystroke!fi +} +\end{defineJS} \def\@@RespBoxMathActions{% \AA{\if\eqQuizType\isQZ - \AAKeystroke{\AAKqRespBoxMath\eqAddAAKeystroke} - \AAFormat{\ifShowAppr\ifSubstVars\ifarrowDelim % dps17 + \AAKeystroke{\AAKqRespBoxMath} + \AAFormat{\ifShowAppr\ifSubstVars\ifarrowDelim try{event.value=RespBoxAppr(event);}catch(e){}\r \fi\fi\fi\eqAddAAFormat} \else - \AAKeystroke{if(event.willCommit) {\r\t -\ifSubstVars% - var\eqSP_substVars=\indepVars;\r\t - var\eqSP_mathVars=processMathVars(_substVars);\r\t - var\eqSP_substValue=getSubstValue(_substVars,event.value);\r\t - var\eqSP_substAns=getSubstValue(_substVars,"\eqCorrectAns");\r\t - var\eqSP retn=\processJSfunc(\rbArgs,% - \compareJSfunc,_substValue);\r\t -\else - var\eqSP_mathVars=\indepVars;\r\t - var\eqSP retn=\processJSfunc(\rbArgs,\compareJSfunc); -\fi -\if\@sqTurnOffAlerts1% - OnBlurRespBox(retn,"\curr@quiz"); -\fi - \eqAddAAKeystroke\r - }} - \AAFormat{\ifShowAppr\ifSubstVars\ifarrowDelim % dps17 + \AAKeystroke{\rbmAAKey} + \AAFormat{\ifShowAppr\ifSubstVars\ifarrowDelim try{event.value=RespBoxAppr(event);}catch(e){}\r\fi\fi\fi \eqAddAAFormat}% \AAOnFocus{\JS{var retn = null;}}% @@ -3679,7 +3669,7 @@ var\eqSP_substValue=getSubstValue(_substVars,event.value);\RorRT \def\eq@ZERO{0} \def\defaultRDPrecision#1{\def\eq@defaultRDPrecision{#1}} \defaultRDPrecision{1E-14} -\newif\ifarrowDelim\arrowDelimfalse % dps17 +\newif\ifarrowDelim\arrowDelimfalse \def\rpl@#1#2{\rpl@i#1->\@nil} \def\rpl@i#1->#2\@nil{\def\argii{#2}\ifx\argii\@empty\else \global\arrowDelimtrue\fi} @@ -3757,21 +3747,29 @@ var\eqSP_substValue=getSubstValue(_substVars,event.value);\RorRT } \endgroup \def\@eq@RespB@x#1(#2)[#3]#4#5#6{\xdef\@qzsolndest{#3}% dps17 - \gdef\indepVars{"#2"}\isFrstrpl#2\@nil\if\frstIsrpl\eq@YES - \def\@IVi{#2}\else\expandafter\def\expandafter - \@IVi\expandafter{#2}\fi\edef\@IVii{#2}\ifx\@IVi\@IVii - \global\SubstVarsfalse\else\global\SubstVarstrue - \isAltApprSpec{#2}\fi - \cntVars{#2}\def\eq@precision{#5}% - \ifx\eq@precision\eq@ZERO - \def\eq@defaultCompare{reldiffCompare}% - \def\rbArgstmp{\rbFlag,% dps17 - \ifSubstVars_substAns\else"#1"\fi,#4,% - \eq@defaultRDPrecision}\else - \def\eq@defaultCompare{diffCompare}% - \def\rbArgstmp{\rbFlag,% dps17 - \ifSubstVars_substAns\else"#1"\fi,#4,#5}\fi - \edef\eq@ixparam{#6}\expandafter\eq@chkivIntrvls\eq@ixparam\\% + \gdef\indepVars{"#2"}\isFrstrpl#2\@nil + \if\frstIsrpl\eq@YES + \def\@IVi{#2}\else\expandafter\def\expandafter + \@IVi\expandafter{#2}\fi + \edef\@IVii{#2}% + \ifx\@IVi\@IVii + \global\SubstVarsfalse + \else + \global\SubstVarstrue + \isAltApprSpec{#2}% + \fi + \cntVars{#2}\def\eq@precision{#5}% + \ifx\eq@precision\eq@ZERO + \def\eq@defaultCompare{reldiffCompare}% + \def\rbArgstmp{\rbFlag,% + \ifSubstVars_substAns\else"#1"\fi,#4,% + \eq@defaultRDPrecision}% + \else + \def\eq@defaultCompare{diffCompare}% + \def\rbArgstmp{\rbFlag,% + \ifSubstVars_substAns\else"#1"\fi,#4,#5}% + \fi + \edef\eq@ixparam{#6}\expandafter\eq@chkivIntrvls\eq@ixparam\\% } \def\viidna{[0,1]} \def\eq@chkivIntrvls{\@ifnextchar[{\eq@chkivIntrvlsi}% @@ -3810,9 +3808,8 @@ var\eqSP_substValue=getSubstValue(_substVars,event.value);\RorRT \let\@inmathwarn@SAVE\@inmathwarn\let\@inmathwarn\@gobble \pdfstringdef{\eqCorrectAns}{\eqCorrectAns}% \let\@inmathwarn\@inmathwarn@SAVE\fi -\ifx\grpquestions\eq@Zero - \eq@recordCorrAns{"\eqCorrectAns"}% 2018/03/18 -\fi + \ifx\grpquestions\eq@Zero + \eq@recordCorrAns{"\eqCorrectAns"}\fi \ifeq@proofing\makebox[0pt][l]{\space\math@correctAnswer}\fi \eq@TextField % send to the driver-dependent macro \egroup % hbox @@ -3826,62 +3823,62 @@ var\eqSP_substValue=getSubstValue(_substVars,event.value);\RorRT \newcommand\RespBoxTxtNT{\def\rbFlag{0}\@RespBoxTxt} \newcommand\RespBoxTxt{\def\rbFlag{0}\@RespBoxTxt} \def\RespBoxTxtOnBlur{OnBlurRespBox(% - \if\@sqTurnOffAlerts1retn\else null\fi,"\curr@quiz");} + \ifx\@sqTurnOffAlerts\eq@One + retn\else null\fi,"\curr@quiz");} +\def\eqObjAlertIfFalse{if (false) } \def\eqObjAlert{% \ifx\eqQuizType\isQZ\ifx\eq@online\eq@YES\ifeq@noquizsolutions - \else if (false) \fi\fi\fi} -\begin{defineJS}[% - \catcode`\@=0\relax\catcode`\%=14\relax]{\AAKqRespBoxTxt} + \else\eqObjAlertIfFalse\fi\fi\fi} +\def\eqAppAlert{eqAppAlert} +\begin{defineJS}[\makeesc\*\makecmt\%]{\AAKqRespBoxTxt} if(event.willCommit){ - RecordPointValue(@eqPTs,@thequestionno@ifx@grpquestions1,% -@thegrpquestionno,@grpPointValue,@grpTotalWeight,% -"@grpEvalFunction"@fi); - RecordProblemType("@eqQT",@thequestionno); - var retn = ProcRespTxt(@rbTxtAlt); - ProcUserResp(retn,event.value,@thequestionno,% -0@ifx@grpquestions1,@thegrpquestionno@fi); -} -if (!isQuizInitialized("@currQuiz")) { - @eqObjAlert@space eqAppAlert(InitMsg("@bqlabelISO"),3); + RecordPointValue(*eqPTs,*thequestionno*ifx*grpquestions*eq@One,% +*thegrpquestionno,*grpPointValue,*grpTotalWeight,% +"*grpEvalFunction"*fi); + RecordProblemType("*eqQT",*thequestionno); + var retn = ProcRespTxt(*rbTxtAlt); + ProcUserResp(retn,event.value,*thequestionno,0% +*ifx*grpquestions*eq@One,*thegrpquestionno*fi); +} +if (!isQuizInitialized("!currQuiz")) { + *eqObjAlert*eqAppAlert(InitMsg("*bqlabelISO"),3); event.rc = false; } \end{defineJS} -\def\RespBoxTxtDefaults -{% +\def\RespBoxTxtDefaults{% \BC{0 0 0}\W{1}\S{S}\textColor{0 g}\F{\FPrint}% } -\def\moreRespBoxTxtDefaults -{% +\def\moreRespBoxTxtDefaults{% \edef\@moreRespBoxTxtDefaults{% \if\eqQuizType\isQZ\ifx\eq@online\eq@YES \ifeq@noquizsolutions\else \noexpand\Ff{\FfReadOnly}\fi\fi\fi }% } -\def\@@RespBoxTxtActions -{% +\begin{defineJS}[\makeesc\!\makecmt\%]{\rbtAAKey} +if(event.willCommit) { + var retn = ProcRespTxt(!rbTxtAlt);% +!ifx!@sqTurnOffAlerts!eq@One + !RespBoxTxtOnBlur!fi% +!ifx!eqAddAAKeystroke!@empty!else +!eqAddAAKeystroke!fi +} +\end{defineJS} +\def\@@RespBoxTxtActions{% \AA{\if\eqQuizType\isQZ \AAKeystroke{\AAKqRespBoxTxt\eqAddAAKeystroke} \AAFormat{\eqAddAAFormat} \else - \AAKeystroke{% - if(event.willCommit) {\r\t - retn = ProcRespTxt(\rbTxtAlt);\r - \if\@sqTurnOffAlerts1 - \t\RespBoxTxtOnBlur\r\fi - \eqAddAAKeystroke\r - }% - } + \AAKeystroke{\rbtAAKey} \AAFormat{\eqAddAAFormat} - \AAOnFocus{\JS{var retn = null;}} - \if\@sqTurnOffAlerts0% + \AAOnFocus{\JS{var\eqSP retn=null;}} + \ifx\@sqTurnOffAlerts\eq@Zero \AAOnBlur{\JS{\RespBoxTxtOnBlur}}\fi \fi } } \def\annot@subtype@rbt{rbt} -\newcommand\@RespBoxTxt[1][] -{% +\newcommand\@RespBoxTxt[1][]{% \edef\annot@subtype{\annot@subtype@rbt}% \eq@AddProbToQzQuesList \ifx\grpquestions\eq@Zero\addtocounter{eqpointvalue}{\eqPTs}\fi @@ -3922,7 +3919,7 @@ if (!isQuizInitialized("@currQuiz")) { \def\eq@argi{-1}\fi\fi\fi \def\eq@argii{#2}\ifx\eq@argii\eq@ONE\else\def\eq@argii{0}\fi \begingroup - \ifnum\eq@argii=1\relax + \ifnum\eq@argii=\@ne \def\rexpStr##1{\eqbs\eqbs\eqbs\eqbs##1}% \def\\##1{\eqbs\eqbs\eqbs\eqbs##1}% \def\word##1{\\b##1\\b}\def\any{@any@}\fi @@ -3935,309 +3932,314 @@ if (!isQuizInitialized("@currQuiz")) { #4\space instead}{Enter a positive integer.}\fi } \def\@argRead#1{\xdef\jsTempArgs{\txtAltList}% - \ifx\txtAltList\@empty\xdef\txtAltList{"#1"}\else - \xdef\txtAltList{\jsTempArgs,"#1"}\fi\@@argRead} + \ifx\txtAltList\@empty\xdef\txtAltList{"#1"}\else + \xdef\txtAltList{\jsTempArgs,"#1"}\fi\@@argRead} \def\@@argRead{\advance\eqtmpcnta\m@ne - \ifnum\eqtmpcnta=\z@ - \def\eq@next{\endgroup - \xdef\rbTxtAlt{\rbTxtAlt,\txtAltList}% - \if\grpquestions\eq@Zero - \ifwithinMCFI - \xdef\s@veCorrAnsMCFI{[\txtAltList]}\else - \eq@recordCorrAns{[\txtAltList]}\fi - \else - \eq@recordGrpAnsArray{[\txtAltList]}% - \fi - \eq@@RespBoxTxt - }% - \else - \def\eq@next{\@argRead}% - \fi\eq@next + \ifnum\eqtmpcnta=\z@ + \def\eq@next{\endgroup + \xdef\rbTxtAlt{\rbTxtAlt,\txtAltList}% + \if\grpquestions\eq@Zero + \ifwithinMCFI + \xdef\s@veCorrAnsMCFI{[\txtAltList]}\else + \eq@recordCorrAns{[\txtAltList]}\fi + \else + \eq@recordGrpAnsArray{[\txtAltList]}% + \fi + \eq@@RespBoxTxt + }% + \else + \def\eq@next{\@argRead}% + \fi\eq@next } \def\eq@@RespBoxTxt{% - \ifeq@proofing\makebox[0pt][l]{\space\txt@correctAnswer}\fi - \eq@TextField - \egroup + \ifeq@proofing\makebox[0pt][l]{\space\txt@correctAnswer}\fi + \eq@TextField + \egroup } \def\gobbleTxt#1>#2,#3,#4,{} \gdef\txt@correctAnswer{\ttfamily\color{\@proofingsymbolColor}% - \spaceskip=2pt\xspaceskip=2pt - \expandafter\gobbleTxt\meaning\rbTxtAlt + \spaceskip=2pt\xspaceskip=2pt + \expandafter\gobbleTxt\meaning\rbTxtAlt } -\begin{defineJS}[% - \catcode`\@=0\relax\catcode`\%=14\relax]{\AAKqRespBoxTxtPC} +\begin{defineJS}[\makeesc\*\makecmt\%]{\AAKqRespBoxTxtPC} if(event.willCommit){ - RecordPointValue(@eqPTs,@thequestionno@ifx@grpquestions1,% -@thegrpquestionno,@grpPointValue,@grpTotalWeight,% -"@grpEvalFunction"@fi); - RecordProblemType("@eqQT",@thequestionno); - var retn = ProcRespTxtPC(@rbTxtAlt); -@ifx@grpquestions1% -ProbValue[@thequestionno][3+@thegrpquestionno]% -=ProcRespTxtPC.txtPCpCr;@else% -ProbValue[@thequestionno]=ProcRespTxtPC.txtPCpCr;@fi - ProcUserResp(retn,event.value,@thequestionno,0% -@ifx@grpquestions1,@thegrpquestionno@fi); -} -if (!isQuizInitialized("@currQuiz")) { - @eqObjAlert@space eqAppAlert(InitMsg("@bqlabelISO"),3); - event.rc = false; + RecordPointValue(*eqPTs,*thequestionno*ifx*grpquestions*eq@One,% +*thegrpquestionno,*grpPointValue,*grpTotalWeight,% +"*grpEvalFunction"*fi); + RecordProblemType("*eqQT",*thequestionno); + var retn = ProcRespTxtPC(*rbTxtAlt); +*ifx*grpquestions*eq@One% + ProbValue[*thequestionno][3+*thegrpquestionno]% +=ProcRespTxtPC.txtPCpCr;*else% + ProbValue[*thequestionno]=ProcRespTxtPC.txtPCpCr;*fi + ProcUserResp(retn,event.value,*thequestionno,0% +*ifx*grpquestions*eq@One,*thegrpquestionno*fi); +} +if (!isQuizInitialized("*currQuiz")) { + *eqObjAlert*eqAppAlert(InitMsg("*bqlabelISO"),3); + event.rc = false; } \end{defineJS} -\def\@@RespBoxTxtPCActions -{% - \AA{\if\eqQuizType\isQZ - \AAKeystroke{\AAKqRespBoxTxtPC} - \else - \AAKeystroke{% - if(event.willCommit) {\r\t - retn = ProcRespTxtPC(\rbTxtAlt);\r -\if\@sqTurnOffAlerts1% - \t\RespBoxTxtOnBlur\r -\fi - }% - } - \AAOnFocus{\JS{var retn = null;}} -\if\@sqTurnOffAlerts0% - \AAOnBlur{\JS{\RespBoxTxtOnBlur}}% -\fi - \fi - } +\begin{defineJS}[\makeesc\!\makecmt\%]{\rbtPCAAKey} +if(event.willCommit) { + retn = ProcRespTxtPC(!rbTxtAlt);% +!ifx!@sqTurnOffAlerts!eq@One + !RespBoxTxtOnBlur!fi% +} +\end{defineJS} +\def\@@RespBoxTxtPCActions{% + \AA{% + \if\eqQuizType\isQZ + \AAKeystroke{\AAKqRespBoxTxtPC} + \else + \AAKeystroke{\rbtPCAAKey} + \AAOnFocus{\JS{var\eqSP retn=null;}} + \ifx\@sqTurnOffAlerts\eq@Zero + \AAOnBlur{\JS{\RespBoxTxtOnBlur}}\fi + \fi + } } \newcommand{\RespBoxTxtPC}{\def\rbFlag{0}\@RespBoxTxtPC} \def\annot@subtype@rbtpc{rbtpc} -\newcommand\@RespBoxTxtPC[1][] -{% - \edef\annot@subtype{\annot@subtype@rbtpc}% - \eq@AddProbToQzQuesList - \smallskip\ifx\grpquestions\eq@Zero - \addtocounter{eqpointvalue}{\eqPTs}\fi - \if\eqQuizType\isQZ\def\rbFlag{1}\global\IsRespBoxtrue - \ifx\grpquestions\eq@One - \stepcounter{grpquestionno}% - \def\Fld@name{% - grpobj.\curr@quiz.\thequestionno.\thegrpquestionno}% - \else - \eq@recordThesePTs\eq@recordProbType - \edef\eqtmp{\aPointType}% - \xdef\aPointType{\eqtmp,[\eqPTs,"text"]}% - \stepcounter{questionno}% - \def\Fld@name{obj.\curr@quiz.\thequestionno}% - \fi +\newcommand\@RespBoxTxtPC[1][]{% + \edef\annot@subtype{\annot@subtype@rbtpc}% + \eq@AddProbToQzQuesList + \smallskip\ifx\grpquestions\eq@Zero + \addtocounter{eqpointvalue}{\eqPTs}\fi + \if\eqQuizType\isQZ\def\rbFlag{1}\global\IsRespBoxtrue + \ifx\grpquestions\eq@One + \stepcounter{grpquestionno}% + \def\Fld@name{% + grpobj.\curr@quiz.\thequestionno.\thegrpquestionno}% \else - \stepcounter{questionno}% - \def\Fld@name{obj.\oField.\thequestionno}% + \eq@recordThesePTs\eq@recordProbType + \edef\eqtmp{\aPointType}% + \xdef\aPointType{\eqtmp,[\eqPTs,"text"]}% + \stepcounter{questionno}% + \def\Fld@name{obj.\curr@quiz.\thequestionno}% \fi - \moreRespBoxTxtDefaults - \leavevmode\hbox\bgroup\text@@Field{#1}{\Fld@name}% - {\RBW}{\DefaultHeightOfWidget}% - {\eq@protect\AA}{\eq@setWidgetProps\@@RespBoxTxtPC}% - {\RespBoxTxtDefaults\@moreRespBoxTxtDefaults - \@@RespBoxTxtPCActions\every@eqTextField\every@RespBoxTxt}% + \else + \stepcounter{questionno}% + \def\Fld@name{obj.\oField.\thequestionno}% + \fi + \moreRespBoxTxtDefaults + \leavevmode\hbox\bgroup\text@@Field{#1}{\Fld@name}% + {\RBW}{\DefaultHeightOfWidget}% + {\eq@protect\AA}{\eq@setWidgetProps\@@RespBoxTxtPC}% + {\RespBoxTxtDefaults\@moreRespBoxTxtDefaults + \@@RespBoxTxtPCActions\every@eqTextField\every@RespBoxTxt}% } \def\@@RespBoxTxtPC#1{\@ifnextchar[{\@@@RespBoxTxtPC{#1}} - {\@ifstar{\@@@RespBoxTxtPC{#1}[\curr@quiz.\thequestionno]}% - {\@@@RespBoxTxtPC{#1}[]}}} + {\@ifstar{\@@@RespBoxTxtPC{#1}[\curr@quiz.\thequestionno]}% + {\@@@RespBoxTxtPC{#1}[]}}} \def\@@@RespBoxTxtPC#1[#2]#3{\xdef\@qzsolndest{#2}% \begingroup - \def\rexpStr##1{\eqbs\eqbs\eqbs\eqbs##1}% - \def\\##1{\eqbs\eqbs\eqbs\eqbs##1}% - \def\word##1{\\b##1\\b}\def\any{@any@} - \gdef\rbTxtAlt{\rbFlag,#1,1}% force sub-string match - \global\let\txtAltList\@empty - \eqtmpcnta=#3\relax\ifnum\eqtmpcnta>\z@\expandafter\@argReadPC\else - \PackageError{exerquiz}{% - The third required parameter of - \string\RespBoxTxtPC\MessageBreak - is required to be a positive integer. - You entered\MessageBreak #3\space instead} - {Enter a positive integer.}\fi + \def\rexpStr##1{\eqbs\eqbs\eqbs\eqbs##1}% + \def\\##1{\eqbs\eqbs\eqbs\eqbs##1}% + \def\word##1{\\b##1\\b}\def\any{@any@} + \gdef\rbTxtAlt{\rbFlag,#1,1}% force sub-string match + \global\let\txtAltList\@empty + \eqtmpcnta=#3\relax\ifnum\eqtmpcnta>\z@\expandafter\@argReadPC\else + \PackageError{exerquiz}{% + The third required parameter of + \string\RespBoxTxtPC\MessageBreak + is required to be a positive integer. + You entered\MessageBreak #3\space instead} + {Enter a positive integer.}\fi } \newcommand\@argReadPC[2][0]{\xdef\jsTempArgs{\txtAltList}% - \ifx\txtAltList\@empty\xdef\txtAltList{["#2",#1]}\else - \xdef\txtAltList{\jsTempArgs,["#2",#1]}\fi\@@argReadPC} + \ifx\txtAltList\@empty\xdef\txtAltList{["#2",#1]}\else + \xdef\txtAltList{\jsTempArgs,["#2",#1]}\fi\@@argReadPC} \def\@@argReadPC{\advance\eqtmpcnta\m@ne - \ifnum\eqtmpcnta=\z@ - \def\eq@next{\endgroup - \xdef\rbTxtAlt{\rbTxtAlt,\txtAltList}% - \if\grpquestions\eq@Zero - \ifwithinMCFI - \xdef\s@veCorrAnsFCFI{[\txtAltList]}\else - \eq@recordCorrAns{[\txtAltList]}\fi - \else - \eq@recordGrpAnsArray{[\txtAltList]}% - \fi - \eq@@RespBoxTxtPC - }% - \else - \def\eq@next{\@argReadPC}% - \fi\eq@next -} -\def\eq@@RespBoxTxtPC{% - \ifeq@proofing\makebox[0pt][l]{\space\txt@correctAnswer}\fi - \eq@TextField - \egroup -} + \ifnum\eqtmpcnta=\z@ + \def\eq@next{\endgroup + \xdef\rbTxtAlt{\rbTxtAlt,\txtAltList}% + \if\grpquestions\eq@Zero + \ifwithinMCFI + \xdef\s@veCorrAnsFCFI{[\txtAltList]}\else + \eq@recordCorrAns{[\txtAltList]}\fi + \else + \eq@recordGrpAnsArray{[\txtAltList]}% + \fi + \eq@@RespBoxTxtPC + }% + \else + \def\eq@next{\@argReadPC}% + \fi\eq@next +} +\def\eq@@RespBoxTxtPC{\ifeq@proofing + \makebox[0pt][l]{\space\txt@correctAnswer}\fi + \eq@TextField + \egroup +} +\def\afterSplChkActn#1{\def\@fterSplChkActn{\r #1}} +\let\@fterSplChkActn\@empty +\newcommand{\splChkCA}{Check} +\newcommand{\splChkTU}{Check spelling} +\newcommand\SpellCheck[1][]{% + \pushButton[\CA{\splChkCA}\TU{\splChkTU}\S{S} + #1\A{\JS{% + \ifx\grpquestions\eq@One + var targetFldName=% + "grpobj.\curr@quiz.\thequestionno.\thegrpquestionno"; + \else + \ifx\annot@subtype\annot@subtype@rbe + var targetFldName="essay.\curr@quiz.\thequestionno"; + \else + var targetFldName="obj.\curr@quiz.\thequestionno"; + \fi + \fi\r + var splErrors=checkTheSpelling(targetFldName);\@fterSplChkActn + }}]{spl.\curr@quiz.\thequestionno}{}{11bp}} \def\RespBoxEssayDefaults {% \BC{0 0 0}\W{1}\S{S}\Ff{\FfMultiline}\rawPDF{}% } -\def\@@RespBoxEssayActions -{% - \AA{\if\eqQuizType\isQZ - \AAKeystroke{% - if(event.willCommit){\jsR\jsT - RecordPointValue(\eqPTs,\thequestionno);\jsR\jsT - RecordProblemType("\eqQT",\thequestionno);\jsR %\jsT - }\jsR - if (!isQuizInitialized("\curr@quiz")) {\jsR\jsT - \eqObjAlert\space eqAppAlert(% - InitMsg("\bqlabelISO"),3);\jsR\jsT - event.rc = false;\jsR - }% - }% - \fi - } +\def\@@RespBoxEssayActions{\AA{% + \if\eqQuizType\isQZ + \AAKeystroke{% + if(event.willCommit){\jsR\jsT + RecordPointValue(\eqPTs,\thequestionno);\jsR\jsT + RecordProblemType("\eqQT",\thequestionno);\jsR %\jsT + }\jsR + if (!isQuizInitialized("\curr@quiz")) {\jsR\jsT + \eqObjAlert\space eqAppAlert(% + InitMsg("\bqlabelISO"),3);\jsR\jsT + event.rc = false;\jsR + }% + }% + \fi}% } -\newcommand\RespBoxEssay[1][]{\def\rbe@rgi{#1}\RespBoxEssay@i} +\def\annot@subtype@rbe{rbe} +\newcommand\RespBoxEssay[1][]{\edef\annot@subtype{\annot@subtype@rbe}% + \def\rbe@rgi{#1}\RespBoxEssay@i} \def\RespBoxEssay@i{\@ifnextchar[%] {\RespBoxEssay@ii} {\@ifstar{\RespBoxEssay@ii[\curr@quiz.\thequestionno]}}% {\RespBoxEssay@ii[]}% } -\newcommand\RespBoxEssay@ii[3][] -{% - \smallskip\addtocounter{eqpointvalue}{\eqPTs}% - \eq@AddProbToQzQuesList - \stepcounter{questionno}% - \xdef\@qzsolndest{#1}% - \edef\eqtmp{\aPointType}\xdef\aPointType{\eqtmp,[\eqPTs,"essay"]}% - \expandafter\mbox\expandafter{\expandafter\text@@Field - \expandafter{\rbe@rgi}{essay.\curr@quiz.\thequestionno}{#2}{#3}% - {\eq@protect\AA}{\eq@setWidgetProps - \eq@TextField}{\RespBoxEssayDefaults\@@RespBoxEssayActions - \every@eqTextField}}% +\newcommand\RespBoxEssay@ii[3][]{% + \smallskip\addtocounter{eqpointvalue}{\eqPTs}% + \eq@AddProbToQzQuesList + \stepcounter{questionno}% + \xdef\@qzsolndest{#1}% + \edef\eqtmp{\aPointType}\xdef\aPointType{\eqtmp,[\eqPTs,"essay"]}% + \expandafter\mbox\expandafter{\expandafter\text@@Field + \expandafter{\rbe@rgi}{essay.\curr@quiz.\thequestionno}{#2}{#3}% + {\eq@protect\AA}{\eq@setWidgetProps + \eq@TextField}{\RespBoxEssayDefaults\@@RespBoxEssayActions + \every@eqTextField}}% } \let\@@sqTallyBoxActions\@empty \@ifundefined{calcOrder}{% \ifpdf\def\@@sqTallyBoxActions{% \AA{\AAValidate{getTotalTally("\oField");}}}\fi}{} -\def\sqTallyBoxDefaults -{% +\def\sqTallyBoxDefaults{% \BC{0 0 0}\W{1}\textColor{1 0 0 rg}\S{I}\Q{2}\Ff{\FfReadOnly} } \ifpdf\def\@@sqTallyBoxActions{% - \AA{\AAValidate{getTotalTally("\oField");}}}\else - \let\@@sqTallyBoxActions\@empty + \AA{\AAValidate{getTotalTally("\oField");}}}\else + \let\@@sqTallyBoxActions\@empty \fi -\newcommand\sqTallyBox[1][] -{% - \mbox{\text@@Field{#1}{tally.\oField.\thequestionno}% - {\TBW}{\DefaultHeightOfWidget}% - {}{\eq@setWidgetProps\eq@TextField}% - {\sqTallyBoxDefaults\@@sqTallyBoxActions\every@eqTextField - \every@sqTallyBox}}% -} -\def\sqTallyTotalDefaults -{% - \rawPDF{}\W{1}\BC{0 0 0}\S{I}\textColor{1 0 0 rg}% - \Q{2}\Ff{\FfReadOnly}% -} -\def\@@sqTallyTotalActions -{% - \AA{% - \AAKeystroke{AFNumber_Keystroke(0,0,0,0,"",true);} - \AAFormat{AFNumber_Format(0,0,0,0,"",true);} - \AACalculate{% - AFSimple_Calculate("SUM",new Array("tally.\oField")); - }} -} -\newcommand\sqTallyTotal[1][] -{% - \mbox{\text@@Field{#1}{tallytotal.\oField}{\TBW}% - {\DefaultHeightOfWidget}{\eq@protect\AA}% - {\eq@setWidgetProps\eq@TextField}% - {\sqTallyTotalDefaults\@@sqTallyTotalActions\every@eqTextField - \every@sqTallyTotal}}% -} -\def\CorrAnsButtonDefaults -{% - \CA{\eq@local@CorrAnsButton}\W{1}\S{S} - \BC{0 0 0}\BG{.7529 .7529 .7529}\H{P} +\newcommand\sqTallyBox[1][]{% + \mbox{\text@@Field{#1}{tally.\oField.\thequestionno}% + {\TBW}{\DefaultHeightOfWidget}% + {}{\eq@setWidgetProps\eq@TextField}% + {\sqTallyBoxDefaults\@@sqTallyBoxActions\every@eqTextField + \every@sqTallyBox}}% +} +\def\sqTallyTotalDefaults{% + \rawPDF{}\W{1}\BC{0 0 0}\S{I}\textColor{1 0 0 rg}% + \Q{2}\Ff{\FfReadOnly}% +} +\def\@@sqTallyTotalActions{% + \AA{% + \AAKeystroke{AFNumber_Keystroke(0,0,0,0,"",true);} + \AAFormat{AFNumber_Format(0,0,0,0,"",true);} + \AACalculate{% + AFSimple_Calculate("SUM",new Array("tally.\oField")); + }}% +} +\newcommand\sqTallyTotal[1][]{% + \mbox{\text@@Field{#1}{tallytotal.\oField}{\TBW}% + {\DefaultHeightOfWidget}{\eq@protect\AA}% + {\eq@setWidgetProps\eq@TextField}% + {\sqTallyTotalDefaults\@@sqTallyTotalActions\every@eqTextField + \every@sqTallyTotal}}% +} +\def\CorrAnsButtonDefaults{% + \CA{\eq@local@CorrAnsButton}\W{1}\S{S} + \BC{0 0 0}\BG{.7529 .7529 .7529}\H{P} } \def\normalCABtnBC{0 0 0} \def\qCorrAnsButtonActionHook{\JS{% \ifx\@qzsolndest\@empty\else - if (event.shift)\jsR\jsT + if(event.shift)\jsR\jsT this.gotoNamedDest("\@qzsolndest");\jsR else {\jsR\jsT\fi -\ifShowAppr % dps17 +\ifShowAppr \ifarrowDelim - if (typeof event.target.appr=="undefined")\r\JST\t + if(typeof event.target.appr=="undefined")\r\JST\t event.target.appr=false;\r\JST event.target.appr=!event.target.appr;\r\JST - if (event.target.appr) {\r\t\JST - var _substVars=\indepVars;\r\t\JST - var _substAns=getSubstValue(_substVars,"\CorrectAns");\r\t\JST - var value=RespBoxAppr("\CorrectAns");\r\JST - } else value="\CorrectAns";\r\JST + if(event.target.appr) {\r\t\JST + var\eqSP_substVars=\indepVars;\r\t\JST + var\eqSP_substAns=getSubstValue(_substVars,"\CorrectAns");\r\t\JST + var\eqSP value=RespBoxAppr("\CorrectAns");\r\JST + } else\eqSP var\eqSP value="\CorrectAns";\r\JST \else - value="\CorrectAns";\r\JST + var\eqSP value="\CorrectAns";\r\JST \fi \else - value="\CorrectAns";\r\JST + var\eqSP value="\CorrectAns";\r\JST \fi \processJSfunc("Ans.\curr@quiz",value,\currQuiz);\r -\ifx\@qzsolndest\@empty\else % dps17 +\ifx\@qzsolndest\@empty\else }\fi }} - \def\sqCorrAnsButtonActionHook - {% - \JS{% - \ifx\@qzsolndest\@empty\else - if (event.shift)\jsR\jsT - this.gotoNamedDest("\@qzsolndest");\jsR - else\jsR\jsT - \fi - \processJSfunc("obj.\oField.\thequestionno","\CorrectAns",% -\currQuiz); - }% - } +\begin{defineJS}[\makeesc\!\makecmt\%]{\sqCorrAnsCode} +!ifx!@qzsolndest!@empty% +!processJSfunc("obj.!oField.!thequestionno","!CorrectAns",% +!currQuiz);!else% +if (event.shift) this.gotoNamedDest("!@qzsolndest"); +else !processJSfunc("obj.!oField.!thequestionno","!CorrectAns",% +!currQuiz);!fi +\end{defineJS} +\def\sqCorrAnsButtonActionHook{\JS{\sqCorrAnsCode}} \newcommand\CorrAnsButton[1][]{\eq@@CorrAnsButton{#1}} \def\eq@@CorrAnsButton#1#2{\bgroup\makeJSspecials % 1/12 - \@ifstar{\eq@@@CorrAnsButton{#1}{#2}}{% - \eq@@@CorrAnsButton{#1}{#2}{DisplayAnswer}}% -} + \@ifstar{\eq@@@CorrAnsButton{#1}{#2}}{% + \eq@@@CorrAnsButton{#1}{#2}{DisplayAnswer}}} \def\eq@@@CorrAnsButton#1#2#3{\gdef\CorrectAns{#2}% - \def\processJSfunc{#3}\ifx\@qzsolndest\@empty\let\JST\@empty\else - \let\JST\jsT\fi % dps17 - \ifx\eq@ProcRespIntervals\g@processJSfunc % 01/11 - \let\@inmathwarn@SAVE\@inmathwarn\let\@inmathwarn\@gobble - \pdfstringdef{\CorrectAns}{\CorrectAns}% - \let\@inmathwarn\@inmathwarn@SAVE\fi + \def\processJSfunc{#3}\ifx\@qzsolndest\@empty\let\JST\@empty\else + \let\JST\jsT\fi % dps17 + \ifx\eq@ProcRespIntervals\g@processJSfunc % 01/11 + \let\@inmathwarn@SAVE\@inmathwarn\let\@inmathwarn\@gobble + \pdfstringdef{\CorrectAns}{\CorrectAns}% + \let\@inmathwarn\@inmathwarn@SAVE\fi \if\eqQuizType\isQZ\def\Fld@name{corr.\curr@quiz.\thequestionno}% \else\def\Fld@name{corr.\oField.\thequestionno}\fi \if\eqQuizType\isQZ - \edef\@@CorrAnsButtonActions{\noexpand\F{\FHidden}% - \ifx\@qzsolndest\@empty%\noexpand\BC{\normalCABtnBC}% - \else\noexpand\BC{\solution@Color}\fi - \noexpand\A{\noexpand\qCorrAnsButtonActionHook}}% - \ifeq@noquizsolutions\else % dps17 (\let\rpl\eq@rpl) - \mbox{\let\rpl\eq@rpl - \push@@Button{#1}{\Fld@name}{}{\DefaultHeightOfWidget}% - {\eq@protect\A}{\eq@setButtonProps\eq@Button@driver}% - {\CorrAnsButtonDefaults\@@CorrAnsButtonActions - \every@ButtonField\every@CorrAnsButton}}% - \fi + \edef\@@CorrAnsButtonActions{\noexpand\F{\FHidden}% + \ifx\@qzsolndest\@empty%\noexpand\BC{\normalCABtnBC}% + \else\noexpand\BC{\solution@Color}\fi + \noexpand\A{\noexpand\qCorrAnsButtonActionHook}}% + \ifeq@noquizsolutions\else % dps17 (\let\rpl\eq@rpl) + \mbox{\let\rpl\eq@rpl + \push@@Button{#1}{\Fld@name}{}{\DefaultHeightOfWidget}% + {\eq@protect\A}{\eq@setButtonProps\eq@Button@driver}% + {\CorrAnsButtonDefaults\@@CorrAnsButtonActions + \every@ButtonField\every@CorrAnsButton}}% + \fi \else \edef\@@CorrAnsButtonActions{% \ifx\@qzsolndest\@empty%\noexpand\BC{\normalCABtnBC} \else\noexpand\BC{\solution@Color}\fi \noexpand\A{\noexpand\sqCorrAnsButtonActionHook}}% \mbox{\push@@Button{#1}{\Fld@name}{}{\DefaultHeightOfWidget}% - {\eq@protect\A}{\eq@setButtonProps\eq@Button@driver}% - {\CorrAnsButtonDefaults\@@CorrAnsButtonActions - \every@ButtonField\every@CorrAnsButton}}% + {\eq@protect\A}{\eq@setButtonProps\eq@Button@driver}% + {\CorrAnsButtonDefaults\@@CorrAnsButtonActions + \every@ButtonField\every@CorrAnsButton}}% \fi \egroup } @@ -4246,235 +4248,206 @@ if (!isQuizInitialized("@currQuiz")) { \CA{\eq@local@sqClearButton}\textColor{0 g}\F{\FPrint} \BC{0 0 0}\BG{.7529 .7529 .7529}\W{1}\S{B}\Ff{\FfNoExport} } -\def\@@sqClearButtonActions -{% - \A{\JS{ProcessIt = false;\jsR - if ( typeof \oField\space== "undefined" )\jsR\jsT - \oField\space= new Object;\jsR - if (typeof appAlerts["\oField"] == "undefined")\jsR\jsT - appAlerts["\oField"] = new Object;\jsR - this.resetForm(new Array("mc.\oField","obj.\oField",% - "tally.\oField","grpobj.\oField"));\jsR - var f = this.getField("obj.\oField");\jsR - if ( f != null ) f.strokeColor=\ifx\defaultColorJSLoc\@empty -\defaultColorJS\else\defaultColorJSLoc\fi;\jsR - f = this.getField("grpobj.\oField");\jsR - if ( f != null ) f.strokeColor=\ifx\defaultColorJSLoc\@empty -\defaultColorJS\else\defaultColorJSLoc\fi;\jsR - f = this.getField("rbmarkup.\oField");\jsR - if ( f != null ) f.display=display.hidden;\jsR - \oField.Grp = {};\jsR - appAlerts["\oField"].bAfterValue=false;\jsR - ProcessIt=true;}% - } -} -\newcommand\sqClearButton[1][] -{% - \mbox{\push@@Button{#1}{clear.\oField}{}{\DefaultHeightOfWidget}% - {\eq@protect\A}{\eq@setButtonProps\eq@Button@driver}% - {\sqClearButtonDefaults\@@sqClearButtonActions\every@ButtonField - \every@sqClearButton}}% +\begin{defineJS}[\makeesc\*\makecmt\%]{\@@sqClearButtonJSCode} +ProcessIt = false; +if ( typeof *oField == "undefined" ) + *oField = new Object; +if (typeof appAlerts["*oField"] == "undefined") + appAlerts["*oField"] = new Object; +this.resetForm(new Array("mc.*oField","obj.*oField",% +"tally.*oField","grpobj.*oField")); +var f = this.getField("obj.*oField"); +if ( f != null ) f.strokeColor=*ifx*defaultColorJSLoc*@empty% +*defaultColorJS*else*defaultColorJSLoc*fi; +f = this.getField("grpobj.*oField"); +if ( f != null ) f.strokeColor=*ifx*defaultColorJSLoc*@empty% +*defaultColorJS*else*defaultColorJSLoc*fi; +f = this.getField("rbmarkup.*oField"); +if ( f != null ) f.display=display.hidden; +*oField.Grp = {}; +appAlerts["*oField"].bAfterValue=false; +ProcessIt=true; +\end{defineJS} +\def\@@sqClearButtonActions{\A{\JS{\@@sqClearButtonJSCode}}} +\newcommand\sqClearButton[1][]{% + \mbox{\push@@Button{#1}{clear.\oField}{}{\DefaultHeightOfWidget}% + {\eq@protect\A}{\eq@setButtonProps\eq@Button@driver}% + {\sqClearButtonDefaults\@@sqClearButtonActions\every@ButtonField + \every@sqClearButton}}% } -\def\PromptButtonDefaults -{% - \CA{\eq@local@CorrAnsButton}\W{1}\S{S}\BC{0 0 0} - \BG{.7529 .7529 .7529}\H{P} +\def\PromptButtonDefaults{% + \CA{\eq@local@CorrAnsButton}\W{1}\S{S}\BC{0 0 0} + \BG{.7529 .7529 .7529}\H{P} } \newcommand{\promptButtonMsg}{% - "Would you like to see the correct answer at this time? "\r\t\t - + "Your current answer will be the one that will be scored. "\r\t\t - + "If you click on \\"Yes\\", - you will not be able to change your answer." + "Would you like to see the correct answer at this time? "\r\t\t + + "Your current answer will be the one that will be scored. "\r\t\t + + "If you click on \\"Yes\\", + you will not be able to change your answer." } \newcommand{\AnsPromptBtnStr}{Answer:\space} -\def\PromptButtonActionHook -{% - \JS{% - if (!isQuizInitialized("\currQuiz")) {\r\t - eqAppAlert(InitMsg("\bqlabelISO"),3);\r\t - event.rc=false;\r - } else {\r\t - if ( !\currQuiz.oAlertCheck.bAfterValue ) {\r\t - var resp=eqAppAlert({\r\t\t - cMsg:\promptButtonMsg,\r\t\t - nIcon: 2, nType: 2,\r\t\t - cTitle: ("AcroTeX Prompt Message"),\r\t\t - oCheckbox: \currQuiz.oAlertCheck\r\t - });\r\t - }\r - if ( promptQuiz.oAlertCheck.bAfterValue || resp==4 )\r\t - {\r\t\t - var field=this.getField(% - "obj.\currQuiz.\thequestionno");\r\t\t - field.readonly=true;\r\t\t - field=this.getField("Ans.\currQuiz");\r\t\t - if (field!=null) - field.value = "\AnsPromptBtnStr\PromptAns";\r\t - }\r - } - }% +\begin{defineJS}[\makeesc\*\makecmt\%]{\PromptButtonActionCode} +if (!isQuizInitialized("*currQuiz")) { + eqAppAlert(InitMsg("*bqlabelISO"),3); + event.rc=false; +} else { + if ( !*currQuiz.oAlertCheck.bAfterValue ) { + var resp=eqAppAlert({ + cMsg:*promptButtonMsg, + nIcon: 2, nType: 2, + cTitle: ("AcroTeX Prompt Message"), + oCheckbox: *currQuiz.oAlertCheck + }); + } + if ( promptQuiz.oAlertCheck.bAfterValue || resp==4 ) { + var field=this.getField("obj.*currQuiz.*thequestionno"); + field.readonly=true; + field=this.getField("Ans.*currQuiz"); + if (field!=null) field.value = ("*AnsPromptBtnStr*PromptAns"); + } } -\newcommand\@PromptButton[2][] -{% - \def\PromptAns{#2}\if\eqQuizType\isQZ - \def\Fld@name{promptButton.\curr@quiz.\thequestionno}% - \else\def\Fld@name{promptButton.\oField.\thequestionno}\fi - \if\eqQuizType\isQZ - \def\@@PromptButtonActions{% - \A{\PromptButtonActionHook}}% - \mbox{\push@@Button{#1}{\Fld@name}{}% - {\DefaultHeightOfWidget}{\eq@protect\A}% - {\eq@setButtonProps\eq@Button@driver}% - {\PromptButtonDefaults\@@PromptButtonActions - \every@ButtonField\every@CorrAnsButton}}% - \else\PackageWarning{exerquiz}{The \string\PromptButton - is for quiz questions only.} - \fi +\end{defineJS} +\def\PromptButtonActionHook{\JS{\PromptButtonActionCode}} +\newcommand\@PromptButton[2][]{% + \def\PromptAns{#2}\if\eqQuizType\isQZ + \def\Fld@name{promptButton.\curr@quiz.\thequestionno}% + \else\def\Fld@name{promptButton.\oField.\thequestionno}\fi + \if\eqQuizType\isQZ + \def\@@PromptButtonActions{% + \A{\PromptButtonActionHook}}% + \mbox{\push@@Button{#1}{\Fld@name}{}% + {\DefaultHeightOfWidget}{\eq@protect\A}% + {\eq@setButtonProps\eq@Button@driver}% + {\PromptButtonDefaults\@@PromptButtonActions + \every@ButtonField\every@CorrAnsButton}}% + \else\PackageWarning{exerquiz}{The \string\PromptButton + is for quiz questions only.} + \fi } \newcommand{\PromptButton}{\makebox[0pt][r] % assumes xcolor - {\@PromptButton[\textColor{1 0 0 rg}]{\CorrectAns}}} + {\@PromptButton[\textColor{1 0 0 rg}]{\CorrectAns}}} \let\eq@ansGrpArray\@empty \def\eq@recordGrpAnsArray#1{% - \ifx\eq@ansGrpArray\@empty - \edef\tmp@exp{\noexpand\g@addto@macro - \noexpand\eq@ansGrpArray{#1}}\else - \edef\tmp@exp{\noexpand\g@addto@macro - \noexpand\eq@ansGrpArray{,#1}}\fi - \tmp@exp + \ifx\eq@ansGrpArray\@empty + \edef\tmp@exp{\noexpand\g@addto@macro + \noexpand\eq@ansGrpArray{#1}}\else + \edef\tmp@exp{\noexpand\g@addto@macro + \noexpand\eq@ansGrpArray{,#1}}\fi + \tmp@exp } \let\grpquestions\eq@Zero \def\mathGrp{\global\let\eq@ansGrpArray\@empty - \@ifnextchar[{\@imathGrp}{\@imathGrp[groupEval]}} + \@ifnextchar[{\@imathGrp}{\@imathGrp[groupEval]}} \def\@imathGrp[#1]{\def\argi{#1}% - \@ifnextchar[{\@iimathGrp}{\@iimathGrp[]}} + \@ifnextchar[{\@iimathGrp}{\@iimathGrp[]}} \def\@iimathGrp[#1]{\def\argii{#1}% - \eq@AddProbToQzQuesList - \global\let\grpquestions\eq@One - \setcounter{grpquestionno}{0}% - \stepcounter{questionno}% - \xdef\beginGrp{\thequestionno}% - \xdef\grpPointValue{\eqPTs}% - \eq@recordThesePTs\eq@recordProbType - \if\eqQuizType\isQZ - \edef\eqtmp{\aPointType}% - \xdef\aPointType{\eqtmp,[\eqPTs,"grp"]}\fi - \addtocounter{eqpointvalue}{\eqPTs}% - \ifx\argii\@empty - \xdef\grpTotalWeight{\eqPTs}% - \xdef\grpEvalFunction{\argi}% - \else - \xdef\grpTotalWeight{\argi}% - \xdef\grpEvalFunction{\argii}% - \fi + \eq@AddProbToQzQuesList + \global\let\grpquestions\eq@One + \setcounter{grpquestionno}{0}% + \stepcounter{questionno}% + \xdef\beginGrp{\thequestionno}% + \xdef\grpPointValue{\eqPTs}% + \eq@recordThesePTs\eq@recordProbType + \if\eqQuizType\isQZ + \edef\eqtmp{\aPointType}% + \xdef\aPointType{\eqtmp,[\eqPTs,"grp"]}\fi + \addtocounter{eqpointvalue}{\eqPTs}% + \ifx\argii\@empty + \xdef\grpTotalWeight{\eqPTs}% + \xdef\grpEvalFunction{\argi}% + \else + \xdef\grpTotalWeight{\argi}% + \xdef\grpEvalFunction{\argii}% + \fi } \def\endmathGrp{\global\let\grpquestions\eq@Zero - \eq@recordCorrAns{[\eq@ansGrpArray]}% - \xdef\endGrp{\thequestionno}} -\def\CorrAnsButtonGrpDefaults -{% - \CA{\eq@local@CorrAnsButton}\W{1}\S{S}\BC{0 0 0} - \BG{.7529 .7529 .7529}\H{P} + \eq@recordCorrAns{[\eq@ansGrpArray]}% + \xdef\endGrp{\thequestionno}} +\def\CorrAnsButtonGrpDefaults{% + \CA{\eq@local@CorrAnsButton}\W{1}\S{S}\BC{0 0 0} + \BG{.7529 .7529 .7529}\H{P} +} +\begin{defineJS}[\makeesc\!\makecmt\%]{\cabGrpActn} +!ifx!@qzsolndest!@empty!else% +if (event.shift) this.gotoNamedDest("!@qzsolndest"); +else !fi% +{ + var aCorrectAns=!CorrectAns; + var beginGrp=1; + var grpOffset=beginGrp; + if(!currQuiz.Grp==null)!currQuiz.Grp={}; + if(typeof !currQuiz.Grp["!thequestionno"]=="undefined") + { + !currQuiz.Grp["!thequestionno"]={offset:0}; + } else { + !currQuiz.Grp["!thequestionno"].offset=% +++(!currQuiz.Grp["!thequestionno"].offset)!%aCorrectAns.length; + grpOffset=beginGrp% ++!currQuiz.Grp["!thequestionno"].offset; + } + var f=this.getField("grpobj.!curr@quiz.!thequestionno." % ++ grpOffset); + if(f.readonly){ + f.readonly=false; + f.setFocus(); + eqDelay=app.setTimeOut(% +"f.readonly=true;app.clearTimeOut(eqDelay);",10); + } else f.setFocus(); +!if!eqQuizType!isQZ% + DisplayAnswer("Ans.!curr@quiz",% +aCorrectAns[!currQuiz.Grp["!thequestionno"].offset],!currQuiz);!else% + DisplayAnswer("grpobj.!oField.!thequestionno."+ grpOffset,% +aCorrectAns[!currQuiz.Grp["!thequestionno"].offset],!oField);!fi } -\def\CorrAnsButtonGrpActionHook{\JS{% -\ifx\@qzsolndest\@empty\else - if (event.shift)\jsR\jsT - this.gotoNamedDest("\@qzsolndest");\jsR - else\jsR -\fi - {\jsR\jsT - var aCorrectAns=\CorrectAns;\jsR\jsT - var beginGrp = 1;\jsR\jsT - grpOffset = beginGrp;\jsR\jsT - if ( \currQuiz.Grp==null ) \currQuiz.Grp = {};\jsR\jsT - if (typeof \currQuiz.Grp["\thequestionno"]=="undefined")\jsR\jsT - {\jsR\jsT\jsT - \currQuiz.Grp["\thequestionno"] = {offset: 0};\jsR\jsT\jsT - var f = this.getField(% - "grpobj.\curr@quiz.\thequestionno." - + grpOffset)\jsR\jsT\jsT - if ( f.readonly ) {\jsR\jsT\jsT - f.readonly = false;\jsR\jsT\jsT - f.setFocus();\jsR\jsT\jsT - eqDelay = app.setTimeOut(% - "f.readonly = true; - app.clearTimeOut(eqDelay);",10);\jsR\jsT - } else f.setFocus();\jsR\jsT - }\jsR\jsT - else \jsR\jsT - {\jsR\jsT\jsT - \currQuiz.Grp["\thequestionno"].offset = - ++\currQuiz.Grp["\thequestionno"].offset - \% aCorrectAns.length;\jsR\jsT\jsT - grpOffset = beginGrp - + \currQuiz.Grp["\thequestionno"].offset;\jsR\jsT\jsT - var f = this.getField("grpobj.\curr@quiz.\thequestionno." - + grpOffset);\jsR\jsT\jsT - if ( f.readonly ) {\jsR\jsT\jsT - f.readonly = false;\jsR\jsT\jsT - f.setFocus();\jsR\jsT\jsT - eqDelay = app.setTimeOut("f.readonly = true; - app.clearTimeOut(eqDelay);",10);\jsR\jsT - } else f.setFocus();\jsR\jsT - }\jsR\jsT -\if\eqQuizType\isQZ - DisplayAnswer("Ans.\curr@quiz", - aCorrectAns[\currQuiz.Grp["\thequestionno"].offset],% -\currQuiz); -\else - DisplayAnswer("grpobj.\oField.\thequestionno."+ grpOffset, - aCorrectAns[\currQuiz.Grp["\thequestionno"].offset],% -\oField);\jsR -\fi - } -}} -\newcommand\CorrAnsButtonGrp[2][] -{% - \makeStringArray{#2}% - \edef\CorrectAns{\stringArray}% - \if\eqQuizType\isQZ\def\Fld@name{corr.\curr@quiz.\thequestionno}% - \else\edef\currQuiz{\oField}% +\end{defineJS} +\def\CorrAnsButtonGrpActionHook{\JS{\cabGrpActn}} +\newcommand\CorrAnsButtonGrp[2][]{% + \makeStringArray{#2}% + \edef\CorrectAns{\stringArray}% + \if\eqQuizType\isQZ\def\Fld@name{corr.\curr@quiz.\thequestionno}% + \else\edef\currQuiz{\oField}% \def\Fld@name{corr.\oField.\thequestionno}\fi - \if\eqQuizType\isQZ - \edef\@@CorrAnsButtonGrpActions{\noexpand\F{\FHidden}% - \ifx\@qzsolndest\@empty%\noexpand\BC{\normalCABtnBC} - \else\noexpand\BC{\solution@Color}\fi - \noexpand\A{\noexpand\CorrAnsButtonGrpActionHook}}% - \ifeq@noquizsolutions\else - \mbox{\push@@Button{#1}{\Fld@name}{}{\DefaultHeightOfWidget}% - {\eq@protect\A}{\eq@setButtonProps\eq@Button@driver}% - {\CorrAnsButtonGrpDefaults\@@CorrAnsButtonGrpActions - \every@ButtonField\every@CorrAnsButton}}% - \fi - \else - \edef\@@CorrAnsButtonGrpActions{% - \ifx\@qzsolndest\@empty%\noexpand\BC{\normalCABtnBC} - \else\noexpand\BC{\solution@Color}\fi - \noexpand\A{\noexpand\CorrAnsButtonGrpActionHook}}% - \mbox{\push@@Button{#1}{\Fld@name}{}{\DefaultHeightOfWidget}% - {\eq@protect\A}{\eq@setButtonProps\eq@Button@driver}% - {\CorrAnsButtonGrpDefaults\@@CorrAnsButtonGrpActions - \every@ButtonField\every@CorrAnsButton}}% - \fi + \if\eqQuizType\isQZ + \edef\@@CorrAnsButtonGrpActions{\noexpand\F{\FHidden}% + \ifx\@qzsolndest\@empty + \else\noexpand\BC{\solution@Color}\fi + \noexpand\A{\noexpand\CorrAnsButtonGrpActionHook}}% + \ifeq@noquizsolutions\let\x\relax\else + \def\x{\mbox{\push@@Button{#1}{\Fld@name}{}% + {\DefaultHeightOfWidget}{\eq@protect\A}% + {\eq@setButtonProps\eq@Button@driver}% + {\CorrAnsButtonGrpDefaults\@@CorrAnsButtonGrpActions + \every@ButtonField\every@CorrAnsButton}}}\fi\x + \else + \edef\@@CorrAnsButtonGrpActions{% + \ifx\@qzsolndest\@empty%\noexpand\BC{\normalCABtnBC} + \else\noexpand\BC{\solution@Color}\fi + \noexpand\A{\noexpand\CorrAnsButtonGrpActionHook}}% + \mbox{\push@@Button{#1}{\Fld@name}{}{\DefaultHeightOfWidget}% + {\eq@protect\A}{\eq@setButtonProps\eq@Button@driver}% + {\CorrAnsButtonGrpDefaults\@@CorrAnsButtonGrpActions + \every@ButtonField\every@CorrAnsButton}}% + \fi } \def\makeStringArray#1{\def\stringArray{[}\@makeStringArray#1,\@nil} \def\@makeStringArray#1,#2\@nil{% - \edef\eq@temp{\stringArray}\def\argii{#2}% - \ifx\argii\@empty - \edef\stringArray{\eq@temp"#1"]}% - \def\eq@next{}% - \else - \edef\stringArray{\eq@temp"#1",}% - \def\eq@next{\@makeStringArray#2\@nil}% - \fi - \eq@next + \edef\eq@temp{\stringArray}\def\argii{#2}% + \ifx\argii\@empty + \edef\stringArray{\eq@temp"#1"]}% + \def\eq@next{}% + \else + \edef\stringArray{\eq@temp"#1",}% + \def\eq@next{\@makeStringArray#2\@nil}% + \fi + \eq@next } \let\@eqListExp\relax \let\@currentQues\@empty \let\eqQzQuesList\@empty \def\eq@AddProbToQzQuesList{% - \edef\eq@tmpExp{\noexpand\g@addto@macro% - \noexpand\eqQzQuesList{\noexpand - \@eqListExp{\@currentQues}{\the\c@page}}}% + \edef\eq@tmpExp{\noexpand\g@addto@macro% + \noexpand\eqQzQuesList{\noexpand + \@eqListExp{\@currentQues}{\the\c@page}}}% \ifx\grpquestions\eq@Zero\eq@tmpExp\fi } \LangRedefinitions @@ -4482,15 +4455,15 @@ if (!isQuizInitialized("@currQuiz")) { \inputSumryTblCode \inputMCFICode \newcommand{\solutionColor}[1]{\def\eq@argi{#1}\ifx\eq@argi\@empty - \def\solution@Color{\solutionColorDef}\else - \def\solution@Color{#1}\fi} + \def\solution@Color{\solutionColorDef}\else + \def\solution@Color{#1}\fi} \newcommand{\solutionColorDef}{0 .6 0} \solutionColor{\solutionColorDef} \@ifundefined{jsColor}{% - \InputIfFileExists{eqcolor.def}{\PackageInfo{exerquiz} - {Inputting eqcolor.def}} - {\PackageError{exerquiz}{cannot find eqcolor.def} - {Refresh your file name database and try again.}} + \InputIfFileExists{eqcolor.def}{\PackageInfo{exerquiz} + {Inputting eqcolor.def}} + {\PackageError{exerquiz}{cannot find eqcolor.def} + {Refresh your file name database and try again.}} }{} \newcommand\rghtColorJSDef{["RGB", 0, .6, 0]} \newcommand\rghtColorJS{\rghtColorJSDef} @@ -4509,59 +4482,59 @@ if (!isQuizInitialized("@currQuiz")) { \let\partialColorJSLoc\@empty \let\partialColorJSLocDef\@empty \def\chooseJSsymbol{\@ifstar{\let\eq@isstar\eq@YES\chooseJSsymboli} - {\let\eq@isstar\eq@NO\chooseJSsymboli}} + {\let\eq@isstar\eq@NO\chooseJSsymboli}} \def\chooseJSsymboli#1{\lowercase{\edef\eq@arg{#1}}% - \def\eq@carg{check}\ifx\eq@arg\eq@carg - \def\eq@retnStyle{style.ch}\else - \def\eq@carg{cross}\ifx\eq@arg\eq@carg - \def\eq@retnStyle{style.cr}\else - \def\eq@carg{diamond}\ifx\eq@arg\eq@carg - \def\eq@retnStyle{style.di}\else - \def\eq@carg{circle}\ifx\eq@arg\eq@carg - \def\eq@retnStyle{style.ci}\else - \def\eq@carg{star}\ifx\eq@arg\eq@carg - \def\eq@retnStyle{style.st}\else - \def\eq@carg{square}\ifx\eq@arg\eq@carg - \def\eq@retnStyle{style.sq}\else - \let\eq@retnStyle\@empty - \ifx\eq@isstar\eq@NO\PackageWarning{exerquiz} - {Argument `#1' not recognized.\MessageBreak - Permissible values are check, cross, diamond,\MessageBreak - circle, star, square. Will use the default}\fi - \fi\fi\fi\fi\fi\fi + \def\eq@carg{check}\ifx\eq@arg\eq@carg + \def\eq@retnStyle{style.ch}\else + \def\eq@carg{cross}\ifx\eq@arg\eq@carg + \def\eq@retnStyle{style.cr}\else + \def\eq@carg{diamond}\ifx\eq@arg\eq@carg + \def\eq@retnStyle{style.di}\else + \def\eq@carg{circle}\ifx\eq@arg\eq@carg + \def\eq@retnStyle{style.ci}\else + \def\eq@carg{star}\ifx\eq@arg\eq@carg + \def\eq@retnStyle{style.st}\else + \def\eq@carg{square}\ifx\eq@arg\eq@carg + \def\eq@retnStyle{style.sq}\else + \let\eq@retnStyle\@empty + \ifx\eq@isstar\eq@NO\PackageWarning{exerquiz} + {Argument `#1' not recognized.\MessageBreak + Permissible values are check, cross, diamond,\MessageBreak + circle, star, square. Will use the default}\fi + \fi\fi\fi\fi\fi\fi } \newcommand\setRghtAnsSymb[1]{\chooseJSsymbol{#1}% - \ifx\eq@retnStyle\@empty\else - \edef\rghtAnsSymbJS{\eq@retnStyle}% - \edef\rghtAnsSymb{\eq@carg}\fi} + \ifx\eq@retnStyle\@empty\else + \edef\rghtAnsSymbJS{\eq@retnStyle}% + \edef\rghtAnsSymb{\eq@carg}\fi} \def\rghtAnsSymbJS{style.ch} \def\rghtAnsSymb{check} \newcommand\setCorrAnsSymb[1]{\chooseJSsymbol{#1}% - \ifx\eq@retnStyle\@empty\else - \edef\corrAnsSymbJS{\eq@retnStyle}% - \edef\corrAnsSymb{\eq@carg}\fi} + \ifx\eq@retnStyle\@empty\else + \edef\corrAnsSymbJS{\eq@retnStyle}% + \edef\corrAnsSymb{\eq@carg}\fi} \def\corrAnsSymbJS{style.ci} \def\corrAnsSymb{circle} \newcommand\setWrngAnsSymb[1]{\chooseJSsymbol{#1}% - \ifx\eq@retnStyle\@empty\else - \edef\wrngAnsSymbJS{\eq@retnStyle}% - \edef\wrngAnsSymb{\eq@carg}\fi} + \ifx\eq@retnStyle\@empty\else + \edef\wrngAnsSymbJS{\eq@retnStyle}% + \edef\wrngAnsSymb{\eq@carg}\fi} \def\wrngAnsSymbJS{style.cr} \def\wrngAnsSymb{cross} \def\setRghtAnsSymbLoc#1{\chooseJSsymbol*{#1}% - \ifx\eq@retnStyle\@empty - \let\rghtAnsSymbJSLoc\@empty\else - \edef\rghtAnsSymbJSLoc{\eq@retnStyle}\fi + \ifx\eq@retnStyle\@empty + \let\rghtAnsSymbJSLoc\@empty\else + \edef\rghtAnsSymbJSLoc{\eq@retnStyle}\fi } \def\setCorrAnsSymbLoc#1{\chooseJSsymbol*{#1}% - \ifx\eq@retnStyle\@empty - \let\corrAnsSymbJSLoc\@empty\else - \edef\corrAnsSymbJSLoc{\eq@retnStyle}\fi + \ifx\eq@retnStyle\@empty + \let\corrAnsSymbJSLoc\@empty\else + \edef\corrAnsSymbJSLoc{\eq@retnStyle}\fi } \def\setWrngAnsSymbLoc#1{\chooseJSsymbol*{#1}% - \ifx\eq@retnStyle\@empty - \let\wrngAnsSymbJSLoc\@empty\else - \edef\wrngAnsSymbJSLoc{\eq@retnStyle}\fi + \ifx\eq@retnStyle\@empty + \let\wrngAnsSymbJSLoc\@empty\else + \edef\wrngAnsSymbJSLoc{\eq@retnStyle}\fi } \let\rghtAnsSymbJSLoc\@empty \let\rghtAnsSymbJSLocDef\@empty @@ -4672,25 +4645,23 @@ if (!isQuizInitialized("@currQuiz")) { \expandafter\edef\csname eq\@CmdName\endcsname{\the\toks@}% } \def\@eqAddAAKeystroke#1{\def\argi{#1}\ifx\argi\@empty - \def\eqAddAAKeystroke{}\else\def\eqAddAAKeystroke{#1}\fi} %\r + \def\eqAddAAKeystroke{}\else\def\eqAddAAKeystroke{#1}\fi} %\r \def\eqAddAAKeystroke{} \def\@eqAddAAMouseUpMC#1{\def\argi{#1}\ifx\argi\@empty - \def\eqAddAAMouseUpMC{}\else\def\eqAddAAMouseUpMC{#1}\fi} + \def\eqAddAAMouseUpMC{}\else\def\eqAddAAMouseUpMC{#1}\fi} \def\eqAddAAMouseUpMC{} \def\@eqAddAAMouseUpMS#1{\def\argi{#1}\ifx\argi\@empty - \def\eqAddAAMouseUpMS{}\else\def\eqAddAAMouseUpMS{#1}\fi} + \def\eqAddAAMouseUpMS{}\else\def\eqAddAAMouseUpMS{#1}\fi} \def\eqAddAAMouseUpMS{} -\def\eqIconDefaults -{% - \rawPDF{}\S{}\mkIns{/TP 1}\W{} - \CA{}\RC{}\AC{}\BC{}\BG{}\H{N} - \textColor{0 g}\Ff{\FfReadOnly} -} -\newcommand\eqIcon[4][] -{% - \mbox{\push@@Button{#1}{#2}{#3}{#4}{}{\eq@setButtonProps - \eq@Button@driver}{\eqIconDefaults\every@ButtonField - \every@eqIcon}}% +\def\eqIconDefaults{% + \rawPDF{}\S{}\mkIns{/TP 1}\W{} + \CA{}\RC{}\AC{}\BC{}\BG{}\H{N} + \textColor{0 g}\Ff{\FfReadOnly} +} +\newcommand\eqIcon[4][]{% + \mbox{\push@@Button{#1}{#2}{#3}{#4}{}{\eq@setButtonProps + \eq@Button@driver}{\eqIconDefaults\every@ButtonField + \every@eqIcon}}% } \eq@restoreCats \endinput diff --git a/texmf-dist/tex/latex/acrotex/insdljs.sty b/texmf-dist/tex/latex/acrotex/insdljs.sty index 4e4b61c4..f6882def 100644 --- a/texmf-dist/tex/latex/acrotex/insdljs.sty +++ b/texmf-dist/tex/latex/acrotex/insdljs.sty @@ -8,7 +8,7 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% insdljs.sty package, %% -%% Copyright (C) 2001-2019 D. P. Story %% +%% Copyright (C) 2001-2020 D. P. Story %% %% dpstory@uakron.edu %% %% %% %% This program can redistributed and/or modified under %% @@ -19,7 +19,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{insdljs} - [2019/10/30 v2.4.8 Insert Document Level JavaScripts (dps)] + [2020/12/20 v2.5 Insert Document Level JavaScripts (dps)] \usepackage{xkeyval} \RequirePackage{ifpdf}[2006/02/20] \RequirePackage{ifxetex}[2006/08/21] @@ -62,115 +62,122 @@ \DeclareOptionX{nopro}{\let\dl@gopro\dl@NO} \let\dl@gopro\dl@YES \@ifpackageloaded{web}{% - \ExecuteOptionsX{\eq@driver@name}% + \ExecuteOptionsX{\eq@driver@name}% }{% - \@ifpackageloaded{eforms}{% - \ExecuteOptionsX{\ef@driver}% - }{% - \ifpdf\ExecuteOptionsX{pdftex}\else - \ifxetex\ExecuteOptionsX{xetex}\else - \@ifundefined{l@tex@@@@driver}{\ExecuteOptionsX{dvips}} - {\ExecuteOptionsX{dvipsone}}\fi\fi - }% + \@ifpackageloaded{eforms}{% + \ExecuteOptionsX{\ef@driver}% + }{% + \ifpdf\ExecuteOptionsX{pdftex}\else + \ifxetex\ExecuteOptionsX{xetex}\else + \@ifundefined{l@tex@@@@driver}{\ExecuteOptionsX{dvips}} + {\ExecuteOptionsX{dvipsone}}\fi\fi + }% } \DeclareOptionX{reqjs}{\let\dl@reqJS\dl@YES} \let\dljs@reqJS\dl@YES \DeclareOptionX{!reqjs}{\let\dl@reqJS\dl@NO} \DeclareOptionX{usealtadobe}{\let\usedAdbFuncs\dl@YES - \def\inputAltAdbFncs{\InputIfFileExists{altadbfncs.def} - {\PackageInfo{insdljs}{Inputting code for usealtadobe option}} - {\PackageWarning{insdljs}{Cannot find altadbfncs.def.\MessageBreak - Reinstall or refresh your file name database.}}}} +\def\inputAltAdbFncs{\InputIfFileExists{altadbfncs.def} + {\PackageInfo{insdljs}{Inputting code for usealtadobe option}} + {\PackageWarning{insdljs}{Cannot find altadbfncs.def.\MessageBreak + Reinstall or refresh your file name database.}}}} \let\usedAdbFuncs\dl@NO \let\inputAltAdbFncs\relax \ProcessOptionsX \edef\dl@dquoteCat{\the\catcode`\"} \catcode`\"=12\relax -\@ifundefined{dljs@drivernum}{% - \PackageError{insdljs}% - {You have not specified dvips, dvipsone, pdftex,\MessageBreak - dvipdfm, dvipdfmx, or xetex in the option list - \MessageBreak of the insdljs package} - {Place one of the drivers dvips, dvipsone, pdftex, dvipdfm, - dvipdfmx, or xetex - \MessageBreak in the option list of the insdljs package.} +\@ifundefined{dljs@drivernum}{\PackageError{insdljs}% + {You have not specified dvips, dvipsone, pdftex,\MessageBreak + dvipdfm, dvipdfmx, or xetex in the option list + \MessageBreak of the insdljs package} + {Place one of the drivers dvips, dvipsone, pdftex, dvipdfm, + dvipdfmx, or xetex + \MessageBreak in the option list of the insdljs package.} }{} \@ifundefined{ifpdfmarkup}{\newif\ifpdfmarkup}{}\pdfmarkupfalse \ifpdf\else\ifxetex\else\pdfmarkuptrue\fi\fi \RequirePackage{hyperref} \ifpdf\ifx\pdfextension\@undefined\else - \protected\def\pdfnames{\pdfextension names } - \def\pdfpageref{\pdffeedback pageref}\fi\fi + \protected\def\pdfnames{\pdfextension names } + \def\pdfpageref{\pdffeedback pageref}\fi\fi \RequirePackage{verbatim} \let\dlcomment\comment \let\enddlcomment\endcomment \usepackage{conv-xkv}[2017/01/03] \@ifundefined{dljs@drivernum}{% - \@ifundefined{eq@drivernum}{% - \PackageWarning{insdljs} - {No driver specified, will check for pdftex.} - \@ifundefined{pdfoutput}{% - \@ifundefined{@pdfm@mark}{\def\eq@drivernum{2}% - \def\dljs@drivernum{1}\let\isOpenAction\dl@NO - \PackageWarning{insdljs}{No pdftex, but detected dvipdfm}}% - {\PackageWarning{insdljs}{Neither pdftex nor dvipdfm, - assuming dvips/dvipsone.}% - \def\eq@drivernum{0}\def\dljs@drivernum{0}% - \let\isOpenAction\dl@YES} - }{% - \ifcase\pdfoutput - \def\eq@drivernum{1}\def\dljs@drivernum{1}% - \let\isOpenAction\dl@NO - \PackageInfo{insdljs}{Pdftex detected.}% - \else - \def\eq@drivernum{0}\def\dljs@drivernum{0}% - \let\isOpenAction\dl@YES - \PackageWarning{insdljs}{Pdftex engine detected, - but is outputting dvi. Assuming dvips as the driver.}% - \fi - }% + \@ifundefined{eq@drivernum}{% + \PackageWarning{insdljs} + {No driver specified, will check for pdftex.} + \@ifundefined{pdfoutput}{% + \@ifundefined{@pdfm@mark}{\def\eq@drivernum{2}% + \def\dljs@drivernum{1}\let\isOpenAction\dl@NO + \PackageWarning{insdljs}{No pdftex, but detected dvipdfm}}% + {\PackageWarning{insdljs}{Neither pdftex nor dvipdfm, + assuming dvips/dvipsone.}% + \def\eq@drivernum{0}\def\dljs@drivernum{0}% + \let\isOpenAction\dl@YES} }{% - \begingroup - \count0=\eq@drivernum - \xdef\dljs@drivernum{\ifcase\count0 0\or1\or2\or0\else0\fi} - \ifnum\dljs@drivernum=0\global\let\isOpenAction\dl@YES - \else\global\let\isOpenAction\dl@NO\fi - \endgroup + \ifcase\pdfoutput + \def\eq@drivernum{1}\def\dljs@drivernum{1}% + \let\isOpenAction\dl@NO + \PackageInfo{insdljs}{Pdftex detected.}% + \else + \def\eq@drivernum{0}\def\dljs@drivernum{0}% + \let\isOpenAction\dl@YES + \PackageWarning{insdljs}{Pdftex engine detected, + but is outputting dvi. Assuming dvips as the driver.}% + \fi }% + }{% + \begingroup + \count0=\eq@drivernum + \xdef\dljs@drivernum{\ifcase\count0 0\or1\or2\or0\else0\fi} + \ifnum\dljs@drivernum=0\global\let\isOpenAction\dl@YES + \else\global\let\isOpenAction\dl@NO\fi + \endgroup + }% }{} \ifnum\dljs@drivernum=1\relax - \RequirePackage{everyshi} + \RequirePackage{everyshi} \fi \def\AEB@psMrk{[%] \space} \ifx\dl@reqJS\dl@YES - \def\dl@@reqJS{/Type/Requirement/S/EnableJavaScripts} - \ifpdf\pdfcatalog{\dl@@reqJS}\else - \ifxetex\immediate\@pdfm@mark{put @catalog <<\dl@@reqJS>>}\else - \literalps@out{\AEB@psMrk{Catalog} <<\dl@@reqJS>> /PUT pdfmark}\fi\fi + \def\dl@@reqJS{/Type/Requirement/S/EnableJavaScripts} + \ifpdf\pdfcatalog{\dl@@reqJS}\else + \ifxetex\immediate\@pdfm@mark{put @catalog <<\dl@@reqJS>>}\else + \literalps@out{\AEB@psMrk{Catalog} <<\dl@@reqJS>> /PUT pdfmark}\fi\fi \fi \newif\ifthereisdjs \thereisdjsfalse \def\applydljs#1{\ifthereisdjs\else#1 \global\thereisdjstrue\fi} \providecommand\JS[1]{/S/JavaScript/JS(#1)} -\providecommand\Named[1]{/S/Named/N/#1} +\providecommand{\Named}[1]{/S/Named/N/#1} \providecommand{\GoTo}{/S/GoTo/D} \providecommand{\GoToD}{/S/GoTo/D} \providecommand{\GoToR}{/S/GoToR} +\providecommand{\Thread}[1]{/S/Thread/D(#1)} +\providecommand{\URI}[1]{/S/URI/URI(#1)} +\providecommand{\Launch}[1]{/Launch/F(#1)} \def\previewMiKTeX{\def\jsR{\string\r}\def\jsT{\string\t}} {\obeylines % \gdef\js@@R{\noexpand }} \def\pdfSPDef{\string\040} -\let\pdfSP\pdfSPDef +\def\dl@sp@ce{ } +\def\pdfSpacesOn{\let\pdfSP\pdfSPDef} +\def\pdfSpacesOff{\let\pdfSP\dl@sp@ce} +\pdfSpacesOff +\ifpdf\else\ifxetex\else\pdfSpacesOn\fi\fi \def\pdfLBr{\string\173} \def\pdfRBr{\string\175} -\def\dl@sp@ce{ } \bgroup\obeyspaces \gdef\dl@restorespcs{\global\let =\dl@sp@ce}\egroup \let\dljstfor\@tfor +\def\dfnJSCR#1{\gdef\dfnJSR{#1}\gdef\defineJSjsR{#1}} +\def\dfnJSCRDef{\dfnJSCR{\string\r\eqbs^^J}} +\dfnJSCRDef \def\jsR{\string\r\string\n} -\def\defineJSjsR{\string\r\eqbs^^J} \def\jsN{\string\n} {\catcode`\^^I\active % \gdef^^I{\noexpand^^I}% @@ -181,7 +188,7 @@ \def\iwvo#1{\immediate\write\js@verbatim@out{#1}} \def\dl@lparen{(}\def\dl@rparen{)} \def\genericNL{^^J} -\def\defjsLB{\expandafter\pdfmarkLB\@gobblefour} +\def\defjsLB{\gobiv} \def\genericLB{\eqbs\eqbs^^J} \def\pdfmarkLB{\eqbs^^J} \def\jscsDflt{\let\protect\noexpand\let\jslit\string @@ -242,13 +249,12 @@ \def\db#1\db{\ifx\dljs@debug\dl@YES\space\space\space#1\js@R\fi} \newcounter{dljs@cnt} \newcounter{dljssegs}\setcounter{dljssegs}{2} -\newenvironment{js@verbatimwrite}% writes to current \js@verbatim@out - {% - \@bsphack - \let\do\@makeother\dospecials\catcode`\^^M\active - \def\verbatim@processline{% - \immediate\write\js@verbatim@out{\the\verbatim@line}}% - \verbatim@start}{\@esphack} +\newenvironment{js@verbatimwrite}{% writes to current \js@verbatim@out + \@bsphack + \let\do\@makeother\dospecials\catcode`\^^M\active + \def\verbatim@processline{\immediate + \write\js@verbatim@out{\the\verbatim@line}}\verbatim@start +}{\@esphack} \def\closejs@verbatim@out{\immediate\closeout\js@verbatim@out} \begingroup \catcode`\@=0 @catcode`@\=12 @@ -264,36 +270,36 @@ \begingroup \catcode`\~=\active \lccode`\~=`\^^M \lowercase{\endgroup - \def\eqverbatim@#1~{\verbatim@@#1*end\@nil}% - \def\eqverbatim@@#1*end{% - \verbatim@addtoline{#1}% - \futurelet\dl@next\eqverbatim@@@}% - \def\eqverbatim@@@#1\@nil{% - \ifx\dl@next\@nil - \verbatim@processline - \verbatim@startline - \let\dl@next\eqverbatim@ - \else - \def\@tempa##1*end\@nil{##1}% - \@temptokena{*end}% - \def\dl@next{\expandafter\verbatim@test\@tempa#1\@nil~}% - \fi\dl@next}% + \def\eqverbatim@#1~{\verbatim@@#1*end\@nil}% + \def\eqverbatim@@#1*end{% + \verbatim@addtoline{#1}% + \futurelet\dl@next\eqverbatim@@@}% + \def\eqverbatim@@@#1\@nil{% + \ifx\dl@next\@nil + \verbatim@processline + \verbatim@startline + \let\dl@next\eqverbatim@ + \else + \def\@tempa##1*end\@nil{##1}% + \@temptokena{*end}% + \def\dl@next{\expandafter\verbatim@test\@tempa#1\@nil~}% + \fi\dl@next}% }% \def\jsexpverbatimwrite {% writes to current \js@verbatim@out - \@bsphack - \ccpdfmark - \catcode`\<=12 \catcode`\>=12 - \input{dljscc.def}% - \let\verbatim@=\eqverbatim@ - \let\verbatim@@=\eqverbatim@@ - \let\verbatim@@@=\eqverbatim@@@ - \let\do\@makeother\eqdospecials% - \catcode`\^^M=\active\catcode`\^^I=12% - \def\verbatim@processline{% - \edef\expVerb{\the\verbatim@line}% - \immediate\write\js@verbatim@out{\expVerb}}% - \verbatim@start% + \@bsphack + \ccpdfmark + \catcode`\<=12 \catcode`\>=12 + \input{dljscc.def}% + \let\verbatim@=\eqverbatim@ + \let\verbatim@@=\eqverbatim@@ + \let\verbatim@@@=\eqverbatim@@@ + \let\do\@makeother\eqdospecials% + \catcode`\^^M=\active\catcode`\^^I=12% + \def\verbatim@processline{% + \edef\expVerb{\the\verbatim@line}% + \immediate\write\js@verbatim@out{\expVerb}}% + \verbatim@start% } \def\endjsexpverbatimwrite{\immediate\closeout\js@verbatim@out\@esphack} \let\js@Path\@empty @@ -304,12 +310,12 @@ \gdef\dl@tilda<\string~> \gdef\dl@sup<\string^> \endgroup \def\makeJSspecials{% - \def\\{\eqbs\eqbs}% % define \\ to be \\ - \let\jslit\string - \let\{\dl@lBrace\let\}\dl@rBrace - \let\u\@empty - \def\({\eqbs(}\def\){\eqbs)}% - \makespecialJS % make \r=\jsR and \t=\jsT + \def\\{\eqbs\eqbs}% % define \\ to be \\ + \let\jslit\string + \let\{\dl@lBrace\let\}\dl@rBrace + \let\u\@empty + \def\({\eqbs(}\def\){\eqbs)}% + \makespecialJS % make \r=\jsR and \t=\jsT } \def\dl@fitpage{/Fit} \def\dl@actualsize{/XYZ null null 1.0} %{/XYZ -32768 -32768 1.0} @@ -319,12 +325,12 @@ \def\dl@inheritzoom{/XYZ 0 0 0} \def\dl@mag#1{/XYZ null null #1} \edef\dl@Page#1{\ifcase\dljs@drivernum - {Page#1}\or\noexpand\pdfpageref#1\space\space 0 R\or - @page#1\fi} + {Page#1}\or\noexpand\pdfpageref#1\space\space 0 R\or + @page#1\fi} \def\dl@preProcDefns{\let\Page\dl@Page\let\mag\dl@mag - \let\fitpage\dl@fitpage\let\actualsize\dl@actualsize - \let\fitwidth\dl@fitwidth\let\fitheight\dl@fitheight - \let\fitvisible\dl@fitvisible\let\inheritzoom\dl@inheritzoom + \let\fitpage\dl@fitpage\let\actualsize\dl@actualsize + \let\fitwidth\dl@fitwidth\let\fitheight\dl@fitheight + \let\fitvisible\dl@fitvisible\let\inheritzoom\dl@inheritzoom } \let\aeb@additionalOpenAction\@empty \let\aeb@addActionCode\@empty @@ -333,59 +339,58 @@ \let\aebpFA\dl@NO \def\aebp@rightDelimiters{} \newcommand{\addToDocOpen}[1]{% - \ifx\aebpFA\dl@NO - \g@addto@macro\aebpopentoks{#1}% - \def\aeb@additionalOpenAction{/Next {pubAddToDocOpen}}% + \ifx\aebpFA\dl@NO + \g@addto@macro\aebpopentoks{#1}% + \def\aeb@additionalOpenAction{/Next {pubAddToDocOpen}}% \ifpdf - \def\aeb@addActionCode{\immediate\pdfobj{<< - \aebpopentoks\aebp@rightDelimiters >>}% - \edef\addActionObj{\the\pdflastobj\space 0 R}}% + \def\aeb@addActionCode{\immediate\pdfobj{<< + \aebpopentoks\aebp@rightDelimiters >>}% + \edef\addActionObj{\the\pdflastobj\space 0 R}}% \else\ifxetex - \def\aeb@addActionCode{\immediate - \@pdfm@mark{obj @objAddActionObj - << \aebpopentoks\aebp@rightDelimiters >> }}% - \def\addActionObj{@objAddActionObj}% + \def\aeb@addActionCode{\immediate + \@pdfm@mark{obj @objAddActionObj + << \aebpopentoks\aebp@rightDelimiters >> }}% + \def\addActionObj{@objAddActionObj}% \else % postscript - \def\aeb@addActionCode{\literalps@out{% - \AEB@psMrk/_objdef {pubAddToDocOpen} - /type/dict /OBJ pdfmark^^J% - \AEB@psMrk{pubAddToDocOpen} << - \aebpopentoks\aebp@rightDelimiters >> /PUT pdfmark}}% - \def\addActionObj{{pubAddToDocOpen}}% + \def\aeb@addActionCode{\literalps@out{% + \AEB@psMrk/_objdef {pubAddToDocOpen} + /type/dict /OBJ pdfmark^^J% + \AEB@psMrk{pubAddToDocOpen} << + \aebpopentoks\aebp@rightDelimiters >> /PUT pdfmark}}% + \def\addActionObj{{pubAddToDocOpen}}% \fi\fi - \global\let\aebpFA\dl@YES - \let\@pdfstartview\@empty - \else - \edef\aebp@dljstmp{\aebp@rightDelimiters}% - \xdef\aebp@rightDelimiters{\aebp@dljstmp >> }% - \g@addto@macro\aebpopentoks{/Next << #1 }% - \fi + \global\let\aebpFA\dl@YES + \let\@pdfstartview\@empty + \else + \edef\aebp@dljstmp{\aebp@rightDelimiters}% + \xdef\aebp@rightDelimiters{\aebp@dljstmp >> }% + \g@addto@macro\aebpopentoks{/Next << #1 }% + \fi } \def\dljs@OpenActions{/OpenAction \addActionObj} \def\dljs@setOpenActions{\bgroup\makeJSspecials\dl@preProcDefns - \aeb@addActionCode - \ifpdf\pdfcatalog{\dljs@OpenActions}\else - \ifxetex\immediate - \@pdfm@mark{put @catalog <<\dljs@OpenActions>>}\else - \literalps@out{\AEB@psMrk - {Catalog} <<\dljs@OpenActions>> /PUT pdfmark}\fi\fi\egroup} + \aeb@addActionCode + \ifpdf\pdfcatalog{\dljs@OpenActions}\else + \ifxetex\immediate + \@pdfm@mark{put @catalog <<\dljs@OpenActions>>}\else + \literalps@out{\AEB@psMrk + {Catalog} <<\dljs@OpenActions>> /PUT pdfmark}\fi\fi\egroup} \@ifpackageloaded{aeb_pro}{} - {\AtBeginDocument{\ifx\aebpFA\dl@YES\expandafter - \dljs@setOpenActions\fi}} + {\AtBeginDocument{\ifx\aebpFA\dl@YES\expandafter + \dljs@setOpenActions\fi}} \let\@CloseAction\@empty \def\@OAction@pdfmark{\literalps@out{% - \AEB@psMrk{ThisPage} << /AA << /O << \theFirstAction\space - \opentoks\@rightDelimiters >> \@CloseAction >> >> /PUT pdfmark}} + \AEB@psMrk{ThisPage} << /AA << /O << \theFirstAction\space + \opentoks\@rightDelimiters >> \@CloseAction >> >> /PUT pdfmark}} \def\@POAction@pdfmark{\literalps@out{% - \AEB@psMrk{ThisPage} << /AA << \@thisOpenAction - \@thisCloseAction >> >> /PUT pdfmark}% + \AEB@psMrk{ThisPage} << /AA << \@thisOpenAction + \@thisCloseAction >> >> /PUT pdfmark}% } \def\@OAction@pdftex{% - \ifx\isOpenAction\dl@YES - \xdef\pdftexOAction{/AA << /O << \theFirstAction\space - \opentoks\@rightDelimiters >> \@CloseAction >>}% - \AtNextShipout{\pdfpageattr=\expandafter{\pdftexOAction}}% - \fi + \ifx\isOpenAction\dl@YES + \xdef\pdftexOAction{/AA << /O << \theFirstAction\space + \opentoks\@rightDelimiters >> \@CloseAction >>}% + \AtNextShipout{\pdfpageattr=\expandafter{\pdftexOAction}}\fi } \def\@POAction@pdftex{% \xdef\thisPageActionpdftex{/AA << \@thisOpenAction @@ -393,170 +398,165 @@ \AtNextShipout{\pdfpageattr=\expandafter{\thisPageActionpdftex}}% } \def\@OAction@dvipdfm{\ifx\isOpenAction\dl@YES - \@pdfm@mark{put @thispage << /AA << /O << \theFirstAction\space - \opentoks\@rightDelimiters >> \@CloseAction >> >>}\fi + \@pdfm@mark{put @thispage << /AA << /O << \theFirstAction\space + \opentoks\@rightDelimiters >> \@CloseAction >> >>}\fi } \def\@POAction@dvipdfm{% - \@pdfm@mark{put @thispage << /AA << \@thisOpenAction - \@thisCloseAction >> >>}% + \@pdfm@mark{put @thispage << /AA << \@thisOpenAction + \@thisCloseAction >> >>}% } \ifcase\dljs@drivernum - \let\@OAction\@OAction@pdfmark - \let\@POAction\@POAction@pdfmark - \gdef\theFirstAction{/S/JavaScript/JS (\the\importfdftoks)} - \let\isOpenAction\dl@YES + \let\@OAction\@OAction@pdfmark + \let\@POAction\@POAction@pdfmark + \gdef\theFirstAction{/S/JavaScript/JS (\the\importfdftoks)} + \let\isOpenAction\dl@YES \or - \let\@OAction\@OAction@pdftex - \let\@POAction\@POAction@pdftex - \AtBeginDocument{\@OAction@pdftex} + \let\@OAction\@OAction@pdftex + \let\@POAction\@POAction@pdftex + \AtBeginDocument{\@OAction@pdftex} \or - \let\@OAction\@OAction@dvipdfm - \let\@POAction\@POAction@dvipdfm - \AtBeginDocument{\@OAction@dvipdfm} + \let\@OAction\@OAction@dvipdfm + \let\@POAction\@POAction@dvipdfm + \AtBeginDocument{\@OAction@dvipdfm} \fi \def\opentoks{} \def\makespecialJS{% - \let\r\jsR\let\t\jsT\let\n\jsN} + \let\r\jsR\let\t\jsT\let\n\jsN} \def\@rightDelimiters{} \def\OpenAction{\@ifnextchar\Next - {\expandafter\@OpenAction\@gobble}{\@OpenAction}} + {\expandafter\@OpenAction\@gobble}{\@OpenAction}} \def\@OpenAction#1{% - \ifx\isOpenAction\dl@NO - {\makespecialJS\xdef\theFirstAction{#1}}% - \global\let\isOpenAction\dl@YES - \else - \edef\dljstmp{\@rightDelimiters}% - \xdef\@rightDelimiters{\dljstmp >> }% - {\makespecialJS\xdef\dljstmp{\opentoks /Next << #1 }}% - \xdef\opentoks{\dljstmp}% - \fi - \@nextOpenAction + \ifx\isOpenAction\dl@NO + {\makespecialJS\xdef\theFirstAction{#1}}% + \global\let\isOpenAction\dl@YES + \else + \edef\dljstmp{\@rightDelimiters}% + \xdef\@rightDelimiters{\dljstmp >> }% + {\makespecialJS\xdef\dljstmp{\opentoks /Next << #1 }}% + \xdef\opentoks{\dljstmp}% + \fi + \@nextOpenAction } \def\@nextOpenAction{\@ifnextchar\Next{\expandafter - \@OpenAction\@gobble}{}} + \@OpenAction\@gobble}{}} \def\protectJSCtrls{\def\r{\string\r\string\n}% - \def\t{\string\t}\def\n{\string\n}} + \def\t{\string\t}\def\n{\string\n}} \def\dljs@tstlp{\@ifnextchar\bgroup - {\let\dljs@multi\dl@YES\dljs@tstlpi}% - {\let\dljs@multi\dl@NO\dljs@tstlpi}} + {\let\dljs@multi\dl@YES\dljs@tstlpi}% + {\let\dljs@multi\dl@NO\dljs@tstlpi}} \def\dljs@tstlpi#1\@nil{}% -\def\dljs@bldScript#1#2#3{{% - \dljs@tstlp#1\@nil - \ifx\dljs@multi\dl@NO{\protectJSCtrls\xdef#3{/#2<<#1>>}}\else - \toks0={}\let\dljs@rAngles\@empty\count0=0 - \@tfor\dljs@arg:=#1\do{% - \ifnum\count0=0 - \toks0=\expandafter{\dljs@arg}\else - \toks2=\expandafter{\dljs@arg}% - \edef\holdtokstmp{\the\toks0 - /Next<<\the\toks2 }% - \edef\dljs@rAngles{\dljs@rAngles\space>>}% - \toks0=\expandafter{\holdtokstmp}% - \fi - \advance\count0by1 - }% - {\protectJSCtrls\xdef#3{/#2<<\the\toks0 \dljs@rAngles>>}% - \xdef#3{#3}}% - \fi -}} +\def\dljs@bldScript#1#2#3{\bgroup + \dljs@tstlp#1\@nil + \ifx\dljs@multi\dl@NO{\protectJSCtrls\xdef#3{/#2<<#1>>}}\else + \toks0={}\let\dljs@rAngles\@empty\count0=0 + \@tfor\dljs@arg:=#1\do{% + \ifnum\count0=0 + \toks0=\expandafter{\dljs@arg}\else + \toks2=\expandafter{\dljs@arg}% + \edef\holdtokstmp{\the\toks0 + /Next<<\the\toks2 }% + \edef\dljs@rAngles{\dljs@rAngles\space>>}% + \toks0=\expandafter{\holdtokstmp}% + \fi + \advance\count0by\@ne + }{\protectJSCtrls\xdef#3{/#2<<\the\toks0 \dljs@rAngles>>}% + \xdef#3{#3}}% + \fi +\egroup} \newcommand{\thisPageAction}[2]{% - \let\@CloseAction\@empty - \let\@thisOpenAction\@empty - \let\@thisCloseAction\@empty - \def\dljs@argi{#1}\def\dljs@argii{#2}% - \ifnum\value{page}=1\relax - \ifx\dljs@argii\@empty\else - \dljs@bldScript{#2}{C}{\@CloseAction}\fi - \ifx\dljs@argi\@empty\else\dljs@tstlp#1\@nil - \ifx\dljs@multi\dl@NO\OpenAction{#1}\else - \@tfor\dljs@arg:=#1\do{\expandafter - \OpenAction\expandafter{\dljs@arg}% - }\fi - \fi - \else - \ifx\dljs@argi\@empty\else - \dljs@bldScript{#1}{O}{\@thisOpenAction}\fi - \ifx\dljs@argii\@empty\else - \dljs@bldScript{#2}{C}{\@thisCloseAction}\fi - \@POAction - \fi + \let\@CloseAction\@empty + \let\@thisOpenAction\@empty + \let\@thisCloseAction\@empty + \def\dljs@argi{#1}\def\dljs@argii{#2}% + \ifnum\value{page}=1\relax + \ifx\dljs@argii\@empty\else + \dljs@bldScript{#2}{C}{\@CloseAction}\fi + \ifx\dljs@argi\@empty\else\dljs@tstlp#1\@nil + \ifx\dljs@multi\dl@NO\OpenAction{#1}\else + \@tfor\dljs@arg:=#1\do{\expandafter + \OpenAction\expandafter{\dljs@arg}% + }\fi\fi + \else + \ifx\dljs@argi\@empty\else + \dljs@bldScript{#1}{O}{\@thisOpenAction}\fi + \ifx\dljs@argii\@empty\else + \dljs@bldScript{#2}{C}{\@thisCloseAction}\fi + \@POAction + \fi } \let\insdljsloadVar\@empty \newenvironment{insDLJS}[3][] {% - \gdef\detectdljs{#1}\gdef\dljsBase{#2}% - \ifxetex{\def\1{\string\1}\def\2{\string2}% - \def\3{\string\3}\xdef\dljsName{#3}}\else - \Hy@unicodefalse\pdfstringdef{\dljsName}{#3}\fi + \gdef\detectdljs{#1}\gdef\dljsBase{#2}% + \ifxetex{\def\1{\string\1}\def\2{\string2}% + \def\3{\string\3}\xdef\dljsName{#3}}\else + \Hy@unicodefalse\pdfstringdef{\dljsName}{#3}\fi \ifx\detectdljs\@empty - \stepcounter{dljs@cnt}% - \xdef\detectdljs{_bInsdljsload\arabic{dljs@cnt}}% - \edef\insdljsloadVar{var \detectdljs=true;}% - \addtocounter{dljs@cnt}{-1}% + \stepcounter{dljs@cnt}% + \xdef\detectdljs{_bInsdljsload\arabic{dljs@cnt}}% + \edef\insdljsloadVar{var \detectdljs=true;}% + \addtocounter{dljs@cnt}{-1}% \fi - \global\let\multisegments\dl@NO\setcounter{dljssegs}{2}% - \global\dljsobjtoks={}% - \expandafter\ifx\csname dljs\dljsBase\endcsname\relax - \else\@insjserrDuplicate\fi - \ifcase\dljs@drivernum - \let\insert@DLJS=\insert@DLJS@pdfmark - \let\endinsDLJS=\endinsert@DLJS@pdfmark - \let\newsegment=\newsegment@pdfmark - \let\endnewsegment=\endnewsegment@pdfmark - \or - \let\insert@DLJS=\insert@DLJS@pdftex - \let\endinsDLJS=\endinsert@DLJS@pdftex - \let\newsegment=\newsegment@pdftex - \let\endnewsegment=\endnewsegment@pdftex - \or - \let\insert@DLJS=\insert@DLJS@dvipdfm - \let\endinsDLJS=\endinsert@DLJS@dvipdfm - \let\newsegment=\newsegment@dvipdfm - \let\endnewsegment=\endnewsegment@dvipdfm - \fi - \insert@DLJS + \global\let\multisegments\dl@NO\setcounter{dljssegs}{2}% + \global\dljsobjtoks={}\expandafter + \ifx\csname dljs\dljsBase\endcsname\relax + \else\@insjserrDuplicate\fi + \ifcase\dljs@drivernum + \let\insert@DLJS=\insert@DLJS@pdfmark + \let\endinsDLJS=\endinsert@DLJS@pdfmark + \let\newsegment=\newsegment@pdfmark + \let\endnewsegment=\endnewsegment@pdfmark + \or + \let\insert@DLJS=\insert@DLJS@pdftex + \let\endinsDLJS=\endinsert@DLJS@pdftex + \let\newsegment=\newsegment@pdftex + \let\endnewsegment=\endnewsegment@pdftex + \or + \let\insert@DLJS=\insert@DLJS@dvipdfm + \let\endinsDLJS=\endinsert@DLJS@dvipdfm + \let\newsegment=\newsegment@dvipdfm + \let\endnewsegment=\endnewsegment@dvipdfm + \fi + \insert@DLJS }{} \newenvironment{insDLJS*}[2][] {% - \gdef\detectdljs{#1}\gdef\dljsBase{#2}% + \gdef\detectdljs{#1}\gdef\dljsBase{#2}% \ifx\detectdljs\@empty - \stepcounter{dljs@cnt}% - \xdef\detectdljs{_bInsdljsload\arabic{dljs@cnt}}% - \edef\insdljsloadVar{var \detectdljs=true;}% - \addtocounter{dljs@cnt}{-1}% + \stepcounter{dljs@cnt}% + \xdef\detectdljs{_bInsdljsload\arabic{dljs@cnt}}% + \edef\insdljsloadVar{var \detectdljs=true;}% + \addtocounter{dljs@cnt}{-1}% \fi - \global\let\multisegments\dl@YES\setcounter{dljssegs}{2}% - \global\dljsobjtoks={}% - \expandafter\ifx\csname dljs\dljsBase\endcsname\relax - \else\@insjserrDuplicate\fi - \ifcase\dljs@drivernum - \let\insert@DLJS=\insert@DLJS@pdfmark - \expandafter - \let\csname endinsDLJS*\endcsname\endinsert@DLJS@pdfmark - \let\newsegment=\newsegment@pdfmark - \let\endnewsegment=\endnewsegment@pdfmark - \or - \let\insert@DLJS=\insert@DLJS@pdftex - \expandafter - \let\csname endinsDLJS*\endcsname\endinsert@DLJS@pdftex - \let\newsegment=\newsegment@pdftex - \let\endnewsegment=\endnewsegment@pdftex - \or - \let\insert@DLJS=\insert@DLJS@dvipdfm - \expandafter - \let\csname endinsDLJS*\endcsname\endinsert@DLJS@dvipdfm - \let\newsegment=\newsegment@dvipdfm - \let\endnewsegment=\endnewsegment@dvipdfm - \fi - \insert@DLJS + \global\let\multisegments\dl@YES\setcounter{dljssegs}{2}% + \global\dljsobjtoks={}% + \expandafter\ifx\csname dljs\dljsBase\endcsname\relax + \else\@insjserrDuplicate\fi + \ifcase\dljs@drivernum + \let\insert@DLJS=\insert@DLJS@pdfmark\expandafter + \let\csname endinsDLJS*\endcsname\endinsert@DLJS@pdfmark + \let\newsegment=\newsegment@pdfmark + \let\endnewsegment=\endnewsegment@pdfmark + \or + \let\insert@DLJS=\insert@DLJS@pdftex\expandafter + \let\csname endinsDLJS*\endcsname\endinsert@DLJS@pdftex + \let\newsegment=\newsegment@pdftex + \let\endnewsegment=\endnewsegment@pdftex + \or + \let\insert@DLJS=\insert@DLJS@dvipdfm\expandafter + \let\csname endinsDLJS*\endcsname\endinsert@DLJS@dvipdfm + \let\newsegment=\newsegment@dvipdfm + \let\endnewsegment=\endnewsegment@dvipdfm + \fi + \insert@DLJS }{} \def\@insjserrDuplicate{% - \typeout{^^J! insdljs Package error.} - \typeout{! insDLJS environment: On line number \the\inputlineno,} - \typeout{! the base name `\dljsBase' has already been chosen.} - \typeout{! A DLJS earlier defined has been overwritten!} - \typeout{! Choose another name for the first required argument} - \typeout{! of the insDLJS environment.^^J} + \typeout{^^J! insdljs Package error.} + \typeout{! insDLJS environment: On line number \the\inputlineno,} + \typeout{! the base name `\dljsBase' has already been chosen.} + \typeout{! A DLJS earlier defined has been overwritten!} + \typeout{! Choose another name for the first required argument} + \typeout{! of the insDLJS environment.^^J} } \newif\ifisdljs \isdljsfalse \begingroup @@ -566,18 +566,18 @@ \def\ckivspace#1{\if\noexpand#1\space\else\expandafter#1\fi} \let\DLspecialDefs\@empty \def\fdfAfterheader#1{% - \iwvo{\string\begingroup\string\efdlspecials} - \iwvo{\string\DLspecialDefs\string#1} - \iwvo{\string\isdljstrue} - \iwvo{\string\makeatletter} - \iwvo{\string\immediate\string\openout\string + \iwvo{\string\begingroup\string\efdlspecials} + \iwvo{\string\DLspecialDefs\string#1} + \iwvo{\string\isdljstrue} + \iwvo{\string\makeatletter} + \iwvo{\string\immediate\string\openout\string \js@verbatim@out=\string\js@Path\space\dljsBase.fdf}% - \iwvo{\string\begin{jsexpverbatimwrite}} - \iwvo{\string\firstFDFline} - \iwvo{1 0 obj} - \iwvo{<< /FDF << /JavaScript << /Doc 2 0 R /After 3 0 R >> >> >> } - \iwvo{endobj} - \iwvo{2 0 obj} + \iwvo{\string\begin{jsexpverbatimwrite}} + \iwvo{\string\firstFDFline} + \iwvo{1 0 obj} + \iwvo{<< /FDF << /JavaScript << /Doc 2 0 R /After 3 0 R >> >> >> } + \iwvo{endobj} + \iwvo{2 0 obj} \let\x\@empty \applydljs{\def\x{^^Jvar _thereisdjs=true;}}% \ifpdfmarkup @@ -591,30 +591,30 @@ \def\restoreDLspecialDefs{\let\DLspecialDefs\@empty} \newenvironment{execJS}[2][\relax] {% - \def\x{#1}\ifx\x\@empty\def\x{\relax}\fi - \gdef\detectdljs{\string_#2}\gdef\dljsBase{#2}% - \global\dljsobjtoks={}% - \expandafter\gdef\csname dljs\dljsBase\endcsname{}% - \ifx\importdljs\dl@YES\ifx\execjs\dl@YES - \ifx\dl@gopro\dl@YES - \ifnum\dljs@drivernum=0\relax - \addImportAnFDF\importAnFDFTemplate - \else - \OpenAction{/S/JavaScript/JS (\importAnFDFTemplate)}% - \fi\fi + \def\x{#1}\ifx\x\@empty\def\x{\relax}\fi + \gdef\detectdljs{\string_#2}\gdef\dljsBase{#2}% + \global\dljsobjtoks={}% + \expandafter\gdef\csname dljs\dljsBase\endcsname{}% + \ifx\importdljs\dl@YES\ifx\execjs\dl@YES + \ifx\dl@gopro\dl@YES + \ifnum\dljs@drivernum=0\relax + \addImportAnFDF\importAnFDFTemplate + \else + \OpenAction{/S/JavaScript/JS (\importAnFDFTemplate)}% \fi\fi - \immediate\openout \js@verbatim@out \js@Path\dljsBase.djs - \expandafter\fdfAfterheader\expandafter{\x}% - \js@verbatimwrite + \fi\fi + \immediate\openout \js@verbatim@out \js@Path\dljsBase.djs + \expandafter\fdfAfterheader\expandafter{\x}% + \js@verbatimwrite }{% - \fdfendstreamobj - \endjs@verbatimwrite - \fdftrailer - \iwvo{\string\restoreDLspecialDefs}% - \closejs@verbatim@out - \expandafter\xdef\csname\dljsBase OBJ\endcsname{\the\dljsobjtoks}% - \edef\@dljstmp{\noexpand\AtBeginDocument{% - \noexpand\input{\js@Path\dljsBase.djs}}}\@dljstmp + \fdfendstreamobj + \endjs@verbatimwrite + \fdftrailer + \iwvo{\string\restoreDLspecialDefs}% + \closejs@verbatim@out + \expandafter\xdef\csname\dljsBase OBJ\endcsname{\the\dljsobjtoks}% + \edef\@dljstmp{\noexpand\AtBeginDocument{% + \noexpand\input{\js@Path\dljsBase.djs}}}\@dljstmp } \newtoks\JStoks \def\dl@param(#1){\csname p@r@m#1\endcsname} @@ -627,42 +627,46 @@ \def\bParams@i#1\eParams{\@tfor\x:=#1\do{\advance\c@dljs@cnt\@ne \JStoks=\expandafter{\x}\expandafter \edef\csname\p@r@m\the\c@dljs@cnt\endcsname{\the\JStoks}}} -\def\pdfSpacesOn{\let\pdfSP\pdfSPDef} -\def\pdfSpacesOff{\let\pdfSP\dl@sp@ce} \def\dlcombine(#1)(#2){#1#2} +\def\dlcontig(#1){#1} \def\escIs#1{\def\Eschr{#1}} \def\dl@makeesc#1{\catcode`#1=0\relax} -\def\dlgobToFi#1\fi{\defjsLB} -\newenvironment{defineJS}[2][]{% - \let\makeesc\dl@makeesc +\def\dl@makecmt#1{\catcode`#1=14\relax} +\def\dlgobToFi#1\fi{\fi\defjsLB} +\let\gobiv\@gobblefour +\newif\ifdlfortypeset \dlfortypesetfalse +\def\dl@typesetthis{\global\dlfortypesettrue + \dfnJSCR{\hfil\break\null}} +\def\@initdfnJS{\let\jsFrstLne\dl@One\let\makeesc\dl@makeesc + \let\makecmt\dl@makecmt\let\typeset\dl@typesetthis} +\def\@vrbsetupdfnJS{\def\verbatim@processline{\ifx\jsFrstLne\dl@One + \let\jsFrstLne\dl@Zero + \xdef\JS@temp{\the\JStoks\the\verbatim@line}\else + \xdef\JS@temp{\the\JStoks\defineJSjsR\the\verbatim@line}\fi + \global\JStoks=\expandafter{\JS@temp}}% + \let\do\@makeother\dospecials\catcode`\^^M\active} +\def\b@vrbdfnJS#1{\global\let\space\pdfSP\makeatletter\obeyspaces% + #1\ifdlfortypeset\global\JStoks={\bgroup\leavevmode\dl@paramlocal}\fi% + \verbatim@start} +\def\e@vrbdfnJS{\gdef\eq@JStemp{\ifdlfortypeset\global + \JStoks=\expandafter{\the\JStoks\egroup}\fi\expandafter + \edef\defineJSArg{\the\JStoks}\global + \dlfortypesetfalse}\global\let\space\dl@sp@ce\aftergroup\eq@JStemp} +\newenvironment{defineJS}[2][]{\@initdfnJS \expandafter\@ifundefined\expandafter{% - \expandafter\@gobble\string#2}{}{% - \PackageWarning{insdljs}{The command - \string#2 already defined}}% - \gdef\defineJSArg{#2}\JStoks={}% - \def\verbatim@processline{% - \xdef\JS@temp{\the\JStoks\the\verbatim@line\defineJSjsR}% - \global\JStoks=\expandafter{\JS@temp}}% - \let\do\@makeother\dospecials\catcode`\^^M\active - \global\let\space\pdfSP\makeatletter\obeyspaces - #1% - \verbatim@start -}{\gdef\eq@JStemp{\expandafter\edef\defineJSArg{\the\JStoks}}% - \global\let\space\dl@sp@ce\aftergroup\eq@JStemp} -\newenvironment{@defineJS}[2][] -{% - \let\makeesc\dl@makeesc - \gdef\defineJSArg{#2}\JStoks={}% - \def\verbatim@processline{% - \xdef\JS@temp{\the\JStoks\the\verbatim@line\defineJSjsR}% - \global\JStoks=\expandafter{\JS@temp}}% - \let\do\@makeother\dospecials\catcode`\^^M\active - \global\let\space\pdfSP\makeatletter\obeyspaces - #1% - \verbatim@start -}{\gdef\eq@JStemp{\expandafter\edef\defineJSArg{\the\JStoks}}% - \global\let\space\dl@sp@ce\aftergroup\eq@JStemp} -\newenvironment{defineJS*}{\@defineJS}{\end@defineJS} + \expandafter\@gobble\string#2}{}{\PackageWarning{insdljs} + {The command \string#2 already defined}}% + \gdef\defineJSArg{#2}\global\JStoks={}% + \@vrbsetupdfnJS + \b@vrbdfnJS{#1}}{\e@vrbdfnJS} +\newenvironment{@defineJS}[2][]{\@initdfnJS + \gdef\defineJSArg{#2}\global\JStoks={}% + \@vrbsetupdfnJS + \b@vrbdfnJS{#1}}{\e@vrbdfnJS} +\newenvironment{defineJS*}[2][]{\@initdfnJS + \gdef\defineJSArg{#2}\global\JStoks={}% + \@vrbsetupdfnJS + \b@vrbdfnJS{#1}}{\e@vrbdfnJS} \newenvironment{localJS}[1][]{}{\ifvmode\else\unskip\fi} \newenvironment{willClose}[1][] {\@defineJS[#1]{\will@Close}} @@ -685,29 +689,29 @@ {\end@defineJS} \let\did@Print\@empty \def\dljs@willDidActions{/AA << - \ifx\test@will@Close\@empty\else/WC << - \JS{\will@Close} >>\fi - \ifx\test@will@Save\@empty\else/WS << - \JS{\will@Save} >>\fi - \ifx\test@did@Save\@empty\else/DS << - \JS{\did@Save} >>\fi - \ifx\test@will@Print\@empty\else/WP << - \JS{\will@Print} >>\fi - \ifx\test@did@Print\@empty\else/DP << - \JS{\did@Print} >>\fi - >> + \ifx\test@will@Close\@empty\else/WC << + \JS{\will@Close} >>\fi + \ifx\test@will@Save\@empty\else/WS << + \JS{\will@Save} >>\fi + \ifx\test@did@Save\@empty\else/DS << + \JS{\did@Save} >>\fi + \ifx\test@will@Print\@empty\else/WP << + \JS{\will@Print} >>\fi + \ifx\test@did@Print\@empty\else/DP << + \JS{\did@Print} >>\fi + >> } \newcommand\dljs@setDocActions{% - \edef\test@will@Close{\will@Close}% - \edef\test@will@Save{\will@Save}% - \edef\test@did@Save{\did@Save}% - \edef\test@will@Print{\will@Print}% - \edef\test@did@Print{\did@Print}% - \ifpdf\pdfcatalog{\dljs@willDidActions}\else - \ifxetex\immediate - \@pdfm@mark{put @catalog <<\dljs@willDidActions>>}\else - \literalps@out{\AEB@psMrk - {Catalog} <<\dljs@willDidActions>> /PUT pdfmark}\fi\fi + \edef\test@will@Close{\will@Close}% + \edef\test@will@Save{\will@Save}% + \edef\test@did@Save{\did@Save}% + \edef\test@will@Print{\will@Print}% + \edef\test@did@Print{\did@Print}% + \ifpdf\pdfcatalog{\dljs@willDidActions}\else + \ifxetex\immediate + \@pdfm@mark{put @catalog <<\dljs@willDidActions>>}\else + \literalps@out{\AEB@psMrk + {Catalog} <<\dljs@willDidActions>> /PUT pdfmark}\fi\fi } \@ifpackageloaded{aeb_pro}{} {\AtBeginDocument{\dljs@setDocActions}} @@ -722,7 +726,7 @@ \iwvo{\string\isdljstrue} \iwvo{\string\makeatletter} \iwvo{\string\immediate\string\openout\string - \js@verbatim@out=\string\js@Path\space\dljsBase.fdf}% + \js@verbatim@out=\string\js@Path\space\dljsBase.fdf}% \iwvo{\string\begin{jsexpverbatimwrite}} \iwvo{\string\firstFDFline} \iwvo{1 0 obj} @@ -730,7 +734,7 @@ \iwvo{endobj} \iwvo{2 0 obj} \iwvo{[ \string\csname\string\@gobble\space\dljsBase% - OBJ\string\endcsname]} + OBJ\string\endcsname]} \iwvo{endobj} } \def\fdfbeginstreamobj @@ -739,10 +743,9 @@ \iwvo{<<>>} \iwvo{stream} \applydljs{\iwvo{var _thereisdjs=true;}} - \ifx\insdljsloadVar\@empty\else - \iwvo{\insdljsloadVar} - \global\let\insdljsloadVar\@empty - \fi + \ifx\insdljsloadVar\@empty\else + \iwvo{\insdljsloadVar} + \global\let\insdljsloadVar\@empty\fi } \def\fdfendstreamobj{% \iwvo{endstream} @@ -759,57 +762,54 @@ \newtoks\dljsobjtoks \dljsobjtoks={} \def\importAnFDFTemplate{% if(typeof \detectdljs\space == "undefined")\jsR\jsT - ( app.viewerVersion > 8 ) ? % - aebTrustedFunctions( this, aebImportAnFDF, % - "\js@Path\dljsBase.fdf") : % - this.importAnFDF("\js@Path\dljsBase.fdf");\jsR + ( app.viewerVersion > 8 ) ? % + aebTrustedFunctions( this, aebImportAnFDF, % + "\js@Path\dljsBase.fdf") : % + this.importAnFDF("\js@Path\dljsBase.fdf");\jsR } \def\addImportAnFDF#1{% - \ifx\importdljs\dl@YES - \edef\importAnFDFtmp{\the\importfdftoks#1}% - \global\importfdftoks=\expandafter{\importAnFDFtmp}% - \fi + \ifx\importdljs\dl@YES + \edef\importAnFDFtmp{\the\importfdftoks#1}% + \global\importfdftoks=\expandafter{\importAnFDFtmp}\fi } \def\importAnFDF{\ifx\importdljs\dl@YES\@OAction\fi} \newenvironment{newsegment@pdfmark}[1]{% - \addtocounter{dljssegs}{1}% - \addtocounter{dljs@cnt}{1}% - \Hy@unicodefalse\pdfstringdef{\dljsName}{#1}% - \edef\@dljstmp{\the\dljsobjtoks(\dljsName) - \thedljssegs\space 0 R\space} - \global\dljsobjtoks=\expandafter{\@dljstmp} - \fdfbeginstreamobj - \js@verbatimwrite + \addtocounter{dljssegs}{1}\addtocounter{dljs@cnt}{1}% + \Hy@unicodefalse\pdfstringdef{\dljsName}{#1}% + \edef\@dljstmp{\the\dljsobjtoks(\dljsName) + \thedljssegs\space 0 R\space}% + \global\dljsobjtoks=\expandafter{\@dljstmp}% + \fdfbeginstreamobj + \js@verbatimwrite }{% - \fdfendstreamobj - \endjs@verbatimwrite + \fdfendstreamobj + \endjs@verbatimwrite } \def\insert@DLJS@pdfmark{% - \global\let\dljspresent\dl@YES - \expandafter\gdef\csname dljs\dljsBase\endcsname{}% - \ifx\importdljs\dl@YES\ifx\dl@gopro\dl@YES - \addImportAnFDF\importAnFDFTemplate - \fi\fi - \immediate\openout \js@verbatim@out \js@Path\dljsBase.djs - \fdfheader - \ifx\multisegments\dl@NO\expandafter - \newsegment\expandafter{\expandafter\dljsName\expandafter}\fi + \global\let\dljspresent\dl@YES + \expandafter\gdef\csname dljs\dljsBase\endcsname{}% + \ifx\importdljs\dl@YES\ifx\dl@gopro\dl@YES + \addImportAnFDF\importAnFDFTemplate\fi\fi + \immediate\openout \js@verbatim@out \js@Path\dljsBase.djs + \fdfheader + \ifx\multisegments\dl@NO\expandafter + \newsegment\expandafter{\expandafter\dljsName\expandafter}\fi } \def\endinsert@DLJS@pdfmark{% - \ifx\importdljs\dl@YES - \ifx\multisegments\dl@NO\expandafter\endnewsegment\fi - \fdftrailer - \closejs@verbatim@out - \expandafter\xdef\csname\dljsBase% - OBJ\endcsname{\the\dljsobjtoks}% - \edef\@dljstmp{\noexpand\AtBeginDocument{% - \noexpand\input{\js@Path\dljsBase.djs}}}% - \@dljstmp - \ifx\firstdljs\dl@YES - \AtBeginDocument{\edef\@dljstmp{\importAnFDF}% - \@dljstmp}\global\let\firstdljs\dl@NO - \fi + \ifx\importdljs\dl@YES + \ifx\multisegments\dl@NO\expandafter\endnewsegment\fi + \fdftrailer + \closejs@verbatim@out + \expandafter\xdef\csname\dljsBase% + OBJ\endcsname{\the\dljsobjtoks}% + \edef\@dljstmp{\noexpand\AtBeginDocument{% + \noexpand\input{\js@Path\dljsBase.djs}}}% + \@dljstmp + \ifx\firstdljs\dl@YES + \AtBeginDocument{\edef\@dljstmp{\importAnFDF}% + \@dljstmp}\global\let\firstdljs\dl@NO \fi + \fi } \begingroup \catcode`\@=0 @catcode`@\=12 @@ -889,17 +889,15 @@ if(typeof \detectdljs\space == "undefined")\jsR\jsT \fi \fi } -\def\setDLJSRef@pdftex -{% - \noexpand\immediate\noexpand\pdfobj {% +\def\setDLJSRef@pdftex{\noexpand + \immediate\noexpand\pdfobj {% << /Names [\the\importfdftoks] >> }% \edef\noexpand\objNames{\noexpand\the\noexpand\pdflastobj\space 0 R}% \pdfnames {/JavaScript \noexpand\objNames}% } \newenvironment{newsegment@dvipdfm}[1] {% - \addtocounter{dljssegs}{1}% - \addtocounter{dljs@cnt}{1}% + \addtocounter{dljssegs}{1}\addtocounter{dljs@cnt}{1}% \edef\tmp{^^J\string\immediate\string \csname\space @pdfm@mark\string\endcsname {obj @obj\dljsBase\roman{dljssegs}\space << /S/JavaScript% diff --git a/texmf-dist/tex/latex/acrotex/pdfdochex.def b/texmf-dist/tex/latex/acrotex/pdfdochex.def index 14ff0a80..3132ebf8 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-2019 D. P. Story %% +%% Copyright (C) 2002-2020 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 6f215b0a..288058de 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-2019 D. P. Story %% +%% Copyright (C) 2002-2020 D. P. Story %% %% dpstory@uakron.edu %% %% %% %% This program can redistributed and/or modified under %% @@ -21,42 +21,42 @@ var debugCalc=false; ef_setCalcOrder.lastIndex=0; function ef_setCalcOrder (a) { - var o1, o2, f; - while ( a.length > 0) { - if (a.length > 1) { - f=a.shift(); - o1=this.getField(f); - if ( o1 == null ) { - ef_CalcOrderErr(f); - continue; - } - f = a[0]; - o2=this.getField(f); - if ( o2 == null ) { - ef_CalcOrderErr(f); - a.shift(); - continue; - } - if ( o2.calcOrderIndex < o1.calcOrderIndex ) { - o2.calcOrderIndex=o1.calcOrderIndex+1; -ef_setCalcOrder.lastIndex=o2.calcOrderIndex; -} - } else { - f=a.shift(); -o1=this.getField(f); - if ( o1 == null ) { - ef_CalcOrderErr(f); - continue; - } -o1.calcOrderIndex=ef_setCalcOrder.lastIndex; -} + var o1, o2, f; + while ( a.length > 0) { + if (a.length > 1) { + f=a.shift(); + o1=this.getField(f); + if ( o1 == null ) { + ef_CalcOrderErr(f); + continue; + } + f = a[0]; + o2=this.getField(f); + if ( o2 == null ) { + ef_CalcOrderErr(f); + a.shift(); + continue; + } + if ( o2.calcOrderIndex < o1.calcOrderIndex ) { + o2.calcOrderIndex=o1.calcOrderIndex+1; + ef_setCalcOrder.lastIndex=o2.calcOrderIndex; + } + } else { + f=a.shift(); + o1=this.getField(f); + if ( o1 == null ) { + ef_CalcOrderErr(f); + continue; + } + o1.calcOrderIndex=ef_setCalcOrder.lastIndex; } + } } function ef_CalcOrderErr(f) { - console.show(); app.beep(0); - console.println("calcOrder: the field \""+ f - + "\" does not exist in this document, skipping it.\n\n" - + "calcOrder: Check the case sensitive spelling of the field."); + console.show(); app.beep(0); + console.println("calcOrder: the field \""+ f + + "\" does not exist in this document, skipping it.\n\n" + + "calcOrder: Check the case sensitive spelling of the field."); } var _EfCalcOrder=\efCalcOrder; ef_setCalcOrder(_EfCalcOrder); diff --git a/texmf-dist/tex/latex/acrotex/template.def b/texmf-dist/tex/latex/acrotex/template.def index 08c6a64d..9d06ce86 100644 --- a/texmf-dist/tex/latex/acrotex/template.def +++ b/texmf-dist/tex/latex/acrotex/template.def @@ -18,7 +18,7 @@ %% License, or (at your option) any later version. %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ProvidesFile{template.def} - [2020/03/14 v8.5.10 % + [2021/01/20 v8.6.2 % Exerquiz template for language support (dps)] %%------------- Instructions ------------------------------------ %% Make your language localizations to this file and rename it to diff --git a/texmf-dist/tex/latex/acrotex/uieforms.def b/texmf-dist/tex/latex/acrotex/uieforms.def index b441ba55..74739daa 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-2019 D. P. Story %% +%% Copyright (C) 2002-2020 D. P. Story %% %% dpstory@uakron.edu %% %% %% %% This program can redistributed and/or modified under %% @@ -22,59 +22,63 @@ \def\eq@bordervisibledefault{1}\@eqW{1}\fi \def\getargs#1#2{\def\aeb@argi{#1}\def\aeb@argii{#2}} \def\labelRef#1{\@ifundefined{r@#1}{Doc-Start} - {\aeb@exiii\@fourthoffive\csname r@#1\endcsname}} + {\aeb@exiii\@fourthoffive\csname r@#1\endcsname}} \def\aeb@exiii{\expandafter\expandafter\expandafter} \newtoks\ef@flagtoks \newtoks\ef@jstoks \def\noexpandiii{\noexpand\noexpand\noexpand} \define@choicekey{eforms}{border}[\val\nr]{visible,invisible} {% - \ifcase\nr - \def\eq@visibleborder{1}% - \ifx\eq@W\@empty - \ifx\eq@W@buffered\@empty\@eqW{1}\else - \@eqW{\eq@W@buffered}\fi - \else - \ifnum\eq@W@value=0 \@eqW{1}\fi - \ifx\eq@W@buffered\@empty\else - \@eqW{\eq@W@buffered}\fi - \fi - \@eqBorder{0 0 \eq@W@value}% - \or - % author has chosen invisible border - \def\eq@visibleborder{0}\@eqW{}% - \@eqBorder{0 0 0}\@eqBC{}% + \ifcase\nr + \def\eq@visibleborder{1}% + \ifx\eq@W\@empty + \ifx\eq@W@buffered\@empty\@eqW{1}\else + \@eqW{\eq@W@buffered}\fi + \else + \ifnum\eq@W@value=0 \@eqW{1}\fi + \ifx\eq@W@buffered\@empty\else + \@eqW{\eq@W@buffered}\fi \fi + \@eqBorder{0 0 \eq@W@value}% + \or + % author has chosen invisible border + \def\eq@visibleborder{0}\@eqW{}% + \@eqBorder{0 0 0}\@eqBC{}% + \fi } \define@choicekey{eforms}{linewidth}[\val\nr]{thin,medium,thick} {% - \ifx\annot@type\annot@type@link - \ifx\eq@visibleborder\@empty - \ifnum\eq@bordervisibledefault=0 - \edef\eq@W@buffered{\ifcase\nr 1\or2\or3\fi}% - \@eqW{}% - \else - \ifcase\nr \@eqW{1}\or\@eqW{2}\or - \@eqW{3}\else\@eqW{1}\fi\@eqBorder{0 0 \eq@W@value}% - \fi - \else - \ifnum\eq@visibleborder=1 % visible border - \ifcase\nr \@eqW{1}\or\@eqW{2}\or - \@eqW{3}\else\@eqW{1}\fi\@eqBorder{0 0 \eq@W@value}% - \fi - \fi + \ifx\annot@type\annot@type@link + \ifx\eq@visibleborder\@empty + \ifnum\eq@bordervisibledefault=0 + \edef\eq@W@buffered{\ifcase\nr 1\or2\or3\fi}% + \@eqW{}% + \else + \ifcase\nr\@eqW{1}\or\@eqW{2}\or + \@eqW{3}\else\@eqW{1}\fi + \@eqBorder{0 0 \eq@W@value}% + \fi \else - \ifx\eq@visibleborder\@empty - \ifcase\nr \@eqW{1}\or\@eqW{2}\or - \@eqW{3}\else\@eqW{1}\fi\@eqBorder{0 0 \eq@W@value}% - \edef\eq@W@buffered{\ifcase\nr 1\or2\or3\fi}% - \else - \ifnum\eq@visibleborder>0 - \ifcase\nr \@eqW{1}\or\@eqW{2}\or - \@eqW{3}\else\@eqW{1}\fi\@eqBorder{0 0 \eq@W@value}% - \fi - \fi + \ifnum\eq@visibleborder=1 % visible border + \ifcase\nr\@eqW{1}\or\@eqW{2}\or + \@eqW{3}\else\@eqW{1}\fi + \@eqBorder{0 0 \eq@W@value}% + \fi + \fi + \else + \ifx\eq@visibleborder\@empty + \ifcase\nr \@eqW{1}\or\@eqW{2}\or + \@eqW{3}\else\@eqW{1}\fi + \@eqBorder{0 0 \eq@W@value}% + \edef\eq@W@buffered{\ifcase\nr1\or2\or3\fi}% + \else + \ifnum\eq@visibleborder>0 + \ifcase\nr \@eqW{1}\or\@eqW{2}\or + \@eqW{3}\else\@eqW{1}\fi + \@eqBorder{0 0 \eq@W@value}% + \fi \fi + \fi } \let\eq@visibleborder\@empty \let\eq@W@buffered\@empty @@ -102,42 +106,41 @@ \let\ef@linktxtcolor@set=1\@eqlinktxtcolor{#1}} \let\ef@linktxtcolor@set=0 \define@key{eforms}{annotflags}[]{\ef@flagtoks={}% - \setkeys{annotflags}{#1}} + \setkeys{annotflags}{#1}} \@tfor\ef@flagopts:={{hidden}{FHidden}}{{print}{FPrint}}{{noprint}% - {FNoPrint}}{{-print}{FNoPrint}}{{noview}{FNoView}}{{lock}{FLock}}% - \do{\expandafter\getargs\ef@flagopts - \edef\temp@expand@def{% - \noexpand\define@key{annotflags}{\aeb@argi}[true]{% - \noexpand\ef@flagtoks=% - \noexpand\expandafter{\noexpand\ef@passedArgs}% - \noexpand\edef\noexpand\ef@passedArgs{\noexpandiii% - \F{\noexpandiii\csname\aeb@argii\noexpandiii\endcsname}% - \noexpand\the\noexpand\ef@flagtoks}% - }% - }\temp@expand@def + {FNoPrint}}{{-print}{FNoPrint}}{{noview}{FNoView}}{{lock}{FLock}}% + \do{\expandafter\getargs\ef@flagopts + \edef\temp@expand@def{\noexpand + \define@key{annotflags}{\aeb@argi}[true]{% + \noexpand\ef@flagtoks=\noexpand + \expandafter{\noexpand\ef@passedArgs}% + \noexpand\edef\noexpand\ef@passedArgs{\noexpandiii + \F{\noexpandiii\@nameuse{\aeb@argii\noexpandiii}}% + \noexpand\the\noexpand\ef@flagtoks}% + }% + }\temp@expand@def } \define@key{eforms}{fieldflags}[]{\ef@flagtoks={}% - \setkeys{fieldflags}{#1}} + \setkeys{fieldflags}{#1}} \@tfor\ef@flagopts:={{readonly}{FfReadOnly}}{{required}{FfRequired}}% - {{noexport}{FfNoExport}}{{multiline}{FfMultiline}}% - {{password}{FfPassword}}{{notoggleoff}{FfNoToggleToOff}}% - {{radio}{FfRadio}}{{pushbutton}{FfPushButton}}{{combo}{FfCombo}}% - {{edit}{FfEdit}}{{sort}{FfSort}}{{fileselect}{FfFileSelect}}% - {{multiselect}{FfMultiSelect}}{{nospellcheck}{FfDoNotSpellCheck}}% - {{noscrolling}{FfDoNotScroll}}{{comb}{FfComb}}% - {{radiosinunison}{FfRadiosInUnison}}% - {{commitonchange}{FfCommitOnSelChange}}{{richtext}{FfRichText}}\do{% - \expandafter\getargs\ef@flagopts - \edef\temp@expand@def{% - \noexpand\define@key{fieldflags}{\aeb@argi}[true]% - {% - \noexpand\ef@flagtoks=\noexpand\expandafter{% - \noexpand\ef@passedArgs}% - \noexpand\edef\noexpand\ef@passedArgs{\noexpandiii% - \Ff{\noexpandiii\csname\aeb@argii\noexpandiii\endcsname}% - \noexpand\the\noexpand\ef@flagtoks}% - }% - }\temp@expand@def + {{noexport}{FfNoExport}}{{multiline}{FfMultiline}}% + {{password}{FfPassword}}{{notoggleoff}{FfNoToggleToOff}}% + {{radio}{FfRadio}}{{pushbutton}{FfPushButton}}{{combo}{FfCombo}}% + {{edit}{FfEdit}}{{sort}{FfSort}}{{fileselect}{FfFileSelect}}% + {{multiselect}{FfMultiSelect}}{{nospellcheck}{FfDoNotSpellCheck}}% + {{noscrolling}{FfDoNotScroll}}{{comb}{FfComb}}% + {{radiosinunison}{FfRadiosInUnison}}% + {{commitonchange}{FfCommitOnSelChange}}{{richtext}{FfRichText}}\do{% + \expandafter\getargs\ef@flagopts + \edef\temp@expand@def{\noexpand + \define@key{fieldflags}{\aeb@argi}[true]{\noexpand + \ef@flagtoks=\noexpand\expandafter{\noexpand + \ef@passedArgs}\noexpand + \edef\noexpand\ef@passedArgs{\noexpandiii + \Ff{\noexpandiii\@nameuse{\aeb@argii\noexpandiii}}% + \noexpand\the\noexpand\ef@flagtoks}% + }% + }\temp@expand@def } \define@key{eforms}{tooltip}{\@eqTU{#1}} \define@key{eforms}{default}{\@eqDV{#1}} @@ -156,99 +159,97 @@ \expandafter\@eqQ\expandafter{\nr}\fi}{} \define@key{eforms}{textfont}{\@eqtextFont{#1}} \define@key{eforms}{textsize}{\@eqtextSize{#1}} -\define@key{eforms}{textcolor}{% - \@eqtextColor{#1}% -} +\define@key{eforms}{textcolor}{\@eqtextColor{#1}} \define@key{eforms}{maxlength}{\@eqMaxLen{#1}} \define@key{eforms}{normappr}{\@eqI{#1}} \define@key{eforms}{rollappr}{\@eqRI{#1}} \define@key{eforms}{downappr}{\@eqIX{#1}} \define@choicekey{eforms}{layout}[\val\nr]{labelonly,icononly,% - icontop,iconbottom,iconleft,iconright,labelover}{% - \ifx\annot@type\annot@type@button - \expandafter\@eqTP\expandafter{\nr}\fi}{} + icontop,iconbottom,iconleft,iconright,labelover}{% + \ifx\annot@type\annot@type@button\expandafter + \@eqTP\expandafter{\nr}\fi}{} \define@choicekey{eforms}{scalewhen}[\val\nr]{always,never,% - iconbig,iconsmall}{% - \ifx\annot@type\annot@type@button - \ifcase\nr\relax - \def\eq@@SW{A}\or - \def\eq@@SW{N}\or - \def\eq@@SW{B}\or - \def\eq@@SW{S}\else - \def\eq@@SW{A}\fi - \expandafter\@eqSW\expandafter{\eq@@SW}\fi}{} + iconbig,iconsmall}{% + \ifx\annot@type\annot@type@button + \ifcase\nr\relax + \def\eq@@SW{A}\or + \def\eq@@SW{N}\or + \def\eq@@SW{B}\or + \def\eq@@SW{S}\else + \def\eq@@SW{A}\fi + \expandafter\@eqSW\expandafter{\eq@@SW}\fi}{} \define@choicekey{eforms}{scale}[\val\nr]{proportional,% - nonproportional}{% - \ifx\annot@type\annot@type@button - \ifcase\nr\relax - \def\eq@@ST{P}\or - \def\eq@@ST{A}\else - \def\eq@@ST{P}\fi - \expandafter\@eqST\expandafter{\eq@@ST}\fi}{} + nonproportional}{% + \ifx\annot@type\annot@type@button + \ifcase\nr\relax + \def\eq@@ST{P}\or + \def\eq@@ST{A}\else + \def\eq@@ST{P}\fi + \expandafter\@eqST\expandafter{\eq@@ST}\fi}{} \define@key{eforms}{position}{\@eqPA{#1}} \define@choicekey{eforms}{fitbounds}[\val\nr]{true,false}[true]{% - \ifx\annot@type\annot@type@button + \ifx\annot@type\annot@type@button \ifcase\nr\relax - \def\eq@@FB{true}\or - \def\eq@@FB{false}\else - \def\eq@@FB{false}\fi - \expandafter\@eqFB\expandafter{\eq@@FB}\fi}{} + \def\eq@@FB{true}\or + \def\eq@@FB{false}\else + \def\eq@@FB{false}\fi + \expandafter\@eqFB\expandafter{\eq@@FB}\fi}{} \define@key{efappr}{norm}[]{\def\efappr@norm{#1}} \define@key{efappr}{roll}[]{\def\efappr@roll{#1}} \define@key{efappr}{down}[]{\def\efappr@down{#1}} \setkeys{efappr}{norm,roll,down} -\define@key{efappr@state}{on}[]{% - \expandafter\def\csname \ef@state @on\endcsname{#1}} -\define@key{efappr@state}{off}[]{% - \expandafter\def\csname \ef@state @off\endcsname{#1}} +\define@key{efappr@state}{on}[]{\expandafter + \def\csname \ef@state @on\endcsname{#1}} +\define@key{efappr@state}{off}[]{\expandafter + \def\csname \ef@state @off\endcsname{#1}} \let\norm@on\@empty\let\norm@off\@empty \let\roll@on\@empty\let\roll@off\@empty \let\down@on\@empty\let\down@off\@empty \define@key{eforms}{appr}{\setkeys{efappr}{#1}% - \def\ef@state{norm}% - \edef\ef@edef@tmp{\noexpand\setkeys{efappr@state}{\efappr@norm}}% - \ef@edef@tmp\def\ef@state{roll}% - \edef\ef@edef@tmp{\noexpand\setkeys{efappr@state}{\efappr@roll}}% - \ef@edef@tmp\def\ef@state{down}% - \edef\ef@edef@tmp{\noexpand\setkeys{efappr@state}{\efappr@down}}% - \ef@edef@tmp\def\eq@AP{% - /AP<< - \ifx\efappr@norm\@empty\else/N << - \eq@On\space{\norm@on}/Off {\norm@off}>>\fi - \ifx\efappr@roll\@empty\else/R << - \eq@On\space{\roll@on}/Off {\roll@off}>>\fi - \ifx\efappr@down\@empty\else/D << - \eq@On\space{\down@on}/Off {\down@off}>>\fi - \space>> - }% + \def\ef@state{norm}% + \edef\ef@edef@tmp{\noexpand\setkeys{efappr@state}{\efappr@norm}}% + \ef@edef@tmp\def\ef@state{roll}% + \edef\ef@edef@tmp{\noexpand\setkeys{efappr@state}{\efappr@roll}}% + \ef@edef@tmp\def\ef@state{down}% + \edef\ef@edef@tmp{\noexpand\setkeys{efappr@state}{\efappr@down}}% + \ef@edef@tmp\def\eq@AP{% + /AP<<% + \ifx\efappr@norm\@empty\else/N <<% + \eq@On\space{\norm@on}/Off {\norm@off}>>\fi + \ifx\efappr@roll\@empty\else/R <<% + \eq@On\space{\roll@on}/Off {\roll@off}>>\fi + \ifx\efappr@down\@empty\else/D <<% + \eq@On\space{\down@on}/Off {\down@off}>>\fi + \space>> + }% } \define@choicekey{eforms}{autocenter}[\val\nr]{yes,no} {% - \ifcase\nr\relax\@eqautoCenter{y}\or - \@eqautoCenter{n}\fi + \ifcase\nr\relax\@eqautoCenter{y}\or + \@eqautoCenter{n}\fi }{} \define@choicekey{eforms}{inline}[\val\nr]{yes,no} {% - \ifcase\nr\relax\@eqinline{y}\or - \@eqinline{n}\fi + \ifcase\nr\relax\@eqinline{y}\or + \@eqinline{n}\fi }{} \define@choicekey{eforms}{mlfix}[\val\nr]{yes,no} {% - \ifcase\nr\relax\@eqmlfix{y}\or - \@eqmlfix{n}\fi + \ifcase\nr\relax\@eqmlfix{y}\or + \@eqmlfix{n}\fi }{} \define@choicekey{eforms}{importicons}[\val\nr]{yes,no} {% - \ifcase\nr\relax\@eqimportIcons{y}\or - \@eqimportIcons{n}\fi + \ifcase\nr\relax\@eqimportIcons{y}\or + \@eqimportIcons{n}\fi }{} \define@key{eforms}{mlstrut}[\strut]{\@eqmlstrut{#1}} \define@key{eforms}{mlcrackat}[]{\@eqmlcrackat{#1}} \define@key{eforms}{mlcrackinat}[]{\@eqmlcrackinsat{#1}} \define@choicekey{eforms}{mlhyph}[\val\nr]{yes,no} {% - \ifcase\nr\relax\@eqmlhyph{y}\or - \@eqmlhyph{n}\fi + \ifcase\nr\relax\@eqmlhyph{y}\or + \@eqmlhyph{n}\fi }{} \define@key{eforms}{cmd}[]{\@eqcmd{#1}} \define@key{eforms}{presets}{\ef@jstoks=\expandafter{#1}% @@ -261,9 +262,29 @@ \ef@temp@expand } \define@choicekey{eforms}{symbolchoice}[\val\nr]% - {check,circle,cross,diamond,square,star} - {\expandafter\@eqsymbolchoice\expandafter{\val}}{} -\define@key{eforms}{lock}{\@eqLock{#1}} + {check,circle,cross,diamond,square,star} + {\expandafter\@eqsymbolchoice\expandafter{\val}}{} +\define@key{eforms}{rectW}{\@eqrectW{#1}} +\define@key{eforms}{rectH}{\@eqrectH{#1}} +\define@key{eforms}{width}{\@eqwidth{#1}} +\define@key{eforms}{height}{\@eqheight{#1}} +\define@key{eforms}{scalefactor}{\@eqscalefactor{#1}} +\define@key{eforms}{lock}{\setkeys{lckflds}{#1}% + \ifx\lckFlds\@empty + \edef\ActnArgs{\noexpand\Action\noexpand\All}\else + \edef\ActnArgs{\noexpand\Action\expandafter + \noexpand\lckActnArg{\lckFlds}}\fi + \expandafter\@eqLock\expandafter{\ActnArgs}% +} +\define@choicekey{lckflds}{action}[\val\nr]{all,include,exclude} +{% + \ifcase\nr\relax + \def\lckActnArg{\All}\or + \def\lckActnArg{\IncludeFields}\or + \def\lckActnArg{\ExcludeFields}\fi +}{} +\define@key{lckflds}{fields}{\def\lckFlds{#1}} +\let\lckFlds\@empty \define@key{eforms}{goto}[]{% \cxkvsetkeys{efgoto}{#1}% \ifx\ef@goto@url\@empty @@ -271,12 +292,9 @@ % Jump within the file \def\ef@subtype{/S/GoTo }% \ifcase\eq@drivernum - \def\ef@formatpage{{Page\ef@page}}% - \or - \def\ef@formatpage{\pdfpageref\ef@page\space\space 0 R}% - \or - \def\ef@formatpage{@page\ef@page}% - \fi + \def\ef@formatpage{{Page\ef@page}}\or + \def\ef@formatpage{\pdfpageref\ef@page\space\space 0 R}\or + \def\ef@formatpage{@page\ef@page}\fi \let\ef@open\@empty \let\ef@formatfile\@empty \else @@ -289,25 +307,21 @@ \ifx\ef@goto@targetdest\@empty \ifx\ef@labeldest\@empty % we will jump to a page, it might be the default page - \expandafter\@eqA\expandafter{\ef@subtype - /D[\ef@formatpage\ef@view]% - \ef@formatfile\ef@open}% - \else + \expandafter\@eqA\expandafter{\ef@subtype + /D[\ef@formatpage\ef@view]\ef@formatfile\ef@open}\else % jump to a label - \expandafter\@eqA\expandafter{\ef@subtype% - /D (\labelRef{\ef@labeldest})% - \ef@formatfile\ef@open}% - \fi + \expandafter\@eqA\expandafter{\ef@subtype% + /D (\labelRef{\ef@labeldest})% + \ef@formatfile\ef@open}\fi \else % jump to a target - \expandafter\@eqA\expandafter{\ef@subtype% - /D (\ef@goto@targetdest)% - \ef@formatfile\ef@open}% + \expandafter\@eqA\expandafter{\ef@subtype% + /D (\ef@goto@targetdest)\ef@formatfile\ef@open}% \fi \else % go to url \ifx\ef@goto@openparams\@empty - \@eqA{/S/URI/URI(\ef@goto@url)}\else - \@eqA{/S/URI/URI(\ef@goto@url\#\ef@goto@openparams)}% + \@eqA{/S/URI/URI(\ef@goto@url)}\else + \@eqA{/S/URI/URI(\ef@goto@url\#\ef@goto@openparams)}% \fi \fi } @@ -334,33 +348,33 @@ }{} \define@choicekey{efgoto}{open}[\val\nr]{userpref,new,existing} {% - \ifcase\nr\relax + \ifcase\nr\relax \let\ef@open\@empty\or \def\ef@open{/NewWindow true }\or \def\ef@open{/NewWindow false }\fi }{} \let\ef@open\@empty \define@key{eforms}{launch}[]{% - \cxkvsetkeys{eflaunch}{#1}% - \@eqA{/S/Launch\ifx\ef@launch@file\@empty\else - /F(\ef@launch@file)\fi\ef@launch@open - \ifx\ef@launch@win\@empty\else - /Win<<\ifx\ef@launchwin@file\@empty - /F(\ef@launch@file)\else/F(\ef@launchwin@file)\fi - \ifx\ef@launchwin@params\@empty\else - /P(\ef@launchwin@params)\fi - \ifx\ef@launchwin@open\@empty\else - /O(\ef@launchwin@open)\fi - \ifx\ef@launchwin@dir\@empty\else - /D(\ef@launchwin@dir)\fi>> - \fi - }% + \cxkvsetkeys{eflaunch}{#1}% + \@eqA{/S/Launch\ifx\ef@launch@file\@empty\else + /F(\ef@launch@file)\fi\ef@launch@open + \ifx\ef@launch@win\@empty\else + /Win<<\ifx\ef@launchwin@file\@empty + /F(\ef@launch@file)\else/F(\ef@launchwin@file)\fi + \ifx\ef@launchwin@params\@empty\else + /P(\ef@launchwin@params)\fi + \ifx\ef@launchwin@open\@empty\else + /O(\ef@launchwin@open)\fi + \ifx\ef@launchwin@dir\@empty\else + /D(\ef@launchwin@dir)\fi>> + \fi + }% } \define@key{eflaunch}{file}[]{\def\ef@launch@file{#1}} \let\ef@launch@file\@empty \define@choicekey{eflaunch}{open}[\val\nr]{userpref,new,existing} {% - \ifcase\nr\relax + \ifcase\nr\relax \let\ef@launch@open\@empty\or \def\ef@launch@open{/NewWindow true }\or \def\ef@launch@open{/NewWindow false }\fi @@ -379,18 +393,18 @@ \let\ef@launchwin@params\@empty \define@key{eforms}{js}[]{\@eqA{\JS{#1}}} \@tfor\ef@AActions:={{mouseup}{AAmouseup}}{{mousedown}{AAmousedown}}% - {{onenter}{AAmouseenter}}{{onexit}{AAmouseexit}}% - {{onfocus}{AAonfocus}}{{onblur}{AAonblur}}% - {{format}{AAformat}}{{keystroke}{AAkeystroke}}% - {{validate}{AAvalidate}}{{calculate}{AAcalculate}}% - {{pageopen}{AApageopen}}{{pageclose}{AApageclose}}% - {{pagevisible}{AApagevisible}}% - {{pageinvisible}{AApageinvisible}}\do{% - \expandafter\getargs\ef@AActions\ef@jstoks={#1}% - \edef\temp@expand@def{\noexpand\define@key{eforms}{\aeb@argi}[]% - {\noexpand\csname @eq\aeb@argii\noexpand\endcsname% - {\the\ef@jstoks}}}% - \temp@expand@def + {{onenter}{AAmouseenter}}{{onexit}{AAmouseexit}}% + {{onfocus}{AAonfocus}}{{onblur}{AAonblur}}% + {{format}{AAformat}}{{keystroke}{AAkeystroke}}% + {{validate}{AAvalidate}}{{calculate}{AAcalculate}}% + {{pageopen}{AApageopen}}{{pageclose}{AApageclose}}% + {{pagevisible}{AApagevisible}}% + {{pageinvisible}{AApageinvisible}}\do{% + \expandafter\getargs\ef@AActions\ef@jstoks={#1}% + \edef\temp@expand@def{\noexpand\define@key{eforms}{\aeb@argi}[]% + {\noexpand\csname @eq\aeb@argii\noexpand\endcsname% + {\the\ef@jstoks}}}% + \temp@expand@def } \define@key{eforms}{objdef}{\@eqobjdef{#1}} \define@key{eforms}{taborder}{\@eqtaborder{#1}} diff --git a/texmf-dist/tex/latex/acrotex/usemcfi.def b/texmf-dist/tex/latex/acrotex/usemcfi.def index f2e70208..1ccdee4c 100644 --- a/texmf-dist/tex/latex/acrotex/usemcfi.def +++ b/texmf-dist/tex/latex/acrotex/usemcfi.def @@ -17,41 +17,40 @@ %% macros/latex/base/lppl.txt; either version 1 of the %% %% License, or (at your option) any later version. %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\bMCFI{% - \withinMCFItrue - \ifx\qRadionActionsHook\@empty - \let\qRadionActionsHook@SAVE\@empty - \def\qRadionActionsHook{\jsR - qRadioButtonMCFI(\Ans@choice,"\currQuiz",\thequestionno);}\else - \let\qRadionActionsHook@SAVE\qRadionActionsHook - \def\qRadionActionsHook{\qRadionActionsHook@SAVE\jsR - qRadioButtonMCFI(\Ans@choice,"\currQuiz",\thequestionno);}\fi - \ifx\every@RespBoxMath\@empty - \let\every@RespBoxMath@SAVE\@empty - \def\every@RespBoxMath{% - \AddAAKeystroke{mcfiKeyStroke("\currQuiz",\thequestionno);}}% - \else - \let\every@RespBoxMath@SAVE\every@RespBoxMath - \expandafter\def\expandafter\every@RespBoxMath\expandafter{% - \every@RespBoxMath@SAVE - \AddAAKeystroke{mcfiKeyStroke("\currQuiz",\thequestionno);}}% - \fi +\def\bMCFI{\withinMCFItrue + \ifx\qRadionActionsHook\@empty + \let\qRadionActionsHook@SAVE\@empty + \def\qRadionActionsHook{\jsR + qRadioButtonMCFI(\Ans@choice,"\currQuiz",\thequestionno);}\else + \let\qRadionActionsHook@SAVE\qRadionActionsHook + \def\qRadionActionsHook{\qRadionActionsHook@SAVE\jsR + qRadioButtonMCFI(\Ans@choice,"\currQuiz",\thequestionno);}\fi + \ifx\every@RespBoxMath\@empty + \let\every@RespBoxMath@SAVE\@empty + \def\every@RespBoxMath{% + \AddAAKeystroke{mcfiKeyStroke("\currQuiz",\thequestionno);}}% + \else + \let\every@RespBoxMath@SAVE\every@RespBoxMath + \expandafter\def\expandafter\every@RespBoxMath\expandafter + {\every@RespBoxMath@SAVE + \AddAAKeystroke{mcfiKeyStroke("\currQuiz",\thequestionno);}}% + \fi } \def\eMCFI{% - \ifx\qRadionActionsHook@SAVE\@empty - \let\qRadionActionsHook\@empty\else - \let\qRadionActionsHook\qRadionActionsHook@SAVE\fi - \ifx\every@RespBoxMath@SAVE\@empty - \let\every@RespBoxMath\@empty\else - \let\every@RespBoxMath\every@RespBoxMath@SAVE\fi - \withinMCFIfalse + \ifx\qRadionActionsHook@SAVE\@empty + \let\qRadionActionsHook\@empty\else + \let\qRadionActionsHook\qRadionActionsHook@SAVE\fi + \ifx\every@RespBoxMath@SAVE\@empty + \let\every@RespBoxMath\@empty\else + \let\every@RespBoxMath\every@RespBoxMath@SAVE\fi + \withinMCFIfalse } \def\eqNA{-43252452452} \@ifundefined{text}{\let\MCFIMarkup@BOX\mbox}{\let\MCFIMarkup@BOX\text} \newcommand\mcfiMarkupfmt{\cgBdry - ${}^{\MCFIMarkup@BOX{\aeb@creditmarkup}}$} + ${}^{\MCFIMarkup@BOX{\aeb@creditmarkup}}$} \def\mcfiMarkup{\addtocounter{questionno}{-1}\mcfiMarkupfmt - \stepcounter{questionno}} + \stepcounter{questionno}} \newcommand{\clickChkBxMCFI}{"Click the check box preceding this math input field to enter text."} \begin{insDLJS}{mcf}{Eq: Supports MCFI-type questions} diff --git a/texmf-dist/tex/latex/acrotex/web.sty b/texmf-dist/tex/latex/acrotex/web.sty index 2a9e97e1..7398d319 100644 --- a/texmf-dist/tex/latex/acrotex/web.sty +++ b/texmf-dist/tex/latex/acrotex/web.sty @@ -29,47 +29,45 @@ \RequirePackage{ifpdf}[2006/02/20] \RequirePackage{ifxetex}[2006/08/21] \IfFileExists{xcolor.sty}{% - \def\eq@ColorPackage{xcolor}% - \PassOptionsToPackage{xcolor}{table,hyperref}% + \def\eq@ColorPackage{xcolor}% + \PassOptionsToPackage{xcolor}{table,hyperref}% }{\def\eq@ColorPackage{color}} \DeclareOptionX{noxcolor}{\def\eq@ColorPackage{color}} \let\i@web@ddtoHyOpts\@empty \let\eq@driver@name\@empty \let\web@YES=y \let\web@NO=n +\let\web@One=1 \let\web@Zero=0 \DeclareOptionX{dvipsone}{% - \def\eq@drivernum{0}\def\eq@driver@name{dvipsone}% - \let\web@set@paper\@empty - \@namedef{papersize@for@\eq@driver@name}{\AtBeginDocument{% - \special{papersize=\the\paperwidth,\the\paperheight}}}% + \def\eq@drivernum{0}\def\eq@driver@name{dvipsone}% + \let\web@set@paper\@empty + \@namedef{papersize@for@\eq@driver@name}{\AtBeginDocument + {\special{papersize=\the\paperwidth,\the\paperheight}}}% } \DeclareOptionX{dviwindo}{% - \def\eq@drivernum{4}\def\eq@driver@name{dviwindo}% - \@namedef{papersize@for@\eq@driver@name}{\def\web@set@paper{% - \special{papersize=\the\paperwidth,\the\paperheight}}}% + \def\eq@drivernum{4}\def\eq@driver@name{dviwindo}% + \@namedef{papersize@for@\eq@driver@name}{\def\web@set@paper + {\special{papersize=\the\paperwidth,\the\paperheight}}}% } \DeclareOptionX{dvipdfm}{% - \def\eq@drivernum{2}\def\eq@driver@name{dvipdfm}% - \web@opts@xdvipdfmx + \def\eq@drivernum{2}\def\eq@driver@name{dvipdfm}\web@opts@xdvipdfmx } \DeclareOptionX{dvipdfmx}{% - \def\eq@drivernum{2}\def\eq@driver@name{dvipdfmx}% - \web@opts@xdvipdfmx + \def\eq@drivernum{2}\def\eq@driver@name{dvipdfmx}\web@opts@xdvipdfmx } \DeclareOptionX{xetex}{% - \def\eq@drivernum{2}\def\eq@driver@name{xetex}% - \web@opts@xdvipdfmx + \def\eq@drivernum{2}\def\eq@driver@name{xetex}\web@opts@xdvipdfmx } \newcommand{\web@opts@xdvipdfmx}{% - \@namedef{papersize@for@\eq@driver@name}% - {\def\web@set@paper{\AtBeginDvi{% - \special{papersize=\the\paperwidth,\the\paperheight}}}}% + \@namedef{papersize@for@\eq@driver@name}% + {\def\web@set@paper{\AtBeginDvi + {\special{papersize=\the\paperwidth,\the\paperheight}}}}% } \DeclareOptionX{dvips}{% - \def\eq@drivernum{0}\def\eq@driver@name{dvips}% - \def\i@web@ddtoHyOpts{setpagesize=false}% - \let\web@set@paper\@empty - \@namedef{papersize@for@\eq@driver@name}{\AtBeginDocument{% - \special{papersize=\the\paperwidth,\the\paperheight}}}% + \def\eq@drivernum{0}\def\eq@driver@name{dvips}% + \def\i@web@ddtoHyOpts{setpagesize=false}% + \let\web@set@paper\@empty + \@namedef{papersize@for@\eq@driver@name}{\AtBeginDocument + {\special{papersize=\the\paperwidth,\the\paperheight}}}% } \DeclareOptionX{pdftex}{\ifx\eq@driver@name\@empty \def\eq@drivernum{1}\def\eq@driver@name{pdftex}% @@ -80,19 +78,17 @@ \def\i@web@ddtoHyOpts{setpagesize}\def\web@set@paper{}\fi } \DeclareOptionX{textures}{% - \def\eq@drivernum{3}\def\eq@driver@name{textures}% - \@namedef{papersize@for@\eq@driver@name}% - {\def\web@set@paper{\bgroup - \dimen2=\origpaperheight \advance\dimen2 by -\topmargin - \dimen0\dimen2 \advance\dimen0-\paperheight - \xdef\@pdfpagescrop{0 \strip@pt\dimen0 \space - \strip@pt\paperwidth\space \strip@pt\dimen2}% - \egroup}% - \AtEndOfPackage{% - \edef\origpaperwidth{\the\paperwidth}% - \edef\origpaperheight{\the\paperheight}% - }% - }% + \def\eq@drivernum{3}\def\eq@driver@name{textures}% + \@namedef{papersize@for@\eq@driver@name}% + {\def\web@set@paper{\bgroup + \dimen2=\origpaperheight \advance\dimen2 by -\topmargin + \dimen0\dimen2 \advance\dimen0-\paperheight + \xdef\@pdfpagescrop{0 \strip@pt\dimen0 \space + \strip@pt\paperwidth\space \strip@pt\dimen2}% + \egroup}\AtEndOfPackage + {\edef\origpaperwidth{\the\paperwidth}% + \edef\origpaperheight{\the\paperheight}}% + }% } \@ifundefined{ifequsecolor}{\newif\ifequsecolor \equsecolorfalse}{} \DeclareOptionX{forpaper}{\equsecolorfalse\eqforpapertrue @@ -103,15 +99,15 @@ \PassOptionsToPackage{forcolorpaper}{eqexam} \PassOptionsToPackage{forcolorpaper}{exerquiz}} \DeclareOptionX{latexlayout}{% - \let\web@layout\web@NO\ExecuteOptionsX{forcolorpaper}} + \let\web@layout\web@NO\ExecuteOptionsX{forcolorpaper}} \DeclareOptionX{uselatexsectioning}{% - \web@sectioningfalse + \web@sectioningfalse } \newif\ifweb@sectioning \web@sectioningtrue \DeclareOptionX{weblikeclass}{% - \ExecuteOptionsX{latexlayout}% - \ExecuteOptionsX{nobullets}% - \ExecuteOptionsX{uselatexsectioning}% + \ExecuteOptionsX{latexlayout}% + \ExecuteOptionsX{nobullets}% + \ExecuteOptionsX{uselatexsectioning}% } \DeclareOptionX{nodirectory}{\let\web@directory@option\web@NO} \DeclareOptionX{usedirectory}{\let\web@directory@option\web@YES} @@ -119,35 +115,35 @@ \DeclareOptionX{nobullets}{\let\web@bullets\web@NO \let\web@latextoc\web@YES\forceSubSubNumbers} \def\web@MargScrDimOpts#1#2#3#4#5#6{% - \margins{#1}{#2}{#3}{#4} % left,right,top, bottom - \screensize{#5}{#6} % height, width - \let\margins\@@margins\let\screensize\@gobbletwo + \margins{#1}{#2}{#3}{#4} % left,right,top, bottom + \screensize{#5}{#6} % height, width + \let\margins\@@margins\let\screensize\@gobbletwo } \DeclareOptionX{designi}{\AtEndOfPackage{% - \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{3.736in}{4.67in}}} + \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{3.736in}{4.67in}}} \DeclareOptionX{designii}{\AtEndOfPackage{% - \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{4.5in}{5in}}} + \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{4.5in}{5in}}} \DeclareOptionX{designiii}{\AtEndOfPackage{% - \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{5in}{6in}}} + \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{5in}{6in}}} \DeclareOptionX{designiv}{\AtEndOfPackage{% - \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{4in}{5in}}} + \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{4in}{5in}}} \DeclareOptionX{designv}{\AtEndOfPackage{% - \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{4.5in}{6in}}} + \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{4.5in}{6in}}} \DeclareOptionX{designvi}{\AtEndOfPackage{% - \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{4.17in}{4.67in}}} + \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{4.17in}{4.67in}}} \DeclareOptionX{designvii}{\AtEndOfPackage{% - \web@MargScrDimOpts{.5in}{.5in}{24pt}{.5in}{7.5in}{10in}}} + \web@MargScrDimOpts{.5in}{.5in}{24pt}{.5in}{7.5in}{10in}}} \DeclareOptionX{designviii}{\AtEndOfPackage{% - \web@MargScrDimOpts{.5in}{.5in}{24pt}{.5in}{3.75in}{6.67in}}} + \web@MargScrDimOpts{.5in}{.5in}{24pt}{.5in}{3.75in}{6.67in}}} \DeclareOptionX{designix}{\AtEndOfPackage{% - \web@MargScrDimOpts{.5in}{.5in}{24pt}{.5in}{3.75in}{6in}}} + \web@MargScrDimOpts{.5in}{.5in}{24pt}{.5in}{3.75in}{6in}}} \DeclareOptionX{usesf}{% - \def\aeb@defaultfamily{\sffamily} - \def\itdefault{sl} - \renewcommand{\familydefault}{\sfdefault} - \selectfont - \renewcommand\labelitemi{\textrm{\textbullet}} - \AtEndOfPackage{\def\web@copyright@symbol{\textrm{\copyright}}} + \def\aeb@defaultfamily{\sffamily} + \def\itdefault{sl} + \renewcommand{\familydefault}{\sfdefault} + \selectfont + \renewcommand\labelitemi{\textrm{\textbullet}} + \AtEndOfPackage{\def\web@copyright@symbol{\textrm{\copyright}}} } \def\aeb@defaultfamily{\rmfamily} \DeclareOptionX{unicode}{\def\aeb@useunicode{unicode}} @@ -155,19 +151,19 @@ \newif\if@web@hyperref \@web@hyperreftrue \DeclareOptionX{xhyperref}{\@web@hyperreffalse} \define@choicekey+{webHyOpts}{pdfencoding}[\val\nr]% - {auto,pdfdoc,unicode}[pdfdoc]{\edef\web@Hypdfencoding{\val}} - {\PackageWarning{web}{Bad choice for pdfencoding, - permissible values\MessageBreak - are auto, pdfdoc, and unicode.\MessageBreak Try again}} + {auto,pdfdoc,unicode}[pdfdoc]{\edef\web@Hypdfencoding{\val}} + {\PackageWarning{web}{Bad choice for pdfencoding, + permissible values\MessageBreak + are auto, pdfdoc, and unicode.\MessageBreak Try again}} \let\web@Hypdfencoding\@empty \let\u@web@ddtoHyOpts\@empty \let\u@web@ddtoHySetup\@empty \def\web@addtoHyOpts#1{\g@addto@macro\u@web@ddtoHyOpts{#1}} \def\web@addtoHySetup#1{\g@addto@macro\u@web@ddtoHySetup{#1}} \define@key{web.sty}{addtoHyOpts}[]{% - \setkeys*{webHyOpts}{#1}\web@addtoHyOpts{#1}} + \setkeys*{webHyOpts}{#1}\web@addtoHyOpts{#1}} \define@key{web.sty}{addtoHyOpts*}[]{% - \setkeys*{webHyOpts}{#1}\web@addtoHySetup{#1}} + \setkeys*{webHyOpts}{#1}\web@addtoHySetup{#1}} \DeclareOptionX{useui}{\PassOptionsToPackage{useui}{eforms}} \DeclareOptionX{forceSubSubNumbers}{\ExecuteOptionsX{nobullets}} \DeclareOptionX{centertitlepage}{\@centertitlepagetrue} @@ -182,31 +178,28 @@ \DeclareOptionX{draft}{\web@allowtemplatesfalse} \DeclareOptionX{usetemplates}{\def\@usetemplates{1}} \DeclareOptionX{leftpanel}% - {\def\@panelconfig{1}\def\@usetemplates{1}} + {\def\@panelconfig{1}\def\@usetemplates{1}} \DeclareOptionX{rightpanel}% - {\def\@panelconfig{2}\def\@usetemplates{1}} + {\def\@panelconfig{2}\def\@usetemplates{1}} \newif\iftemplatesforpaper \templatesforpaperfalse \DeclareOptionX{templatesforpaper}{\templatesforpapertrue - \ExecuteOptionsX{forcolorpaper}} -\DeclareOptionX{rightpanelprt}{% - \ifeqforpaper\else\ExecuteOptionsX{rightpanel}\fi -} -\DeclareOptionX{leftpanelprt}{% - \ifeqforpaper\else\ExecuteOptionsX{leftpanel}\fi -} + \ExecuteOptionsX{forcolorpaper}} +\DeclareOptionX{rightpanelprt}{\ifeqforpaper\else + \ExecuteOptionsX{rightpanel}\fi} +\DeclareOptionX{leftpanelprt}{\ifeqforpaper\else + \ExecuteOptionsX{leftpanel}\fi} \def\templatedefaults{\def\@panelsep{0pt}\def\@usetemplates{0}% - \def\@panelconfig{0}\def\@textX{0}\def\@panelX{0}% -} + \def\@panelconfig{0}\def\@textX{0}\def\@panelX{0}} \templatedefaults \DeclareOptionX{navibar}{\web@navibartrue} \DeclareOptionX{tight}{\AtEndOfPackage{\tightsettings}} \DeclareOptionX{tight*}{\AtEndOfPackage{\tightsettings*}} \let\web@tight\web@NO \DeclareOptionX{uselatexparts}{% - \AtEndOfPackage{\@ifundefined{part}{}{\let\part\web@save@part}}} + \AtEndOfPackage{\@ifundefined{part}{}{\let\part\web@save@part}}} \DeclareOptionX{uselatexchapters}{% - \AtEndOfPackage{\@ifundefined{chapter}{} - {\let\chapter\web@save@chapter}}} + \AtEndOfPackage{\@ifundefined{chapter}{} + {\let\chapter\web@save@chapter}}} \DeclareOptionX{french}{% \AtEndOfPackage{% % Recouvrement de \today @@ -244,8 +237,7 @@ \def\web@doc{Dok}} \PassOptionsToPackage{german}{exerquiz} } -\DeclareOptionX{norsk}{% - \AtEndOfPackage{% +\DeclareOptionX{norsk}{\AtEndOfPackage{% \def\today{\ifcase\month\or Januar \or Februar \or Mars \or April \or Mai \or Juni \or Juli \or August @@ -263,86 +255,82 @@ \def\web@doc{Dok}} \PassOptionsToPackage{norsk}{exerquiz} } -\DeclareOptionX{dutch}{% - \AtEndOfPackage{% +\DeclareOptionX{dutch}{\AtEndOfPackage{% \def\today{\the\day~\ifcase\month\or januari - \or februari \or maart \or april - \or mei \or juni \or juli \or augustus - \or september \or oktober \or november - \or december \fi \space \the\year} - \def\web@versionlabel{Versie} - \def\web@toc{Inhoudsopgave} - \def\web@continued{vervolg} - \def\web@article{Begin \hyperlink{\web@Start.1}{Artikel}} - \def\web@directory{Overzicht} - \def\web@revision{Laatste wijziging:} - \def\web@copyright{Copyright} - \def\web@section{Sectie} - \def\web@back{Terug} - \def\web@doc{Doc}} + \or februari \or maart \or april + \or mei \or juni \or juli \or augustus + \or september \or oktober \or november + \or december \fi \space \the\year} + \def\web@versionlabel{Versie} + \def\web@toc{Inhoudsopgave} + \def\web@continued{vervolg} + \def\web@article{Begin \hyperlink{\web@Start.1}{Artikel}} + \def\web@directory{Overzicht} + \def\web@revision{Laatste wijziging:} + \def\web@copyright{Copyright} + \def\web@section{Sectie} + \def\web@back{Terug} + \def\web@doc{Doc}} \PassOptionsToPackage{dutch}{exerquiz} } -\DeclareOptionX{spanish}{% - \AtEndOfPackage{% - \def\today{\the\day\ de \ifcase\month\or Enero - \or Febrero \or Marzo \or Abril - \or Mayo \or Junio \or Julio \or Agosto - \or Septiembre \or Octubre \or Noviembre - \or Deciembre \fi de \the\year} - \renewcommand\web@versionlabel{Versi\noexpand\'{o}n} - \renewcommand\web@toc{Tabla de Contenido} - \renewcommand\web@continued{cont.} - \renewcommand\web@article{Inicio - \hyperlink{\web@Start.1}{Art\'{\i}culo}} - \renewcommand\web@directory{Directorio} - \renewcommand\web@revision{Actualizado el:} - \renewcommand\web@copyright{Copyright} - \renewcommand\web@section{Secci\'on} - \renewcommand\web@back{Volver} - \renewcommand\web@doc{Doc}} +\DeclareOptionX{spanish}{\AtEndOfPackage{% + \def\today{\the\day\ de \ifcase\month\or Enero + \or Febrero \or Marzo \or Abril + \or Mayo \or Junio \or Julio \or Agosto + \or Septiembre \or Octubre \or Noviembre + \or Deciembre \fi de \the\year} + \renewcommand\web@versionlabel{Versi\noexpand\'{o}n} + \renewcommand\web@toc{Tabla de Contenido} + \renewcommand\web@continued{cont.} + \renewcommand\web@article{Inicio + \hyperlink{\web@Start.1}{Art\'{\i}culo}} + \renewcommand\web@directory{Directorio} + \renewcommand\web@revision{Actualizado el:} + \renewcommand\web@copyright{Copyright} + \renewcommand\web@section{Secci\'on} + \renewcommand\web@back{Volver} + \renewcommand\web@doc{Doc}} \PassOptionsToPackage{spanish}{exerquiz} } -\DeclareOptionX{italian}{% - \AtEndOfPackage{% - \def\today{\ifcase\month\or Gennaio - \or Febbraio \or Marzo \or Aprile - \or Maggio \or Giugno \or Luglio \or Agosto - \or Settembre \or Ottobre \or Novembre - \or Dicembre \fi \the\day, \the\year} - \renewcommand\web@versionlabel{Versione} - \renewcommand\web@toc{Indice} - \renewcommand\web@continued{cont.} - \renewcommand\web@article{Inizio \hyperlink{\web@Start.1}{Articolo}} - \renewcommand\web@directory{Directory} - \renewcommand\web@revision{Data Ultima Revisione:} - \renewcommand\web@copyright{Copyright} - \renewcommand\web@section{Sezione} - \renewcommand\web@back{Back} - \renewcommand\web@doc{Doc}} +\DeclareOptionX{italian}{\AtEndOfPackage{% + \def\today{\ifcase\month\or Gennaio + \or Febbraio \or Marzo \or Aprile + \or Maggio \or Giugno \or Luglio \or Agosto + \or Settembre \or Ottobre \or Novembre + \or Dicembre \fi \the\day, \the\year} + \renewcommand\web@versionlabel{Versione} + \renewcommand\web@toc{Indice} + \renewcommand\web@continued{cont.} + \renewcommand\web@article{Inizio \hyperlink{\web@Start.1}{Articolo}} + \renewcommand\web@directory{Directory} + \renewcommand\web@revision{Data Ultima Revisione:} + \renewcommand\web@copyright{Copyright} + \renewcommand\web@section{Sezione} + \renewcommand\web@back{Back} + \renewcommand\web@doc{Doc}} \PassOptionsToPackage{italian}{exerquiz} } -\DeclareOptionX{russian}{% - \ExecuteOptionsX{unicode}% +\DeclareOptionX{russian}{\ExecuteOptionsX{unicode}% \AtEndOfPackage{% \def\today{\the\day\ \ifcase\month - \or \cyrya\cyrn\cyrv\cyra\cyrr\cyrya - \or \cyrf\cyre\cyrv\cyrr\cyra\cyrl\cyrya - \or \cyrm\cyra\cyrr\cyrt\cyra - \or \cyra\cyrp\cyrr\cyre\cyrl\cyrya - \or \cyrm\cyra\cyrya - \or \cyri\cyryu\cyrn\cyrya - \or \cyri\cyryu\cyrl\cyrya - \or \cyra\cyrv\cyrg\cyru\cyrs\cyrt\cyra - \or \cyrs\cyre\cyrn\cyrt\cyrya\cyrb\cyrr\cyrya - \or \cyro\cyrk\cyrt\cyrya\cyrb\cyrr\cyrya - \or \cyrn\cyro\cyrya\cyrb\cyrr\cyrya - \or \cyrd\cyre\cyrk\cyrya\cyrb\cyrr\cyrya \fi{ }% - \the\year\ \cyrg.} + \or \cyrya\cyrn\cyrv\cyra\cyrr\cyrya + \or \cyrf\cyre\cyrv\cyrr\cyra\cyrl\cyrya + \or \cyrm\cyra\cyrr\cyrt\cyra + \or \cyra\cyrp\cyrr\cyre\cyrl\cyrya + \or \cyrm\cyra\cyrya + \or \cyri\cyryu\cyrn\cyrya + \or \cyri\cyryu\cyrl\cyrya + \or \cyra\cyrv\cyrg\cyru\cyrs\cyrt\cyra + \or \cyrs\cyre\cyrn\cyrt\cyrya\cyrb\cyrr\cyrya + \or \cyro\cyrk\cyrt\cyrya\cyrb\cyrr\cyrya + \or \cyrn\cyro\cyrya\cyrb\cyrr\cyrya + \or \cyrd\cyre\cyrk\cyrya\cyrb\cyrr\cyrya \fi{ }% + \the\year\ \cyrg.} \gdef\eq@protected##1##2{{\ifhmode ##2\else - \ifvmode ##2\else\ifinner##2\else\noexpand ##1\fi\fi\fi}}% + \ifvmode ##2\else\ifinner##2\else\noexpand ##1\fi\fi\fi}}% \def\cyrCommand##1##2{\def##1{\eq@protected##1{##2}}}% \cyrCommand\web@toc{\CYRO\cyrg\cyrl\cyra\cyrv\cyrl\cyre\cyrn% - \cyri\cyre} + \cyri\cyre} \cyrCommand\web@continued{\cyrp\cyrr\cyro\cyrd\cyro\cyrl% \cyrzh\cyre\cyrn\cyri\cyre} \cyrCommand\web@article{\CYRN\cyra\cyrch\cyra\cyrl\cyro{ }% @@ -358,8 +346,7 @@ \cyrCommand\web@section{\CYRCH\cyra\cyrs\cyrt\cyrsftsn}} \PassOptionsToPackage{russian}{exerquiz} } -\DeclareOptionX{dansk}{% - \AtEndOfPackage{% +\DeclareOptionX{dansk}{\AtEndOfPackage{% \def\today{\ifcase\month\or Januar \or Februar \or Marts \or April \or Maj \or Juni \or Juli \or August @@ -378,30 +365,26 @@ \renewcommand\web@doc{Dok}} % restricted to three characters \PassOptionsToPackage{dansk}{exerquiz} } -\DeclareOptionX{polish}{% - \AtEndOfPackage{% - \def\today{\ifcase\month\or {Stycze\'{n}} - \or Luty \or Marzec \or {Kwiecie\'{n}} - \or Maj \or Czerwiec \or Lipiec \or {\'{S}ierpie\'{n}} - \or {Wrzesie\'{n}} \or {Pa\'{z}dziernik} \or Listopad - \or {Grudzie\'{n}} \fi \the\day, \the\year} - \renewcommand\web@versionlabel{Wersja} - \renewcommand\web@toc{Spis Tre\'{s}ci} - \renewcommand\web@continued{verte} - \renewcommand\web@article{Pocz\k{a}tek do - \hyperlink{\web@Start.1}{Tekstu}} - \renewcommand\web@directory{Zawarto\'{s}\'{c}} - \renewcommand\web@revision{Ostatnia zmiana:} - \renewcommand\web@copyright{Copyright} - \renewcommand\web@section{Cze\'{s}\'{c}} - % Label Navibar - \renewcommand\web@back{Wstecz} - \renewcommand\web@doc{Dok}} % restricted to three characters - \PassOptionsToPackage{polish}{exerquiz} -} -\DeclareOptionX{finnish}{% - \AtEndOfPackage{% - % Recouvrement de \today +\DeclareOptionX{polish}{\AtEndOfPackage{% + \def\today{\ifcase\month\or {Stycze\'{n}} + \or Luty \or Marzec \or {Kwiecie\'{n}} + \or Maj \or Czerwiec \or Lipiec \or {\'{S}ierpie\'{n}} + \or {Wrzesie\'{n}} \or {Pa\'{z}dziernik} \or Listopad + \or {Grudzie\'{n}} \fi \the\day, \the\year} + \renewcommand\web@versionlabel{Wersja} + \renewcommand\web@toc{Spis Tre\'{s}ci} + \renewcommand\web@continued{verte} + \renewcommand\web@article{Pocz\k{a}tek do + \hyperlink{\web@Start.1}{Tekstu}} + \renewcommand\web@directory{Zawarto\'{s}\'{c}} + \renewcommand\web@revision{Ostatnia zmiana:} + \renewcommand\web@copyright{Copyright} + \renewcommand\web@section{Cze\'{s}\'{c}} + \renewcommand\web@back{Wstecz} + \renewcommand\web@doc{Dok}}% restricted to three characters + \PassOptionsToPackage{polish}{exerquiz} +} +\DeclareOptionX{finnish}{\AtEndOfPackage{% \def\today{\the\day\ \ifcase\month\or Tammikuu \or Helmikuu \or Maaliskuu \or Huhtikuu \or Toukokuu \or Kes\"{a}kuu \or Hein\"{a}kuu \or Elokuu @@ -418,27 +401,25 @@ \def\web@back{Takaisin}} \PassOptionsToPackage{finnish}{exerquiz} } -\DeclareOptionX{catalan}{% - \AtEndOfPackage{% - \def\today{\the\day\ de \ifcase\month\or Gener - \or Febrer \or Mar\c{c} \or Abril - \or Maig \or Juny \or Juliol \or Agost - \or Setembre \or Octubre \or Novembre - \or Desembre \fi de \the\year} - \renewcommand\web@versionlabel{Versi\noexpand\'{o}} - \renewcommand\web@toc{Taula de Contingut} - \renewcommand\web@continued{cont.} - \renewcommand\web@article{Inici \hyperlink{\web@Start.1}{Article}} - \renewcommand\web@directory{Directori} - \renewcommand\web@revision{Actualizat el:} - \renewcommand\web@copyright{Copyright} - \renewcommand\web@section{Secci\'o} - \renewcommand\web@back{Tornar} - \renewcommand\web@doc{Doc}} - \PassOptionsToPackage{catalan}{exerquiz} -} -\DeclareOptionX{czech}{% - \AtEndOfPackage{% +\DeclareOptionX{catalan}{\AtEndOfPackage{% + \def\today{\the\day\ de \ifcase\month\or Gener + \or Febrer \or Mar\c{c} \or Abril + \or Maig \or Juny \or Juliol \or Agost + \or Setembre \or Octubre \or Novembre + \or Desembre \fi de \the\year} + \renewcommand\web@versionlabel{Versi\noexpand\'{o}} + \renewcommand\web@toc{Taula de Contingut} + \renewcommand\web@continued{cont.} + \renewcommand\web@article{Inici \hyperlink{\web@Start.1}{Article}} + \renewcommand\web@directory{Directori} + \renewcommand\web@revision{Actualizat el:} + \renewcommand\web@copyright{Copyright} + \renewcommand\web@section{Secci\'o} + \renewcommand\web@back{Tornar} + \renewcommand\web@doc{Doc}} + \PassOptionsToPackage{catalan}{exerquiz} +} +\DeclareOptionX{czech}{\AtEndOfPackage{% \def\today{\number\day. \ifcase\month\or ledna\or \'unora\or b\v{r}ezna\or dubna\or kv\v{e}tna\or \v{c}ervna\or \v{c}ervence\or srpna\or z\'a\v{r}\'\i\or \v{r}\'{\i}jna\or listopadu\or prosince\fi @@ -455,28 +436,26 @@ \def\web@doc{Dok}} \PassOptionsToPackage{czech}{exerquiz} } -\DeclareOptionX{brazil}{% - \AtEndOfPackage{% - \def\today{\the\day\ de \ifcase\month\or janeiro - \or fevereiro \or mar\c{c}o \or abril - \or maio \or junho \or julho \or agosto - \or setembro \or outubro \or novembro - \or dezembro \fi de \the\year} - \renewcommand\web@versionlabel{Vers\~{a}o} - \renewcommand\web@toc{Tabela de Conte\'{u}do} - \renewcommand\web@continued{cont.} - \renewcommand\web@article{Inicie o - \hyperlink{\web@Start.1}{Artigo}} - \renewcommand\web@directory{Diret\'{o}rio} - \renewcommand\web@revision{Atualizado em:} - \renewcommand\web@copyright{Copyright} - \renewcommand\web@section{Se\c{c}\noexpand\~{a}o} - \renewcommand\web@back{Voltar} - \renewcommand\web@doc{Doc}} +\DeclareOptionX{brazil}{\AtEndOfPackage{% + \def\today{\the\day\ de \ifcase\month\or janeiro + \or fevereiro \or mar\c{c}o \or abril + \or maio \or junho \or julho \or agosto + \or setembro \or outubro \or novembro + \or dezembro \fi de \the\year} + \renewcommand\web@versionlabel{Vers\~{a}o} + \renewcommand\web@toc{Tabela de Conte\'{u}do} + \renewcommand\web@continued{cont.} + \renewcommand\web@article{Inicie o + \hyperlink{\web@Start.1}{Artigo}} + \renewcommand\web@directory{Diret\'{o}rio} + \renewcommand\web@revision{Atualizado em:} + \renewcommand\web@copyright{Copyright} + \renewcommand\web@section{Se\c{c}\noexpand\~{a}o} + \renewcommand\web@back{Voltar} + \renewcommand\web@doc{Doc}} \PassOptionsToPackage{brazil}{exerquiz} } -\DeclareOptionX{turkish}{% - \ExecuteOptionsX{unicode}% +\DeclareOptionX{turkish}{\ExecuteOptionsX{unicode}% \AtEndOfPackage{% \def\today{\the\day\ \ifcase\month\or Ocak \or \c{S}ubat \or Mart \or Nisan @@ -496,20 +475,17 @@ \PassOptionsToPackage{turkish}{exerquiz} } \DeclareOptionX*{\PassOptionsToPackage{\CurrentOption} - {\eq@ColorPackage}} -\@ifpackageloaded{xcolor}% -{% - \@ifpackagelater{xcolor}{2004/07/04}{} - {% - \PackageError{web}{% - *************************************************\MessageBreak - * Your Version of `xcolor.sty' is too old!\MessageBreak - * You need the version from 2004/07/04 or newer\MessageBreak - * or use: \string\usepackage[noxcolor]{web}\MessageBreak - * or \string\documentclass[noxcolor]{article}\MessageBreak - *************************************************}{}% - }% -}{} + {\eq@ColorPackage}} +\@ifpackageloaded{xcolor}{% + \@ifpackagelater{xcolor}{2004/07/04}{}{% + \PackageError{web}{% + *************************************************\MessageBreak + * Your Version of `xcolor.sty' is too old!\MessageBreak + * You need the version from 2004/07/04 or newer\MessageBreak + * or use: \string\usepackage[noxcolor]{web}\MessageBreak + * or \string\documentclass[noxcolor]{article}\MessageBreak + *************************************************}{}% +}}{} \newif\ifweb@navibar\web@navibarfalse \def\NaviBarOn{\global\web@navibartrue} \def\NaviBarOff{\global\web@navibarfalse} @@ -517,11 +493,10 @@ \newif\ifweb@papersize@set \web@papersize@setfalse \newif\ifweb@margins@set \web@margins@setfalse \newif\if@defaultsubsubding \@defaultsubsubdingtrue -\def\forceSubSubNumbers{% - \ifx\web@latextoc\web@YES\else - \PackageWarning{webpro}{\string\forSubSubNumbers\space - requested,\MessageBreak I'm adding the option of latextoc}\fi - \let\web@latextoc\web@YES\@defaultsubsubdingfalse +\def\forceSubSubNumbers{\ifx\web@latextoc\web@YES\else + \PackageWarning{webpro}{\string\forSubSubNumbers\space + requested,\MessageBreak I'm adding the option of latextoc}\fi + \let\web@latextoc\web@YES\@defaultsubsubdingfalse } \@ifclassloaded{report}{\newif\if@mainmatter\@mainmattertrue}{} \newcommand\NewPage{\ifeqforpaper\else\newpage\fi} @@ -560,7 +535,7 @@ \@onlypreamble\inputWebCfg \ProcessOptionsX \ifx\web@Hypdfencoding\@empty\else - \let\aeb@useunicode\@gobble\fi + \let\aeb@useunicode\@gobble\fi \def\w@csarg#1#2{\expandafter#1\csname#2\endcsname} \@nameuse{papersize@for@\eq@driver@name} \ifx\web@layout\web@YES\else\templatedefaults\fi @@ -572,23 +547,23 @@ \RequirePackage{calc} \RequirePackage{amssymb}% used for navibar \edef\web@RequireHyperref{\noexpand\RequirePackage[% - \ifpdf\else\ifxetex\else\eq@driver@name,\fi\fi - bookmarks,bookmarksnumbered,bookmarksopen,% - colorlinks,\aeb@useunicode,linkcolor=webgreen,% - filecolor=webbrown,citecolor=webgreen,% - urlcolor=webbrown,pagebackref,pdfpagemode=UseNone,% - pdfstartview=Fit,pdfpagelayout=SinglePage% - \ifx\u@web@ddtoHyOpts\@empty\else,\u@web@ddtoHyOpts\fi - \ifx\i@web@ddtoHyOpts\@empty\else,\i@web@ddtoHyOpts\fi]{hyperref}% + \ifpdf\else\ifxetex\else\eq@driver@name,\fi\fi + bookmarks,bookmarksnumbered,bookmarksopen,% + colorlinks,\aeb@useunicode,linkcolor=webgreen,% + filecolor=webbrown,citecolor=webgreen,% + urlcolor=webbrown,pagebackref,pdfpagemode=UseNone,% + pdfstartview=Fit,pdfpagelayout=SinglePage% + \ifx\u@web@ddtoHyOpts\@empty\else,\u@web@ddtoHyOpts\fi + \ifx\i@web@ddtoHyOpts\@empty\else,\i@web@ddtoHyOpts\fi]{hyperref}% } \def\w@isHyLoaded{\@ifpackageloaded{hyperref}{}{\PackageError{web} - {The xhyperref option used, but hyperref is not\MessageBreak - already loaded. Will load hyperref with the options\MessageBreak - chosen by web}{Remove xhyperref or load hyperref prior to the web - package.}\web@RequireHyperref}% + {The xhyperref option used, but hyperref is not\MessageBreak + already loaded. Will load hyperref with the options\MessageBreak + chosen by web}{Remove xhyperref or load hyperref prior to the web + package.}\web@RequireHyperref}% } \if@web@hyperref\expandafter\web@RequireHyperref\else - \expandafter\w@isHyLoaded\fi + \expandafter\w@isHyLoaded\fi \ifx\u@web@ddtoHySetup\@empty\else\edef\x{\noexpand\hypersetup {\u@web@ddtoHySetup}}\expandafter\x\fi \def\@pdfcreator{The AcroTeX eDucation Bundle} @@ -598,62 +573,58 @@ {The comment package is incompatible with the\MessageBreak aeb-comment package, do not use the comment package}}{}} \AtBeginDocument{\web@commentChkMsg} -\ifnum\@usetemplates=1\relax +\ifnum\@usetemplates=\@ne\relax \def\x{\RequirePackage{graphicx}}\expandafter\x\fi -\ifnum\@usetemplates=1\relax - \RequirePackage{eso-pic} - \ifnum\eq@drivernum=2\relax - \def\web@set@paper{\AddToShipoutPicture*{% - \special{papersize=\the\paperwidth,\the\paperheight}}}% - \AtBeginShipoutFirst{% - \begingroup - \@ifundefined{stockwidth}{% - \ifx\special@paper\@empty - \special{papersize=\the\paperwidth,\the\paperheight}% - \else - \special{papersize=\special@paper}% - \fi - }{% - \ifdim\stockwidth=\z@ - \else - \special{papersize=\the\stockwidth,\the\stockheight}% - \fi - }% - \endgroup - }% - \@ifundefined{@ShipoutPicture}{}{% - \renewcommand{\@ShipoutPicture}{% - \bgroup - \@tempswafalse% - \ifx\ESO@HookI\@empty\else\@tempswatrue\fi% - \ifx\ESO@HookII\@empty\else\@tempswatrue\fi% - \if@tempswa% - \@tempdima=1in\@tempdimb=-\@tempdima% - \advance\@tempdimb\paperheight - \@ifundefined{stockwidth}{}{% - \advance\@tempdima+\trimedge% - \advance\@tempdima+\paperwidth% - \advance\@tempdima-\stockwidth% - \if@twoside\ifodd\c@page\else% - \advance\@tempdima-2\trimedge% - \advance\@tempdima-\paperwidth% - \advance\@tempdima+\stockwidth% - \fi\fi% - \advance\@tempdimb+\trimtop}% - \unitlength=1pt% - \global\setbox\@cclv\vbox{% - \vbox{\let\protect\relax - \pictur@(0,0)% - (\strip@pt\@tempdima,\strip@pt\@tempdimb)% - \ESO@HookII\ESO@HookI\global\let\ESO@HookII\@empty% - \endpicture}% - \box\@cclv% - }% - \fi - \egroup +\ifnum\@usetemplates=\@ne + \RequirePackage{eso-pic} + \ifnum\eq@drivernum=\tw@ + \def\web@set@paper{\AddToShipoutPicture*{% + \special{papersize=\the\paperwidth,\the\paperheight}}}% + \AtBeginShipoutFirst{% + \begingroup + \@ifundefined{stockwidth}{% + \ifx\special@paper\@empty + \special{papersize=\the\paperwidth,\the\paperheight}\else + \special{papersize=\special@paper}\fi + }{% + \ifdim\stockwidth=\z@\else + \special{papersize=\the\stockwidth,\the\stockheight}\fi }% + \endgroup }% - \fi + \@ifundefined{@ShipoutPicture}{}{% + \renewcommand{\@ShipoutPicture}{% + \bgroup + \@tempswafalse% + \ifx\ESO@HookI\@empty\else\@tempswatrue\fi% + \ifx\ESO@HookII\@empty\else\@tempswatrue\fi% + \if@tempswa% + \@tempdima=1in\@tempdimb=-\@tempdima% + \advance\@tempdimb\paperheight + \@ifundefined{stockwidth}{}{% + \advance\@tempdima+\trimedge% + \advance\@tempdima+\paperwidth% + \advance\@tempdima-\stockwidth% + \if@twoside\ifodd\c@page\else% + \advance\@tempdima-2\trimedge% + \advance\@tempdima-\paperwidth% + \advance\@tempdima+\stockwidth% + \fi\fi\advance\@tempdimb+\trimtop + }% + \unitlength=1pt% + \global\setbox\@cclv\vbox{% + \vbox{\let\protect\relax + \pictur@(0,0)% + (\strip@pt\@tempdima,\strip@pt\@tempdimb)% + \ESO@HookII\ESO@HookI\global\let\ESO@HookII\@empty% + \endpicture}% + \box\@cclv% + }% + \fi + \egroup + }% shipout + }% ifundefined shipout + \fi \fi \def\getargs#1#2{\def\aeb@argi{#1}\def\aeb@argii{#2}} \let\getargsii\getargs @@ -670,223 +641,212 @@ \newcommand{\web@footskip}{4pt} \def\web@additionalheadsep{0pt} \pagestyle{empty} -\def\InitLayout -{% - \ifeqforpaper\else - \setlength\headheight{\websetheadheight} - \hoffset=0pt \voffset=0pt - \fi - \ifeqforpaper\else +\def\InitLayout{% + \ifeqforpaper\else + \setlength\headheight{\websetheadheight} + \hoffset=0pt \voffset=0pt {\@tempdima=\paperwidth - \addtolength{\@tempdima}{-\@Leftmargin}% - \addtolength{\@tempdima}{-\@Rightmargin}% - \xdef\fullscreenwidth{\the\@tempdima}}% + \addtolength{\@tempdima}{-\@Leftmargin}% + \addtolength{\@tempdima}{-\@Rightmargin}% + \xdef\fullscreenwidth{\the\@tempdima}}\fi + \ifx\web@layout\web@YES\else\templatedefaults\fi + \ifeqforpaper\else + \setlength{\textwidth}{\paperwidth} + \setlength{\textheight}{\paperheight} + \addtolength{\textheight}{-\@Topmargin} + \addtolength{\textheight}{-\@Bottommargin} + \setlength{\headsep}{\@Topmargin} + \addtolength\headsep{-\headheight} + \setlength{\topmargin}{\web@Topmargin} + \addtolength\headsep{-\topmargin} + \addtolength\headsep{\web@additionalheadsep} + \addtolength{\topmargin}{-1in} + \setlength\footskip{\@Bottommargin} + \addtolength{\footskip}{-\web@footskip} % depth of navibar + \ifcase\@panelconfig + \setlength{\oddsidemargin}{\@Leftmargin} + \setlength{\evensidemargin}{\@Leftmargin} + \or + \setlength{\oddsidemargin}{\@panelwidth} + \setlength{\evensidemargin}{\@panelwidth} + \or + \setlength{\oddsidemargin}{\@Leftmargin} + \setlength{\evensidemargin}{\@Leftmargin} \fi - \ifx\web@layout\web@YES\else\templatedefaults\fi - \ifeqforpaper\else - \setlength{\textwidth}{\paperwidth} - \setlength{\textheight}{\paperheight} - \addtolength{\textheight}{-\@Topmargin} - \addtolength{\textheight}{-\@Bottommargin} - \setlength{\headsep}{\@Topmargin} - \addtolength\headsep{-\headheight} - \setlength{\topmargin}{\web@Topmargin} - \addtolength\headsep{-\topmargin} - \addtolength\headsep{\web@additionalheadsep} - \addtolength{\topmargin}{-1in} - \setlength\footskip{\@Bottommargin} - \addtolength{\footskip}{-\web@footskip} % depth of navibar - \ifcase\@panelconfig - \setlength{\oddsidemargin}{\@Leftmargin} - \setlength{\evensidemargin}{\@Leftmargin} - \or - \setlength{\oddsidemargin}{\@panelwidth} - \setlength{\evensidemargin}{\@panelwidth} - \or - \setlength{\oddsidemargin}{\@Leftmargin} - \setlength{\evensidemargin}{\@Leftmargin} - \fi - \addtolength{\evensidemargin}{-1in} - \addtolength{\oddsidemargin}{-1in} + \addtolength{\evensidemargin}{-1in} + \addtolength{\oddsidemargin}{-1in} \fi \ifx\web@layout\web@YES - \ifcase\@panelconfig - \addtolength{\textwidth}{-\@Leftmargin} - \addtolength{\textwidth}{-\@Rightmargin} - \or % leftpanel - \addtolength{\textwidth}{-\@panelwidth} - \addtolength{\textwidth}{-\@Rightmargin} - \or % rightpanel - \addtolength{\textwidth}{-\@panelwidth} - \addtolength{\textwidth}{-\@Leftmargin} + \ifcase\@panelconfig + \addtolength{\textwidth}{-\@Leftmargin} + \addtolength{\textwidth}{-\@Rightmargin} + \or % leftpanel + \addtolength{\textwidth}{-\@panelwidth} + \addtolength{\textwidth}{-\@Rightmargin} + \or % rightpanel + \addtolength{\textwidth}{-\@panelwidth} + \addtolength{\textwidth}{-\@Leftmargin} + \fi + \ifnum\@usetemplates=\@ne + \setlength{\textscreenwidth}{\paperwidth} + \def\@textX{0} + \ifnum\@panelconfig=\@ne % leftpanel + \addtolength{\textwidth}{-\@panelsep} + \addtolength{\oddsidemargin}{\@panelsep} + \addtolength{\evensidemargin}{\@panelsep} + \addtolength{\textscreenwidth}{-\@panelwidth} + \def\@textX{\strip@pt\@panelwidth} + \def\@panelX{0} \fi - \ifnum\@usetemplates=1\relax - \setlength{\textscreenwidth}{\paperwidth} - \def\@textX{0} - \ifnum\@panelconfig=1 % leftpanel - \addtolength{\textwidth}{-\@panelsep} - \addtolength{\oddsidemargin}{\@panelsep} - \addtolength{\evensidemargin}{\@panelsep} - \addtolength{\textscreenwidth}{-\@panelwidth} - \def\@textX{\strip@pt\@panelwidth} - \def\@panelX{0} - \fi - \ifnum\@panelconfig=2 % rightpanel - \addtolength{\textwidth}{-\@panelsep} - \addtolength{\textscreenwidth}{-\@panelwidth} - \def\@textX{0} - \def\@panelX{\strip@pt\textscreenwidth} - \fi - \calculatefullwidth + \ifnum\@panelconfig=\tw@ % rightpanel + \addtolength{\textwidth}{-\@panelsep} + \addtolength{\textscreenwidth}{-\@panelwidth} + \def\@textX{0} + \def\@panelX{\strip@pt\textscreenwidth} \fi + \calculatefullwidth + \fi \fi } -\def\@convLtoP#1#2{% - \afterassignment\@convLtoP@i\dimen@#2bp\relax{#1}{#2}} +\def\@convLtoP#1#2{\afterassignment + \@convLtoP@i\dimen@#2bp\relax{#1}{#2}} \def\@convLtoP@i#1\relax#2#3{% - \if!#1!% - \def#2{#3}% - \else - \dimen@.99626\dimen@ - \edef#2{\strip@pt\dimen@}% - \fi} + \if!#1!\def#2{#3}\else + \dimen@.99626\dimen@\edef#2{\strip@pt\dimen@}\fi} \providecommand\setPageDevice[3][600]{\bgroup - \@convLtoP{\width}{#2}\@convLtoP{\height}{#3} - \ifpdfmarkup\headerps@out{<< /HWResolution [#1 #1] % - /PageSize [\width\space\height] >> setpagedevice}\else - \PackageWarning{web}{This is a distiller only command,\MessageBreak + \@convLtoP{\width}{#2}\@convLtoP{\height}{#3} + \ifpdfmarkup\headerps@out{<< /HWResolution [#1 #1] % + /PageSize [\width\space\height] >> setpagedevice}\else + \PackageWarning{web}{This is a distiller only command,\MessageBreak ignoring \string\setPageDevice}\fi\egroup} \providecommand\allowTransparency{\bgroup - \ifpdfmarkup\headerps@out{<< % - /AllowTransparency true >> setdistillerparams}\else - \PackageWarning{web}{This is a distiller only command,\MessageBreak - ignoring \string\allowTransparency}\fi\egroup} + \ifpdfmarkup\headerps@out{<< % + /AllowTransparency true >> setdistillerparams}\else + \PackageWarning{web}{This is a distiller only command,\MessageBreak + ignoring \string\allowTransparency}\fi\egroup} \@onlypreamble\setPageDevice \@onlypreamble\allowTransparency \def\screensize#1#2{% - \def\webSaveSSDim{{#1}{#2}}% - \begingroup + \def\webSaveSSDim{{#1}{#2}}% + \begingroup \ifeqforpaper - \ifx\web@layout\web@YES - \setlength{\@tempdima}{#2}% - \global\textwidth\@tempdima - \addtolength{\@tempdima}{-\@Leftmargin}% - \addtolength{\@tempdima}{-\@Rightmargin}% - \xdef\fullscreenwidth{\the\@tempdima}% - \else - \xdef\fullscreenwidth{\the\textwidth}% - \fi + \ifx\web@layout\web@YES + \setlength{\@tempdima}{#2}\global + \textwidth\@tempdima + \addtolength{\@tempdima}{-\@Leftmargin}% + \addtolength{\@tempdima}{-\@Rightmargin}% + \xdef\fullscreenwidth{\the\@tempdima}\else + \xdef\fullscreenwidth{\the\textwidth}\fi \else - \setlength{\@tempdima}{#1}% - \global\paperheight\@tempdima - \setlength{\@tempdima}{#2}% - \global\paperwidth\@tempdima + \setlength{\@tempdima}{#1}\global + \paperheight\@tempdima + \setlength{\@tempdima}{#2}\global + \paperwidth\@tempdima \fi - \endgroup - \web@papersize@settrue - \web@set@paper % dps modified - \let\screensize\@gobbletwo - \InitLayout + \endgroup + \web@papersize@settrue + \web@set@paper + \let\screensize\@gobbletwo + \InitLayout } \let\screensize@web@save\screensize \newcommand{\setScreensizeFromGraphic}[2][]{% - \getDimsFromGraphic[#1]{#2}% + \getDimsFromGraphic[#1]{#2}% {\web@graphicScreenWidth}{\web@graphicScreenHeight}% - \screensize{\web@graphicScreenHeight}{\web@graphicScreenWidth}% + \screensize{\web@graphicScreenHeight}{\web@graphicScreenWidth}% } \@onlypreamble\setScreensizeFromGraphic -\newcommand{\getDimsFromGraphic}[4][]{{% - \setbox0=\hbox{\includegraphics[draft,#1]{#2}}% - \dimen@=\dp0 \advance\dimen@\ht0 - \xdef#3{\the\wd0 }\xdef#4{\the\dimen@}% -}} +\newcommand{\getDimsFromGraphic}[4][]{\bgroup + \setbox\z@=\hbox{\includegraphics[draft,#1]{#2}}% + \dimen@=\dp\z@ \advance\dimen@\ht\z@ + \xdef#3{\the\wd\z@ }\xdef#4{\the\dimen@}\egroup +} \def\web@getSSDims#1#2{\edef\web@@height{#1}\edef\web@@width{#2}} \def\addToWebHWError{\PackageError{web}{% - You must declare screen size first by using\MessageBreak - the \string\screensize\space command, or by declaring \MessageBreak - a design in the web option list}% - {Do as is suggested in error message!}} + You must declare screen size first by using\MessageBreak + the \string\screensize\space command, or by declaring \MessageBreak + a design in the web option list}% + {Do as is suggested in error message!}} \newcommand{\addtoWebHeight}[1]{% - \ifx\screensize\@gobbletwo - \expandafter\web@getSSDims\webSaveSSDim - \screensize@web@save{\web@@height+#1}{\web@@width}% - \else\addToWebHWError\fi + \ifx\screensize\@gobbletwo + \expandafter\web@getSSDims\webSaveSSDim + \screensize@web@save{\web@@height+#1}{\web@@width}% + \else\addToWebHWError\fi } \newcommand{\addtoWebWidth}[1]{% - \ifx\screensize\@gobbletwo - \expandafter\web@getSSDims\webSaveSSDim - \screensize@web@save{\web@@height}{\web@@width+#1}% - \else\addToWebHWError\fi + \ifx\screensize\@gobbletwo + \expandafter\web@getSSDims\webSaveSSDim + \screensize@web@save{\web@@height}{\web@@width+#1}% + \else\addToWebHWError\fi } \@onlypreamble\addtoWebHeight \@onlypreamble\addtoWebWidth -\newcommand{\@margins}[5][\web@minpanelwidth] -{% - \def\webSaveMargDim{[#1]{#2}{#3}{#4}{#5}}% - \setlength{\@panelwidth}{#1}% - \ifdim\@panelwidth<\web@minpanelwidth - \setlength{\@panelwidth}{\web@minpanelwidth}\fi - \setlength{\@Leftmargin}{#2}% - \setlength{\@Rightmargin}{#3}% - \setlength{\@Topmargin}{#4}% - \setlength{\@Bottommargin}{#5}% - \web@margins@settrue - \InitLayout +\newcommand{\@margins}[5][\web@minpanelwidth]{% + \def\webSaveMargDim{[#1]{#2}{#3}{#4}{#5}}% + \setlength{\@panelwidth}{#1}% + \ifdim\@panelwidth<\web@minpanelwidth + \setlength{\@panelwidth}{\web@minpanelwidth}\fi + \setlength{\@Leftmargin}{#2}% + \setlength{\@Rightmargin}{#3}% + \setlength{\@Topmargin}{#4}% + \setlength{\@Bottommargin}{#5}% + \web@margins@settrue + \InitLayout } \let\margins\@margins \let\margins@web@save\margins \newcommand{\@@margins}[5][]{} \let\marginsize\margins \newcommand\get@MargDim[5][]{% - \def\currPanelWidth{#1}% - \def\currLeftMarg{#2}\def\currRightMarg{#3}% - \def\currTopMarg{#4}\def\currBottomMarg{#5}} + \def\currPanelWidth{#1}% + \def\currLeftMarg{#2}\def\currRightMarg{#3}% + \def\currTopMarg{#4}\def\currBottomMarg{#5}} \newcommand{\resetmargins}[5][\web@minpanelwidth]{% - \expandafter\get@MargDim\webSaveMargDim - \begingroup - \let\incby\currPanelWidth - \def\web@arg{#1}\ifx\web@arg\@empty - \setlength{\@tempdima}{\currPanelWidth}\else - \setlength{\@tempdima}{#1}\fi - \xdef\newPanelWidth{\the\@tempdima}% - \let\incby\currLeftMarg - \def\web@arg{#2}\ifx\web@arg\@empty - \setlength{\@tempdima}{\currLeftMarg}\else - \setlength{\@tempdima}{#2}\fi - \xdef\newLeftMarg{\the\@tempdima}% - \let\incby\currRightMarg - \def\web@arg{#3}\ifx\web@arg\@empty - \setlength{\@tempdima}{\currRightMarg}\else - \setlength{\@tempdima}{#3}\fi - \xdef\newRightMarg{\the\@tempdima}% - \let\incby\currTopMarg - \def\web@arg{#4}\ifx\web@arg\@empty - \setlength{\@tempdima}{\currTopMarg}\else - \setlength{\@tempdima}{#4}\fi - \xdef\newTopMarg{\the\@tempdima}% - \let\incby\currBottomMarg - \def\web@arg{#4}\ifx\web@arg\@empty - \setlength{\@tempdima}{\currBottomMarg}\else - \setlength{\@tempdima}{#5}\fi - \xdef\newBottomMarg{\the\@tempdima}% - \endgroup - \margins@web@save[\newPanelWidth]{\newLeftMarg}{\newRightMarg} - {\newTopMarg}{\newBottomMarg} + \expandafter\get@MargDim\webSaveMargDim + \begingroup + \let\incby\currPanelWidth + \def\web@arg{#1}\ifx\web@arg\@empty + \setlength{\@tempdima}{\currPanelWidth}\else + \setlength{\@tempdima}{#1}\fi + \xdef\newPanelWidth{\the\@tempdima}% + \let\incby\currLeftMarg + \def\web@arg{#2}\ifx\web@arg\@empty + \setlength{\@tempdima}{\currLeftMarg}\else + \setlength{\@tempdima}{#2}\fi + \xdef\newLeftMarg{\the\@tempdima}% + \let\incby\currRightMarg + \def\web@arg{#3}\ifx\web@arg\@empty + \setlength{\@tempdima}{\currRightMarg}\else + \setlength{\@tempdima}{#3}\fi + \xdef\newRightMarg{\the\@tempdima}% + \let\incby\currTopMarg + \def\web@arg{#4}\ifx\web@arg\@empty + \setlength{\@tempdima}{\currTopMarg}\else + \setlength{\@tempdima}{#4}\fi + \xdef\newTopMarg{\the\@tempdima}% + \let\incby\currBottomMarg + \def\web@arg{#4}\ifx\web@arg\@empty + \setlength{\@tempdima}{\currBottomMarg}\else + \setlength{\@tempdima}{#5}\fi + \xdef\newBottomMarg{\the\@tempdima}% + \endgroup + \margins@web@save[\newPanelWidth]{\newLeftMarg}{\newRightMarg} + {\newTopMarg}{\newBottomMarg}% } \@onlypreamble\resetscreensize \let\web@save@title\title \def\title{\@ifnextchar[{\@web@title}{\@web@title[]}} \def\@web@title[#1]#2{\gdef\webtitle{#2}\hypersetup{pdftitle={#2}}% - \def\webArg{#1}\ifx\webArg\@empty\gdef\shortwebtitle{#2}\else - \gdef\shortwebtitle{#1}\fi\web@save@title{#2}} + \def\webArg{#1}\ifx\webArg\@empty\gdef\shortwebtitle{#2}\else + \gdef\shortwebtitle{#1}\fi\web@save@title{#2}} \let\web@saved@author\author \def\author#1{\gdef\webauthor{#1}\hypersetup{pdfauthor={#1}}% \web@saved@author{#1}} \def\subject{\@ifnextchar[{\@subject}{\@subject[]}} \def\@subject[#1]#2{% - \def\webArg{#1}\ifx\webArg\@empty\gdef\shortwebsubject{#2}\else - \gdef\shortwebsubject{#1}\fi\gdef\websubject{#2}% - \hypersetup{pdfsubject={#2}}} + \def\webArg{#1}\ifx\webArg\@empty\gdef\shortwebsubject{#2}\else + \gdef\shortwebsubject{#1}\fi\gdef\websubject{#2}% + \hypersetup{pdfsubject={#2}}} \def\email#1{\gdef\webemail{#1}} \def\thewebemail{\href{mailto:\webemail}{\webemail}} \def\keywords#1{\gdef\webkeywords{#1}\hypersetup{pdfkeywords={#1}}} @@ -894,9 +854,9 @@ \let\web@pdfLang\@empty \def\university#1{\gdef\webuniversity{#1}} \def\version#1{\gdef\web@version@value{#1}% - \edef\webversion{\ifx\web@version@value\@empty\else - \noexpand\web@versionlabel\noexpand\ - \noexpand\web@version@value\fi}% + \edef\webversion{\ifx\web@version@value\@empty\else + \noexpand\web@versionlabel\noexpand\ + \noexpand\web@version@value\fi}% } \let\web@version@value\@empty \def\versionLabel#1{\def\web@versionlabel{#1}} @@ -934,24 +894,23 @@ \providecommand\FALSEACTIONii{\aftergroup\SETTEMPBOXi} \providecommand\FALSEACTIONiia{\aftergroup\SHOWTEMPBOXi} \providecommand\SETTEMPBOXi{\IF@AorBswitch\else - \afterassignment\TRUEACTIONia\fi - \setbox\webtempboxi=\hbox} + \afterassignment\TRUEACTIONia\fi + \setbox\webtempboxi=\hbox} \providecommand\SETTEMPBOXii{\IF@AorBswitch - \afterassignment\FALSEACTIONiia\fi - \setbox\webtempboxii=\hbox} + \afterassignment\FALSEACTIONiia\fi + \setbox\webtempboxii=\hbox} \def\prtscrV{\let\IF@AorBswitch\ifeqforpaper - \ifeqforpaper - \def\web@next{\afterassignment\TRUEACTIONi\SETTEMPBOXi}\else - \def\web@next{\afterassignment\FALSEACTIONii\SETTEMPBOXii}\fi - \web@next} + \ifeqforpaper + \def\web@next{\afterassignment\TRUEACTIONi\SETTEMPBOXi}\else + \def\web@next{\afterassignment\FALSEACTIONii\SETTEMPBOXii}\fi + \web@next} \newcommand{\web@aboveOptPgMatDef}{\minimumskip\vspace{\stretch{1}}} \newcommand{\aboveOPMvspace}{\web@aboveOptPgMatDef} \newcommand{\optionalPageMatter}[2][\web@aboveOptPgMatDef]{% - \def\aboveOPMvspace{#1}\def\optionalpagematter{#2}% -} + \def\aboveOPMvspace{#1}\def\optionalpagematter{#2}} \def\optionalpagematter{} \@ifundefined{thechapter} - {\def\web@Start{section}}{\def\web@Start{chapter}} + {\def\web@Start{section}}{\def\web@Start{chapter}} \newcommand{\titleauthorproportion}{.33} \newcommand{\hproportionwebuniversity}{.7} \newcommand{\hproportionwebtitle}{.7} @@ -962,31 +921,30 @@ \def\nocopyrightsymbol{\let\web@copyright@symbol\@gobble} \newcommand{\trailerFontSize}{\footnotesize} \def\maketitle@trailer@ul{\web@copyright\ \web@copyright@symbol\ - \webcopyrightyears} + \webcopyrightyears} \def\maketitle@trailer@ll{\web@revision\ \@date} \def\maketitle@trailer@ur{\thewebemail} \def\maketitle@trailer@lr{\webversion} -\newcommand{\titlepageTrailer} -{% - \makebox[\linewidth]{\parbox{\linewidth}{% - \maketitle@trailer@ul\hfill\maketitle@trailer@ur\\ - \maketitle@trailer@ll\hfill\maketitle@trailer@lr}}% -} -\newcommand{\webdirectory}{% - \par\ifeqforpaper\else\minimumskip\fi\vspace{\stretch{1}}% - \web@priorDirMatter - \begin{flushleft}{\web@formatWordDirectory\web@directory}% - \web@priorDirList - \vspace{\vspaceAfterDirName}% - \begin{itemize}\setlength{\itemsep}{-3pt}\web@formatDirectoryItems - \ifx\web@removeDirTOC\web@YES\else\item\relax\dirTOCItem\fi - \ifx\web@removeDirArticle\web@YES\else - \item\relax\dirArticleItem\fi - \web@addtoDirList - \end{itemize} - \web@afterDirList - \end{flushleft} - \web@afterDirMatter +\newcommand{\titlepageTrailer}{% + \makebox[\linewidth]{\parbox{\linewidth}{% + \maketitle@trailer@ul\hfill\maketitle@trailer@ur\\ + \maketitle@trailer@ll\hfill\maketitle@trailer@lr}}% +} +\newcommand{\webdirectory}{\par + \ifeqforpaper\else\minimumskip\fi\vspace{\stretch{1}}% + \web@priorDirMatter + \begin{flushleft}{\web@formatWordDirectory\web@directory}% + \web@priorDirList + \vspace{\vspaceAfterDirName}% + \begin{itemize}\setlength{\itemsep}{-3pt}\web@formatDirectoryItems + \ifx\web@removeDirTOC\web@YES\else\item\relax\dirTOCItem\fi + \ifx\web@removeDirArticle\web@YES\else + \item\relax\dirArticleItem\fi + \web@addtoDirList + \end{itemize} + \web@afterDirList + \end{flushleft} + \web@afterDirMatter } \newcommand{\directoryhook}[1]{\def\web@directory@hook##1{#1}} \let\web@directory@hook\@empty @@ -1021,108 +979,101 @@ \subjectColor{black} \def\aboveTopTitleSkip#1{\def\web@aboveTopTitleSkip{#1}} \aboveTopTitleSkip{0pt} -\newcommand{\topTitlePage} -{% - \vglue\web@aboveTopTitleSkip - \noindent\makebox[\linewidth]{% - \parbox{\hproportionwebuniversity\linewidth}% - {\bfseries\color{\webuniversity@color}\ifeqforpaper\large\fi - \centering\webuniversity}}\par\ifeqforpaper\else\minimumskip\fi - \vspace{\stretch{1}}% - \noindent\makebox[\linewidth]{% - \parbox{\hproportionwebtitle\linewidth}% - {\bfseries\color{\webtitle@color}\ifeqforpaper\Large\else - \large\fi\centering\webtitle}}\par\ifeqforpaper - \vspace{2\baselineskip}\else\minimumskip\vspace{\stretch{1}}\fi - \noindent\makebox[\linewidth]{% - \parbox{\hproportionwebauthor\linewidth}% - {\bfseries\color{\webauthor@color}\ifeqforpaper - \large\fi\centering\webauthor}} +\newcommand{\topTitlePage}{% + \vglue\web@aboveTopTitleSkip + \noindent\makebox[\linewidth]{% + \parbox{\hproportionwebuniversity\linewidth}% + {\bfseries\color{\webuniversity@color}\ifeqforpaper\large\fi + \centering\webuniversity}}\par\ifeqforpaper\else\minimumskip\fi + \vspace{\stretch{1}}\noindent + \makebox[\linewidth]{% + \parbox{\hproportionwebtitle\linewidth}% + {\bfseries\color{\webtitle@color}\ifeqforpaper\Large\else + \large\fi\centering\webtitle}}\par + \ifeqforpaper + \vspace{2\baselineskip}\else\minimumskip\vspace{\stretch{1}}\fi + \noindent + \makebox[\linewidth]{% + \parbox{\hproportionwebauthor\linewidth}% + {\bfseries\color{\webauthor@color}\ifeqforpaper + \large\fi\centering\webauthor}} } \newcommand{\allowHeadingsTitlePage}{\let\web@titlepagestyle\@gobble} \def\web@titlepagestyle#1{#1} \newcommand{\coverpagemargin}{1in} -\newcommand{\maketitlepreamble} -{% - \web@titlepagestyle{\thispagestyle{empty}}% - \ifeqforpaper\if@centertitlepage - \begingroup - \if@centertitlepagefull - \@tempdima=\coverpagemargin - \else - \@tempdima\paperwidth - \advance\@tempdima-\textwidth - \@tempdima=.5\@tempdima - \edef\coverpagemargin{\the\@tempdima}% - \fi - \@tempdimb\paperwidth - \addtolength{\@tempdimb}{-2\@tempdima}% - \edef\fullscreenwidth{\the\@tempdimb}% - \linewidth\fullscreenwidth - \textwidth\fullscreenwidth - \hfuzz\linewidth - \setlength{\oddsidemargin}{\coverpagemargin-1in}% - \setlength{\evensidemargin}{\oddsidemargin}% - \marginparsep=0pt - \marginparwidth=0pt - \parindent0pt +\newcommand{\maketitlepreamble}{% + \web@titlepagestyle{\thispagestyle{empty}}% + \ifeqforpaper\if@centertitlepage + \begingroup % closes in \maketitlepostamble + \if@centertitlepagefull + \@tempdima=\coverpagemargin + \else + \@tempdima\paperwidth + \advance\@tempdima-\textwidth + \@tempdima=.5\@tempdima + \edef\coverpagemargin{\the\@tempdima}% + \fi + \@tempdimb\paperwidth + \addtolength{\@tempdimb}{-2\@tempdima}% + \edef\fullscreenwidth{\the\@tempdimb}% + \linewidth\fullscreenwidth + \textwidth\fullscreenwidth + \hfuzz\linewidth + \setlength{\oddsidemargin}{\coverpagemargin-1in}% + \setlength{\evensidemargin}{\oddsidemargin}% + \marginparsep=0pt + \marginparwidth=0pt + \parindent0pt \fi\fi } -\newcommand{\maketitlepostamble} -{% - \newpage +\newcommand{\maketitlepostamble}{\newpage \ifeqforpaper\if@centertitlepage\endgroup\fi\fi } -\newcommand{\web@maketitle} -{% - \maketitlepreamble - \ifeqforpaper\vspace*{2\baselineskip}\else - \vbox to\titleauthorproportion\textheight\bgroup\fi - \topTitlePage - \ifeqforpaper\else\egroup\fi % end of \vbox for title and author - \ifx\optionalpagematter\@empty\par\else - \begingroup\par - \aboveOPMvspace - \noindent\parbox{\linewidth}{\optionalpagematter}% - \par\endgroup\fi - \vspace{\stretch{1}} - \ifx\web@directory@option\web@YES\web@directory@hook\webdirectory\fi - \par\ifeqforpaper\else\minimumskip\fi\vspace{\stretch{1}} - \vfill\noindent\begingroup - \trailerFontSize\titlepageTrailer\par\endgroup - \maketitlepostamble +\newcommand{\web@maketitle}{% + \maketitlepreamble + \ifeqforpaper\vspace*{2\baselineskip}\else + \vbox to\titleauthorproportion\textheight\bgroup\fi + \topTitlePage + \ifeqforpaper\else\egroup\fi % end of \vbox for title and author + \ifx\optionalpagematter\@empty\par\else + \begingroup\par + \aboveOPMvspace + \noindent\parbox{\linewidth}{\optionalpagematter}% + \par\endgroup\fi + \vspace{\stretch{1}} + \ifx\web@directory@option\web@YES\web@directory@hook\webdirectory\fi + \par\ifeqforpaper\else\minimumskip\fi\vspace{\stretch{1}} + \vfill\noindent\begingroup + \trailerFontSize\titlepageTrailer\par\endgroup + \maketitlepostamble } \let\web@save@maketitle\maketitle \let\maketitle\web@maketitle -\newcommand{\makeinlinetitle} -{% - \noindent\makebox[\linewidth][c]{% - \bfseries\color{\webtitle@color}\webtitle} - \makebox[\linewidth]{% - \shortstack[l]{\strut\\ - \makebox[0pt][l]{\webuniversity}\\ - \makebox[0pt][l]{% - \@ifundefined{aeb@prepared} - {\@date}{\aeb@prepared}% - }% - }\hfill - \shortstack[c]{\strut\webauthor\\\strut}\hfill - \shortstack[r]{\strut\makebox[0pt][r]{\thewebemail}\\ - \makebox[0pt][r]{% - \@ifundefined{aeb@talksite}{\webversion} - {\ifx\aeb@talksite\@empty\webversion - \else\aeb@talksite\fi}% - }% - }% +\newcommand{\makeinlinetitle}{\noindent + \makebox[\linewidth][c]{% + \bfseries\color{\webtitle@color}\webtitle} + \makebox[\linewidth]{% + \shortstack[l]{\strut\\ + \makebox[0pt][l]{\webuniversity}\\ + \makebox[0pt][l]{\@ifundefined{aeb@prepared} + {\@date}{\aeb@prepared}% + }% + }\hfill + \shortstack[c]{\strut\webauthor\\\strut}\hfill + \shortstack[r]{\strut\makebox[0pt][r]{\thewebemail}\\ + \makebox[0pt][r]{% + \@ifundefined{aeb@talksite}{\webversion} + {\ifx\aeb@talksite\@empty\webversion + \else\aeb@talksite\fi}% + }% }% - \bigskip + }% + \bigskip } \setcounter{secnumdepth}{3} \setcounter{tocdepth}{3} \ifeqforpaper\else - \clubpenalty=50 - \widowpenalty=50 -\fi + \clubpenalty=50 \widowpenalty=50 \fi \let\web@save@listi\@listi \let\web@save@listii\@listii \let\web@save@listiii\@listiii @@ -1132,291 +1083,289 @@ \def\w@ppp#1#2#3{#1\p@ \@plus#2\p@ \@minus#3\p@} \def\w@zpp#1#2{\z@ \@plus#1\p@ \@minus#2\p@} \def\tightsettings@z{% - \setlength\partopsep{\w@ppp{2}{}{}} % unchanged - \def\web@listi{\leftmargin\leftmargini - \parsep \w@ppp{2}{2}{}% 4+2-1 - \topsep \w@ppp{2}{1}{}% 8+2-4 - \itemsep\w@ppp{2}{1}{}}% 4+2-1 - \let\@listi\web@listi - \let\@listI\@listi - \@listi - \def\web@listii {\leftmargin\leftmarginii - \labelwidth\leftmarginii - \advance\labelwidth-\labelsep - \topsep \w@zpp{}{}% 4+2-1 - \parsep \w@zpp{}{}% 2+1-1 - \itemsep \parsep}% unchanged - \def\web@listiii{\leftmargin\leftmarginiii - \labelwidth\leftmarginiii - \advance\labelwidth-\labelsep - \topsep \w@zpp{}{}% 2+1-1 - \parsep \z@ % unchanged - \partopsep \w@ppp{}{}{}% unchanged - \itemsep \topsep}% unchanged - \let\@listii\web@listii - \let\@listiii\web@listiii - \renewcommand\web@normalsize{% - \@setfontsize\normalsize\@xpt\@xiipt - \abovedisplayskip \w@ppp{5}{3}{}% 10+2-5 - \abovedisplayshortskip \w@zpp{3}{0}% unchanged - \belowdisplayshortskip \w@ppp{3}{2}{2}% 6+3-3 - \belowdisplayskip \abovedisplayskip - \let\@listi\@listI}% - \let\normalsize\web@normalsize - \normalsize + \setlength\partopsep{\w@ppp{2}{}{}} % unchanged + \def\web@listi{\leftmargin\leftmargini + \parsep \w@ppp{2}{2}{}% 4+2-1 + \topsep \w@ppp{2}{1}{}% 8+2-4 + \itemsep\w@ppp{2}{1}{}}% 4+2-1 + \let\@listi\web@listi + \let\@listI\@listi + \@listi + \def\web@listii {\leftmargin\leftmarginii + \labelwidth\leftmarginii + \advance\labelwidth-\labelsep + \topsep \w@zpp{}{}% 4+2-1 + \parsep \w@zpp{}{}% 2+1-1 + \itemsep \parsep}% unchanged + \def\web@listiii{\leftmargin\leftmarginiii + \labelwidth\leftmarginiii + \advance\labelwidth-\labelsep + \topsep \w@zpp{}{}% 2+1-1 + \parsep \z@ % unchanged + \partopsep \w@ppp{}{}{}% unchanged + \itemsep \topsep + }% unchanged + \let\@listii\web@listii + \let\@listiii\web@listiii + \renewcommand\web@normalsize{% + \@setfontsize\normalsize\@xpt\@xiipt + \abovedisplayskip \w@ppp{5}{3}{}% 10+2-5 + \abovedisplayshortskip \w@zpp{3}{0}% unchanged + \belowdisplayshortskip \w@ppp{3}{2}{2}% 6+3-3 + \belowdisplayskip \abovedisplayskip + \let\@listi\@listI}% + \let\normalsize\web@normalsize + \normalsize } \def\tightsettings@i{% - \setlength\partopsep{\w@ppp{2}{}{}}% 3+1-1 - \def\web@listi{\leftmargin\leftmargini - \parsep \w@ppp{2.5}{2}{}% 4.5+2-1 - \topsep \w@ppp{4.5}{1.5}{2.5}% 9+3-5 - \itemsep \w@ppp{2.5}{}{}}% 4.5+2-1 - \let\@listi\web@listi - \let\@listI\@listi - \@listi - \def\web@listii {\leftmargin\leftmarginii - \labelwidth\leftmarginii - \advance\labelwidth-\labelsep - \topsep \w@ppp{}{}{}% 4.5+2-1 - \parsep \w@ppp{}{}{}% 2+1-1 - \itemsep \parsep}% unchanged - \def\web@listiii{\leftmargin\leftmarginiii - \labelwidth\leftmarginiii - \advance\labelwidth-\labelsep - \topsep \w@ppp{}{}{}% 2+1-1 - \parsep \z@ % unchanged - \partopsep \w@ppp{}{}{}% unchanged - \itemsep \topsep}% unchanged - \let\@listii\web@listii - \let\@listiii\web@listiii - \renewcommand\web@normalsize{% - \@setfontsize\normalsize\@xipt{13.6}% - \abovedisplayskip \w@ppp{5.5}{3}{3}% 11+3-6 - \abovedisplayshortskip \w@zpp{}{0}% unchanged - \belowdisplayshortskip \w@ppp{4}{2}{2}% 6.5+3.5-3 - \belowdisplayskip \abovedisplayskip - \let\@listi\@listI}% - \let\normalsize\web@normalsize - \normalsize + \setlength\partopsep{\w@ppp{2}{}{}}% 3+1-1 + \def\web@listi{\leftmargin\leftmargini + \parsep \w@ppp{2.5}{2}{}% 4.5+2-1 + \topsep \w@ppp{4.5}{1.5}{2.5}% 9+3-5 + \itemsep \w@ppp{2.5}{}{}}% 4.5+2-1 + \let\@listi\web@listi + \let\@listI\@listi + \@listi + \def\web@listii {\leftmargin\leftmarginii + \labelwidth\leftmarginii + \advance\labelwidth-\labelsep + \topsep \w@ppp{}{}{}% 4.5+2-1 + \parsep \w@ppp{}{}{}% 2+1-1 + \itemsep \parsep}% unchanged + \def\web@listiii{\leftmargin\leftmarginiii + \labelwidth\leftmarginiii + \advance\labelwidth-\labelsep + \topsep \w@ppp{}{}{}% 2+1-1 + \parsep \z@ % unchanged + \partopsep \w@ppp{}{}{}% unchanged + \itemsep \topsep}% unchanged + \let\@listii\web@listii + \let\@listiii\web@listiii + \renewcommand\web@normalsize{% + \@setfontsize\normalsize\@xipt{13.6}% + \abovedisplayskip \w@ppp{5.5}{3}{3}% 11+3-6 + \abovedisplayshortskip \w@zpp{}{0}% unchanged + \belowdisplayshortskip \w@ppp{4}{2}{2}% 6.5+3.5-3 + \belowdisplayskip \abovedisplayskip + \let\@listi\@listI}% + \let\normalsize\web@normalsize + \normalsize } \def\tightsettings@ii{% - \setlength\partopsep{\w@ppp{3}{2}{2}}% unchanged - \def\web@listi{\leftmargin\leftmargini - \parsep \w@ppp{3}{2}{}% 5+2.5-1 - \topsep \w@ppp{5}{2}{3}% 10+4-6 - \itemsep\w@ppp{2.5}{}{}}% 5+2.5-1 - \let\@listi\web@listi - \let\@listI\@listi - \@listi - \def\web@listii {\leftmargin\leftmarginii - \labelwidth\leftmarginii - \advance\labelwidth-\labelsep - \topsep \w@ppp{2.5}{}{}% 5+2.5-1 - \parsep \w@ppp{2}{}{}% 2.5+1-1 - \itemsep \parsep}% unchanged - \def\web@listiii{\leftmargin\leftmarginiii - \labelwidth\leftmarginiii - \advance\labelwidth-\labelsep - \topsep \w@ppp{1.5}{}{}% 2.5+1-1 - \parsep \z@ % unchanged - \partopsep \w@ppp{}{}{}% unchanged - \itemsep \topsep}% unchanged - \let\@listii\web@listii - \let\@listiii\web@listiii - \renewcommand\web@normalsize{% - \@setfontsize\normalsize\@xiipt{14.5}% - \abovedisplayskip \w@ppp{6}{1.5}{3.5}% 12+3-7 - \abovedisplayshortskip \w@zpp{3}{0}% unchanged - \belowdisplayshortskip \w@ppp{4}{2}{2}% 6.5+3.5-3 - \belowdisplayskip \abovedisplayskip - \let\@listi\@listI}% - \let\normalsize\web@normalsize - \normalsize + \setlength\partopsep{\w@ppp{3}{2}{2}}% unchanged + \def\web@listi{\leftmargin\leftmargini + \parsep \w@ppp{3}{2}{}% 5+2.5-1 + \topsep \w@ppp{5}{2}{3}% 10+4-6 + \itemsep\w@ppp{2.5}{}{}}% 5+2.5-1 + \let\@listi\web@listi + \let\@listI\@listi + \@listi + \def\web@listii {\leftmargin\leftmarginii + \labelwidth\leftmarginii + \advance\labelwidth-\labelsep + \topsep \w@ppp{2.5}{}{}% 5+2.5-1 + \parsep \w@ppp{2}{}{}% 2.5+1-1 + \itemsep \parsep}% unchanged + \def\web@listiii{\leftmargin\leftmarginiii + \labelwidth\leftmarginiii + \advance\labelwidth-\labelsep + \topsep \w@ppp{1.5}{}{}% 2.5+1-1 + \parsep \z@ % unchanged + \partopsep \w@ppp{}{}{}% unchanged + \itemsep \topsep}% unchanged + \let\@listii\web@listii + \let\@listiii\web@listiii + \renewcommand\web@normalsize{% + \@setfontsize\normalsize\@xiipt{14.5}% + \abovedisplayskip \w@ppp{6}{1.5}{3.5}% 12+3-7 + \abovedisplayshortskip \w@zpp{3}{0}% unchanged + \belowdisplayshortskip \w@ppp{4}{2}{2}% 6.5+3.5-3 + \belowdisplayskip \abovedisplayskip + \let\@listi\@listI}% + \let\normalsize\web@normalsize + \normalsize } \def\tightsettings{\@ifstar{\ifeqforpaper\else\tightsettings@cont\fi} - {\tightsettings@cont}} + {\tightsettings@cont}} \def\tightsettings@cont{\let\web@tight\web@YES - \ifcase\@ptsize - \tightsettings@z\or - \tightsettings@i\or - \tightsettings@ii - \fi + \ifcase\@ptsize + \tightsettings@z\or + \tightsettings@i\or + \tightsettings@ii\fi } \def\restorenormalsettings{\let\web@tight\web@NO - \let\@listi\web@save@listi - \let\@listii\web@save@listii - \let\@listiii\web@save@listiii - \let\normalsize\web@save@normalsize - \let\partopsep\web@save@partopsep - \let\@listI\@listi - \@listi - \normalsize + \let\@listi\web@save@listi + \let\@listii\web@save@listii + \let\@listiii\web@save@listiii + \let\normalsize\web@save@normalsize + \let\partopsep\web@save@partopsep + \let\@listI\@listi + \@listi + \normalsize } \def\navibarTextColor#1{\def\@menucolor{#1}} \def\@menucolor{webblue} \def\navibarBgColor#1{\def\@menuBgColor{#1}} \def\@menuBgColor{webgray} -\newcommand{\newNaviIcon}[1][\@empty] -{% - \ifx#1m\let\web@next\@newNaviIconMenu - \else\ifx#1j\let\web@next\@newNaviIconJS - \else\ifx#1l\let\web@next\@newNaviIconLink - \else\ifx#1\@empty\let\web@next\@newNaviIconLink - \else\let\web@next\relax - \PackageWarning{web}{\string\newNaviIcon: unknown first parameter} - \fi\fi\fi\fi\web@next +\newcommand{\newNaviIcon}[1][\@empty]{% + \ifx#1m\let\web@next\@newNaviIconMenu + \else\ifx#1j\let\web@next\@newNaviIconJS + \else\ifx#1l\let\web@next\@newNaviIconLink + \else\ifx#1\@empty\let\web@next\@newNaviIconLink + \else\let\web@next\relax + \PackageWarning{web}{\string\newNaviIcon: unknown first parameter} + \fi\fi\fi\fi\web@next } \def\web@colorbox@w@transparency#1{% - \ifx#1\@empty\setlength{\fboxrule}{0pt}\let\aeb@next\fbox\else - \def\aeb@next{\colorbox{#1}}\fi\aeb@next} -\newcommand{\@newNaviIconMenu}[6][I] -{% - \def#2{{\setlength{\fboxsep}{0pt}\def\@pdfhighlight{/#1}% - \Acrobatmenu{#6}{\web@colorbox@w@transparency{\@menuBgColor}{% - \parbox[c][#4][c]{#3}% - {\normalsize\centering\color{\@menucolor}#5}}}% - }}% -} -\newcommand{\@newNaviIconJS}[6][I] -{% - \ifcase\eq@drivernum - \def#2{{\setlength{\fboxsep}{0pt}% - \pdf@rect{\web@colorbox@w@transparency{\@menuBgColor}% - {\parbox[c][#4][c]{#3}% - {\normalsize\centering\color{\@menucolor}#5}}}% - \literalps@out{% - [ /Rect [pdf@llx pdf@lly pdf@urx pdf@ury] - /Border [ 0 0 0 ]/H/#1\space - /Action <> - /Subtype/Link - /ANN pdfmark}% - }}% - \or - \def#2{{\setlength{\fboxsep}{0pt}% - \leavevmode\pdfstartlink - attr {/Border [0 0 0 ] /H/#1}% - user{ /Subtype /Link - /A << /S/JavaScript/JS (#6) >>}% - \web@colorbox@w@transparency{\@menuBgColor}% - {\parbox[c][#4][c]{#3}% - {\normalsize\centering\color{\@menucolor}#5}}% - \pdfendlink - }}% - \or - \def#2{{\setlength{\fboxsep}{0pt}% - \@pdfm@mark{bann - << - /Border [0 0 0 ] /H/#1\space - /Subtype /Link - /A << /S/JavaScript/JS (#6) >> - >>}\web@colorbox@w@transparency{\@menuBgColor}% - {\parbox[c][#4][c]{#3}% - {\normalsize\centering\color{\@menucolor}#5}}% - \@pdfm@mark{eann}% - }}% - \fi -} -\newcommand{\@newNaviIconLink}[6][I] -{% - \def#2{{\setlength{\fboxsep}{0pt}\def\@pdfhighlight{/#1}% - #6{\web@colorbox@w@transparency{\@menuBgColor}% + \ifx#1\@empty\setlength{\fboxrule}{0pt}\let\aeb@next\fbox\else + \def\aeb@next{\colorbox{#1}}\fi\aeb@next} +\newcommand{\@newNaviIconMenu}[6][I]{% + \def#2{{\setlength{\fboxsep}{0pt}\def\@pdfhighlight{/#1}% + \Acrobatmenu{#6}{\web@colorbox@w@transparency{\@menuBgColor}{% + \parbox[c][#4][c]{#3}% + {\normalsize\centering\color{\@menucolor}#5}}}% + }}% +} +\newcommand{\@newNaviIconJS}[6][I]{% + \ifcase\eq@drivernum + \def#2{{\setlength{\fboxsep}{0pt}% + \pdf@rect{\web@colorbox@w@transparency{\@menuBgColor}% + {\parbox[c][#4][c]{#3}% + {\normalsize\centering\color{\@menucolor}#5}}}% + \literalps@out{% + [ /Rect [pdf@llx pdf@lly pdf@urx pdf@ury] + /Border [ 0 0 0 ]/H/#1\space + /Action <> + /Subtype/Link + /ANN pdfmark}% + }}% + \or + \def#2{{\setlength{\fboxsep}{0pt}% + \leavevmode\pdfstartlink + attr {/Border [0 0 0 ] /H/#1}% + user{ /Subtype /Link + /A << /S/JavaScript/JS (#6) >>}% + \web@colorbox@w@transparency{\@menuBgColor}% + {\parbox[c][#4][c]{#3}% + {\normalsize\centering\color{\@menucolor}#5}}% + \pdfendlink + }}% + \or + \def#2{{\setlength{\fboxsep}{0pt}% + \@pdfm@mark{bann + << + /Border [0 0 0 ] /H/#1\space + /Subtype /Link + /A << /S/JavaScript/JS (#6) >> + >>}\web@colorbox@w@transparency{\@menuBgColor}% {\parbox[c][#4][c]{#3}% - {\normalsize\centering\color{\@menucolor}#5}}}% + {\normalsize\centering\color{\@menucolor}#5}}% + \@pdfm@mark{eann}% }}% + \fi +} +\newcommand{\@newNaviIconLink}[6][I]{% + \def#2{{\setlength{\fboxsep}{0pt}\def\@pdfhighlight{/#1}% + #6{\web@colorbox@w@transparency{\@menuBgColor}% + {\parbox[c][#4][c]{#3}% + {\normalsize\centering\color{\@menucolor}#5}}}% + }}% } \let\insertwebtoc\relax \def\insert@webtoc{\web@TOC\ } \def\web@TocText{Toc} \newNaviIcon[l]{\web@TOC}{\web@nb@width}{\web@nb@height} - {\footnotesize\web@TocText}{\hyperlink{webtoc}} + {\footnotesize\web@TocText}{\hyperlink{webtoc}} \newcommand\navibariconWidth[1]{\def\web@nb@width{#1}} \newcommand\navibariconHeight[1]{\def\web@nb@height{#1}} \navibariconWidth{34pt}\navibariconHeight{10pt} \@newNaviIconMenu{\web@FirstPage}{\web@nb@width}{\web@nb@height} - {\web@FirstPageText}{FirstPage} + {\web@FirstPageText}{FirstPage} \def\web@FirstPageText{$\blacktriangleleft\blacktriangleleft$} \@newNaviIconMenu{\web@LastPage}{\web@nb@width}{\web@nb@height} - {\web@LastPageText}{LastPage} + {\web@LastPageText}{LastPage} \def\web@LastPageText{$\blacktriangleright\blacktriangleright$} \@newNaviIconMenu{\web@PrevPage}{\web@nb@width}{\web@nb@height} - {\web@PrevPageText}{PrevPage} + {\web@PrevPageText}{PrevPage} \def\web@PrevPageText{$\blacktriangleleft$} \@newNaviIconMenu{\web@NextPage}{\web@nb@width}{\web@nb@height} - {\web@NextPageText}{NextPage} + {\web@NextPageText}{NextPage} \def\web@NextPageText{$\blacktriangleright$} \@newNaviIconMenu{\web@GoBack}{\web@nb@width}{\web@nb@height} - {\footnotesize\web@back}{GoBack} + {\footnotesize\web@back}{GoBack} \@newNaviIconMenu{\web@GoBackDoc}{\web@nb@width}{\web@nb@height} - {$\blacktriangleleft$\ \footnotesize\web@doc}{GoBackDoc} + {$\blacktriangleleft$\ \footnotesize\web@doc}{GoBackDoc} \@newNaviIconMenu{\web@GoForwardDoc}{\web@nb@width}{\web@nb@height} - {\footnotesize\web@doc\ \normalsize$\blacktriangleright$} - {GoForwardDoc} + {\footnotesize\web@doc\ \normalsize$\blacktriangleright$} + {GoForwardDoc} \@newNaviIconMenu{\web@FS}{\web@nb@width}{\web@nb@height} - {\footnotesize\web@FSText}{FullScreen} + {\footnotesize\web@FSText}{FullScreen} \def\web@FSText{FS} \@newNaviIconMenu{\web@GoToPage}{\web@nb@width}{\web@nb@height} - {\footnotesize\web@GoToPageText}{GoToPage} + {\footnotesize\web@GoToPageText}{GoToPage} \def\web@GoToPageText{Page...} \newcommand\web@navigationbar{% -\hfil\bfseries\footnotesize -\insertwebtoc -\web@FirstPage\ -\web@LastPage\ -\web@PrevPage\ -\web@NextPage\ -\web@GoBack -\hfil} -\newcommand{\panelgroupWidth}[1]{% - \global\let\chkpanelgroup\web@chkpanelgroup - \def\web@pg@width{#1}} -\newcommand{\panelgroupHeight}[1]{% - \global\let\chkpanelgroup\web@chkpanelgroup - \def\web@pg@height{#1}} -\newcommand{\panelgroupSep}[1]{% - \global\let\chkpanelgroup\web@chkpanelgroup - \def\web@pg@sep{#1}} + \hfil\bfseries\footnotesize + \insertwebtoc + \web@FirstPage\ + \web@LastPage\ + \web@PrevPage\ + \web@NextPage\ + \web@GoBack + %\web@GoBackDoc\ + %\web@GoForwardDoc + \hfil +} +\newcommand{\panelgroupWidth}[1]{\global + \let\chkpanelgroup\web@chkpanelgroup + \def\web@pg@width{#1}} +\newcommand{\panelgroupHeight}[1]{\global + \let\chkpanelgroup\web@chkpanelgroup + \def\web@pg@height{#1}} +\newcommand{\panelgroupSep}[1]{\global + \let\chkpanelgroup\web@chkpanelgroup + \def\web@pg@sep{#1}} \@newNaviIconMenu{\panel@FirstPage}{\web@pg@width}{\web@pg@height} - {\web@FirstPageText}{FirstPage} + {\web@FirstPageText}{FirstPage} \@newNaviIconMenu{\panel@LastPage}{\web@pg@width}{\web@pg@height} - {\web@LastPageText}{LastPage} + {\web@LastPageText}{LastPage} \@newNaviIconMenu{\panel@PrevPage}{\web@pg@width}{\web@pg@height} - {\web@PrevPageText}{PrevPage} + {\web@PrevPageText}{PrevPage} \@newNaviIconMenu{\panel@NextPage}{\web@pg@width}{\web@pg@height} - {\web@NextPageText}{NextPage} + {\web@NextPageText}{NextPage} \@newNaviIconMenu{\panel@GoBack}{\web@pg@width}{\web@pg@height} - {\footnotesize\web@back}{GoBack} + {\footnotesize\web@back}{GoBack} \@newNaviIconMenu{\panel@GoBackDoc}{\web@pg@width}{\web@pg@height} - {$\blacktriangleleft$\,\footnotesize\web@doc}{GoBackDoc} + {$\blacktriangleleft$\,\footnotesize\web@doc}{GoBackDoc} \@newNaviIconMenu{\panel@GoForwardDoc}{\web@pg@width}{\web@pg@height} - {\footnotesize\web@doc\,\normalsize$\blacktriangleright$} - {GoForwardDoc} + {\footnotesize\web@doc\,\normalsize$\blacktriangleright$} + {GoForwardDoc} \@newNaviIconMenu{\panel@Close}{\web@pg@width}{\web@pg@height} - {\footnotesize Close}{Close} + {\footnotesize Close}{Close} \def\web@CloseText{Close} \@newNaviIconMenu{\panel@FS}{\web@pg@width}{\web@pg@height} - {\footnotesize\web@FSText}{FullScreen} + {\footnotesize\web@FSText}{FullScreen} \@newNaviIconMenu{\panel@GoToPage}{\web@pg@width}{\web@pg@height} - {\footnotesize\web@GoToPageText}{GoToPage} + {\footnotesize\web@GoToPageText}{GoToPage} \newcommand{\web@chkpanelgroup}{\bgroup \setlength{\@tempdima}{\web@pg@width+\web@pg@width+\web@pg@sep}% \ifdim\@tempdima>\@panelwidth\PackageError{web}{Width of \string\panelNaviGroup\space is wider than the panel}{}\else \xdef\panelNavigroupWidth{\the\@tempdima}\fi - \egroup\global\let\chkpanelgroup\@empty + \egroup + \global\let\chkpanelgroup\@empty } \panelgroupWidth{28pt}\panelgroupHeight{15pt} \panelgroupSep{2pt} \newcommand{\panelrowsep}{1pt} \newcommand\panelNaviGroup{\chkpanelgroup - \parbox[c]{\panelNavigroupWidth}{% - \offinterlineskip - \panelIconGroup - }% -} + \parbox[c]{\panelNavigroupWidth}{% + \offinterlineskip + \panelIconGroup}} \newcommand{\panelIconGroup}{% - \panel@FirstPage\hfill\panel@LastPage\\[\panelrowsep] - \panel@PrevPage\hfill\panel@NextPage\\[\panelrowsep] - \panel@GoBack\hfill\panel@Close + \panel@FirstPage\hfill\panel@LastPage\\[\panelrowsep] + \panel@PrevPage\hfill\panel@NextPage\\[\panelrowsep] + \panel@GoBack\hfill\panel@Close } \let\ins@NaviBar\@empty \newcommand\insNaviBar{\@ifstar{\@gdefInsNaviBar}{\@defInsNaviBar}} @@ -1425,50 +1374,49 @@ \newcommand\insNaviBarOff{\global\let\ins@NaviBar\@empty} \def\web@ifOnThisPage#1#2{\ifnum\c@page=\@thispage\relax #1\else#2\fi} -\newcommand{\insertnaviiconhere}[1] -{% - \xdef\@thispage{\the\c@page}% - \def\web@insToRight{% - \ifeqforpaper\makebox[0pt][l]{\ifdim\marginparsep>0pt\relax - \hspace{\marginparsep}\else\ \fi#1}\else - \makebox[0pt][l]{% - \ifnum\@panelconfig=2\relax - \hspace{\@panelsep}\else - \hspace{\@Rightmargin}\fi - \makebox[0pt][r]{#1}}\fi - }\expandafter\rheader\expandafter - {\expandafter\web@ifOnThisPage - \expandafter{\web@rightheader\web@insToRight}% - {\web@defaultrightheader}}% +\newcommand{\insertnaviiconhere}[1]{% + \xdef\@thispage{\the\c@page}% + \def\web@insToRight{% + \ifeqforpaper + \makebox[0pt][l]{\ifdim\marginparsep>\z@ + \hspace{\marginparsep}\else\ \fi#1}\else + \makebox[0pt][l]{% + \ifnum\@panelconfig=\tw@ + \hspace{\@panelsep}\else + \hspace{\@Rightmargin}\fi + \makebox[0pt][r]{#1}}\fi + }\expandafter\rheader\expandafter + {\expandafter\web@ifOnThisPage + \expandafter{\web@rightheader\web@insToRight}% + {\web@defaultrightheader}}% } \def\insertnaviiconhereafter#1{\def\web@insToLeft{% - \ifeqforpaper\makebox[0pt][r]{#1\ifdim\marginparsep>0pt\relax - \hspace{\marginparsep}\else\ \fi}\else + \ifeqforpaper + \makebox[0pt][r]{#1\ifdim\marginparsep>\z@ + \hspace{\marginparsep}\else\ \fi}\else \makebox[0pt][r]{\makebox[0pt][l]{#1}% - \ifnum\@panelconfig=1\relax - \hspace{\@panelsep}\else - \hspace{\@Leftmargin}\fi}\fi - }\expandafter\lheader\expandafter - {\expandafter\web@insToLeft\web@lhead}} + \ifnum\@panelconfig=\@ne + \hspace{\@panelsep}\else + \hspace{\@Leftmargin}\fi}\fi + }\expandafter\lheader\expandafter + {\expandafter\web@insToLeft\web@lhead}} \def\removehereaftericon{\lheader{\aeb@setmarks}} \let\defaultpageheader\removehereaftericon -\newcommand\ArrowUp[1] -{% - \normalsize\ifeqforpaper - \setlength{\fboxsep}{6pt}\else - \setlength{\fboxsep}{4pt}\fi - \raisebox{\depth-\fboxsep}[0pt][0pt]{% - #1{\web@colorbox@w@transparency{\web@directionIconBgColor}% - {\textcolor{\web@directionIconTextColor}{$\bigl\Uparrow$}}}}% -} -\newcommand\ArrowDown[1] -{% - \normalsize\ifeqforpaper - \setlength{\fboxsep}{6pt}\else - \setlength{\fboxsep}{4pt}\fi - \raisebox{\depth-\fboxsep}[0pt][0pt]{% - #1{\web@colorbox@w@transparency{\web@directionIconBgColor}% - {\textcolor{\web@directionIconTextColor}{$\bigl\Downarrow$}}}}% +\newcommand\ArrowUp[1]{% + \normalsize\ifeqforpaper + \setlength{\fboxsep}{6pt}\else + \setlength{\fboxsep}{4pt}\fi + \raisebox{\depth-\fboxsep}[0pt][0pt]{% + #1{\web@colorbox@w@transparency{\web@directionIconBgColor}% + {\textcolor{\web@directionIconTextColor}{$\bigl\Uparrow$}}}}% +} +\newcommand\ArrowDown[1]{% + \normalsize\ifeqforpaper + \setlength{\fboxsep}{6pt}\else + \setlength{\fboxsep}{4pt}\fi + \raisebox{\depth-\fboxsep}[0pt][0pt]{% + #1{\web@colorbox@w@transparency{\web@directionIconBgColor}% + {\textcolor{\web@directionIconTextColor}{$\bigl\Downarrow$}}}}% } \def\directionIconTextColor#1{\def\web@directionIconTextColor{#1}} \def\web@directionIconTextColor{webblue} @@ -1494,25 +1442,25 @@ \ins@NaviBar\global\let\ins@NaviBar\@empty\fi} \cfooter{\placeScreenNavibar} \newcommand{\clearHeaders}{% - \let\web@lhead@save\web@lhead - \let\web@chead@save\web@chead - \let\web@rightheader@save\web@rightheader - \let\web@lhead\@empty\let\web@chead\@empty - \let\web@rightheader\@empty} + \let\web@lhead@save\web@lhead + \let\web@chead@save\web@chead + \let\web@rightheader@save\web@rightheader + \let\web@lhead\@empty\let\web@chead\@empty + \let\web@rightheader\@empty} \newcommand{\restoreHeaders}{% - \let\web@lhead\web@lhead@save - \let\web@chead\web@chead@save - \let\web@rightheader\web@rightheader@save} + \let\web@lhead\web@lhead@save + \let\web@chead\web@chead@save + \let\web@rightheader\web@rightheader@save} \newcommand{\clearFooters}{% - \let\web@lfoot@save\web@lfoot - \let\web@cfoot@save\web@cfoot - \let\web@rfoot@save\web@lfoot - \let\web@lfoot\@empty\let\web@cfoot\@empty - \let\web@rfoot\@empty} + \let\web@lfoot@save\web@lfoot + \let\web@cfoot@save\web@cfoot + \let\web@rfoot@save\web@lfoot + \let\web@lfoot\@empty\let\web@cfoot\@empty + \let\web@rfoot\@empty} \newcommand{\restoreFooters}{% - \let\web@lfoot\web@lfoot@save - \let\web@cfoot\web@cfoot@save - \let\web@rfoot\web@rfoot@save} + \let\web@lfoot\web@lfoot@save + \let\web@cfoot\web@cfoot@save + \let\web@rfoot\web@rfoot@save} \def\headerformat#1{\def\web@headerhook{#1}} \headerformat{} \def\footerformat#1{\def\web@footerhook{#1}} @@ -1521,31 +1469,30 @@ \let\webfootwrapper\@empty \newcommand{\headWrapper}[1]{\def\webheadwrapper##1{#1}} \newcommand{\footWrapper}[1]{\def\webfootwrapper##1{#1}} -\newcommand{\ps@webheadings} -{% - \renewcommand{\@oddhead}{\webheadwrapper{% - \normalfont\ifeqforpaper\else\footnotesize\fi - \web@headerprivate\web@headerhook\web@lhead\hfil\web@chead\hfil - \web@rightheader}} - \renewcommand{\@evenhead}{\@oddhead} - \renewcommand{\@oddfoot}{\webfootwrapper{% - \normalfont\ifeqforpaper\else\footnotesize\fi - \web@footerprivate\web@footerhook\web@lfoot\hfil - \web@cfoot\hfil\web@rfoot}} - \renewcommand{\@evenfoot}{\@oddfoot} +\newcommand{\ps@webheadings}{% + \renewcommand{\@oddhead}{\webheadwrapper{% + \normalfont\ifeqforpaper\else\footnotesize\fi + \web@headerprivate\web@headerhook\web@lhead\hfil\web@chead\hfil + \web@rightheader}} + \renewcommand{\@evenhead}{\@oddhead} + \renewcommand{\@oddfoot}{\webfootwrapper{% + \normalfont\ifeqforpaper\else\footnotesize\fi + \web@footerprivate\web@footerhook\web@lfoot\hfil + \web@cfoot\hfil\web@rfoot}} + \renewcommand{\@evenfoot}{\@oddfoot} } \renewcommand{\sectionmark}[1]{% - \markboth{}{\web@section\ \thesection: #1}} + \markboth{}{\web@section\ \thesection: #1}} \newcommand{\noHeadersOnSectionPage}{% - \gdef\web@headerpolicy{% - \expandafter\aeb@gettopmark\topmark{}{}% - \expandafter\aeb@getbotmark\botmark{}{}% - \ifx\aeb@topmark\aeb@botmark\rightmark\fi - }% + \gdef\web@headerpolicy{% + \expandafter\aeb@gettopmark\topmark{}{}% + \expandafter\aeb@getbotmark\botmark{}{}% + \ifx\aeb@topmark\aeb@botmark\rightmark\fi + }% } \noHeadersOnSectionPage \newcommand{\headersOnSectionPage}{% - \gdef\web@headerpolicy{\rightmark}% + \gdef\web@headerpolicy{\rightmark}% } \def\aeb@gettopmark#1#2{\def\aeb@topmark{#2}} \def\aeb@getbotmark#1#2{\def\aeb@botmark{#2}} @@ -1553,54 +1500,55 @@ \lheader{\aeb@setmarks} \AtEndOfPackage{\pagestyle{webheadings}} \newcommand{\sectionColor}[1]{\def\web@sectionsColorOld{#1} - \def\aeb@sectioncolor{#1}} + \def\aeb@sectioncolor{#1}} \sectionColor{blue} \def\web@inputsectiondefs{\InputIfFileExists{websec.def}{} - {\PackageError{web}{Cannot find the file websec.def}{}} + {\PackageError{web}{Cannot find the file websec.def}{}} } \ifweb@sectioning\expandafter\web@inputsectiondefs\fi \def\aebwritelastpage{% - \immediate\write\@auxout{% - \string\w@csarg\string\gdef{aebLastPage}{\arabic{page}}}% + \immediate\write\@auxout{% + \string\w@csarg\string\gdef{aebLastPage}{\arabic{page}}}% } \AtEndDocument{% - \clearpage\addtocounter{page}{-1}\aebwritelastpage - \addtocounter{page}{1}} + \clearpage\addtocounter{page}{-1}\aebwritelastpage + \addtocounter{page}{1}} \def\useFullWidthForPaper{\ifeqforpaper \setlength{\textwidth}{\paperwidth-2in} \setlength{\textheight} - {\paperheight-2in-\footskip-\topmargin-\headheight-\headsep} + {\paperheight-2in-\footskip-\topmargin-\headheight-\headsep} \oddsidemargin=0pt \evensidemargin=0pt \marginparsep=0pt \marginparwidth=0pt - \fi + \fi } \def\maxtextscreentext{% - \iftemplatesforpaper\else\ifeqforpaper - \ifnum\@usetemplates=1 - \ifnum\@panelconfig=1 % left panel - \setlength{\oddsidemargin}% - {\@panelwidth+\@panelsep-1in}% - \setlength{\textwidth}% - {\paperwidth-\@panelwidth-\@panelsep-% - \marginparwidth-\marginparsep}% - \else\ifnum\@panelconfig=2 % right panel - \setlength{\oddsidemargin}{0in}% - \setlength{\textwidth}% - {\paperwidth-\@panelwidth-\@panelsep-% - \oddsidemargin-\marginparwidth-\marginparsep}% - \else - \useFullWidthForPaper - \fi\fi\fi - \fi\fi + \iftemplatesforpaper\else\ifeqforpaper + \ifnum\@usetemplates=\@ne + \ifnum\@panelconfig=\@ne % left panel + \setlength{\oddsidemargin}% + {\@panelwidth+\@panelsep-1in}% + \setlength{\textwidth}% + {\paperwidth-\@panelwidth-\@panelsep-% + \marginparwidth-\marginparsep}% + \else + \ifnum\@panelconfig=\tw@ % right panel + \setlength{\oddsidemargin}{0in}% + \setlength{\textwidth}% + {\paperwidth-\@panelwidth-\@panelsep-% + \oddsidemargin-\marginparwidth-\marginparsep}% + \else + \useFullWidthForPaper + \fi\fi\fi + \fi\fi } \newcommand{\centertextonpage}{% - \ifeqforpaper\AtBeginDocument{\web@centertextonpage}\fi} + \ifeqforpaper\AtBeginDocument{\web@centertextonpage}\fi} \def\web@centertextonpage{% - \setlength{\oddsidemargin}{\paperwidth-\textwidth-2in}% - \oddsidemargin=.5\oddsidemargin - \evensidemargin=\oddsidemargin + \setlength{\oddsidemargin}{\paperwidth-\textwidth-2in}% + \oddsidemargin=.5\oddsidemargin + \evensidemargin=\oddsidemargin } \definecolor{webgreen}{rgb}{0,.5,0} \definecolor{webbrown}{rgb}{.6,0,0} @@ -1624,78 +1572,78 @@ \definecolor{yellowgreen}{rgb}{.604, .804, .196} \definecolor{vlightblue}{rgb}{.88, .85, .95} \definecolor{khaki}{rgb}{.741, .718, .42} -\ifx\web@latextoc\web@YES\ifx\web@bullets\web@YES% +\ifx\web@latextoc\web@YES + \ifx\web@bullets\web@YES \@ifundefined{chapter} {% - \renewcommand*\l@subsubsection{\@dottedtocline{3}{3.8em}{1.2em}} + \renewcommand*\l@subsubsection{\@dottedtocline{3}{3.8em}{1.2em}} }{% - \renewcommand*\l@subsubsection{\@dottedtocline{3}{7.0em}{1.2em}} + \renewcommand*\l@subsubsection{\@dottedtocline{3}{7.0em}{1.2em}} }% -\fi\fi + \fi +\fi \def\tocColor#1{\def\web@tocColor{#1}\def\aeb@toccolor{#1}} \tocColor{blue} \newcommand{\allowHeadingsTocPage}{\let\web@Tocpagestyle\@gobble} \def\web@Tocpagestyle#1{#1} \let\web@latextoc@save\tableofcontents \ifx\web@bullets\web@YES -\def\tableofcontents -{% - \global\let\insertwebtoc\insert@webtoc + \def\tableofcontents{\global + \let\insertwebtoc\insert@webtoc \def\contentsname{\web@toc}% \pdfbookmark[1]{\web@toc}{toc}% - \web@Tocpagestyle{\thispagestyle{empty}}% - \markright{{\normalfont\small \web@toc\ (\web@continued)}}% - \@ifundefined{sectionToc}{% - \begin{center}\hypertarget{webtoc}{}% - \normalfont\bfseries\Large\color{\web@tocColor}% - \contentsname - \end{center} - }{\sectionToc{\web@toc}}\par + \web@Tocpagestyle{\thispagestyle{empty}}% + \markright{{\normalfont\small \web@toc\ (\web@continued)}}% + \@ifundefined{sectionToc}{% + \begin{center}\hypertarget{webtoc}{}% + \normalfont\bfseries\Large\color{\web@tocColor}% + \contentsname + \end{center} + }{\sectionToc{\web@toc}}\par \ifx\web@latextoc\web@YES - \@starttoc{toc}% LaTeX toc listing with page numbers + \@starttoc{toc}% LaTeX toc listing with page numbers \else - \noindent\webtableofcontents + \noindent\webtableofcontents \fi \newpage -} + } \else - \PackageInfo{web}{No Bullets Requested} - \def\tableofcontents{% - \begingroup - \def\contentsname{\web@toc}% - \let\web@save@mkboth\@mkboth - \def\@mkboth{\protect\hypertarget{webtoc}{}\web@save@mkboth}% - \ifx\web@finalDot\@empty\else - \def\numberline##1{\hb@xt@\@tempdima{##1.\hfil}}\fi - \web@latextoc@save - \endgroup\newpage - } - \renewcommand\subsubsection{\renewcommand{\@seccntformat}[1]{% - \@nameuse{the##1}\web@finalDot\enspace} - \@startsection{subsubsection}{3}{\z@}% - {-2ex\@plus -1ex \@minus -.2ex}{.5ex \@plus .2ex}% - {\noindent\normalfont\normalsize\bfseries}} - \renewcommand*{\thesubsubsection} - {\thesubsection.\arabic{subsubsection}} + \PackageInfo{web}{No Bullets Requested} + \def\tableofcontents{% + \begingroup + \def\contentsname{\web@toc}% + \let\web@save@mkboth\@mkboth + \def\@mkboth{\protect\hypertarget{webtoc}{}\web@save@mkboth}% + \ifx\web@finalDot\@empty\else + \def\numberline##1{\hb@xt@\@tempdima{##1.\hfil}}\fi + \web@latextoc@save + \endgroup + \newpage + } + \renewcommand\subsubsection{\renewcommand{\@seccntformat}[1]{% + \@nameuse{the##1}\web@finalDot\enspace} + \@startsection{subsubsection}{3}{\z@}% + {-2ex\@plus -1ex \@minus -.2ex}{.5ex \@plus .2ex}% + {\noindent\normalfont\normalsize\bfseries}} + \renewcommand*{\thesubsubsection} + {\thesubsection.\arabic{subsubsection}} \fi -\def\widestNumber#1{% - \def\widest@Number{#1\ }} +\def\widestNumber#1{\def\widest@Number{#1\ }} \widestNumber{0.0.} \newcommand{\tocIndent}[1]{\def\toc@indent{#1}} \tocIndent{20pt} \def\tocIndentByNumber#1{{% - \settowidth{\@tempdima}{\normalfont\textbf{#1\ }}% - \xdef\toc@indent{\the\@tempdima}% + \settowidth{\@tempdima}{\normalfont\textbf{#1\ }}% + \xdef\toc@indent{\the\@tempdima}% }} \tocIndentByNumber{00.} \let\tocindent\tocIndent \let\tocindentByNumber\tocIndentByNumber -\def\webtableofcontents -{% - \begingroup +\def\webtableofcontents{% + \begingroup \global\let\isChapter\web@NO \parskip0pt\parindent\toc@indent\relax \settowidth{\@tempdima}{\normalfont - \textbf{\widest@Number}}% + \textbf{\widest@Number}}% \@tempdimb\@tempdima \advance\@tempdimb by\parindent \edef\web@subsubSecIndent{\the\@tempdimb}% @@ -1703,108 +1651,98 @@ \let\numberline\web@numberline \let\contentsline\web@contentsline \def\web@section##1##2##3{\web@parse##1\\% - \web@toc@section{##1}{##2}{##3}}% + \web@toc@section{##1}{##2}{##3}}% \def\web@subsection##1##2##3{\web@parse##1\\% - \web@toc@subsection{##1}{##2}{##3}}% + \web@toc@subsection{##1}{##2}{##3}}% \def\web@subsubsection##1##2##3{\web@parse##1\\% - \web@toc@subsubsection{##1}{##2}{##3}}% + \web@toc@subsubsection{##1}{##2}{##3}}% \def\web@part##1##2##3{\web@toc@part{##1}{##2}{##3}}% \def\web@chapter##1##2##3{\web@parse##1\\% - \web@toc@chapter{##1}{##2}{##3}}% + \web@toc@chapter{##1}{##2}{##3}}% \@starttoc{toc}% \setlength{\@tempdimb}{\ifx\isChapter\web@YES - \parindent+\web@subsubSecIndent\else\web@subsubSecIndent\fi}% + \parindent+\web@subsubSecIndent\else\web@subsubSecIndent\fi}% \leftskip\@tempdimb - \par\endgroup + \par + \endgroup } \def\web@numberline#1{\makebox[0pt]{#1\enspace}}% \def\web@contentsline#1#2#3#4{% - \@nameuse{web@#1}{#2}{#3}{#4}}% + \@nameuse{web@#1}{#2}{#3}{#4}}% \def\web@parse#1#2#3\\{% - \def\web@title{#3}\def\numberline{#2}}% + \def\web@title{#3}\def\numberline{#2}}% \def\web@toc@part#1#2#3{\par\noindent - {\bfseries\hyperlink{#3}{#1}}\par\smallskip} + {\bfseries\hyperlink{#3}{#1}}\par\smallskip} \def\web@toc@chapter#1#2#3{\global\let\isChapter\web@YES - \par\mbox{}{\bfseries - \ifx\numberline\@empty - \@ifundefined{d@DingToc}{\hyperlink{#3}{\web@title}} - {% - \ifx\d@DingToc\@empty - \hyperlink{#3}{\web@title}% - \else - \if\aeb@use@section@numbers0\relax - \makebox[0pt][r]{\color{\d@DingTocColor}% - \d@DingToc\space}\hyperlink{#3}{\web@title}% - \else - \hyperlink{#3}{\web@title}% - \fi - \fi - }% + \par\mbox{}{\bfseries + \ifx\numberline\@empty + \@ifundefined{d@DingToc}{\hyperlink{#3}{\web@title}}{% + \ifx\d@DingToc\@empty + \hyperlink{#3}{\web@title}% \else - \makebox[0pt][r]{\hyperlink{#3}{% - \numberline\web@finalDot}\space}\web@title - \fi}\par\smallskip + \if\aeb@use@section@numbers\web@Zero + \makebox[0pt][r]{\color{\d@DingTocColor}% + \d@DingToc\space}\hyperlink{#3}{\web@title}\else + \hyperlink{#3}{\web@title}\fi + \fi + }% + \else + \makebox[0pt][r]{\hyperlink{#3}{% + \numberline\web@finalDot}\space}\web@title + \fi}\par\smallskip } \def\web@toc@section#1#2#3{\penalty-500\par - \hspace*{\if\isChapter y\parindent\else0pt\fi}\mbox{}{\bfseries - \ifx\numberline\@empty - \@ifundefined{d@DingToc}{\hyperlink{#3}{\web@title}} - {% - \ifx\d@DingToc\@empty - \hyperlink{#3}{\web@title}% - \else - \if\aeb@use@section@numbers0\relax - \makebox[0pt][r]{\color{\d@DingTocColor}% - \d@DingToc\space}\hyperlink{#3}{\web@title}% - \else - \hyperlink{#3}{\web@title}% - \fi - \fi - }% - \else - \makebox[0pt][r]{\hyperlink{#3}{% - \numberline\web@finalDot}\space}\web@title - \fi}\endgraf + \hspace*{\if\isChapter y\parindent\else0pt\fi}\mbox{}{\bfseries + \ifx\numberline\@empty + \@ifundefined{d@DingToc}{\hyperlink{#3}{\web@title}}{% + \ifx\d@DingToc\@empty + \hyperlink{#3}{\web@title}% + \else + \if\aeb@use@section@numbers\web@Zero + \makebox[0pt][r]{\color{\d@DingTocColor}% + \d@DingToc\space}\hyperlink{#3}{\web@title}\else + \hyperlink{#3}{\web@title}\fi + \fi + }% + \else + \makebox[0pt][r]{\hyperlink{#3}{% + \numberline\web@finalDot}\space}\web@title + \fi}\endgraf }% \def\web@toc@subsection#1#2#3{\par - \setlength{\@tempdimb}{\ifx\isChapter\web@YES - \parindent+\@tempdima\else\@tempdima\fi}% - \penalty-50 \hspace*{\@tempdimb}\mbox{}{\bfseries - \ifx\numberline\@empty - \@ifundefined{dd@DingToc}{\hyperlink{#3}{\web@title}} - {% - \ifx\dd@DingToc\@empty - \hyperlink{#3}{\web@title}% - \else - \makebox[0pt][r]{\color{\dd@DingTocColor}% - \dd@DingToc\space}\hyperlink{#3}{\web@title}% - \fi - }% - \else - \makebox[0pt][r]{\makebox[\@tempdima][l]% - {\hyperlink{#3}{\numberline\web@finalDot}}}\web@title - \fi}\endgraf -}% + \setlength{\@tempdimb}{\ifx\isChapter\web@YES + \parindent+\@tempdima\else\@tempdima\fi}% + \penalty-50 \hspace*{\@tempdimb}\mbox{}{\bfseries + \ifx\numberline\@empty + \@ifundefined{dd@DingToc}{\hyperlink{#3}{\web@title}}{% + \ifx\dd@DingToc\@empty + \hyperlink{#3}{\web@title}\else + \makebox[0pt][r]{\color{\dd@DingTocColor}% + \dd@DingToc\space}\hyperlink{#3}{\web@title}\fi + }% + \else + \makebox[0pt][r]{\makebox[\@tempdima][l]% + {\hyperlink{#3}{\numberline\web@finalDot}}}\web@title + \fi}\endgraf +} \def\web@toc@subsubsection#1#2#3{% - \def\numberline{\strut$\bullet$}% - \setlength{\@tempdimb}{\ifx\isChapter\web@YES - \parindent+\web@subsubSecIndent\else\web@subsubSecIndent\fi}% - \leftskip\@tempdimb\noindent\unskip\mbox{}\penalty-50 - \@ifundefined{ddd@DingToc}{}{% - \if\aeb@use@section@numbers0\relax\ifx\ddd@DingToc\@empty\else + \def\numberline{\strut$\bullet$}% + \setlength{\@tempdimb}{\ifx\isChapter\web@YES + \parindent+\web@subsubSecIndent\else\web@subsubSecIndent\fi}% + \leftskip\@tempdimb\noindent\unskip\mbox{}\penalty-50 + \@ifundefined{ddd@DingToc}{}{% + \if\aeb@use@section@numbers\web@Zero\ifx\ddd@DingToc\@empty\else \def\numberline{\color{\ddd@DingTocColor}\strut\ddd@DingToc}% -\fi\fi}\hyperlink{#3}{\numberline}~\web@title\ + \fi\fi}\hyperlink{#3}{\numberline}~\web@title\ }% \let\web@textTemplate\@empty \newcommand{\@AddToTextTemplate}{\g@addto@macro\web@textTemplate} -\newcommand{\template}[2][] -{% - \ifweb@allowtemplates - \def\web@argi{#1}\ifx\web@argi\@empty - \xdef\web@template@opt@args{\web@addtotemplateArgs}% - \else\xdef\web@template@opt@args{\web@addtotemplateArgs,#1}% - \fi\gdef\web@template{#2}% - \fi +\newcommand{\template}[2][]{% + \ifweb@allowtemplates + \def\web@argi{#1}\ifx\web@argi\@empty + \xdef\web@template@opt@args{\web@addtotemplateArgs}\else + \xdef\web@template@opt@args{\web@addtotemplateArgs,#1}\fi + \gdef\web@template{#2}\fi } \let\web@template\@empty \def\addtotemplateArgs#1{\gdef\web@addtotemplateArgs{#1}} @@ -1814,196 +1752,187 @@ \newcommand{\textBgColor}[1]{\gdef\web@textBgColor{#1}} \let\web@textBgColor\@empty \let\listAddToTemplates\@empty -\newcommand{\AddToTemplate}[1] -{% - \global\w@csarg\let{eqTmpl#1}\web@YES - {\toks@=\expandafter{\listAddToTemplates}% - \xdef\listAddToTemplates{\the\toks@\noexpand\\{#1}}}% - \ifweb@allowtemplates - \@AddToTextTemplate{% +\newcommand{\AddToTemplate}[1]{% + \global\w@csarg\let{eqTmpl#1}\web@YES + {\toks@=\expandafter{\listAddToTemplates}% + \xdef\listAddToTemplates{\the\toks@\noexpand\\{#1}}}% + \ifweb@allowtemplates + \@AddToTextTemplate{% + \w@csarg\ifx{eqTmpl#1}\web@YES + \fboxsep=0pt\setlength{\unitlength}{1pt}% + \put(\@textX,0){\@nameuse{#1}}% + \fi + }% + \else + \w@csarg\ifx{#1}\BGColorAndGraphic + \@AddToTextTemplate{% \w@csarg\ifx{eqTmpl#1}\web@YES - \fboxsep=0pt\setlength{\unitlength}{1pt}% - \put(\@textX,0){\@nameuse{#1}}% - \fi - }% - \else - \w@csarg\ifx{#1}\BGColorAndGraphic - \@AddToTextTemplate{% - \w@csarg\ifx{eqTmpl#1}\web@YES - \fboxsep=0pt\setlength{\unitlength}{1pt}% - \put(\@textX,0){\@nameuse{#1}}% - \fi - }% - \fi - \w@csarg\ifx{#1}\BGColorAndGraphicFullWidth - \@AddToTextTemplate{% - \w@csarg\ifx{eqTmpl#1}\web@YES - \fboxsep=0pt\setlength{\unitlength}{1pt}% - \put(\@textX,0){\@nameuse{#1}}% - \fi - }% + \fboxsep=0pt\setlength{\unitlength}{1pt}% + \put(\@textX,0){\@nameuse{#1}}% \fi + }% \fi + \w@csarg\ifx{#1}\BGColorAndGraphicFullWidth + \@AddToTextTemplate{% + \w@csarg\ifx{eqTmpl#1}\web@YES + \fboxsep=0pt\setlength{\unitlength}{1pt}% + \put(\@textX,0){\@nameuse{#1}}\fi + }% + \fi + \fi } \newcommand\placeTemplateInLayer[2][webTextBG]{% - \@ifpackageloaded{aeb_pro} - {\@ifundefined{xBld}{\PackageWarning{web} - {The uselayers option - of aeb_pro is\MessageBreak required with - \string\placeTemplateInLayer}} - {\def\b@webTextLayer{\xBld[#2]{#1}}% - \def\e@webTextLayer{\eBld}}}% - {\PackageWarning{web}{\string\placeTemplateInLayer\space - requires the\MessageBreak aeb_pro package}}% + \@ifpackageloaded{aeb_pro} + {\@ifundefined{xBld}{\PackageWarning{web} + {The uselayers option + of aeb_pro is\MessageBreak required with + \string\placeTemplateInLayer}} + {\def\b@webTextLayer{\xBld[#2]{#1}}% + \def\e@webTextLayer{\eBld}}}% + {\PackageWarning{web}{\string\placeTemplateInLayer\space + requires the\MessageBreak aeb_pro package}}% } \let\b@webTextLayer\@empty \let\e@webTextLayer\@empty \newcommand{\BGColorAndGraphic}{% - \b@webTextLayer\web@colorbox@w@transparency{\web@textBgColor}% + \b@webTextLayer\web@colorbox@w@transparency{\web@textBgColor}% + {% + \parbox[b][\paperheight]{\textscreenwidth}% {% - \parbox[b][\paperheight]{\textscreenwidth}% - {% - \ifx\web@template\@empty - \hfill\vfill - \else - \hfuzz=1pt\vfuzz=1pt\expandafter - \includegraphics\expandafter[\web@template@opt@args,% - width=\textscreenwidth,height=\paperheight]% - {\web@template} - \fi - }% - }\e@webTextLayer + \ifx\web@template\@empty + \hfill\vfill + \else + \hfuzz=1pt\vfuzz=1pt\expandafter + \includegraphics\expandafter[\web@template@opt@args,% + width=\textscreenwidth,height=\paperheight]% + {\web@template} + \fi + }% + }\e@webTextLayer } \AddToTemplate{BGColorAndGraphic} \let\web@panelTemplate\@empty \newcommand{\@AddToPanelTemplate}{\g@addto@macro\web@panelTemplate} \let\listAddToPanelTemplates=\@empty -\newcommand{\AddToPanelTemplate}[1] -{% - \global\w@csarg\let{eqPanTmpl#1}\web@YES - {\toks@=\expandafter{\listAddToPanelTemplates}% - \xdef\listAddToPanelTemplates{\the\toks@\noexpand\\{#1}}}% - \ifweb@allowtemplates +\newcommand{\AddToPanelTemplate}[1]{% + \global\w@csarg\let{eqPanTmpl#1}\web@YES + {\toks@=\expandafter{\listAddToPanelTemplates}% + \xdef\listAddToPanelTemplates{\the\toks@\noexpand\\{#1}}}% + \ifweb@allowtemplates \@AddToPanelTemplate{% \w@csarg\ifx{eqPanTmpl#1}\web@YES \fboxsep=0pt\setlength{\unitlength}{1pt}% \put(\@panelX,0){\@nameuse{#1}}\fi }% - \else - \w@csarg\ifx{#1}\stdPanelBG - \@AddToPanelTemplate{% - \w@csarg\ifx{eqPanTmpl#1}\web@YES - \fboxsep=0pt\setlength{\unitlength}{1pt}% - \put(\@panelX,0){\@nameuse{#1}}\fi - }% - \fi - \w@csarg\ifx{#1}\stdbldpanel - \@AddToPanelTemplate{% - \w@csarg\ifx{eqPanTmpl#1}\web@YES - \fboxsep=0pt\setlength{\unitlength}{1pt}% - \put(\@panelX,0){\@nameuse{#1}}\fi - }% - \fi + \else + \w@csarg\ifx{#1}\stdPanelBG + \@AddToPanelTemplate{% + \w@csarg\ifx{eqPanTmpl#1}\web@YES + \fboxsep=0pt\setlength{\unitlength}{1pt}% + \put(\@panelX,0){\@nameuse{#1}}\fi + }% + \fi + \w@csarg\ifx{#1}\stdbldpanel + \@AddToPanelTemplate{% + \w@csarg\ifx{eqPanTmpl#1}\web@YES + \fboxsep=0pt\setlength{\unitlength}{1pt}% + \put(\@panelX,0){\@nameuse{#1}}\fi + }% \fi + \fi } -\newcommand{\paneltemplate}[2][] -{% - \ifweb@allowtemplates\def\web@argi{#1}% - \ifx\web@argi\@empty - \edef\web@paneltemplate@opt@args{% - \web@addtopaneltemplateArgs}% - \else - \edef\web@paneltemplate@opt@args{% - \web@addtopaneltemplateArgs,#1}% - \fi\gdef\web@paneltemplate{#2}% - \fi +\newcommand{\paneltemplate}[2][]{% + \ifweb@allowtemplates\def\web@argi{#1}% + \ifx\web@argi\@empty + \edef\web@paneltemplate@opt@args + {\web@addtopaneltemplateArgs}\else + \edef\web@paneltemplate@opt@args + {\web@addtopaneltemplateArgs,#1}\fi + \gdef\web@paneltemplate{#2}% + \fi } \let\web@paneltemplate\@empty \def\addtopaneltemplateArgs#1{\gdef\web@addtopaneltemplateArgs{#1}} \def\clearpaneltemplateArgs{% - \global\let\web@addtopaneltemplateArgs=\@empty} + \global\let\web@addtopaneltemplateArgs=\@empty} \let\web@addtopaneltemplateArgs=\@empty \let\panel@scaletype\@empty \newcommand\panelsep[1]{\bgroup - \setlength\@tempdima{#1}% - \xdef\@panelsep{\the\@tempdima}\egroup} + \setlength\@tempdima{#1}% + \xdef\@panelsep{\the\@tempdima}\egroup} \panelsep{10bp} \def\panelSep{\@panelsep} \newcommand{\panelwidth}[1]{% - \let\web@next\relax - \iftemplatesforpaper\else\ifnum\@panelconfig>0 - \ifnum\@panelconfig=1 % left panel - \ifx\web@layout\web@YES - \addtolength{\textwidth}{\@panelwidth}% - \addtolength{\textwidth}{\@Rightmargin}% - \fi - \addtolength{\textwidth}{\@panelsep}% - \addtolength{\oddsidemargin}{-\@panelsep}% - \addtolength{\evensidemargin}{-\@panelsep}% - \addtolength{\textscreenwidth}{\@panelwidth}% - \fi - \ifnum\@panelconfig=2 % panel right - \ifx\web@layout\web@YES - \addtolength{\textwidth}{\@panelwidth}% - \addtolength{\textwidth}{\@Leftmargin}% - \fi - \addtolength{\textwidth}{\@panelsep}% - \addtolength{\textscreenwidth}{\@panelwidth}% - \fi - \setlength{\@panelwidth}{#1}% - \ifdim\@panelwidth<\web@minpanelwidth - \setlength{\@panelwidth}{\web@minpanelwidth}\fi - \def\web@next{\InitLayout}% - \fi\fi\web@next + \let\web@next\relax + \iftemplatesforpaper\else\ifnum\@panelconfig>\z@ + \ifnum\@panelconfig=\@ne % left panel + \ifx\web@layout\web@YES + \addtolength{\textwidth}{\@panelwidth}% + \addtolength{\textwidth}{\@Rightmargin}% + \fi + \addtolength{\textwidth}{\@panelsep}% + \addtolength{\oddsidemargin}{-\@panelsep}% + \addtolength{\evensidemargin}{-\@panelsep}% + \addtolength{\textscreenwidth}{\@panelwidth}% + \fi + \ifnum\@panelconfig=\tw@ % panel right + \ifx\web@layout\web@YES + \addtolength{\textwidth}{\@panelwidth}% + \addtolength{\textwidth}{\@Leftmargin}% + \fi + \addtolength{\textwidth}{\@panelsep}% + \addtolength{\textscreenwidth}{\@panelwidth}% + \fi + \setlength{\@panelwidth}{#1}% + \ifdim\@panelwidth<\web@minpanelwidth + \setlength{\@panelwidth}{\web@minpanelwidth}\fi + \def\web@next{\InitLayout}% + \fi\fi\web@next } \newcommand{\panelBgColor}[1]{\gdef\web@panelBgColor{#1}} \let\web@panelBgColor\@empty \newcommand\placePanelTemplateInLayer[2][webPanelBG]{% - \@ifpackageloaded{aeb_pro} - {\@ifundefined{xBld}{\PackageWarning{web} - {The uselayers option - of aeb_pro is\MessageBreak required with - \string\placePanelTemplateInLayer}} - {\def\b@webPanelLayer{\xBld[#2]{#1}}% - \def\e@webPanelLayer{\eBld}}}% - {\PackageWarning{web}{\string\placePanelTemplateInLayer\space - requires the\MessageBreak aeb_pro package}}% + \@ifpackageloaded{aeb_pro} + {\@ifundefined{xBld}{\PackageWarning{web} + {The uselayers option + of aeb_pro is\MessageBreak required with + \string\placePanelTemplateInLayer}} + {\def\b@webPanelLayer{\xBld[#2]{#1}}% + \def\e@webPanelLayer{\eBld}}}% + {\PackageWarning{web}{\string\placePanelTemplateInLayer\space + requires the\MessageBreak aeb_pro package}}% } \let\b@webPanelLayer\@empty \let\e@webPanelLayer\@empty -\newcommand\stdPanelBG -{% - \b@webPanelLayer\web@colorbox@w@transparency{\web@panelBgColor}% - {\parbox[b][\paperheight]{\@panelwidth}% - {\ifx\web@paneltemplate\@empty\hfill\vfill\else - \hfuzz=1pt\vfuzz=1pt\expandafter - \includegraphics\expandafter[\web@paneltemplate@opt@args,% - width=\@panelwidth,height=\paperheight]% - {\web@paneltemplate}\fi}}\e@webPanelLayer +\newcommand\stdPanelBG{% + \b@webPanelLayer\web@colorbox@w@transparency{\web@panelBgColor}% + {\parbox[b][\paperheight]{\@panelwidth}% + {\ifx\web@paneltemplate\@empty\hfill\vfill\else + \hfuzz=1pt\vfuzz=1pt\expandafter + \includegraphics\expandafter[\web@paneltemplate@opt@args,% + width=\@panelwidth,height=\paperheight]% + {\web@paneltemplate}\fi}}\e@webPanelLayer } \AddToPanelTemplate{stdPanelBG} -\newcommand{\buildpanel}[1] -{% - \gdef\stdbldpanel - {% - \parbox[b][\paperheight]{\@panelwidth}% - {% - \normalsfcodes\normalfont\normalsize - \spaceskip=0pt\xspaceskip=0pt - \par\medskip\vfil - \centering#1% - \par\medskip\vfil - }% +\newcommand{\buildpanel}[1]{% + \gdef\stdbldpanel{% + \parbox[b][\paperheight]{\@panelwidth}{% + \normalsfcodes\normalfont\normalsize + \spaceskip=0pt\xspaceskip=0pt + \par\medskip\vfil + \centering#1% + \par\medskip\vfil }% + }% } \let\stdbldpanel\@empty \AddToPanelTemplate{stdbldpanel} \newcommand{\useStandardPanel}{% - \buildpanel{% - \web@panel@top - \par\vspace{\stretch{1}}% - \web@panel@middle - \par\vspace{\stretch{1}}% - \web@panel@bottom - }% + \buildpanel{% + \web@panel@top + \par\vspace{\stretch{1}}% + \web@panel@middle + \par\vspace{\stretch{1}}% + \web@panel@bottom + }% } \newcommand{\panelTop}[1]{\def\web@panel@top{#1}} \panelTop{} @@ -2011,183 +1940,176 @@ \panelMiddle{} \newcommand{\panelBottom}[1]{\def\web@panel@bottom{#1}} \panelBottom{\panelNaviGroup} -\newcommand{\ClearTextTemplate} -{% - \global\let\web@textBgColor\@empty - \global\let\web@template\@empty +\newcommand{\ClearTextTemplate}{% + \global\let\web@textBgColor\@empty + \global\let\web@template\@empty } -\newcommand{\ClearPanelTemplate} -{% - \global\let\web@panelBgColor\@empty - \global\let\web@paneltemplate\@empty +\newcommand{\ClearPanelTemplate}{% + \global\let\web@panelBgColor\@empty + \global\let\web@paneltemplate\@empty } \newcommand{\ClearBuildPanel} - {\global\let\stdbldpanel\@empty} + {\global\let\stdbldpanel\@empty} -\newcommand{\ClearAllTemplates} -{% - \ClearTextTemplate - \ClearPanelTemplate +\newcommand{\ClearAllTemplates}{% + \ClearTextTemplate + \ClearPanelTemplate } \newcommand{\ClearTextTemplateBuffer} - {\global\let\web@textTemplate\@empty} + {\global\let\web@textTemplate\@empty} \newcommand{\ClearPanelTemplateBuffer} - {\global\let\web@panelTemplate\@empty} -\newcommand{\saveElements}[1] -{% - \begingroup - \global\w@csarg\let{web@SaveTmpls#1}\@empty - \toks@={}% - \def\web@addtoSaveToks##1{% - \edef\web@let{\global\expandafter - \let\expandafter\noexpand\csname#1##1\endcsname=% - \expandafter\noexpand\csname##1\endcsname}% - \web@let - \edef\web@SaveTmpls{\the\toks@\noexpand\\{##1}% - \expandafter\noexpand\csname#1##1\endcsname}% - \toks@=\expandafter{\web@SaveTmpls}% - }% - \web@addtoSaveToks{web@textBgColor}% - \web@addtoSaveToks{web@template}% - \web@addtoSaveToks{stdbldpanel}% - \web@addtoSaveToks{web@panelBgColor}% - \web@addtoSaveToks{web@paneltemplate}% - \w@csarg\xdef{web@SaveTmpls#1}{\the\toks@}% - \endgroup + {\global\let\web@panelTemplate\@empty} +\newcommand{\saveElements}[1]{% + \begingroup + \global\w@csarg\let{web@SaveTmpls#1}\@empty + \toks@={}% + \def\web@addtoSaveToks##1{% + \edef\web@let{\global\expandafter + \let\expandafter\noexpand\csname#1##1\endcsname=% + \expandafter\noexpand\csname##1\endcsname}% + \web@let + \edef\web@SaveTmpls{\the\toks@\noexpand\\{##1}% + \expandafter\noexpand\csname#1##1\endcsname}% + \toks@=\expandafter{\web@SaveTmpls}% + }% + \web@addtoSaveToks{web@textBgColor}% + \web@addtoSaveToks{web@template}% + \web@addtoSaveToks{stdbldpanel}% + \web@addtoSaveToks{web@panelBgColor}% + \web@addtoSaveToks{web@paneltemplate}% + \w@csarg\xdef{web@SaveTmpls#1}{\the\toks@}% + \endgroup } \newcommand{\saveClearElements}[1]{% - \saveElements{#1}\ClearAllTemplates\ClearBuildPanel + \saveElements{#1}\ClearAllTemplates\ClearBuildPanel } \newcommand{\restoreElements}[1]{% - \ClearAllTemplates\ClearBuildPanel - \begingroup - \toks@=\expandafter{\csname web@SaveTmpls#1\endcsname}% - \def\\##1##2{\global\w@csarg\let{##1}=##2}\the\toks@ - \endgroup -} -\newcommand{\disableScreens}[1] -{% - \begingroup + \ClearAllTemplates\ClearBuildPanel + \begingroup + \toks@=\expandafter{\csname web@SaveTmpls#1\endcsname}% + \def\\##1##2{\global\w@csarg\let{##1}=##2}\the\toks@ + \endgroup +} +\newcommand{\disableScreens}[1]{% + \begingroup \toks@=\expandafter{\listAddToTemplates}% \toks2={}% \def\\##1{\w@csarg\ifx{eqTmpl##1}\web@YES - \disableTemplate{##1}% - \xdef\web@saveAddTo{\the\toks2 \noexpand\\{##1}}% - \toks2=\expandafter{\web@saveAddTo}\fi}% + \disableTemplate{##1}% + \xdef\web@saveAddTo{\the\toks2 \noexpand\\{##1}}% + \toks2=\expandafter{\web@saveAddTo}\fi}% \the\toks@ - \endgroup - \w@csarg\let{web@DisabledTmpls#1}\web@saveAddTo + \endgroup + \w@csarg\let{web@DisabledTmpls#1}\web@saveAddTo } -\newcommand{\restoreScreens}[1] -{% - \begingroup - \toks@=\expandafter{\csname web@DisabledTmpls#1\endcsname}% - \def\\##1{\enableTemplate{##1}}\the\toks@ - \endgroup +\newcommand{\restoreScreens}[1]{% + \begingroup + \toks@=\expandafter{\csname web@DisabledTmpls#1\endcsname}% + \def\\##1{\enableTemplate{##1}}\the\toks@ + \endgroup } -\newcommand{\disablePanels}[1] -{% - \begingroup +\newcommand{\disablePanels}[1]{% + \begingroup \toks@ = \expandafter{\listAddToPanelTemplates}% \toks2 = {}% \def\\##1{\w@csarg\ifx{eqPanTmpl##1}\web@YES - \disablePanelTemplate{##1}% - \xdef\web@saveAddTo{\the\toks2 \noexpand\\{##1}}% - \toks2 =\expandafter{\web@saveAddTo}\fi}% + \disablePanelTemplate{##1}% + \xdef\web@saveAddTo{\the\toks2 \noexpand\\{##1}}% + \toks2 =\expandafter{\web@saveAddTo}\fi}% \the\toks@ - \endgroup - \global\w@csarg\let{web@DisabledPanelTmpls#1}\web@saveAddTo + \endgroup + \global\w@csarg\let{web@DisabledPanelTmpls#1}\web@saveAddTo } -\newcommand{\restorePanels}[1] -{% - \begingroup - \toks@=\expandafter{\csname web@DisabledPanelTmpls#1\endcsname}% - \def\\##1{\enablePanelTemplate{##1}}\the\toks@ - \endgroup +\newcommand{\restorePanels}[1]{% + \begingroup + \toks@=\expandafter{\csname web@DisabledPanelTmpls#1\endcsname}% + \def\\##1{\enablePanelTemplate{##1}}\the\toks@ + \endgroup } \newcommand{\disableTemplate}[1]{{% - \global\w@csarg\let{eqTmpl#1}\web@NO}} + \global\w@csarg\let{eqTmpl#1}\web@NO}} \newcommand{\enableTemplate}[1]{{% - \global\w@csarg\let{eqTmpl#1}\web@YES}} + \global\w@csarg\let{eqTmpl#1}\web@YES}} \newcommand{\disablePanelTemplate}[1]{{% - \global\w@csarg\let{eqPanTmpl#1}\web@NO}} + \global\w@csarg\let{eqPanTmpl#1}\web@NO}} \newcommand{\enablePanelTemplate}[1]{{% - \global\w@csarg\let{eqPanTmpl#1}\web@YES}} + \global\w@csarg\let{eqPanTmpl#1}\web@YES}} \let\fullscreenwidthadj\@empty \def\web@leftMargAdj{0pt} \def\web@rightMargAdj{0pt} \def\calculatefullwidth{% - \ifeqforpaper - \let\fullscreenwidthadj\@empty - \else - \ifnum\@panelconfig=1\relax % leftpanel - \bgroup + \ifeqforpaper + \let\fullscreenwidthadj\@empty + \else + \ifnum\@panelconfig=\@ne % leftpanel + \bgroup \setlength{\@tempdima}{-\@panelwidth-\@panelsep+\@Leftmargin}% \xdef\web@leftMargAdj{\the\@tempdima}% \setlength{\@tempdima}{-\@panelwidth-\@panelsep+\@Rightmargin}% \xdef\web@rightMargAdj{\the\@tempdima}% - \egroup - \def\fullscreenwidthadj{\hspace{\web@leftMargAdj}}% - \fi + \egroup + \def\fullscreenwidthadj{\hspace{\web@leftMargAdj}}% \fi + \fi } \newcommand{\makeFullwidthhead}{% - \global\let\web@save@oddhead\@oddhead - \renewcommand{\@oddhead}{\fullscreenwidthadj - \hbox to\fullscreenwidth{\normalfont\footnotesize - \web@headerhook\web@lhead\hfil\web@chead\hfil - \web@rightheader}\hss}% + \global\let\web@save@oddhead\@oddhead + \renewcommand{\@oddhead}{\fullscreenwidthadj + \hbox to\fullscreenwidth{\normalfont\footnotesize + \web@headerhook\web@lhead\hfil\web@chead\hfil + \web@rightheader}\hss}% } \newcommand{\restoreSavedHead}{% - \global\let\@oddhead\web@save@oddhead - \let\web@save@oddhead\@empty + \global\let\@oddhead\web@save@oddhead + \let\web@save@oddhead\@empty } \def\webNotPaneledWarning{% - The Fullwidthtext environment is valid only\MessageBreak - for a paneled document, ignoring this\MessageBreak - environment} + The Fullwidthtext environment is valid only\MessageBreak + for a paneled document, ignoring this\MessageBreak + environment} \newenvironment{Fullwidthtext}{% - \ifnum\@panelconfig=0\relax - \PackageWarning{web}{\webNotPaneledWarning}% - \let\web@next\relax - \else - \def\web@next{% - \enableTemplate{BGColorAndGraphicFullWidth}% - \list{}{% - \setlength{\textwidth}{\fullscreenwidth}% - \setlength{\linewidth}{\fullscreenwidth}% - \setlength{\itemindent}{0pt}\setlength{\itemsep}{0pt}% - \setlength{\topsep}{0pt}\setlength{\parsep}{0pt}% - \setlength{\listparindent}{\parindent}% - \setlength{\leftmargin}{\web@leftMargAdj}% - \setlength{\rightmargin}{-\web@rightMargAdj}% - }\item\relax}% - \fi\web@next + \ifnum\@panelconfig=\@ne + \PackageWarning{web}{\webNotPaneledWarning}% + \let\web@next\relax + \else + \def\web@next{% + \enableTemplate{BGColorAndGraphicFullWidth}% + \list{}{% + \setlength{\textwidth}{\fullscreenwidth}% + \setlength{\linewidth}{\fullscreenwidth}% + \setlength{\itemindent}{0pt}\setlength{\itemsep}{0pt}% + \setlength{\topsep}{0pt}\setlength{\parsep}{0pt}% + \setlength{\listparindent}{\parindent}% + \setlength{\leftmargin}{\web@leftMargAdj}% + \setlength{\rightmargin}{-\web@rightMargAdj}% + }\item\relax}% + \fi\web@next }{% - \ifnum\@panelconfig=0\relax\let\web@next\relax\else - \def\web@next{\endlist\newpage - \disableTemplate{BGColorAndGraphicFullWidth}}% - \fi\web@next + \ifnum\@panelconfig=\z@ + \let\web@next\relax\else + \def\web@next{\endlist\newpage + \disableTemplate{BGColorAndGraphicFullWidth}}% + \fi\web@next } \newcommand{\pushToFullWidthPage}{% - \ifnum\@panelconfig>0\relax - \disableScreens{gofullwidth}% - \disablePanels{gofullwidth}% - \makeFullwidthhead - \let\web@save@footwrapper\webfootwrapper - \def\webfootwrapper{\fullscreenwidthadj - \makebox[\fullscreenwidth]}% - \fi - \begin{Fullwidthtext} + \ifnum\@panelconfig>\z@ + \disableScreens{gofullwidth}% + \disablePanels{gofullwidth}% + \makeFullwidthhead + \let\web@save@footwrapper\webfootwrapper + \def\webfootwrapper{\fullscreenwidthadj + \makebox[\fullscreenwidth]}% + \fi + \begin{Fullwidthtext} } \newcommand{\popFromFullWidthPage}{% - \end{Fullwidthtext} - \ifnum\@panelconfig>0\relax - \restoreScreens{gofullwidth}% - \restorePanels{gofullwidth}% - \restoreSavedHead - \let\webfootwrapper\web@save@footwrapper - \fi + \end{Fullwidthtext} + \ifnum\@panelconfig>\z@ + \restoreScreens{gofullwidth}% + \restorePanels{gofullwidth}% + \restoreSavedHead + \let\webfootwrapper\web@save@footwrapper + \fi } \def\addtofullwidthtemplateArgs#1{% \gdef\web@addtofullwidthtemplateArgs{#1}} @@ -2197,47 +2119,45 @@ \newcommand{\fullwidthBgColor}[1]{\gdef\web@fullwidthBgColor{#1}} \let\web@fullwidthBgColor\@empty \let\web@fullwidthtemplate\@empty -\newcommand{\fullwidthtemplate}[2][] -{% - \ifweb@allowtemplates - \def\web@arg{#1}\ifx\web@argi\@empty - \xdef\web@fullwidthtemplate@opt@args - {\web@addtofullwidthtemplateArgs}% - \else - \xdef\web@fullwidthtemplate@opt@args - {\web@addtofullwidthtemplateArgs,#1}% - \fi\gdef\web@fullwidthtemplate{#2}% - \fi +\newcommand{\fullwidthtemplate}[2][]{% + \ifweb@allowtemplates + \def\web@arg{#1}\ifx\web@argi\@empty + \xdef\web@fullwidthtemplate@opt@args + {\web@addtofullwidthtemplateArgs}% + \else + \xdef\web@fullwidthtemplate@opt@args + {\web@addtofullwidthtemplateArgs,#1}% + \fi\gdef\web@fullwidthtemplate{#2}% + \fi } -\newcommand\BGColorAndGraphicFullWidth -{% - \put(-\@textX,0){% - \web@colorbox@w@transparency{\web@fullwidthBgColor}% - {% - \parbox[b][\paperheight]{\paperwidth}% - {% - \ifx\web@fullwidthtemplate\@empty - \hfill\vfill - \else - \hfuzz=1pt\vfuzz=1pt - \expandafter\includegraphics\expandafter - [\web@fullwidthtemplate@opt@args,% - width=\paperwidth,height=\paperheight]% - {\web@fullwidthtemplate}% - \fi - }% - }% +\newcommand\BGColorAndGraphicFullWidth{% + \put(-\@textX,0){% + \web@colorbox@w@transparency{\web@fullwidthBgColor}% + {% + \parbox[b][\paperheight]{\paperwidth}% + {% + \ifx\web@fullwidthtemplate\@empty + \hfill\vfill + \else + \hfuzz=1pt\vfuzz=1pt + \expandafter\includegraphics\expandafter + [\web@fullwidthtemplate@opt@args,% + width=\paperwidth,height=\paperheight]% + {\web@fullwidthtemplate}% + \fi + }% }% + }% } \AddToTemplate{BGColorAndGraphicFullWidth} \disableTemplate{BGColorAndGraphicFullWidth} -\ifnum\@usetemplates>0 - \ifnum\@panelconfig>0 - \AtBeginDocument{% - \AddToShipoutPicture{\web@textTemplate\web@panelTemplate}} - \else - \AtBeginDocument{\AddToShipoutPicture{\web@textTemplate}} - \fi +\ifnum\@usetemplates>\z@ + \ifnum\@panelconfig>\z@ + \AtBeginDocument{% + \AddToShipoutPicture{\web@textTemplate\web@panelTemplate}} + \else + \AtBeginDocument{\AddToShipoutPicture{\web@textTemplate}} + \fi \fi \raggedbottom \ifx\webpro@loaded\web@YES\expandafter\loadwebpro\fi diff --git a/texmf-dist/tex/latex/acrotex/webpro.def b/texmf-dist/tex/latex/acrotex/webpro.def index d494fec1..971056db 100644 --- a/texmf-dist/tex/latex/acrotex/webpro.def +++ b/texmf-dist/tex/latex/acrotex/webpro.def @@ -24,7 +24,7 @@ %%--------------------------------------------------------- \RequirePackage{pifont} \newcommand{\DeclareDocInfo}[1]{\setkeys{aebDocInfo}{#1}% - \ifx\web@talkdate@value\@empty\else\let\webversion\webtalkdate\fi} + \ifx\web@talkdate@value\@empty\else\let\webversion\webtalkdate\fi} \@onlypreamble\DeclareDocInfo \define@key{aebDocInfo}{title}[]{\title{#1}} \define@key{aebDocInfo}{author}[]{\author{#1}} @@ -41,59 +41,57 @@ \define@key{aebDocInfo}{prepared}[]{\prepared{#1}} \define@key{aebDocInfo}{preparedLabel}[]{\preparedLabel{#1}} \define@key{aebDocInfo}{Title}[]% - {\@ifpackageloaded{aebxmp}{\Title{#1}}{}} + {\@ifpackageloaded{aebxmp}{\Title{#1}}{}} \define@key{aebDocInfo}{authors}[]% - {\@ifpackageloaded{aebxmp}{\Authors{#1}}{}} + {\@ifpackageloaded{aebxmp}{\Authors{#1}}{}} \define@key{aebDocInfo}{Subject}[]% - {\@ifpackageloaded{aebxmp}{\Subject{#1}}{\subject{#1}}} + {\@ifpackageloaded{aebxmp}{\Subject{#1}}{\subject{#1}}} \define@key{aebDocInfo}{Keywords}[]% - {\@ifpackageloaded{aebxmp}{\Keywords{#1}}{\keywords{#1}}} + {\@ifpackageloaded{aebxmp}{\Keywords{#1}}{\keywords{#1}}} \define@key{aebDocInfo}{lang}[]% - {\@ifpackageloaded{aebxmp}{\metaLang{#1}}{}} + {\@ifpackageloaded{aebxmp}{\metaLang{#1}}{}} \define@key{aebDocInfo}{copyrightStatus}[]% - {\@ifpackageloaded{aebxmp}{\copyrightStatus{#1}}{}} + {\@ifpackageloaded{aebxmp}{\copyrightStatus{#1}}{}} \define@key{aebDocInfo}{copyrightNotice}[]% - {\@ifpackageloaded{aebxmp}{\copyrightNotice{#1}}{}} + {\@ifpackageloaded{aebxmp}{\copyrightNotice{#1}}{}} \define@key{aebDocInfo}{copyrightInfoURL}[]% - {\@ifpackageloaded{aebxmp}{\copyrightInfoURL{#1}}{}} + {\@ifpackageloaded{aebxmp}{\copyrightInfoURL{#1}}{}} \define@key{aebDocInfo}{authortitle}[]% - {\@ifpackageloaded{aebxmp}{\authortitle{#1}}{}} + {\@ifpackageloaded{aebxmp}{\authortitle{#1}}{}} \define@key{aebDocInfo}{descriptionwriter}[]% - {\@ifpackageloaded{aebxmp}{\descriptionwriter{#1}}{}} + {\@ifpackageloaded{aebxmp}{\descriptionwriter{#1}}{}} \define@key{aebDocInfo}{customProperties}[]% - {\@ifpackageloaded{aebxmp}{\customProperties{#1}}{}} + {\@ifpackageloaded{aebxmp}{\customProperties{#1}}{}} \newcommand{\DeclarePageLayout}[1]{\save@prtscr - \setkeys{web@pl}{topmargin,headheight,marginparsep,% - marginparwidth,marginparpush,webfootskip}% - \protected@edef\web@temp{\noexpand\setkeys{web@pl}{#1}}% - \web@temp\save@prtscr - \ifx\web@pl@screensize\@empty\else - \expandafter\screensize\web@pl@screensize\fi - \ifx\web@pl@margins\@empty\else - \expandafter\margins\web@pl@margins\fi - \ifeqforpaper\else - \ifdim\@Leftmargin<\@Rightmargin - \ifdim\marginparwidth>\@Leftmargin - \setlength{\marginparwidth} - {\@Leftmargin-2\marginparsep}% - \fi - \else - \ifdim\marginparwidth>\@Rightmargin - \setlength{\marginparwidth} - {\@Rightmargin-2\marginparsep}% - \fi - \fi - \fi - \ifeqforpaper\else - \ifdim\@Bottommargin<\web@footskip\relax\PackageError{web}{% - Error in the value of the webfootskip key\MessageBreak - of the \string\DeclarePageLayout\space command.\MessageBreak - The bottom margin must be larger then\MessageBreak - the value of webfootskip}{% - Increase the size of the bottom margin,\MessageBreak - or decrease the value of webfootskip.}\else - \fi + \setkeys{web@pl}{topmargin,headheight,marginparsep,% + marginparwidth,marginparpush,webfootskip}% + \protected@edef\web@temp{\noexpand\setkeys{web@pl}{#1}}% + \web@temp\save@prtscr + \ifx\web@pl@screensize\@empty\else + \expandafter\screensize\web@pl@screensize\fi + \ifx\web@pl@margins\@empty\else + \expandafter\margins\web@pl@margins\fi + \ifeqforpaper\else + \ifdim\@Leftmargin<\@Rightmargin + \ifdim\marginparwidth>\@Leftmargin + \setlength{\marginparwidth} + {\@Leftmargin-2\marginparsep}\fi + \else + \ifdim\marginparwidth>\@Rightmargin + \setlength{\marginparwidth} + {\@Rightmargin-2\marginparsep}\fi \fi + \fi + \ifeqforpaper\else + \ifdim\@Bottommargin<\web@footskip\relax\PackageError{web}{% + Error in the value of the webfootskip key\MessageBreak + of the \string\DeclarePageLayout\space command.\MessageBreak + The bottom margin must be larger then\MessageBreak + the value of webfootskip}{% + Increase the size of the bottom margin,\MessageBreak + or decrease the value of webfootskip.}\fi + \fi + \InitLayout } \@onlypreamble\DeclarePageLayout \define@key{web@pl}{screensize}[]{\def\web@pl@screensize{#1}} @@ -101,8 +99,8 @@ \define@key{web@pl}{margins}[]{\def\web@pl@margins{#1}} \let\web@pl@margins\@empty \define@choicekey+{web@pl}{design}[\val\nr]{designi,designii,% - designiii,designiv,designv,designvi,designvii,designviii,designix}{% - \ifcase\nr\relax + designiii,designiv,designv,designvi,designvii,designviii,designix}{% + \ifcase\nr\relax \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{3.736in}{4.67in}\or \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{4.5in}{5in}\or \web@MargScrDimOpts{.25in}{.25in}{24pt}{.25in}{5in}{6in}\or @@ -112,88 +110,86 @@ \web@MargScrDimOpts{.5in}{.5in}{24pt}{.5in}{7.5in}{10in}\or \web@MargScrDimOpts{.5in}{.5in}{24pt}{.5in}{3.75in}{6.67in}\or \web@MargScrDimOpts{.5in}{.5in}{24pt}{.5in}{3.75in}{6in}\fi - }{\PackageWarning{webpro}{% - Bad choice for design, use designi--designvix. Try again}} + }{\PackageWarning{webpro}{% + Bad choice for design, use designi--designvix. Try again}} \define@choicekey+{web@pl}{screensizeOf}[\val\nr]{designi,designii,% - designiii,designiv,designv,designvi,designvii,designviii,designix}{% - \ifcase\nr\relax - \screensize{3.736in}{4.67in}\or - \screensize{4.5in}{5in}\or - \screensize{5in}{6in}\or - \screensize{4in}{5in}\or - \screensize{4.5in}{6in}\or - \screensize{4.17in}{4.67in}\or - \screensize{7.5in}{10in}\or - \screensize{3.75in}{6.67in}\or - \screensize{3.75in}{6in}\fi - }{\PackageWarning{webpro}{% - Bad choice for screensizeOf, use designi--designvix. Try again}} + designiii,designiv,designv,designvi,designvii,designviii,designix}{% + \ifcase\nr\relax + \screensize{3.736in}{4.67in}\or + \screensize{4.5in}{5in}\or + \screensize{5in}{6in}\or + \screensize{4in}{5in}\or + \screensize{4.5in}{6in}\or + \screensize{4.17in}{4.67in}\or + \screensize{7.5in}{10in}\or + \screensize{3.75in}{6.67in}\or + \screensize{3.75in}{6in}\fi + }{\PackageWarning{webpro}{% + Bad choice for screensizeOf, use designi--designvix. Try again}} \define@key{web@pl}{headheight}[8pt]{\def\websetheadheight{#1}} \define@key{web@pl}{topmargin}[\prtscr{\the\topmargin}{8pt}]{% - \edef\web@argi{#1}\ifx\web@argi\@empty - \edef\web@argi{\prtscr{\the\topmargin}{8pt}}\fi - \ifeqforpaper - \setlength{\topmargin}{\web@argi}% - \else - \setlength{\web@Topmargin}{\web@argi}% - \fi} + \edef\web@argi{#1}\ifx\web@argi\@empty + \edef\web@argi{\prtscr{\the\topmargin}{8pt}}\fi + \ifeqforpaper + \setlength{\topmargin}{\web@argi}\else + \setlength{\web@Topmargin}{\web@argi}\fi} \define@key{web@pl}{textwidth}[345pt]{\setlength{\textwidth}{#1}} \define@key{web@pl}{textheight}[43\baselineskip]% - {\setlength{\textheight}{#1}} + {\setlength{\textheight}{#1}} \define@key{web@pl}{oddsidemargin}[63pt]% - {\setlength{\oddsidemargin}{#1}} + {\setlength{\oddsidemargin}{#1}} \define@key{web@pl}{evensidemargin}[63pt]% - {\setlength{\evensidemargin}{#1}} + {\setlength{\evensidemargin}{#1}} \define@key{web@pl}{marginparsep}[\prtscr{\the\marginparsep}{11pt}]{% - \edef\web@argi{#1}\ifx\web@argi\@empty - \edef\web@argi{\prtscr{\the\marginparsep}{11pt}}\fi - \setlength{\marginparsep}{\web@argi}} + \edef\web@argi{#1}\ifx\web@argi\@empty + \edef\web@argi{\prtscr{\the\marginparsep}{11pt}}\fi + \setlength{\marginparsep}{\web@argi}} \define@key{web@pl}{marginparwidth}% - [\prtscr{\the\marginparwidth}{.25in}]{% - \edef\web@argi{#1}\ifx\web@argi\@empty - \edef\web@argi{\prtscr{\the\marginparwidth}{.25in}}\fi - \setlength{\marginparwidth}{\web@argi}} + [\prtscr{\the\marginparwidth}{.25in}]{% + \edef\web@argi{#1}\ifx\web@argi\@empty + \edef\web@argi{\prtscr{\the\marginparwidth}{.25in}}\fi + \setlength{\marginparwidth}{\web@argi}} \define@key{web@pl}{marginparpush}[5pt]{% - \setlength{\marginparpush}{#1}} + \setlength{\marginparpush}{#1}} \define@key{web@pl}{webfootskip}[4pt]{% - \def\web@footskip{#1}} + \def\web@footskip{#1}} \define@key{web@pl}{footskip}[30pt]{\setlength{\footskip}{#1}} \define@key{web@pl}{panelwidth}[1in]{\panelwidth{#1}} \define@key{web@pl}{panelsep}[10pt]{\panelsep{#1}} \define@key{web@pl}{additionalheadsep}[0pt]% - {\def\web@additionalheadsep{#1}} + {\def\web@additionalheadsep{#1}} \renewcommand{\topTitlePage} {% - \vglue\web@aboveTopTitleSkip - \noindent\makebox[\linewidth][\halignuniversity]{\parbox{% - \hproportionwebuniversity\linewidth}% - {\sectionUniversity{\webuniversity}}}% - \par\ifeqforpaper\else\minimumskip\fi - \vspace{\stretch{1}}% - \noindent\makebox[\linewidth][\haligntitle]% - {\parbox{\hproportionwebtitle\linewidth}% - {\sectionTitle{\webtitle}}}% - \par\ifeqforpaper\vspace{2\baselineskip}\else - \minimumskip\vspace{\stretch{1}}\fi - \noindent\makebox[\linewidth][\halignauthor]% - {\parbox{\hproportionwebauthor\linewidth}% - {\sectionAuthor{\webauthor}}} - \par\ifeqforpaper\vspace{2\baselineskip}\else - \minimumskip\vspace{\stretch{1}}\fi + \vglue\web@aboveTopTitleSkip\noindent + \makebox[\linewidth][\halignuniversity]{\parbox{% + \hproportionwebuniversity\linewidth}% + {\sectionUniversity{\webuniversity}}}\par + \ifeqforpaper\else\minimumskip\fi + \vspace{\stretch{1}}\noindent + \makebox[\linewidth][\haligntitle]% + {\parbox{\hproportionwebtitle\linewidth}% + {\sectionTitle{\webtitle}}}% + \par\ifeqforpaper\vspace{2\baselineskip}\else + \minimumskip\vspace{\stretch{1}}\fi\noindent + \makebox[\linewidth][\halignauthor]% + {\parbox{\hproportionwebauthor\linewidth}% + {\sectionAuthor{\webauthor}}} + \par\ifeqforpaper\vspace{2\baselineskip}\else + \minimumskip\vspace{\stretch{1}}\fi } \newcommand{\topTitlePageProportion}[1]{\def\titleauthorproportion{#1}} \renewcommand{\titlepageTrailer} {% - \webtpTrailerWrapper{\makebox[\web@tp@linewidth]{% - \parbox{\web@tp@linewidth}{% - \ifx\tpTrailer@textcolor\@empty\else - \color{\tpTrailer@textcolor}\fi\web@tpTrailer@formatting - \maketitle@trailer@ul\hfill\maketitle@trailer@ur\\ - \maketitle@trailer@ll\hfill\maketitle@trailer@lr - }}}% + \webtpTrailerWrapper{\makebox[\web@tp@linewidth]{% + \parbox{\web@tp@linewidth}{% + \ifx\tpTrailer@textcolor\@empty\else + \color{\tpTrailer@textcolor}\fi\web@tpTrailer@formatting + \maketitle@trailer@ul\hfill\maketitle@trailer@ur\\ + \maketitle@trailer@ll\hfill\maketitle@trailer@lr + }}}% } \def\maketitle@trailer@ul{\web@copyright\ \web@copyright@symbol\ - \webcopyrightyears\ \thewebemail} + \webcopyrightyears\ \thewebemail} \def\maketitle@trailer@ll{\aeb@Prepared} \def\maketitle@trailer@ur{\aeb@talksite} \def\maketitle@trailer@lr{\webversion} @@ -223,79 +219,79 @@ \define@key{tpTrailer}{raise}{\def\web@tpTrailer@raise{#1}} \newcommand{\DesignTitlePageTrailer}[1] {% - \setkeys{tpTrailer}{fboxsep=3pt,fboxrule=.4pt}% - \setkeys{tpTrailer}{#1}% - \setlength{\fboxsep}{\web@tpTrailerfboxsep}% - \setlength{\fboxrule}{\web@tpTrailerfboxrule}% - \let\web@tp@graphic\web@NO - \ifx\web@tpTrailer@graphic\@empty - \ifx\web@tpTrailer@namedgraphic\@empty\else - \let\web@tp@graphic\web@YES\fi - \else\let\web@tp@graphic\web@YES\fi - \ifx\web@tp@graphic\web@NO\relax - \ifx\web@tpTrailerBgColor\@empty - \def\grfbox@spec##1{##1}% - \else - \ifx\web@tpTrailerBorderColor\@empty - \def\web@tp@linewidth{\linewidth-2\fboxsep}% - \def\grfbox@spec{\colorbox{\web@tpTrailerBgColor}}% - \else - \def\web@tp@linewidth{% - \linewidth-2\fboxsep-2\fboxrule}% - \def\grfbox@spec{\fcolorbox{\web@tpTrailerBorderColor}% - {\web@tpTrailerBgColor}}% - \fi - \fi - \def\webtpTrailerWrapper##1{\smash{\raisebox - {\web@tpTrailer@raise}{\grfbox@spec{##1}}}}% + \setkeys{tpTrailer}{fboxsep=3pt,fboxrule=.4pt}% + \setkeys{tpTrailer}{#1}% + \setlength{\fboxsep}{\web@tpTrailerfboxsep}% + \setlength{\fboxrule}{\web@tpTrailerfboxrule}% + \let\web@tp@graphic\web@NO + \ifx\web@tpTrailer@graphic\@empty + \ifx\web@tpTrailer@namedgraphic\@empty\else + \let\web@tp@graphic\web@YES\fi + \else\let\web@tp@graphic\web@YES\fi + \ifx\web@tp@graphic\web@NO\relax + \ifx\web@tpTrailerBgColor\@empty + \def\grfbox@spec##1{##1}% \else - \@ifundefined{graphicxbox}{\begingroup - \gdef\webtpTrailerWrapper##1{% - \edef\web@tmp@opt{\ifx\web@tpTrailer@namedgraphic\@empty\else - name=\web@tpTrailer@namedgraphic,\fi}% - \def\web@tp@linewidth{\linewidth-2\fboxsep}% - \setbox0=\hbox{##1}% - \noindent\makebox[0pt][l]{% - \smash{\raisebox{-\dp0-\fboxsep+\web@tpTrailer@raise}{% - \expandafter\includegraphics\expandafter[\web@tmp@opt - width=\wd0+2\fboxsep,% - height=\dp0+\ht0+2\fboxsep]{\web@tpTrailer@graphic}}% - }}\kern\fboxsep\smash{% - \raisebox{\web@tpTrailer@raise}{\unhbox0\relax}}% - }% - \endgroup}{% - \xdef\grfbox@spec{% - \ifx\web@tpTrailerBorderColor\@empty - \noexpand\graphicxbox\else - \noexpand\fgraphicxbox{\web@tpTrailerBorderColor}\fi - \ifx\web@tpTrailer@namedgraphic\@empty\else - [name=\web@tpTrailer@namedgraphic]\fi}% - \gdef\webtpTrailerWrapper##1{% - \edef\web@tp@linewidth{% - \linewidth-2\fboxsep\ifx\web@tpTrailerBorderColor\@empty - \else-2\fboxrule\fi}% - \smash{\raisebox{\web@tpTrailer@raise}{% - \grfbox@spec{\web@tpTrailer@graphic}{##1}}}}% - }% + \ifx\web@tpTrailerBorderColor\@empty + \def\web@tp@linewidth{\linewidth-2\fboxsep}% + \def\grfbox@spec{\colorbox{\web@tpTrailerBgColor}}% + \else + \def\web@tp@linewidth{% + \linewidth-2\fboxsep-2\fboxrule}% + \def\grfbox@spec{\fcolorbox{\web@tpTrailerBorderColor}% + {\web@tpTrailerBgColor}}% + \fi \fi + \def\webtpTrailerWrapper##1{\smash{\raisebox + {\web@tpTrailer@raise}{\grfbox@spec{##1}}}}% + \else + \@ifundefined{graphicxbox}{\begingroup + \gdef\webtpTrailerWrapper##1{% + \edef\web@tmp@opt{\ifx\web@tpTrailer@namedgraphic\@empty\else + name=\web@tpTrailer@namedgraphic,\fi}% + \def\web@tp@linewidth{\linewidth-2\fboxsep}% + \setbox0=\hbox{##1}% + \noindent\makebox[0pt][l]{% + \smash{\raisebox{-\dp0-\fboxsep+\web@tpTrailer@raise}{% + \expandafter\includegraphics\expandafter[\web@tmp@opt + width=\wd0+2\fboxsep,% + height=\dp0+\ht0+2\fboxsep]{\web@tpTrailer@graphic}}% + }}\kern\fboxsep\smash{% + \raisebox{\web@tpTrailer@raise}{\unhbox0\relax}}% + }% + \endgroup}{% + \xdef\grfbox@spec{% + \ifx\web@tpTrailerBorderColor\@empty + \noexpand\graphicxbox\else + \noexpand\fgraphicxbox{\web@tpTrailerBorderColor}\fi + \ifx\web@tpTrailer@namedgraphic\@empty\else + [name=\web@tpTrailer@namedgraphic]\fi}% + \gdef\webtpTrailerWrapper##1{% + \edef\web@tp@linewidth{% + \linewidth-2\fboxsep\ifx\web@tpTrailerBorderColor\@empty + \else-2\fboxrule\fi}% + \smash{\raisebox{\web@tpTrailer@raise}{% + \grfbox@spec{\web@tpTrailer@graphic}{##1}}}}% + }% + \fi } \renewcommand{\web@maketitle} {% - \maketitlepreamble - \ifeqforpaper\vspace*{2\baselineskip}\else + \maketitlepreamble + \ifeqforpaper\vspace*{2\baselineskip}\else \vbox to\titleauthorproportion\textheight\bgroup\fi - \topTitlePage - \ifeqforpaper\else\egroup\fi % end of \vbox for title and author - \begingroup\par - \aboveOPMvspace - \noindent\parbox{\linewidth}{\optionalpagematter}% - \par\endgroup - \par\vspace{\stretch{1}} - \ifx\web@directory@option\web@YES\web@directory@hook\webdirectory\fi - \par\ifeqforpaper\else\minimumskip\fi\vspace{\stretch{1}} - \vfill\noindent\begingroup\trailerFontSize\titlepageTrailer - \par\endgroup - \maketitlepostamble + \topTitlePage + \ifeqforpaper\else\egroup\fi % end of \vbox for title and author + \begingroup\par + \aboveOPMvspace\noindent + \parbox{\linewidth}{\optionalpagematter}\par + \endgroup + \par\vspace{\stretch{1}} + \ifx\web@directory@option\web@YES\web@directory@hook\webdirectory\fi + \par\ifeqforpaper\else\minimumskip\fi\vspace{\stretch{1}}% + \vfill\noindent\begingroup\trailerFontSize\titlepageTrailer + \par\endgroup + \maketitlepostamble } \let\web@maketitle@save\maketitle \let\maketitle\web@maketitle @@ -306,7 +302,7 @@ \def\aeb@prepared{\@date} \def\aeb@Prepared{\web@revision\ \aeb@prepared} \def\talkdate#1{\gdef\web@talkdate@value{#1}% - \edef\webtalkdate{\ifx\web@talkdate@value\@empty + \edef\webtalkdate{\ifx\web@talkdate@value\@empty \else\noexpand\web@talkdatelabel\ #1\fi}} \let\web@talkdate@value\@empty \def\talkdateLabel#1{\def\web@talkdatelabel{#1}} @@ -314,43 +310,45 @@ \def\talksite#1{\def\aeb@talksite{#1}} \talksite{} \define@choicekey+{aebsection}{reset}[\val\nr]{font,all}{% - \ifcase\nr\relax - \aeb@reset@section@fonts\or - \aeb@reset@section@all\fi + \ifcase\nr\relax + \aeb@reset@section@fonts\or + \aeb@reset@section@all + \fi }{\PackageWarning{webpro}{Bad choice for reset, permissible values are font and all. Try again}} \define@choicekey+{aebsection}{type}[\val\nr]{section,subsection,% - subsubsection,university,title,author,toc}% + subsubsection,university,title,author,toc}% {% - \edef\aeb@section@type{#1}% - \edef\aeb@section@typeIndex{\nr}% + \edef\aeb@section@type{#1}% + \edef\aeb@section@typeIndex{\nr}% }{}{} \define@key{aebsection}{special}{% - \edef\aeb@temp@expand{% - \noexpand\XKV@cc+[\noexpand\val\noexpand\nr]{#1}}% - \aeb@temp@expand{shadow,framebox,colorbox,fcolorbox,frameboxfit,% - colorboxfit,fcolorboxfit,colorboxfitrule,custom,default}% + \edef\aeb@temp@expand{% + \noexpand\XKV@cc+[\noexpand\val\noexpand\nr]{#1}}% + \aeb@temp@expand{shadow,framebox,colorbox,fcolorbox,frameboxfit,% + colorboxfit,fcolorboxfit,colorboxfitrule,custom,default}% {% \ifcase\nr\relax - \w@csarg\let{aeb@\aeb@section@type @special}\aeb@shadowHead\or - \w@csarg\let{aeb@\aeb@section@type @special}\aeb@frameboxHead\or - \w@csarg\let{aeb@\aeb@section@type @special}\aeb@colorboxHead\or - \w@csarg\let{aeb@\aeb@section@type @special}\aeb@fcolorboxHead\or - \w@csarg\let{aeb@\aeb@section@type @special}\aeb@frameboxfitHead\or - \w@csarg\let{aeb@\aeb@section@type @special}\aeb@colorboxfitHead\or - \w@csarg\let{aeb@\aeb@section@type @special} - \aeb@fcolorboxfitHead\or - \w@csarg\let{aeb@\aeb@section@type @special} - \aeb@colorboxfitruleHead\or - \edef\aeb@temp{\noexpand\def\expandafter\noexpand + \w@csarg\let{aeb@\aeb@section@type @special}\aeb@shadowHead\or + \w@csarg\let{aeb@\aeb@section@type @special}\aeb@frameboxHead\or + \w@csarg\let{aeb@\aeb@section@type @special}\aeb@colorboxHead\or + \w@csarg\let{aeb@\aeb@section@type @special}\aeb@fcolorboxHead\or + \w@csarg\let{aeb@\aeb@section@type @special}\aeb@frameboxfitHead\or + \w@csarg\let{aeb@\aeb@section@type @special}\aeb@colorboxfitHead\or + \w@csarg\let{aeb@\aeb@section@type @special} + \aeb@fcolorboxfitHead\or + \w@csarg\let{aeb@\aeb@section@type @special} + \aeb@colorboxfitruleHead\or + \edef\aeb@temp{\noexpand\def\expandafter\noexpand \csname aeb@\aeb@section@type @special\endcsname{\expandafter - \noexpand\csname aeb@\aeb@section@type @customHead\endcsname}}% - \aeb@temp\or - \w@csarg\let{aeb@\aeb@section@type @special}\@empty\fi + \noexpand\csname aeb@\aeb@section@type @customHead\endcsname}}% + \aeb@temp\or + \w@csarg\let{aeb@\aeb@section@type @special}\@empty + \fi }{% - \PackageWarning{webpro}{Bad choice for special, permissible values - are shadow, framebox, colorbox, fcolorbox, custom and default. - Try again}}% + \PackageWarning{webpro}{Bad choice for special, permissible values + are shadow, framebox, colorbox, fcolorbox, custom and default. + Try again}}% } \@tfor\@@tmp:={section}{subsection}{subsubsection}% {university}{title}{author}{toc}\do{% @@ -364,185 +362,184 @@ \newcommand{\customAuthor}[1]{\def\aeb@author@customHead##1{#1}} \newcommand{\customToc}[1]{\def\aeb@toc@customHead##1{#1}} \def\aeb@frameboxHead#1{% - \begingroup + \begingroup \@tempdima=\linewidth \advance\@tempdima-2\fboxsep \advance\@tempdima-2\fboxrule \edef\@@aeb@sectionframecolor - {\@nameuse{aeb@\aeb@section@type framecolor}}% + {\@nameuse{aeb@\aeb@section@type framecolor}}% \edef\@@aeb@sectioncolor - {\@nameuse{aeb@\aeb@section@type color}}% - \setbox0\vbox{\hsize=\@tempdima#1}\color{\@@aeb@sectionframecolor}% - \framebox{\color{\@@aeb@sectioncolor}\copy0}% - \endgroup + {\@nameuse{aeb@\aeb@section@type color}}% + \setbox\z@\vbox{\hsize=\@tempdima#1}% + \color{\@@aeb@sectionframecolor}% + \framebox{\color{\@@aeb@sectioncolor}\copy\z@}% + \endgroup } \def\aeb@colorboxHead#1{% - \begingroup + \begingroup \@tempdima=\linewidth \advance\@tempdima-2\fboxsep - \setbox0\vbox{\hsize=\@tempdima#1}% + \setbox\z@\vbox{\hsize=\@tempdima#1}% \edef\@@aeb@sectionbgcolor {\@nameuse{aeb@\aeb@section@type bgcolor}}% - \colorbox{\@@aeb@sectionbgcolor}{\copy0}% - \endgroup + \colorbox{\@@aeb@sectionbgcolor}{\copy\z@}% + \endgroup } \def\aeb@fcolorboxHead#1{% - \begingroup - \@tempdima=\linewidth + \begingroup + \@tempdima=\linewidth \advance\@tempdima-2\fboxsep \advance\@tempdima-2\fboxrule - \setbox0\vbox{\hsize=\@tempdima#1}% + \setbox\z@\vbox{\hsize=\@tempdima#1}% \edef\@@aeb@sectionbgcolor - {\@nameuse{aeb@\aeb@section@type bgcolor}}% + {\@nameuse{aeb@\aeb@section@type bgcolor}}% \fcolorbox{\aeb@sectionframecolor}% - {\@@aeb@sectionbgcolor}{\copy0} - \endgroup + {\@@aeb@sectionbgcolor}{\copy\z@} + \endgroup } \def\aeb@frameboxfitHead#1{% - \begingroup + \begingroup \edef\@@aeb@sectionframecolor - {\@nameuse{aeb@\aeb@section@type framecolor}}% + {\@nameuse{aeb@\aeb@section@type framecolor}}% \edef\@@aeb@sectioncolor - {\@nameuse{aeb@\aeb@section@type color}}% + {\@nameuse{aeb@\aeb@section@type color}}% \vbox{\color{\@@aeb@sectionframecolor}% \framebox{\color{\@@aeb@sectioncolor}#1}}% - \endgroup + \endgroup } \def\aeb@colorboxfitHead#1{% - \begingroup + \begingroup \edef\@@aeb@sectioncolor - {\@nameuse{aeb@\aeb@section@type color}}% + {\@nameuse{aeb@\aeb@section@type color}}% \edef\@@aeb@sectionbgcolor - {\@nameuse{aeb@\aeb@section@type bgcolor}}% + {\@nameuse{aeb@\aeb@section@type bgcolor}}% \vbox{\colorbox{\@@aeb@sectionbgcolor}% - {\color{\@@aeb@sectioncolor}#1}}% - \endgroup + {\color{\@@aeb@sectioncolor}#1}}% + \endgroup } \def\aeb@fcolorboxfitHead#1{% - \begingroup + \begingroup \edef\@@aeb@sectioncolor - {\@nameuse{aeb@\aeb@section@type color}}% + {\@nameuse{aeb@\aeb@section@type color}}% \edef\@@aeb@sectionbgcolor - {\@nameuse{aeb@\aeb@section@type bgcolor}}% + {\@nameuse{aeb@\aeb@section@type bgcolor}}% \edef\@@aeb@sectionframecolor - {\@nameuse{aeb@\aeb@section@type framecolor}}% + {\@nameuse{aeb@\aeb@section@type framecolor}}% \vbox{\fcolorbox{\@@aeb@sectionframecolor}{\@@aeb@sectionbgcolor}% - {\color{\@@aeb@sectioncolor}#1}}% - \endgroup + {\color{\@@aeb@sectioncolor}#1}}% + \endgroup } \def\shadowhoffset#1{\def\aeb@shadowhoffset{#1}} \shadowhoffset{.2ex} \def\shadowvoffset#1{\def\aeb@shadowvoffset{#1}} \shadowvoffset{-.2ex} -\def\aeb@shadowHead#1{% dps1 - \begingroup +\def\aeb@shadowHead#1{% + \begingroup \edef\@@aeb@sectionshadowcolor - {\@nameuse{aeb@\aeb@section@type shadowcolor}}% + {\@nameuse{aeb@\aeb@section@type shadowcolor}}% \edef\@@aeb@sectioncolor - {\@nameuse{aeb@\aeb@section@type color}}% - \setbox0\vbox{\Shadowtrue\hsize=\linewidth #1}% - \wd0\z@\dp0\z@\relax\raisebox{\aeb@shadowvoffset}% + {\@nameuse{aeb@\aeb@section@type color}}% + \setbox\z@\vbox{\Shadowtrue\hsize=\linewidth #1}% + \wd\z@\z@\dp\z@\z@\raisebox{\aeb@shadowvoffset}% {\hbox to\z@{\kern\aeb@shadowhoffset% \Shadowtrue\color{\@@aeb@sectionshadowcolor} - \box0\hss}}% - \setbox0\vbox{\Shadowfalse\hsize=\linewidth #1}\box0 - \endgroup + \box\z@\hss}}\setbox\z@ + \vbox{\Shadowfalse\hsize=\linewidth #1}\box\z@ + \endgroup } \define@key{aebsection}{usefont}{% - \w@csarg\def{aeb@\aeb@section@type @usefont}{\aeb@usefont#1}} + \w@csarg\def{aeb@\aeb@section@type @usefont}{\aeb@usefont#1}} \@tfor\@@tmp:={section}{subsection}{subsubsection} -{university}{title}{author}{toc}\do{% + {university}{title}{author}{toc}\do{% \w@csarg\let{aeb@\@@tmp @usefont}\@empty} \def\aeb@usefont#1#2#3#4#5{\def\aeb@usefontargv{#5}% - \ifx\aeb@usefontargv\@empty - \def\aeb@next{\expandafter\@gobble\@gobbletwo}% - \else - \def\aeb@next{\expandafter\@gobbletwo\@gobbletwo}% - \fi - \fontencoding{#1}\fontfamily{#2}% - \fontseries{#3}\fontshape{#4}\ifx\aeb@usefontargv\@empty\else - \fontsize#5\fi\selectfont\aeb@next + \ifx\aeb@usefontargv\@empty + \def\aeb@next{\expandafter\@gobble\@gobbletwo}% + \else + \def\aeb@next{\expandafter\@gobbletwo\@gobbletwo}% + \fi + \fontencoding{#1}\fontfamily{#2}% + \fontseries{#3}\fontshape{#4}\ifx\aeb@usefontargv\@empty\else + \fontsize#5\fi\selectfont\aeb@next } \define@key{aebsection}{fontfamily}{% - \edef\aeb@temp@expand{\noexpand\XKV@cc+{#1}}% - \aeb@temp@expand{rmfamily,sffamily,ttfamily}{% - \w@csarg\def{aeb@\aeb@section@type @fontfamily}{\@nameuse{#1}}% + \edef\aeb@temp@expand{\noexpand\XKV@cc+{#1}}% + \aeb@temp@expand{rmfamily,sffamily,ttfamily}{% + \w@csarg\def{aeb@\aeb@section@type @fontfamily}{\@nameuse{#1}}% }{\PackageWarning{webpro}{Bad choice for fontfamily, permissible values - are rmfamily, sffamily and ttfamily. Try again}}% -} + are rmfamily, sffamily and ttfamily. Try again}}} \@tfor\@@tmp:={section}{subsection}{subsubsection}{university}{title}% -{author}{toc}\do{\w@csarg\let{aeb@\@@tmp @fontfamily}\aeb@defaultfamily} + {author}{toc}\do + {\w@csarg\let{aeb@\@@tmp @fontfamily}\aeb@defaultfamily} \define@key{aebsection}{fontseries}{% - \edef\aeb@temp@expand{\noexpand\XKV@cc+{#1}}% - \aeb@temp@expand{bfseries,mdseries}{% - \w@csarg\def{aeb@\aeb@section@type @fontseries}{\@nameuse{#1}}% + \edef\aeb@temp@expand{\noexpand\XKV@cc+{#1}}% + \aeb@temp@expand{bfseries,mdseries}{% + \w@csarg\def{aeb@\aeb@section@type @fontseries}{\@nameuse{#1}}% }{\PackageWarning{webpro}{Bad choice for fontseries, permissible values - are bfseries and mdseries. Try again}}% -} + are bfseries and mdseries. Try again}}} \@tfor\@@tmp:={section}{subsection}{subsubsection}{university}{title}% -{author}{toc}\do{\w@csarg\let{aeb@\@@tmp @fontseries}\bfseries} + {author}{toc}\do{\w@csarg\let{aeb@\@@tmp @fontseries}\bfseries} \define@key{aebsection}{fontshape}{% - \edef\aeb@temp@expand{\noexpand\XKV@cc+{#1}}% - \aeb@temp@expand{upshape,itshape,scshape,slshape}{% - \w@csarg\def{aeb@\aeb@section@type @fontshape}{\@nameuse{#1}}% + \edef\aeb@temp@expand{\noexpand\XKV@cc+{#1}}% + \aeb@temp@expand{upshape,itshape,scshape,slshape}{% + \w@csarg\def{aeb@\aeb@section@type @fontshape}{\@nameuse{#1}}% }{\PackageWarning{webpro}{Bad choice for fontshape, permissible values are upshape, itshape, scshape and slshape. Try again}}% } \@tfor\@@tmp:={section}{subsection}{subsubsection}{university}{title}% -{author}{toc}\do{\w@csarg\let{aeb@\@@tmp @fontshape}\upshape} + {author}{toc}\do{\w@csarg\let{aeb@\@@tmp @fontshape}\upshape} \define@key{aebsection}{fontsize}{% - \edef\aeb@temp@expand{\noexpand\XKV@cc+{#1}}% - \aeb@temp@expand{tiny,scriptsize,footnotesize,% - small,normalsize,large,Large,LARGE,huge,Huge}{% - \w@csarg\def{aeb@\aeb@section@type @fontsize}{\@nameuse{#1}}% + \edef\aeb@temp@expand{\noexpand\XKV@cc+{#1}}% + \aeb@temp@expand{tiny,scriptsize,footnotesize,% + small,normalsize,large,Large,LARGE,huge,Huge}{% + \w@csarg\def{aeb@\aeb@section@type @fontsize}{\@nameuse{#1}}% }{\PackageWarning{webpro}{Bad choice for fontsize, permissible values - are tiny, scriptsize, footnotesize, small, normalsize, - large, Large, LARGE, huge and Huge. Try again}}% + are tiny, scriptsize, footnotesize, small, normalsize, + large, Large, LARGE, huge and Huge. Try again}}% } \@tfor\@@tmp:={{section}{\normalsize}}{{subsection}{\normalsize}}% -{{subsubsection}{\normalsize}}{{university}{\normalsize}}% -{{title}{\large}}{{author}{\normalsize}}{{toc}{\small}}\do{% + {{subsubsection}{\normalsize}}{{university}{\normalsize}}% + {{title}{\large}}{{author}{\normalsize}}{{toc}{\small}}\do{% \expandafter\getargs\@@tmp \edef\aeb@temp{\global\noexpand \let\expandafter\noexpand\csname aeb@\aeb@argi @fontsize\endcsname \expandafter\noexpand\aeb@argii}\aeb@temp } \define@key{aebsection}{halign}{% - \edef\aeb@temp@expand{% - \noexpand\XKV@cc+[\noexpand\val\noexpand\nr]{#1}}% - \aeb@temp@expand{l,c,r}{% - \ifcase\nr\relax - \w@csarg\let{aeb@\aeb@section@type @halign}\raggedright\or - \w@csarg\let{aeb@\aeb@section@type @halign}\centering\or - \w@csarg\let{aeb@\aeb@section@type @halign}\raggedleft\fi + \edef\aeb@temp@expand{\noexpand + \XKV@cc+[\noexpand\val\noexpand\nr]{#1}}% + \aeb@temp@expand{l,c,r}{% + \ifcase\nr\relax + \w@csarg\let{aeb@\aeb@section@type @halign}\raggedright\or + \w@csarg\let{aeb@\aeb@section@type @halign}\centering\or + \w@csarg\let{aeb@\aeb@section@type @halign}\raggedleft\fi }{\PackageWarning{webpro}{Bad choice for halign, permissible values are l, c and r. Try again}}% } \@tfor\@@tmp:={\aeb@section@halign\raggedright} -{\aeb@subsection@halign\raggedright} -{\aeb@subsubsection@halign\raggedright} -{\aeb@university@halign\centering} -{\aeb@title@halign\centering}{\aeb@author@halign\centering}% -{\aeb@toc@halign\centering}\do -{% + {\aeb@subsection@halign\raggedright} + {\aeb@subsubsection@halign\raggedright} + {\aeb@university@halign\centering} + {\aeb@title@halign\centering}{\aeb@author@halign\centering}% + {\aeb@toc@halign\centering}\do{% \expandafter\getargs\@@tmp \edef\aeb@temp{\noexpand\let\expandafter\noexpand\aeb@argi \expandafter\noexpand\aeb@argii}\aeb@temp } -\define@key{aebsection}{ding}{\if\aeb@use@section@numbers0 - \webtoksi=\expandafter{\expandafter\protect - \expandafter\web@sel@sec@col\expandafter{\aeb@section@type}#1\ }% - \w@csarg\edef{aeb@\aeb@section@type Num}##1{\the\webtoksi}% - \else\PackageWarning{webpro}{The ding key is not available with a - section numbering system,\MessageBreak - ignoring request for a ding.}\fi +\define@key{aebsection}{ding}{\if\aeb@use@section@numbers\web@Zero + \webtoksi=\expandafter{\expandafter\protect + \expandafter\web@sel@sec@col\expandafter{\aeb@section@type}#1\ }% + \w@csarg\edef{aeb@\aeb@section@type Num}##1{\the\webtoksi}% + \else\PackageWarning{webpro}{The ding key is not available with a + section numbering system,\MessageBreak + ignoring request for a ding.}\fi } \define@key{aebsection}{color}{% - \w@csarg\def{aeb@\aeb@section@type color}{#1}} + \w@csarg\def{aeb@\aeb@section@type color}{#1}} \define@key{aebsection}{ruleheight}{% - \w@csarg\def{aeb@\aeb@section@type ruleheight}{#1}} + \w@csarg\def{aeb@\aeb@section@type ruleheight}{#1}} \define@key{aebsection}{numdingcolor}{% - \w@csarg\def{aeb@\aeb@section@type numdingcolor}{#1}} + \w@csarg\def{aeb@\aeb@section@type numdingcolor}{#1}} \def\aeb@sectioncolor{blue} \def\aeb@subsectioncolor{\aeb@sectioncolor} \def\aeb@subsubsectioncolor{\aeb@sectioncolor} @@ -567,7 +564,7 @@ \def\aeb@authorframecolor{blue} \def\aeb@tocframecolor{blue} \define@key{aebsection}{bgcolor}{% - \w@csarg\def{aeb@\aeb@section@type bgcolor}{#1}} + \w@csarg\def{aeb@\aeb@section@type bgcolor}{#1}} \def\aeb@sectionbgcolor{cornsilk} \def\aeb@subsectionbgcolor{cornsilk} \def\aeb@subsubsectionbgcolor{cornsilk} @@ -576,7 +573,7 @@ \def\aeb@authorbgcolor{cornsilk} \def\aeb@tocbgcolor{cornsilk} \define@key{aebsection}{shadowcolor}{% - \w@csarg\def{aeb@\aeb@section@type shadowcolor}{#1}} + \w@csarg\def{aeb@\aeb@section@type shadowcolor}{#1}} \def\aeb@sectionshadowcolor{black} \def\aeb@subsectionshadowcolor{black} \def\aeb@subsubsectionshadowcolor{black} @@ -585,9 +582,9 @@ \def\aeb@authorshadowcolor{black} \def\aeb@tocshadowcolor{black} \define@key{aebsection}{indent}[0pt]{% - \edef\web@argi{#1}\ifx\web@argi\@empty - \def\web@argi{0pt}\fi - \w@csarg\edef{aeb@\aeb@section@type @indent}{\web@argi}} + \edef\web@argi{#1}\ifx\web@argi\@empty + \def\web@argi{0pt}\fi + \w@csarg\edef{aeb@\aeb@section@type @indent}{\web@argi}} \def\aeb@section@indent{\z@} \def\aeb@subsection@indent{\z@} \def\aeb@subsubsection@indent{\z@} @@ -596,7 +593,7 @@ \def\aeb@author@indent{\z@} \def\aeb@toc@indent{\z@} \define@key{aebsection}{beforeskip}{% - \w@csarg\def{aeb@\aeb@section@type @beforeskip}{#1}} + \w@csarg\def{aeb@\aeb@section@type @beforeskip}{#1}} \def\aeb@section@beforeskip{-3ex\@plus -1ex \@minus-.2ex} \def\aeb@subsection@beforeskip{-2.5ex\@plus -1ex \@minus -.2ex} \def\aeb@subsubsection@beforeskip{-2ex\@plus -1ex \@minus -.2ex} @@ -605,7 +602,7 @@ \def\aeb@author@beforeskip{-1ex\@plus -1ex \@minus-.2ex} \def\aeb@toc@beforeskip{-3ex\@plus -1ex \@minus-.2ex} \define@key{aebsection}{afterskip}{% - \w@csarg\def{aeb@\aeb@section@type @afterskip}{#1}} + \w@csarg\def{aeb@\aeb@section@type @afterskip}{#1}} \def\aeb@section@afterskip{1ex\@plus .2ex} \def\aeb@subsection@afterskip{1ex\@plus .2ex} \def\aeb@subsubsection@afterskip{.5ex\@plus .2ex} @@ -616,9 +613,9 @@ \define@key{aebsection}{hproportion}{% \w@csarg\def{hproportionweb\aeb@section@type}{#1}} \define@key{aebsection}{xhalign}{% - \edef\aeb@temp@expand{\noexpand\XKV@cc+{#1}}% - \aeb@temp@expand{l,c,r}{% - \w@csarg\def{halign\aeb@section@type}{#1}% + \edef\aeb@temp@expand{\noexpand\XKV@cc+{#1}}% + \aeb@temp@expand{l,c,r}{% + \w@csarg\def{halign\aeb@section@type}{#1}% }{\PackageWarning{webpro}{Bad choice for xhalign, permissible values are l, c and r. Try again}}% } @@ -631,211 +628,210 @@ \let\haligntoc\relax \define@key{aebToc}{tocName}{\tocName{#1}} \define@key{aebToc}{tocNameCont}{\tocNameCont{#1}} -\def\aeb@reset@section@fonts{% - \normalfont\normalsize - \ifcase\aeb@section@typeIndex\relax - \let\aeb@section@usefont\@empty - \let\aeb@section@fontfamily\aeb@defaultfamily - \let\aeb@section@fontseries\bfseries - \let\aeb@section@fontshape\upshape - \let\aeb@section@fontsize\Large - \or - \let\aeb@subsection@usefont\@empty - \let\aeb@subsection@fontfamily\aeb@defaultfamily - \let\aeb@subsection@fontseries\bfseries - \let\aeb@subsection@fontshape\upshape - \let\aeb@subsection@fontsize\large - \or - \let\aeb@subsubsection@usefont\@empty - \let\aeb@subsubsection@fontfamily\aeb@defaultfamily - \let\aeb@subsubsection@fontseries\bfseries - \let\aeb@subsubsection@fontshape\upshape - \let\aeb@subsubsection@fontsize\normalsize - \fi +\def\aeb@reset@section@fonts{\normalfont\normalsize + \ifcase\aeb@section@typeIndex\relax + \let\aeb@section@usefont\@empty + \let\aeb@section@fontfamily\aeb@defaultfamily + \let\aeb@section@fontseries\bfseries + \let\aeb@section@fontshape\upshape + \let\aeb@section@fontsize\Large + \or + \let\aeb@subsection@usefont\@empty + \let\aeb@subsection@fontfamily\aeb@defaultfamily + \let\aeb@subsection@fontseries\bfseries + \let\aeb@subsection@fontshape\upshape + \let\aeb@subsection@fontsize\large + \or + \let\aeb@subsubsection@usefont\@empty + \let\aeb@subsubsection@fontfamily\aeb@defaultfamily + \let\aeb@subsubsection@fontseries\bfseries + \let\aeb@subsubsection@fontshape\upshape + \let\aeb@subsubsection@fontsize\normalsize + \fi } -\def\aeb@reset@section@all{% - \aeb@reset@section@fonts - \ifcase\aeb@section@typeIndex\relax - \let\aeb@section@halign\raggedright - \def\aeb@sectioncolor{blue}% - \def\aeb@sectionshadowcolor{black}% - \let\aeb@section@special=\@empty - \def\aeb@section@beforeskip{-3ex\@plus -1ex \@minus-.2ex}% - \def\aeb@section@afterskip{1ex\@plus .2ex}% - \def\aeb@sectionframecolor{blue}% - \def\aeb@sectionframecolor{cornsilk}% - \or - \let\aeb@subsection@halign\raggedright - \def\aeb@subsectioncolor{blue}% - \def\aeb@subsectionshadowcolor{black}% - \let\aeb@subsection@special=\@empty - \def\aeb@subsection@beforeskip{-2.5ex\@plus-1ex \@minus-.2ex}% - \def\aeb@subsection@afterskip{1ex\@plus .2ex}% - \def\aeb@subsectionframecolor{blue}% - \def\aeb@subsectionframecolor{cornsilk}% - \or - \let\aeb@subsubsection@halign\raggedright - \def\aeb@subsubsectioncolor{blue}% - \def\aeb@subsubsectionshadowcolor{black}% - \let\aeb@subsubsection@special=\@empty - \def\aeb@subsubsection@beforeskip{-2ex\@plus-1ex \@minus-.2ex}% - \def\aeb@subsubsection@afterskip{1ex\@plus .2ex}% - \def\aeb@subsubsectionframecolor{blue}% - \def\aeb@subsubsectionframecolor{cornsilk}% - \fi +\def\aeb@reset@section@all{\aeb@reset@section@fonts + \ifcase\aeb@section@typeIndex\relax + \let\aeb@section@halign\raggedright + \def\aeb@sectioncolor{blue}% + \def\aeb@sectionshadowcolor{black}% + \let\aeb@section@special=\@empty + \def\aeb@section@beforeskip{-3ex\@plus -1ex \@minus-.2ex}% + \def\aeb@section@afterskip{1ex\@plus .2ex}% + \def\aeb@sectionframecolor{blue}% + \def\aeb@sectionframecolor{cornsilk}% + \or + \let\aeb@subsection@halign\raggedright + \def\aeb@subsectioncolor{blue}% + \def\aeb@subsectionshadowcolor{black}% + \let\aeb@subsection@special=\@empty + \def\aeb@subsection@beforeskip{-2.5ex\@plus-1ex \@minus-.2ex}% + \def\aeb@subsection@afterskip{1ex\@plus .2ex}% + \def\aeb@subsectionframecolor{blue}% + \def\aeb@subsectionframecolor{cornsilk}% + \or + \let\aeb@subsubsection@halign\raggedright + \def\aeb@subsubsectioncolor{blue}% + \def\aeb@subsubsectionshadowcolor{black}% + \let\aeb@subsubsection@special=\@empty + \def\aeb@subsubsection@beforeskip{-2ex\@plus-1ex \@minus-.2ex}% + \def\aeb@subsubsection@afterskip{1ex\@plus .2ex}% + \def\aeb@subsubsectionframecolor{blue}% + \def\aeb@subsubsectionframecolor{cornsilk}% + \fi } -\renewcommand{\section}{% dps1 - \renewcommand{\@seccntformat}[1]{\aeb@sectionNum{##1}}% - \@startsection{section}{1}{\aeb@section@indent}% - {\aeb@section@beforeskip}{\aeb@section@afterskip}% - {\noindent\xdef\aeb@sectionpage{\the\c@page}% - \def\aeb@section@type{section}% - \aeb@section@usefont\aeb@section@fontfamily\aeb@section@fontseries - \aeb@section@fontshape\aeb@section@fontsize\aeb@section@halign - \color{\aeb@sectioncolor}\aeb@section@special}} -\renewcommand\subsection{% dps1 - \renewcommand{\@seccntformat}[1]{\aeb@subsectionNum{##1}}% - \@startsection{subsection}{2}{\aeb@subsection@indent}% - {\aeb@subsection@beforeskip}{\aeb@subsection@afterskip}% - {\noindent\def\aeb@section@type{subsection}% - \aeb@subsection@usefont\aeb@subsection@fontfamily - \aeb@subsection@fontseries\aeb@subsection@fontshape - \aeb@subsection@fontsize\aeb@subsection@halign - \color{\aeb@subsectioncolor}\aeb@subsection@special}} +\renewcommand{\section}{% + \renewcommand{\@seccntformat}[1]{\aeb@sectionNum{##1}}% + \@startsection{section}{1}{\aeb@section@indent}% + {\aeb@section@beforeskip}{\aeb@section@afterskip}% + {\noindent\xdef\aeb@sectionpage{\the\c@page}% + \def\aeb@section@type{section}% + \aeb@section@usefont\aeb@section@fontfamily\aeb@section@fontseries + \aeb@section@fontshape\aeb@section@fontsize\aeb@section@halign + \color{\aeb@sectioncolor}\aeb@section@special}} +\renewcommand\subsection{% + \renewcommand{\@seccntformat}[1]{\aeb@subsectionNum{##1}}% + \@startsection{subsection}{2}{\aeb@subsection@indent}% + {\aeb@subsection@beforeskip}{\aeb@subsection@afterskip}% + {\noindent\def\aeb@section@type{subsection}% + \aeb@subsection@usefont\aeb@subsection@fontfamily + \aeb@subsection@fontseries\aeb@subsection@fontshape + \aeb@subsection@fontsize\aeb@subsection@halign + \color{\aeb@subsectioncolor}\aeb@subsection@special}} \def\subsubDefaultDing#1{\def\web@subsubDefaultDing{{#1}}} \subsubDefaultDing{\textrm\textbullet} -\renewcommand\subsubsection{% dps1 - \renewcommand{\@seccntformat}[1]{\aeb@subsubsectionNum{##1}}% - \@startsection{subsubsection}{3}{\aeb@subsubsection@indent}% - {\aeb@subsubsection@beforeskip}{\aeb@subsubsection@afterskip}% - {\noindent\def\aeb@section@type{subsubsection}% - \aeb@subsubsection@usefont\aeb@subsubsection@fontfamily - \aeb@subsubsection@fontseries\aeb@subsubsection@fontshape - \aeb@subsubsection@fontsize\aeb@subsubsection@halign - \color{\aeb@subsubsectioncolor}\aeb@subsubsection@special}} +\renewcommand\subsubsection{% + \renewcommand{\@seccntformat}[1]{\aeb@subsubsectionNum{##1}}% + \@startsection{subsubsection}{3}{\aeb@subsubsection@indent}% + {\aeb@subsubsection@beforeskip}{\aeb@subsubsection@afterskip}% + {\noindent\def\aeb@section@type{subsubsection}% + \aeb@subsubsection@usefont\aeb@subsubsection@fontfamily + \aeb@subsubsection@fontseries\aeb@subsubsection@fontshape + \aeb@subsubsection@fontsize\aeb@subsubsection@halign + \color{\aeb@subsubsectioncolor}\aeb@subsubsection@special}} \renewcommand*\thesection{% - \if\aeb@use@section@numbers1\arabic{section}\fi} + \if\aeb@use@section@numbers\web@One\arabic{section}\fi} \renewcommand*\thesubsection{% - \if\aeb@use@section@numbers1\thesection.\arabic{subsection}\fi} + \if\aeb@use@section@numbers\web@One\thesection.\arabic{subsection}\fi} \renewcommand*{\thesubsubsection}{% - \if\aeb@use@section@numbers1% - \if@defaultsubsubding\web@subsubDefaultDing - \else\thesubsection.\arabic{subsubsection}\fi - \fi} + \if\aeb@use@section@numbers\web@One + \if@defaultsubsubding\web@subsubDefaultDing + \else\thesubsection.\arabic{subsubsection}\fi + \fi +} \newcommand{\sectionTitle}{\aeb@sectionTitle*} \newcommand{\aeb@sectionTitle}{% - \renewcommand{\@seccntformat}[1]{\aeb@titleNum{##1}}% - \@startsection{section}{1}{\aeb@title@indent}% - {\aeb@title@beforeskip}{\aeb@title@afterskip}% - {\xdef\aeb@titlepage{\the\c@page}\def\aeb@section@type{title}% - \aeb@title@usefont\aeb@title@fontfamily\aeb@title@fontseries - \aeb@title@fontshape\aeb@title@fontsize\aeb@title@halign - \ifx\webtitle@color\@empty\else\color{\aeb@titlecolor}\fi - \aeb@title@special}} + \renewcommand{\@seccntformat}[1]{\aeb@titleNum{##1}}% + \@startsection{section}{1}{\aeb@title@indent}% + {\aeb@title@beforeskip}{\aeb@title@afterskip}% + {\xdef\aeb@titlepage{\the\c@page}\def\aeb@section@type{title}% + \aeb@title@usefont\aeb@title@fontfamily\aeb@title@fontseries + \aeb@title@fontshape\aeb@title@fontsize\aeb@title@halign + \ifx\webtitle@color\@empty\else\color{\aeb@titlecolor}\fi + \aeb@title@special}} \newcommand{\sectionAuthor}{\aeb@sectionAuthor*} \newcommand{\aeb@sectionAuthor}{% - \renewcommand{\@seccntformat}[1]{\aeb@authorNum{##1}}% - \@startsection{section}{1}{\aeb@author@indent}% - {\aeb@author@beforeskip}{\aeb@author@afterskip}% - {\xdef\aeb@titlepage{\the\c@page}\def\aeb@section@type{author}% - \aeb@author@usefont\aeb@author@fontfamily\aeb@author@fontseries - \aeb@author@fontshape\aeb@author@fontsize\aeb@author@halign - \ifx\webauthor@color\@empty\else\color{\aeb@authorcolor}\fi - \aeb@author@special}} + \renewcommand{\@seccntformat}[1]{\aeb@authorNum{##1}}% + \@startsection{section}{1}{\aeb@author@indent}% + {\aeb@author@beforeskip}{\aeb@author@afterskip}% + {\xdef\aeb@titlepage{\the\c@page}\def\aeb@section@type{author}% + \aeb@author@usefont\aeb@author@fontfamily\aeb@author@fontseries + \aeb@author@fontshape\aeb@author@fontsize\aeb@author@halign + \ifx\webauthor@color\@empty\else\color{\aeb@authorcolor}\fi + \aeb@author@special}} \newcommand{\sectionUniversity}{\aeb@sectionUniversity*} \newcommand{\aeb@sectionUniversity}{% - \renewcommand{\@seccntformat}[1]{\aeb@universityNum{##1}}% - \@startsection{section}{1}{\aeb@university@indent}% - {\aeb@university@beforeskip}{\aeb@university@afterskip}% - {\xdef\aeb@titlepage{\the\c@page}\def\aeb@section@type{university}% - \aeb@university@usefont\aeb@university@fontfamily - \aeb@university@fontseries\aeb@university@fontshape - \aeb@university@fontsize\aeb@university@halign - \ifx\webuniversity@color\@empty\else - \color{\aeb@universitycolor}\fi\aeb@university@special}} + \renewcommand{\@seccntformat}[1]{\aeb@universityNum{##1}}% + \@startsection{section}{1}{\aeb@university@indent}% + {\aeb@university@beforeskip}{\aeb@university@afterskip}% + {\xdef\aeb@titlepage{\the\c@page}\def\aeb@section@type{university}% + \aeb@university@usefont\aeb@university@fontfamily + \aeb@university@fontseries\aeb@university@fontshape + \aeb@university@fontsize\aeb@university@halign + \ifx\webuniversity@color\@empty\else + \color{\aeb@universitycolor}\fi\aeb@university@special}} \newcommand{\sectionToc}{\aeb@sectionToc*} \newcommand{\aeb@sectionToc}{% - \renewcommand{\@seccntformat}[1]{\aeb@tocNum{##1}}% - \@startsection{section}{1}{\aeb@toc@indent}% - {\aeb@toc@beforeskip}{\aeb@toc@afterskip}% - {\hypertarget{webtoc}{}% - \xdef\aeb@titlepage{\the\c@page}\def\aeb@section@type{toc}% - \aeb@toc@usefont\aeb@toc@fontfamily - \aeb@toc@fontseries\aeb@toc@fontshape - \aeb@toc@fontsize\aeb@toc@halign - \ifx\aeb@toccolor\@empty\else - \color{\aeb@toccolor}\fi\aeb@toc@special}} + \renewcommand{\@seccntformat}[1]{\aeb@tocNum{##1}}% + \@startsection{section}{1}{\aeb@toc@indent}% + {\aeb@toc@beforeskip}{\aeb@toc@afterskip}% + {\hypertarget{webtoc}{}% + \xdef\aeb@titlepage{\the\c@page}\def\aeb@section@type{toc}% + \aeb@toc@usefont\aeb@toc@fontfamily + \aeb@toc@fontseries\aeb@toc@fontshape + \aeb@toc@fontsize\aeb@toc@halign + \ifx\aeb@toccolor\@empty\else + \color{\aeb@toccolor}\fi\aeb@toc@special}} \def\save@prtscr{\global\let\prtscr@save\prtscr - \global\let\prtscr\prtscrA} + \global\let\prtscr\prtscrA} \def\restore@prtscr{\global\let\prtscr\prtscr@save} \newcommand{\sectionLayout}[1]{\save@prtscr - \setkeys{aebsection}{type=section,color=blue,ruleheight=1pt}% - \protected@edef\aeb@temp{\noexpand\setkeys{aebsection}{#1}}% - \aeb@temp\restore@prtscr} + \setkeys{aebsection}{type=section,color=blue,ruleheight=1pt}% + \protected@edef\x{\noexpand\setkeys{aebsection}{#1}}\x + \aeb@temp\restore@prtscr} \newcommand{\subsectionLayout}[1]{\save@prtscr - \setkeys{aebsection}{type=subsection,color=blue,ruleheight=1pt}% - \protected@edef\aeb@temp{\noexpand\setkeys{aebsection}{#1}}% - \aeb@temp\restore@prtscr} + \setkeys{aebsection}{type=subsection,color=blue,ruleheight=1pt}% + \protected@edef\x{\noexpand\setkeys{aebsection}{#1}}\x + \aeb@temp\restore@prtscr} \newcommand{\subsubsectionLayout}[1]{\save@prtscr - \setkeys{aebsection}{type=subsubsection,color=blue,ruleheight=1pt}% - \protected@edef\aeb@temp{\noexpand\setkeys{aebsection}{#1}}% - \aeb@temp\restore@prtscr} + \setkeys{aebsection}{type=subsubsection,color=blue,ruleheight=1pt}% + \protected@edef\x{\noexpand\setkeys{aebsection}{#1}}\x + \aeb@temp\restore@prtscr} \newcommand{\universityLayout}[1]{\save@prtscr - \setkeys{aebsection}{type=university}% - \protected@edef\aeb@temp{\noexpand\setkeys{aebsection}{#1}}% - \aeb@temp\restore@prtscr} + \setkeys{aebsection}{type=university}% + \protected@edef\x{\noexpand\setkeys{aebsection}{#1}}\x + \aeb@temp\restore@prtscr} \universityLayout{fontsize={\prtscrA{large}{normalsize}}} \newcommand{\titleLayout}[1]{\save@prtscr - \setkeys{aebsection}{type=title}% - \protected@edef\aeb@temp{\noexpand\setkeys{aebsection}{#1}}% - \aeb@temp\restore@prtscr} + \setkeys{aebsection}{type=title}% + \protected@edef\x{\noexpand\setkeys{aebsection}{#1}}\x + \aeb@temp\restore@prtscr} \titleLayout{fontsize={\prtscrA{Large}{normalsize}}} \newcommand{\authorLayout}[1]{\save@prtscr - \setkeys{aebsection}{type=author}% - \protected@edef\aeb@temp{\noexpand\setkeys{aebsection}{#1}}% - \aeb@temp\restore@prtscr} + \setkeys{aebsection}{type=author}% + \protected@edef\x{\noexpand\setkeys{aebsection}{#1}}\x + \aeb@temp\restore@prtscr} \authorLayout{fontsize={\prtscrA{large}{normalsize}}} \newcommand{\tocLayout}[1]{\save@prtscr - \setkeys{aebsection}{type=toc,color=\web@tocColor}% - \protected@edef\aeb@temp{\noexpand\setkeys{aebsection,aebToc}{#1}}% - \aeb@temp\restore@prtscr} + \setkeys{aebsection}{type=toc,color=\web@tocColor}% + \protected@edef\x{\noexpand\setkeys{aebsection,aebToc}{#1}}\x + \aeb@temp\restore@prtscr} \tocLayout{fontsize=Large} \newif\ifShadow \Shadowfalse % dps1 \def\web@sel@sec@col#1{\ifShadow - \color{\@nameuse{aeb@#1shadowcolor}}\else - \color{\@nameuse{aeb@#1numdingcolor}}\fi} + \color{\@nameuse{aeb@#1shadowcolor}}\else + \color{\@nameuse{aeb@#1numdingcolor}}\fi} \newcommand{\useSectionNumbers} -{% dps1 - \let\aeb@use@section@numbers1\relax - \def\aeb@sectionNum##1{\protect\web@sel@sec@col{section}% - \@nameuse{the##1}\web@finalDot\ }% - \def\aeb@subsectionNum##1{\protect\web@sel@sec@col{subsection}% - \@nameuse{the##1}\web@finalDot\ }% - \def\aeb@subsubsectionNum##1{% - \protect\web@sel@sec@col{subsubsection}% +{% + \let\aeb@use@section@numbers\web@One + \def\aeb@sectionNum##1{\protect + \web@sel@sec@col{section}\@nameuse{the##1}\web@finalDot\ }% + \def\aeb@subsectionNum##1{\protect + \web@sel@sec@col{subsection}\@nameuse{the##1}\web@finalDot\ }% + \def\aeb@subsubsectionNum##1{\protect + \web@sel@sec@col{subsubsection}% \@nameuse{the##1}\if@defaultsubsubding\else\web@finalDot\fi\ }% \def\sectionmark##1{\markright{##1}}% } \newcommand{\noSectionNumbers} {% - \ifx\web@latextoc\web@YES - \PackageInfo{web}{The nobullets or latextoc option - taken,\MessageBreak - ignoring \string\noSectionNumbers}% - \else - \let\aeb@use@section@numbers0\relax - \let\aeb@sectionNum\@gobble - \let\aeb@subsectionNum\@gobble - \let\aeb@subsubsectionNum\@gobble - \fi + \ifx\web@latextoc\web@YES + \PackageInfo{web}{The nobullets or latextoc option + taken,\MessageBreak + ignoring \string\noSectionNumbers}% + \else + \let\aeb@use@section@numbers\web@Zero + \let\aeb@sectionNum\@gobble + \let\aeb@subsectionNum\@gobble + \let\aeb@subsubsectionNum\@gobble + \fi } \useSectionNumbers \define@key{aebcolordesign}{universityColor}{\universityColor{#1}} - \def\aeb@universitycolor{\webuniversity@color} + \def\aeb@universitycolor{\webuniversity@color} \define@key{aebcolordesign}{titleColor}{\titleColor{#1}} - \def\aeb@titlecolor{\webtitle@color} + \def\aeb@titlecolor{\webtitle@color} \define@key{aebcolordesign}{authorColor}{\authorColor{#1}} - \def\aeb@authorcolor{\webauthor@color} + \def\aeb@authorcolor{\webauthor@color} \define@key{aebcolordesign}{textBgColor}{\textBgColor{#1}} \define@key{aebcolordesign}{panelBgColor}{\panelBgColor{#1}} \define@key{aebcolordesign}{linkColor}{\def\@linkcolor{#1}} @@ -859,17 +855,17 @@ \ddDingTocColor{blue} \dddDingTocColor{webgreen} \@tfor\@@tmp:={d@DingToc}{dd@DingToc}{ddd@DingToc}\do - {\w@csarg\let{\@@tmp}\@empty} + {\w@csarg\let{\@@tmp}\@empty} \newcommand{\selectTocDings}[1]{\setkeys{aebDings}{#1}} \def\@setTocDings{% - \ifx\d@DingToc\@empty\else\dDing{\d@DingToc}\fi - \ifx\dd@DingToc\@empty\else\ddDing{\dd@DingToc}\fi - \ifx\ddd@DingToc\@empty\else\dddDing{\ddd@DingToc}\fi + \ifx\d@DingToc\@empty\else\dDing{\d@DingToc}\fi + \ifx\dd@DingToc\@empty\else\ddDing{\dd@DingToc}\fi + \ifx\ddd@DingToc\@empty\else\dddDing{\ddd@DingToc}\fi } \ifeqforpaper - \includecomment{forpaper}\excludecomment{forscreen} + \includecomment{forpaper}\excludecomment{forscreen} \else - \includecomment{forscreen}\excludecomment{forpaper} + \includecomment{forscreen}\excludecomment{forpaper} \fi \endinput %% diff --git a/texmf-dist/tex/latex/acrotex/websec.def b/texmf-dist/tex/latex/acrotex/websec.def index 2a5b21f5..5d745ca0 100644 --- a/texmf-dist/tex/latex/acrotex/websec.def +++ b/texmf-dist/tex/latex/acrotex/websec.def @@ -26,31 +26,30 @@ \renewcommand*\thesubsection{\thesection.\arabic{subsection}} \renewcommand*{\thesubsubsection}{\textbullet} \renewcommand{\section}{\renewcommand{\@seccntformat}[1]{% - \@nameuse{the##1}\web@finalDot\enspace}% - \@startsection{section}{1}{\z@}% - {-3ex\@plus -1ex \@minus-.2ex}% - {1ex\@plus .2ex}% 6pt - {\noindent\normalfont\normalsize\bfseries - \color{\web@sectionsColorOld}}}% + \@nameuse{the##1}\web@finalDot\enspace}% + \@startsection{section}{1}{\z@}% + {-3ex\@plus -1ex \@minus-.2ex}% + {1ex\@plus .2ex}% 6pt + {\noindent\normalfont\normalsize\bfseries + \color{\web@sectionsColorOld}}}% \renewcommand{\subsection}{\renewcommand{\@seccntformat}[1]{% - \@nameuse{the##1}\web@finalDot\enspace}% - \@startsection{subsection}{2}{\z@}% - {-2.5ex\@plus -1ex \@minus -.2ex}% - {1ex\@plus .2ex}% - {\noindent\normalfont\normalsize\bfseries - \color{\web@sectionsColorOld}}} + \@nameuse{the##1}\web@finalDot\enspace}% + \@startsection{subsection}{2}{\z@}% + {-2.5ex\@plus -1ex \@minus -.2ex}% + {1ex\@plus .2ex}% + {\noindent\normalfont\normalsize\bfseries + \color{\web@sectionsColorOld}}} \renewcommand{\subsubsection}{% - \renewcommand{\@seccntformat}[1]{\color{\web@sectionsColorOld}\large - $\bullet$\enspace}% - \@startsection{subsubsection}{3}{\z@}% - {-2ex\@plus -1ex \@minus -.2ex}% - {.5ex\@plus .2ex}% - {\noindent\normalfont\normalsize\bfseries}} + \renewcommand{\@seccntformat}[1]{\color{\web@sectionsColorOld}\large + $\bullet$\enspace}% + \@startsection{subsubsection}{3}{\z@}% + {-2ex\@plus -1ex \@minus -.2ex}% + {.5ex\@plus .2ex}% + {\noindent\normalfont\normalsize\bfseries}} \def\tocPartTitle#1{\def\web@tocPartTitle##1{#1}} \tocPartTitle{\thepart\hspace{1em}#1} \newcommand\@webpart{\secdef\web@@part\web@@spart} -\def\web@@part[#1]#2{% - \newpage +\def\web@@part[#1]#2{\newpage \def\@currentlabelname{#1}% \ifnum\Hy@secnum@part>\c@secnumdepth \phantomsection @@ -67,125 +66,120 @@ \@afterheading } \def\web@@spart#1{% - \Hy@GlobalStepCount\Hy@linkcounter - \xdef\@currentHref{part*.\the\Hy@linkcounter}% - \Hy@raisedlink{% - \hyper@anchorstart{\@currentHref}\hyper@anchorend - }{\web@makesparthead{#1}}% - \nobreak - \vskip 1ex - \@afterheading + \Hy@GlobalStepCount\Hy@linkcounter + \xdef\@currentHref{part*.\the\Hy@linkcounter}% + \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend + }{\web@makesparthead{#1}}% + \nobreak + \vskip 1ex + \@afterheading } \let\web@save@part\part \let\part\@webpart \newcommand{\formatPartTitle}[1]{% - \def\web@formatPartTitle##1{#1}} -\def\web@defaultFormatPartTitle#1{% - \large\bfseries - \ifnum \c@secnumdepth >\m@ne - \partname~\thepart:\space - \fi#1} + \def\web@formatPartTitle##1{#1}} +\def\web@defaultFormatPartTitle#1{\large\bfseries + \ifnum \c@secnumdepth >\m@ne + \partname~\thepart:\space + \fi#1} \let\web@formatPartTitle\web@defaultFormatPartTitle \newcommand{\restorePartTitleFormat}{% - \let\web@formatPartTitle\web@defaultFormatPartTitle} + \let\web@formatPartTitle\web@defaultFormatPartTitle} \def\noPartNumbers{\formatPartTitle{\large\bfseries##1}% - \tocPartTitle{##1}} + \tocPartTitle{##1}} \def\web@makeparthead#1{% - \parindent\z@\raggedright - \interlinepenalty \@M - \normalfont - \web@formatPartTitle{#1}% - \markboth{}{}\par + \parindent\z@\raggedright + \interlinepenalty \@M + \normalfont + \web@formatPartTitle{#1}% + \markboth{}{}\par } \def\web@makesparthead#1{% - \parindent\z@\raggedright - \interlinepenalty \@M - \normalfont - \large\bfseries #1\par + \parindent\z@\raggedright + \interlinepenalty \@M + \normalfont + \large\bfseries #1\par } \@ifundefined{chapter}{}{% - \newcommand\@webchapter{% - \global\@topnum\z@ - \@afterindentfalse - \secdef\web@@chapter\web@@schapter - } - \let\web@save@chapter\chapter - \let\chapter\@webchapter - \def\web@@chapter[#1]#2{% - \def\@currentlabelname{#1}% - \def\Hy@next{% - \Hy@GlobalStepCount\Hy@linkcounter - \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}% - \Hy@raisedlink{% - \hyper@anchorstart{\@currentHref}\hyper@anchorend - }% - }% - \ifnum\c@secnumdepth>\m@ne - \@ifundefined{if@mainmatter}% - \iftrue{\@nameuse{if@mainmatter}}% - \let\Hy@next\relax - \fi - \fi - \Hy@next - \ifnum \c@secnumdepth >\m@ne - \if@mainmatter - \refstepcounter{chapter}% - \typeout{\@chapapp\space\thechapter.}% - \addcontentsline{toc}{chapter}% - {\protect\numberline{\thechapter}#1}% - \else - \addcontentsline{toc}{chapter}{{}{}#1}% - \fi - \else - \addcontentsline{toc}{chapter}{{}{}#1}% - \fi - \chaptermark{#1}% - \addtocontents{lof}{\protect\addvspace{10\p@}}% - \addtocontents{lot}{\protect\addvspace{10\p@}}% - \if@twocolumn - \@topnewpage[\web@makechapterhead{#2}]% - \else - \web@makechapterhead{#2}% - \@afterheading - \fi - } - \def\web@@schapter#1{% - \if@twocolumn - \@topnewpage[\@makeschapterhead{#1}]% - \else - \web@makeschapterhead{#1}% - \@afterheading - \fi - } - \long\def\formatChapterNumber#1{\def\web@formatChapterNumber{#1}} - \formatChapterNumber{\large\bfseries - \@chapapp\space\thechapter\par\nobreak} - \long\def\formatChapterTitle#1{\def\web@formatChapterTitle##1{#1}} - \formatChapterTitle{% - \interlinepenalty\@M - \noindent\hspace{1em}\large\bfseries#1\par\nobreak - } - \def\web@makechapterhead#1{% - \vspace{3\p@}{% - \parindent\z@ \raggedright \normalfont - \ifnum \c@secnumdepth >\m@ne - \if@mainmatter - \web@formatChapterNumber - \fi - \fi - \web@formatChapterTitle{#1}% - \vskip 12\p@ - }% - } - \def\web@makeschapterhead#1{% - \vspace{3\p@}{% - \parindent\z@\raggedright - \normalfont - \interlinepenalty\@M - \large\bfseries #1\par\nobreak - \vskip 12\p@ - }% - } + \newcommand\@webchapter{% + \global\@topnum\z@ + \@afterindentfalse + \secdef\web@@chapter\web@@schapter + } + \let\web@save@chapter\chapter + \let\chapter\@webchapter + \def\web@@chapter[#1]#2{% + \def\@currentlabelname{#1}% + \def\Hy@next{% + \Hy@GlobalStepCount\Hy@linkcounter + \xdef\@currentHref{\Hy@chapapp*.\the\Hy@linkcounter}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% + }% + \ifnum\c@secnumdepth>\m@ne + \@ifundefined{if@mainmatter}% + \iftrue{\@nameuse{if@mainmatter}}% + \let\Hy@next\relax + \fi + \fi + \Hy@next + \ifnum \c@secnumdepth >\m@ne + \if@mainmatter + \refstepcounter{chapter}% + \typeout{\@chapapp\space\thechapter.}% + \addcontentsline{toc}{chapter}% + {\protect\numberline{\thechapter}#1}% + \else + \addcontentsline{toc}{chapter}{{}{}#1}% + \fi + \else + \addcontentsline{toc}{chapter}{{}{}#1}% + \fi + \chaptermark{#1}% + \addtocontents{lof}{\protect\addvspace{10\p@}}% + \addtocontents{lot}{\protect\addvspace{10\p@}}% + \if@twocolumn + \@topnewpage[\web@makechapterhead{#2}]% + \else + \web@makechapterhead{#2}% + \@afterheading + \fi + } + \def\web@@schapter#1{% + \if@twocolumn + \@topnewpage[\@makeschapterhead{#1}]% + \else + \web@makeschapterhead{#1}% + \@afterheading + \fi + } + \long\def\formatChapterNumber#1{\def\web@formatChapterNumber{#1}} + \formatChapterNumber{\large\bfseries + \@chapapp\space\thechapter\par\nobreak} + \long\def\formatChapterTitle#1{\def\web@formatChapterTitle##1{#1}} + \formatChapterTitle{% + \interlinepenalty\@M + \noindent\hspace{1em}\large\bfseries#1\par\nobreak + } + \def\web@makechapterhead#1{% + \vspace{3\p@}{% + \parindent\z@ \raggedright \normalfont + \ifnum \c@secnumdepth >\m@ne + \if@mainmatter\web@formatChapterNumber\fi + \fi + \web@formatChapterTitle{#1}\vskip 12\p@ + }% + } + \def\web@makeschapterhead#1{% + \vspace{3\p@}{% + \parindent\z@\raggedright + \normalfont + \interlinepenalty\@M + \large\bfseries #1\par\nobreak + \vskip 12\p@ + }% + } } % end \@ifundefined{chapter} \endinput %% -- cgit v1.2.3