From e98d5dc25eeecb2f30d84b21c064e5fe4264ac52 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 25 Dec 2019 15:31:44 +0900 Subject: acrotex update --- texmf-dist/tex/latex/acrotex/aeb-comment.sty | 6 +- texmf-dist/tex/latex/acrotex/aebdocfmt.def | 9 +- texmf-dist/tex/latex/acrotex/aebjs.def | 343 +++++++++++++------------- texmf-dist/tex/latex/acrotex/aebrandom.def | 2 +- texmf-dist/tex/latex/acrotex/aebsumrytbls.def | 2 +- texmf-dist/tex/latex/acrotex/eforms.sty | 8 +- texmf-dist/tex/latex/acrotex/eqexam.def | 29 ++- texmf-dist/tex/latex/acrotex/eqtr.def | 4 +- texmf-dist/tex/latex/acrotex/exerquiz.sty | 256 ++++++++++--------- texmf-dist/tex/latex/acrotex/insdljs.sty | 12 +- texmf-dist/tex/latex/acrotex/template.def | 6 +- texmf-dist/tex/latex/acrotex/web.cfg | 3 + texmf-dist/tex/latex/acrotex/web.sty | 54 +++- 13 files changed, 417 insertions(+), 317 deletions(-) (limited to 'texmf-dist/tex') diff --git a/texmf-dist/tex/latex/acrotex/aeb-comment.sty b/texmf-dist/tex/latex/acrotex/aeb-comment.sty index 35624bd1..fd14ef73 100644 --- a/texmf-dist/tex/latex/acrotex/aeb-comment.sty +++ b/texmf-dist/tex/latex/acrotex/aeb-comment.sty @@ -1,6 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % This is an unmodified version of comment.sty (version 3.2) that is distributed % with acrotex under the name of aeb-comment.sty. D. P. Story (dpstory at acrotex dot net) +% 2019/12/18 (dps): Defined \CommentCutFile % % Comment.sty version 3.2, August 1997 % selectively in/exclude pieces of text: the user can define new @@ -117,13 +118,14 @@ %%%% definitions for LaTeX %%%% \edef\restoreat{\catcode\noexpand`\noexpand\@=\the\catcode`\@\relax} +\def\CommentCutFile{comment.cut} % 2019/12/18 \makeatletter \def\AfterIncludedComment {\immediate\closeout\CommentStream - \input comment.cut + \input{\CommentCutFile}\relax }% \def\WriteCommentLine#1{\immediate\write\CommentStream{#1}} -\def\BeforeIncludedComment{\immediate\openout\CommentStream=comment.cut +\def\BeforeIncludedComment{\immediate\openout\CommentStream=\CommentCutFile \let\ThisComment\WriteCommentLine} \def\includecomment #1{\message{Include comment '#1'}% diff --git a/texmf-dist/tex/latex/acrotex/aebdocfmt.def b/texmf-dist/tex/latex/acrotex/aebdocfmt.def index 44babcf0..b275c117 100644 --- a/texmf-dist/tex/latex/acrotex/aebdocfmt.def +++ b/texmf-dist/tex/latex/acrotex/aebdocfmt.def @@ -26,13 +26,14 @@ \def\clindx{\ifcodeline@index\expandafter\@firstoftwo\else \expandafter\@secondoftwo\fi} \GlossaryPrologue{\section{Change History}} -\IndexPrologue{\section{Index} \parbox{\linewidth}{Numbers written in italic - refer to the page where the corresponding entry is described; - numbers underlined refer to the +\IndexPrologue{\section{Index}\hfuzz\linewidth + \parbox{\linewidth}{Numbers written in italic + refer to the page where the corresponding entry is described; + numbers underlined refer to the \clindx{code line of the}{} definition; numbers in roman refer to the \clindx{code lines}{pages} - where the entry is used.}\medskip} + where the entry is used.}\medskip\par\hfuzz=0.1pt} \value{IndexColumns}=2 \value{GlossaryColumns}=2 \def\changes@#1#2#3{% diff --git a/texmf-dist/tex/latex/acrotex/aebjs.def b/texmf-dist/tex/latex/acrotex/aebjs.def index 8c75a6f0..93c261af 100644 --- a/texmf-dist/tex/latex/acrotex/aebjs.def +++ b/texmf-dist/tex/latex/acrotex/aebjs.def @@ -18,8 +18,8 @@ %% License, or (at your option) any later version. %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ProvidesFile{aebjs.def} - [2019/08/13 v8.3 % - Exerquiz document level JavaScript (dps)] + [2019/12/17 v8.5.5 % + Exerquiz document level JavaScript (dps)] \def\aeb@array{new Array} \def\refac#1{\\(#1\\)}\def\regrp#1{(#1)}\def\rechrclass#1{[#1]} \def\redm{\\.}\def\remul{\\*}\def\rediv{\\/}\def\repow{\\^} @@ -45,9 +45,10 @@ \begin{insDLJS*}[exerquizLoaded]{exerquiz} \begin{newsegment}{AeB: AcroTeX eDucation Bundle} /* - Document Level JavaScript - AcroTeX eDucation Bundle - D. P. Story copyright 2000-\the\year + Document Level JavaScript + AcroTeX eDucation Bundle + D. P. Story copyright 2000-\the\year + \dlPkgInfoPkg Dated \dlPkgInfoDate */ var exerquizLoaded = true; this.disclosed = true; @@ -797,16 +798,16 @@ function ProcUserResp(key,userresp,probno,notify) RightWrong[probno][arguments[4]] = (!!key) ? 1 : 0; Responses[probno][arguments[4]] = userresp; } else { - if ( typeof key == "object" ) { - RightWrong[probno][0] = key[0]; - RightWrong[probno][1] = key[1]; -Responses[probno] = userresp; -if (Responses[probno].length==0) - Responses[probno]=undefined; - } else { - RightWrong[probno] = (!!key)?1:0; -Responses[probno] = userresp; -} + if ( typeof key == "object" ) { + RightWrong[probno][0] = key[0]; + RightWrong[probno][1] = key[1]; + Responses[probno] = userresp; + if (Responses[probno].length==0) + Responses[probno]=undefined; + } else { + RightWrong[probno] = (!!key)?1:0; + Responses[probno] = userresp; + } } if ( (typeof fieldPopTbl == "function")&&(event.type != "Link") ) { var a=reExtractBaseName.exec(event.target.name); @@ -815,29 +816,29 @@ Responses[probno] = userresp; } function ProcUserNoResp(key,userresp,probno,notify) { - if ( arguments.length > 4 ) { - RightWrong[probno][arguments[4]] = undefined; - Responses[probno][arguments[4]] = undefined; -var bVoidArray=true; -for (var i=0; i 4 ) { + RightWrong[probno][arguments[4]] = undefined; + Responses[probno][arguments[4]] = undefined; + var bVoidArray=true; + for (var i=0; i 2) { - if ( typeof ProbValue[probno] == "undefined" ) { - ProbValue[probno]=[1,arguments[5],arguments[3],arguments[4]]; - ProbValue[probno][3+arguments[2]] = ptvalue; - } else ProbValue[probno][3+arguments[2]] = ptvalue; - } - else { - ProbValue[probno]=ptvalue; - } + if (arguments.length > 2) { + if ( typeof ProbValue[probno] == "undefined" ) { + ProbValue[probno]=[1,arguments[5],arguments[3],arguments[4]]; + ProbValue[probno][3+arguments[2]] = ptvalue; + } else ProbValue[probno][3+arguments[2]] = ptvalue; + } + else { + ProbValue[probno]=ptvalue; + } } function RecordProblemType(qType,probno) { @@ -1126,39 +1127,45 @@ function ProcessQuestion (key,letterresp,probno, } function correctQuiz(qtfield,nQuestions) { - var oQName=eval(qtfield); - var defaultColor=(typeof oQName.DefaultColorJSLoc=="undefined")% + var bROQD=(typeof oRecordOfQuizData=="object"); + if(bROQD && % +(typeof oRecordOfQuizData["RightWrong."+qtfield]!="undefined")) { + RightWrong=oRecordOfQuizData["RightWrong."+qtfield]; + ProbDist=oRecordOfQuizData["ProbDist."+qtfield]; + } + var oQName=eval(qtfield); + var defaultColor=(typeof oQName.DefaultColorJSLoc=="undefined")% ?\defaultColorJS:oQName.DefaultColorJSLoc; - var rightColor=(typeof oQName.RightColorJSLoc=="undefined")% + var rightColor=(typeof oQName.RightColorJSLoc=="undefined")% ?\rghtColorJS:oQName.RightColorJSLoc; - var wrongColor=(typeof oQName.WrongColorJSLoc=="undefined")% + var wrongColor=(typeof oQName.WrongColorJSLoc=="undefined")% ?\wrngColorJS:oQName.WrongColorJSLoc; - var rightAnsSymb=(typeof oQName.RightAnsSymbJSLoc=="undefined")% + var rightAnsSymb=(typeof oQName.RightAnsSymbJSLoc=="undefined")% ?\rghtAnsSymbJS:oQName.RightAnsSymbJSLoc; - var wrongAnsSymb=(typeof oQName.WrongAnsSymbJSLoc=="undefined")% + var wrongAnsSymb=(typeof oQName.WrongAnsSymbJSLoc=="undefined")% ?\wrngAnsSymbJS:oQName.WrongAnsSymbJSLoc; var bFullyCorrect=(typeof oQName.fullyCorrectLoc=="undefined")% -?\eqCorrChoiceFully:oQName.fullyCorrectLoc; // dpsf07 - var f = this.getField("mcq." + qtfield); - if ( f != null) { - if (bFullyCorrect) { // dpsf07 - f.display = display.visible; - } else { - for (var n=1; n<=nQuestions; n++) { - var h=this.getField("mc."+qtfield+"."+n); - var bOk=(h!=null); - if(bOk) var choiceType="mc"; - else { - h=this.getField("mck."+qtfield+"."+n); - bOk=(h!=null); - var choiceType="mck"; - } - if (bOk) { - var mcq=this.getField("mcq."+qtfield+"."+n); - var g=mcq.getArray(); - if (choiceType=="mc") { - for (var j=0; j< g.length; j++) { - g[j].display=(h.isBoxChecked(j))?% +?\eqCorrChoiceFully:oQName.fullyCorrectLoc; + var f = this.getField("mcq." + qtfield); + if ( f != null) { + if (bFullyCorrect) { // dpsf07 + f.display = display.visible; + } else { + for (var n=1; n<=nQuestions; n++) { + var h=this.getField("mc."+qtfield+"."+n); + var bOk=(h!=null); + if(bOk) var choiceType="mc"; + else { + h=this.getField("mck."+qtfield+"."+n); + bOk=(h!=null); + var choiceType="mck"; + } + if (bOk) { + var mcq=this.getField("mcq."+qtfield+"."+n); + var g=mcq.getArray(); + if (choiceType=="mc") { + for (var j=0; j< g.length; j++) { + g[j].display=(h.isBoxChecked(j))?% display.visible:display.hidden; } } else { @@ -1174,86 +1181,82 @@ display.visible:display.hidden; } f = this.getField("obj." + qtfield); if ( f != null ) { - var a = f.getArray(); - var re=/^obj\./; - for (var i = 0; i < a.length; i++) { - var probno = a[i].name.replace(/.*\./g,""); - var rbmuname = a[i].name.replace(re,"rbmarkup\."); - var oRBMarkup = this.getField(rbmuname); - var bRBMU = ( oRBMarkup != null ); - if ( RightWrong[probno] == 1 ) { - a[i].strokeColor = rightColor; - if (bRBMU) { - oRBMarkup.textColor=rightColor; - oRBMarkup.style=rightAnsSymb; - } - } else { - a[i].strokeColor = wrongColor; - if (bRBMU) { - oRBMarkup.textColor=wrongColor; - oRBMarkup.style=wrongAnsSymb; - } - } + var a = f.getArray(); + var re=/^obj\./; + for (var i = 0; i < a.length; i++) { + var probno = a[i].name.replace(/.*\./g,""); + var rbmuname = a[i].name.replace(re,"rbmarkup\."); + var oRBMarkup = this.getField(rbmuname); + var bRBMU = ( oRBMarkup != null ); + if ( RightWrong[probno] == 1 ) { + a[i].strokeColor = rightColor; + if (bRBMU) { + oRBMarkup.textColor=rightColor; + oRBMarkup.style=rightAnsSymb; + } + } else { + a[i].strokeColor = wrongColor; + if (bRBMU) { + oRBMarkup.textColor=wrongColor; + oRBMarkup.style=wrongAnsSymb; } + } } - f = this.getField("grpobj." + qtfield); - var re=/^grpobj\./; - if ( f != null ) { - var a = f.getArray(); - for ( var i = 0; i < a.length; i++) { - var rbmuname = a[i].name.replace(re,"rbmarkup\."); - var oRBMarkup = this.getField(rbmuname); - var bRBMU = ( oRBMarkup != null ); - var aX = a[i].name.split("."); - var probno = 1*aX[aX.length-2]; - var grpProbno = 1*aX[aX.length-1]; - if ( ( RightWrong[probno] != undefined ) % + } + f = this.getField("grpobj." + qtfield); + var re=/^grpobj\./; + if ( f != null ) { + var a = f.getArray(); + for ( var i = 0; i < a.length; i++) { + var rbmuname = a[i].name.replace(re,"rbmarkup\."); + var oRBMarkup = this.getField(rbmuname); + var bRBMU = ( oRBMarkup != null ); + var aX = a[i].name.split("."); + var probno = 1*aX[aX.length-2]; + var grpProbno = 1*aX[aX.length-1]; + if ( ( RightWrong[probno] != undefined ) % && ( RightWrong[probno][grpProbno] == 1 ) ) { - a[i].strokeColor = rightColor; - if (bRBMU) { - oRBMarkup.textColor=rightColor; - oRBMarkup.style=rightAnsSymb; - } - } else { - a[i].strokeColor = wrongColor; - if (bRBMU) { - oRBMarkup.textColor=wrongColor; - oRBMarkup.style=wrongAnsSymb; - } - } + a[i].strokeColor = rightColor; + if (bRBMU) { + oRBMarkup.textColor=rightColor; + oRBMarkup.style=rightAnsSymb; + } + } else { + a[i].strokeColor = wrongColor; + if (bRBMU) { + oRBMarkup.textColor=wrongColor; + oRBMarkup.style=wrongAnsSymb; } + } } - f=this.getField("rbmarkup."+qtfield); - if ( f != null ) f.display = display.visible; - % if ( f != null ) f.strokeColor = defaultColor; - f = this.getField("promptButton." + qtfield) - if ( f != null ) f.display = display.hidden; - f = this.getField("corr." + qtfield); - if ( f != null ) f.display = display.noPrint; - f = this.getField("qMark."+qtfield); - if ( f != null ) - { - for ( var i = 1; i <= nQuestions; i++) + } + f=this.getField("rbmarkup."+qtfield); + if ( f != null ) f.display = display.visible; + f = this.getField("promptButton." + qtfield) + if ( f != null ) f.display = display.hidden; + f = this.getField("corr." + qtfield); + if ( f != null ) f.display = display.noPrint; + f = this.getField("qMark."+qtfield); + if ( f != null ) { + for ( var i = 1; i <= nQuestions; i++) { + if ( ProbValue[i] == undefined ) ProbValue[i]=0; + f = this.getField("qMark."+qtfield+"."+(i-1)); + if ( f != null ) { + // find the next non-null field + for ( var j=i; j <= nQuestions; j++) { - if ( ProbValue[i] == undefined ) ProbValue[i]=0 - f = this.getField("qMark."+qtfield+"."+(i-1)); - if ( f != null ) - { - // find the next non-null field - for ( var j=i; j <= nQuestions; j++) - { - var h = this.getField("qMark."+qtfield+"."+j); - if ( h != null ) break; - } - var g = f.getArray(); - var qpts=(ProbDist[i]==undefined) ? 0 : ProbDist[i]; - if ( !negPointsMarkupAllowed && (qpts < 0) ) qpts=0; - g[0].value = qpts + (( qpts == 1 ) ? " \eqptLabel\space" - : " \eqptsLabel"); - } + var h = this.getField("qMark."+qtfield+"."+j); + if ( h != null ) break; } - this.getField("qMark."+qtfield).display = display.visible; + var g = f.getArray(); + var qpts=(ProbDist[i]==undefined) ? 0 : ProbDist[i]; + if ( !negPointsMarkupAllowed && (qpts < 0) ) qpts=0; + g[0].value = qpts + (( qpts == 1 ) ? " \eqptLabel\space" + : " \eqptsLabel"); + } } + this.getField("qMark."+qtfield).display = display.visible; + } } function getTotalTally(basename) { var sqtotal=0; @@ -1360,27 +1363,26 @@ function notifyField(success, flag, fieldname) { ?\wrngColorJS:oQName.WrongColorJSLoc; var wrongSymb=(typeof oQName.WrongAnsSymbJSLoc=="undefined")% ?\wrngAnsSymbJS:oQName.WrongAnsSymbJSLoc; - if (success) { - f.strokeColor = rightColor; - if (isthereRBUP) { - g.style = rightSymb; - g.textColor=rightColor; - g.display=display.visible; - } - return true; - } else { - updateTally.downState=false; - updateTally(fieldname); - f.strokeColor = wrongColor; -if (isthereRBUP) { - b2 = ( typeof oQName.WrongAnsSymbJSLoc == "undefined" ); - g.style = wrongSymb; - g.textColor=wrongColor; - g.display=display.visible; - } - return false; + if (success) { + f.strokeColor = rightColor; + if (isthereRBUP) { + g.style = rightSymb; + g.textColor=rightColor; + g.display=display.visible; + } + return true; + } else { + updateTally.downState=false; + updateTally(fieldname); + f.strokeColor = wrongColor; + if (isthereRBUP) { + b2 = ( typeof oQName.WrongAnsSymbJSLoc == "undefined" ); + g.style = wrongSymb; + g.textColor=wrongColor; + g.display=display.visible; } -// return null; // remove ? + return false; + } } function updateTally(fieldname) { @@ -1397,22 +1399,21 @@ function updateTally(fieldname) if (!updateTally.downState) f.value += 1; return true; } else return false; - } var bNoPeekWait=false; var oNoPeekTimer; function noPeek(qtfield,rtnPage) { - if (!bNoPeekWait) { - if ( (typeof (aQuizControl[qtfield]) == "undefined") % + if (!bNoPeekWait) { + if ( (typeof (aQuizControl[qtfield]) == "undefined") % || (aQuizControl[qtfield] != -1) ) { - bNoPeekWait=true; - oNoPeekTimer=app.setTimeOut("bNoPeekWait=false;% + bNoPeekWait=true; + oNoPeekTimer=app.setTimeOut("bNoPeekWait=false;% app.clearTimeOut(oNoPeekTimer);",5); - this.pageNum = rtnPage-1; - \NoPeekAlert; - } - } else this.pageNum = rtnPage-1; + this.pageNum = rtnPage-1; + \NoPeekAlert; + } + } else this.pageNum = rtnPage-1; } var oCB=\bcheckboxused function OnBlurRespBox (retn) diff --git a/texmf-dist/tex/latex/acrotex/aebrandom.def b/texmf-dist/tex/latex/acrotex/aebrandom.def index 10dbce06..5e53a8e3 100644 --- a/texmf-dist/tex/latex/acrotex/aebrandom.def +++ b/texmf-dist/tex/latex/acrotex/aebrandom.def @@ -18,7 +18,7 @@ %% License, or (at your option) any later version. %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ProvidesFile{aebrandom.def} - [2019/08/13 v8.3 % + [2019/12/17 v8.5.5 % Exerquiz support for randomization (dps)] \@ifundefined{nextrandom}{\input{random.tex}}{} \def\nextrandom{\begingroup diff --git a/texmf-dist/tex/latex/acrotex/aebsumrytbls.def b/texmf-dist/tex/latex/acrotex/aebsumrytbls.def index ce8636cd..00ca013e 100644 --- a/texmf-dist/tex/latex/acrotex/aebsumrytbls.def +++ b/texmf-dist/tex/latex/acrotex/aebsumrytbls.def @@ -18,7 +18,7 @@ %% License, or (at your option) any later version. %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ProvidesFile{aebsumrytbls.def} - [2019/08/13 v8.3 % + [2019/12/17 v8.5.5 % Exerquiz support for summary tables (dps)] \def\ccatCurrQzWith(#1){\currQuiz#1} \def\pbPopulateSumTable{\pushButton[\W0\BG{}\BC{}\S{S}\autoCenter{n} diff --git a/texmf-dist/tex/latex/acrotex/eforms.sty b/texmf-dist/tex/latex/acrotex/eforms.sty index d29485b8..325f0dc3 100644 --- a/texmf-dist/tex/latex/acrotex/eforms.sty +++ b/texmf-dist/tex/latex/acrotex/eforms.sty @@ -19,7 +19,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eforms} - [2019/06/14 v2.3 Provides general eforms support (dps)] + [2019/10/23 v2.3.2 Provides general eforms support (dps)] \RequirePackage{ifpdf}[2006/02/20] \RequirePackage{ifxetex}[2006/08/21] \RequirePackage{ifluatex} @@ -176,6 +176,10 @@ \parbox[b][#2][c]{#1}{\vfil\hfil\hfil\vfil}\fi}% } \let\Bbox\ef@Bbox +\def\efsave{\bgroup\let\as\relax\makeatletter\efsavei} +\def\efsavei#1\as#2{\global\let#2#1\egroup} +\def\efrestore{\bgroup\let\from\relax\makeatletter\efrestorei} +\def\efrestorei#1\from#2{\global\let#1#2\egroup} \let\ef@passedArgs\@empty \def\processAppArgs#1#2{% \ifx\end#1% if #1=\end, #2=\@nil. @@ -519,7 +523,7 @@ \def\noexpand@iii{\noexpand\noexpand\noexpand} \def\@eqV#1{\Hy@pdfstringfalse \let\x\protect - \let\protect\noexpand@iii\edef\pmpvV{#1}% + \let\protect\noexpand@iii \edef\pmpvV{#1}\let\protect\x \let\unicodeStrSAVE\unicodeStr \Hy@pdfstringtrue\let\unicodeStr\relax diff --git a/texmf-dist/tex/latex/acrotex/eqexam.def b/texmf-dist/tex/latex/acrotex/eqexam.def index 505fba81..ab303d3c 100644 --- a/texmf-dist/tex/latex/acrotex/eqexam.def +++ b/texmf-dist/tex/latex/acrotex/eqexam.def @@ -7,8 +7,8 @@ %% exerquiz.dtx (with options: `eqexam') %% \ProvidesFile{eqexam.def} - [2019/08/13 v8.3 % - Exerquiz support file for eqexam (dps)] + [2019/12/17 v8.5.5 % + Exerquiz support file for eqexam (dps)] \let\eq@YES=y \let\eq@NO=n \let\eq@One=1 \let\eq@Zero=0 \def\eq@r{r}\let\eq@f=f \let\eq@l=l @@ -1025,11 +1025,26 @@ \let\eq@solutionshook\@empty \let\priorexsectitle\@empty \let\priorexslinput\@empty -\def\exerSolnsHeadnToc{\section*{\exsectitle}% - \addcontentsline{toc}{section}{% - \@ifundefined{web@latextoc}{}{% - \ifx\web@latextoc\eq@YES\else - \protect\numberline{}\fi}\exsectitle}} +\def\InputExrSolnsLevel{\@ifstar + {\def\eq@ExrSolnsStar{*}\InputExrSolnsLevel@i} + {\let\eq@ExrSolnsStar\@empty\InputExrSolnsLevel@i}} +\newcommand{\InputExrSolnsLevel@i}[2][]{% + \def\eq@ExrSolnsLabel{#1}\def\eq@ExrSolnsLevel{#2}} +\InputExrSolnsLevel*{section} +\def\exerSolnsHeadnToc{% + \edef\eq@mkCmd{\expandafter\noexpand + \csname\eq@ExrSolnsLevel\endcsname\eq@ExrSolnsStar}% + \eq@mkCmd{\exsectitle}\if!\eq@ExrSolnsLabel!\else + \label{\eq@ExrSolnsLabel}\fi + \if\eq@ExrSolnsStar*% + \addcontentsline{toc}{\eq@ExrSolnsLevel}{% + \@ifundefined{web@latextoc}{}{% + \ifx\web@latextoc\eq@YES\else + \protect\numberline{}\fi + }\exsectitle + }% + \fi +} \@ifpackageloaded{web}{\def\eq@normallheader{\lheader{\rightmark}}} {\let\eq@normallheader\relax} \@ifpackageloaded{web}{\def\eq@defaultlheader{\lheader{\aeb@setmarks}}} diff --git a/texmf-dist/tex/latex/acrotex/eqtr.def b/texmf-dist/tex/latex/acrotex/eqtr.def index b2cfd4ec..e72184a7 100644 --- a/texmf-dist/tex/latex/acrotex/eqtr.def +++ b/texmf-dist/tex/latex/acrotex/eqtr.def @@ -55,9 +55,9 @@ \renewcommand\eq@Score{Skor:} \renewcommand\eq@OutOf{\protect\374zerinden} \renewcommand\eqQuizTotalMsg{% - "\eqScore\space"+nQuestions+" \eqOutOf\space"+Score} + "\eqScore\space"+Score+" \eqOutOf\space"+nQuestions} \renewcommand\eqQuizPointsMsg{% - "\eqptScore\space"+nPointTotal+" \eqOutOf\space"+ptScore} + "\eqptScore\space"+ptScore+" \eqOutOf\space"+nPointTotal} \renewcommand\eq@local@CorrAnsButton{Cevap} \renewcommand\eqInitQuizMsg{% "Kuizi Bitirdiniz. Do\protect\u011Fru cevaplar\protect\u0131 diff --git a/texmf-dist/tex/latex/acrotex/exerquiz.sty b/texmf-dist/tex/latex/acrotex/exerquiz.sty index a9c14748..7530720b 100644 --- a/texmf-dist/tex/latex/acrotex/exerquiz.sty +++ b/texmf-dist/tex/latex/acrotex/exerquiz.sty @@ -19,8 +19,8 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{exerquiz} - [2019/08/13 v8.3 % - Exerquiz: Exercises and Quizzes for LaTeX/PDF package (dps)] + [2019/12/17 v8.5.5 % + Exerquiz: Exercises and Quizzes for LaTeX/PDF package (dps)] \usepackage{keyval} \RequirePackage{ifpdf}[2006/02/20] \RequirePackage{ifxetex}[2006/08/21] @@ -305,7 +305,8 @@ \RequirePackage{verbatim} \RequirePackage{hyperref} \RequirePackage{amssymb}% used for return symbols -\RequirePackage{eforms}[2012/06/20] +\RequirePackage{eforms}[2019/10/23] +\dlSetPkgInfo \@ifundefined{eq@drivernum}{% \PackageError{exerquiz}% {You have not specified dvips, dvipsone, pdftex, dvipdfm, @@ -1497,11 +1498,26 @@ \let\eq@solutionshook\@empty \let\priorexsectitle\@empty \let\priorexslinput\@empty -\def\exerSolnsHeadnToc{\section*{\exsectitle}% - \addcontentsline{toc}{section}{% - \@ifundefined{web@latextoc}{}{% - \ifx\web@latextoc\eq@YES\else - \protect\numberline{}\fi}\exsectitle}} +\def\InputExrSolnsLevel{\@ifstar + {\def\eq@ExrSolnsStar{*}\InputExrSolnsLevel@i} + {\let\eq@ExrSolnsStar\@empty\InputExrSolnsLevel@i}} +\newcommand{\InputExrSolnsLevel@i}[2][]{% + \def\eq@ExrSolnsLabel{#1}\def\eq@ExrSolnsLevel{#2}} +\InputExrSolnsLevel*{section} +\def\exerSolnsHeadnToc{% + \edef\eq@mkCmd{\expandafter\noexpand + \csname\eq@ExrSolnsLevel\endcsname\eq@ExrSolnsStar}% + \eq@mkCmd{\exsectitle}\if!\eq@ExrSolnsLabel!\else + \label{\eq@ExrSolnsLabel}\fi + \if\eq@ExrSolnsStar*% + \addcontentsline{toc}{\eq@ExrSolnsLevel}{% + \@ifundefined{web@latextoc}{}{% + \ifx\web@latextoc\eq@YES\else + \protect\numberline{}\fi + }\exsectitle + }% + \fi +} \@ifpackageloaded{web}{\def\eq@normallheader{\lheader{\rightmark}}} {\let\eq@normallheader\relax} \@ifpackageloaded{web}{\def\eq@defaultlheader{\lheader{\aeb@setmarks}}} @@ -1853,8 +1869,8 @@ } \def\eq@promoteNewPageHere#1{\par \bgroup\@nobreakfalse\addpenalty{-500}% - \setlength{\@tempdimb}{#1}% - \@tempdima \pagegoal \advance \@tempdima -\pagetotal + \setlength{\@tempdimb}{#1}\@tempdima \pagegoal + \advance \@tempdima -\pagetotal \ifdim \@tempdima<\@tempdimb\ifnum\col@number>\@ne\columnbreak \else\newpage\penalty1\fi\fi\egroup } @@ -1912,11 +1928,27 @@ \let\eqqzsolutionshook\@empty \let\priorsqslsectitle\@empty \let\priorsqslinput\@empty -\def\quizSolnsHeadnToc{\section*{\sqslsectitle}% - \addcontentsline{toc}{section}{% - \@ifundefined{web@latextoc}{}{% - \ifx\web@latextoc\eq@YES\else - \protect\numberline{}\fi}\sqslsectitle}} +\def\InputQzSolnsLevel{\@ifstar + {\def\eq@QzSolnsStar{*}\InputQzSolnsLevel@i} + {\let\eq@QzSolnsStar\@empty\InputQzSolnsLevel@i}} +\newcommand{\InputQzSolnsLevel@i}[2][]{% + \def\eq@QzSolnsLabel{#1}\def\eq@QzSolnsLevel{#2}} +\InputQzSolnsLevel*{section} +\def\quizSolnsHeadnToc +{% + \edef\eq@mkCmd{\expandafter\noexpand + \csname\eq@QzSolnsLevel\endcsname\eq@QzSolnsStar}% + \eq@mkCmd{\sqslsectitle}\if!\eq@QzSolnsLabel!\else + \label{\eq@QzSolnsLabel}\fi + \if\eq@QzSolnsStar*% + \addcontentsline{toc}{\eq@QzSolnsLevel}{% + \@ifundefined{web@latextoc}{}{% + \ifx\web@latextoc\eq@YES\else + \protect\numberline{}\fi + }\sqslsectitle + }% + \fi +} \newcommand{\quizSolnInput} {% \global\let\webnewpage\relax @@ -2189,14 +2221,14 @@ \def\eqButtonDefaults{% \CA{\eq@local@CA}\AC{}\H{P}\W{1}\S{B} \BC{1 0 0}\BG{.7529 .7529 .7529}} -\def\@@eqButtonActions{% - \A{\JS{if (isEndQuizPushed("\eqBaseName")){\jsR\jsT% - correctQuiz("\eqBaseName",\thequestionno);% - \ifusesumrytbls\jsR\jsT\else\jsR\fi - if (typeof correctSumryTbl == "function")\jsR\jsT\jsT - correctSumryTbl("\eqBaseName",\thequestionno);\jsR - }}}% +\begin{defineJS}[\makeesc\@]{\CorrBtnActionsJS} +if (isEndQuizPushed("@eqBaseName")){ + correctQuiz("@eqBaseName",@thequestionno); + if (typeof correctSumryTbl == "function") + correctSumryTbl("@eqBaseName",@thequestionno); } +\end{defineJS} +\def\@@eqButtonActions{\A{\JS{\CorrBtnActionsJS}}} \newcommand\eqButton[2][]{% \ifnocorrections\else \def\eqBaseName{#2}% @@ -2208,8 +2240,8 @@ } \def\CorrButton{\eqButton} \def\rbMarkup@Defaults{% - \BC{}\F{\FHidden}\Ff{\FfReadOnly}\textSize{12} - \textColor{0 g}\symbolchoice{check}\W{}} + \BC{}\F{\FHidden}\Ff{\FfReadOnly}\textSize{12} + \textColor{0 g}\symbolchoice{check}\W{}} \newcommand\rbMarkup[1][]{% \ifx\grpquestions\eq@One \def\Fld@name{% @@ -2219,7 +2251,7 @@ {rbmarkup.\Fld@name}% {\RadioFieldSize}{\RadioFieldSize}{Yes}{}% {\eq@setWidgetProps\eq@Check@driver}% - {\rbMarkup@Defaults\every@CheckBox\every@rbMarkup}}}% + {\rbMarkup@Defaults\every@CheckBox\every@rbMarkup}}} \newcommand\minQuizResp{lowThreshold} \newcommand\PTs{\@ifstar{\def\eq@star{*}\@PTs}{\def\eq@star{x}\@PTs}} \def\@PTs#1{\gdef\eq@PTs{#1}\ifx\eq@PTs\@empty\gdef\eq@PTs{1}\fi @@ -3780,114 +3812,113 @@ 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");} + \if\@sqTurnOffAlerts1retn\else null\fi,"\curr@quiz");} \def\eqObjAlert{% - \ifx\eqQuizType\isQZ\ifx\eq@online\eq@YES\ifeq@noquizsolutions - \else if (false) \fi\fi\fi} + \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} if(event.willCommit){ - RecordPointValue(@eqPTs,@thequestionno@ifx@grpquestions1,% + RecordPointValue(@eqPTs,@thequestionno@ifx@grpquestions1,% @thegrpquestionno,@grpPointValue,@grpTotalWeight,% "@grpEvalFunction"@fi); - RecordProblemType("@eqQT",@thequestionno); - var retn = ProcRespTxt(@rbTxtAlt); - ProcUserResp(retn,event.value,@thequestionno,% + 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); - event.rc = false; + @eqObjAlert@space eqAppAlert(InitMsg("@bqlabelISO"),3); + event.rc = false; } \end{defineJS} \def\RespBoxTxtDefaults {% - \BC{0 0 0}\W{1}\S{S}\textColor{0 g}\F{\FPrint}% + \BC{0 0 0}\W{1}\S{S}\textColor{0 g}\F{\FPrint}% } \def\moreRespBoxTxtDefaults {% - \edef\@moreRespBoxTxtDefaults{% - \if\eqQuizType\isQZ\ifx\eq@online\eq@YES - \ifeq@noquizsolutions\else - \noexpand\Ff{\FfReadOnly}\fi\fi\fi - }% + \edef\@moreRespBoxTxtDefaults{% + \if\eqQuizType\isQZ\ifx\eq@online\eq@YES + \ifeq@noquizsolutions\else + \noexpand\Ff{\FfReadOnly}\fi\fi\fi + }% } \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 - }% - } - \AAFormat{\eqAddAAFormat} - \AAOnFocus{\JS{var retn = null;}} -\if\@sqTurnOffAlerts0 - \AAOnBlur{\JS{\RespBoxTxtOnBlur}}% -\fi - \fi - } + \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 + }% + } + \AAFormat{\eqAddAAFormat} + \AAOnFocus{\JS{var retn = null;}} + \if\@sqTurnOffAlerts0% + \AAOnBlur{\JS{\RespBoxTxtOnBlur}}\fi + \fi + } } \def\annot@subtype@rbt{rbt} \newcommand\@RespBoxTxt[1][] {% - \edef\annot@subtype{\annot@subtype@rbt}% - \eq@AddProbToQzQuesList - \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 + \edef\annot@subtype{\annot@subtype@rbt}% + \eq@AddProbToQzQuesList + \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\@@RespBoxTxt}% - {\RespBoxTxtDefaults\@moreRespBoxTxtDefaults - \@@RespBoxTxtActions\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\@@RespBoxTxt}% + {\RespBoxTxtDefaults\@moreRespBoxTxtDefaults + \@@RespBoxTxtActions\every@eqTextField\every@RespBoxTxt}% } \def\@@RespBoxTxt#1#2{% - \@ifnextchar[{\@@@RespBoxTxt{#1}{#2}} - {\@ifstar{\@@@RespBoxTxt{#1}{#2}[\curr@quiz.\thequestionno]}% - {\@@@RespBoxTxt{#1}{#2}[]}}} + \@ifnextchar[%] + {\@@@RespBoxTxt{#1}{#2}} + {\@ifstar{\@@@RespBoxTxt{#1}{#2}[\curr@quiz.\thequestionno]}% + {\@@@RespBoxTxt{#1}{#2}[]}}} \def\eq@ZERO{0}\def\eq@ONE{1}\def\eq@TWO{2} \def\@@@RespBoxTxt#1#2[#3]#4{% - \xdef\@qzsolndest{#3}% - \def\eq@argi{#1}\ifx\eq@argi\eq@ZERO\else - \ifx\eq@argi\eq@ONE\else\ifx\eq@argi\eq@TWO\else - \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 - \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 - \xdef\rbTxtAlt{\rbFlag,\eq@argi,\eq@argii}% - \global\let\txtAltList\@empty - \count0=#4 \ifnum\count0 > 0 \expandafter\@argRead\else - \PackageError{exerquiz}{% - The fourth required parameter of \string\RespBoxTxt\MessageBreak - is required to be a positive integer. You entered\MessageBreak - #4\space instead}{Enter a positive integer.}\fi + \xdef\@qzsolndest{#3}% + \def\eq@argi{#1}\ifx\eq@argi\eq@ZERO\else + \ifx\eq@argi\eq@ONE\else\ifx\eq@argi\eq@TWO\else + \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 + \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 + \xdef\rbTxtAlt{\rbFlag,\eq@argi,\eq@argii}% + \global\let\txtAltList\@empty + \count0=#4 \ifnum\count0 > 0 \expandafter\@argRead\else + \PackageError{exerquiz}{% + The fourth required parameter of \string\RespBoxTxt\MessageBreak + is required to be a positive integer. You entered\MessageBreak + #4\space instead}{Enter a positive integer.}\fi } \def\@argRead#1{\xdef\jsTempArgs{\txtAltList}% \ifx\txtAltList\@empty\xdef\txtAltList{"#1"}\else @@ -3922,16 +3953,16 @@ if (!isQuizInitialized("@currQuiz")) { \begin{defineJS}[% \catcode`\@=0\relax\catcode`\%=14\relax]{\AAKqRespBoxTxtPC} if(event.willCommit){ - RecordPointValue(@eqPTs,@thequestionno@ifx@grpquestions1,% + RecordPointValue(@eqPTs,@thequestionno@ifx@grpquestions1,% @thegrpquestionno,@grpPointValue,@grpTotalWeight,% "@grpEvalFunction"@fi); - RecordProblemType("@eqQT",@thequestionno); - var retn = ProcRespTxtPC(@rbTxtAlt); + RecordProblemType("@eqQT",@thequestionno); + var retn = ProcRespTxtPC(@rbTxtAlt); @ifx@grpquestions1% - ProbValue[@thequestionno][3+@thegrpquestionno]% +ProbValue[@thequestionno][3+@thegrpquestionno]% =ProcRespTxtPC.txtPCpCr;@else% - ProbValue[@thequestionno]=ProcRespTxtPC.txtPCpCr;@fi - ProcUserResp(retn,event.value,@thequestionno,0% +ProbValue[@thequestionno]=ProcRespTxtPC.txtPCpCr;@fi + ProcUserResp(retn,event.value,@thequestionno,0% @ifx@grpquestions1,@thegrpquestionno@fi); } if (!isQuizInitialized("@currQuiz")) { @@ -4067,7 +4098,8 @@ if (!isQuizInitialized("@currQuiz")) { \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}% + \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}}% @@ -4427,7 +4459,7 @@ if (!isQuizInitialized("@currQuiz")) { \let\eqQzQuesList\@empty \def\eq@AddProbToQzQuesList{% \edef\eq@tmpExp{\noexpand\g@addto@macro% - \noexpand\eqQzQuesList{\string + \noexpand\eqQzQuesList{\noexpand \@eqListExp{\@currentQues}{\the\c@page}}}% \ifx\grpquestions\eq@Zero\eq@tmpExp\fi } diff --git a/texmf-dist/tex/latex/acrotex/insdljs.sty b/texmf-dist/tex/latex/acrotex/insdljs.sty index cf7089b5..4e4b61c4 100644 --- a/texmf-dist/tex/latex/acrotex/insdljs.sty +++ b/texmf-dist/tex/latex/acrotex/insdljs.sty @@ -19,7 +19,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{insdljs} - [2019/08/06 v2.4.6 Insert Document Level JavaScripts (dps)] + [2019/10/30 v2.4.8 Insert Document Level JavaScripts (dps)] \usepackage{xkeyval} \RequirePackage{ifpdf}[2006/02/20] \RequirePackage{ifxetex}[2006/08/21] @@ -38,6 +38,15 @@ \let\dl@YES=y \let\dl@NO=n \let\dl@One=1 \let\dl@Zero=0 \let\dljs@YES=y \let\dljs@NO=n +\def\dlpkgInfo{\@nameuse{ver@\@currname.\@currext}} +\def\dlSetPkgInfo{% + \edef\dlpkgInfoExpd{\dlpkgInfo}% + \expandafter\dlparsePkgInfo\dlpkgInfoExpd\@nil} +\def\dlparsePkgInfo#1 #2 #3:#4\@nil{% + \def\dlPkgInfoDate{#1}% + \def\dlPkgInfoVer{#2}% + \def\dlPkgInfoPkg{#3}% + \def\dlPkgInfoDesc{#4}} \def\dvips@marker{\ifx\dljspresent\dl@NO\@OAction\fi} \let\isOpenAction\dl@NO \DeclareOptionX{nodljs}{\let\importdljs\dl@NO} @@ -623,6 +632,7 @@ \def\dlcombine(#1)(#2){#1#2} \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 \expandafter\@ifundefined\expandafter{% diff --git a/texmf-dist/tex/latex/acrotex/template.def b/texmf-dist/tex/latex/acrotex/template.def index d729a131..d1c19f9d 100644 --- a/texmf-dist/tex/latex/acrotex/template.def +++ b/texmf-dist/tex/latex/acrotex/template.def @@ -17,9 +17,9 @@ %% macros/latex/base/lppl.txt; either version 1 of the %% %% License, or (at your option) any later version. %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesFile{template.def} - [2019/08/13 v8.3 % - Exerquiz template for language support (dps)] +\ProvidesFile{template.`def} + [2019/12/17 v8.5.5 % + Exerquiz template for language support (dps)] %%------------- Instructions ------------------------------------ %% Make your language localizations to this file and rename it to %% something like \texttt{eq.def}, where \texttt{} diff --git a/texmf-dist/tex/latex/acrotex/web.cfg b/texmf-dist/tex/latex/acrotex/web.cfg index 8afdc114..cf1ebca2 100644 --- a/texmf-dist/tex/latex/acrotex/web.cfg +++ b/texmf-dist/tex/latex/acrotex/web.cfg @@ -7,4 +7,7 @@ % the driver specified here will be used. % \ExecuteOptions{dvips} +\bWebCustomize +% Insert redefinitions between these two marks +\eWebCustomize diff --git a/texmf-dist/tex/latex/acrotex/web.sty b/texmf-dist/tex/latex/acrotex/web.sty index 15567251..094bff39 100644 --- a/texmf-dist/tex/latex/acrotex/web.sty +++ b/texmf-dist/tex/latex/acrotex/web.sty @@ -24,7 +24,7 @@ %%--------------------------------------------------------- \NeedsTeXFormat{LaTeX2e}[1997/12/01] \ProvidesPackage{web} - [2017/12/05 v6.1.1 web: A Screen Design Package (dps)] + [2019/12/16 v6.1.4 web: A Screen Design Package (dps)] \RequirePackage{xkeyval} \RequirePackage{ifpdf}[2006/02/20] \RequirePackage{ifxetex}[2006/08/21] @@ -534,15 +534,30 @@ \@onlypreamble\noFinalDot \def\minPanelWidth#1{\def\web@minpanelwidth{#1}} \minPanelWidth{1in} +\let\bWebCustomize\endinput +\let\eWebCustomize\relax \ifpdf\ExecuteOptionsX{pdftex}\else - \ifxetex\ExecuteOptionsX{xetex}\else - \let\ExecuteOptions@SAVE\ExecuteOptions - \let\ExecuteOptions\ExecuteOptionsX - \InputIfFileExists{web.cfg}{} - {\@ifundefined{l@tex@@@@driver}{\ExecuteOptionsX{dvips}} - {\ExecuteOptionsX{dvipsone}}}% - \let\ExecuteOptions\ExecuteOptions@SAVE - \fi\fi + \ifxetex\ExecuteOptionsX{xetex}\else + \let\ExecuteOptions@SAVE\ExecuteOptions + \let\ExecuteOptions\ExecuteOptionsX + \InputIfFileExists{web.cfg}{} + {\@ifundefined{l@tex@@@@driver}{\ExecuteOptionsX{dvips}} + {\ExecuteOptionsX{dvipsone}}}% + \let\ExecuteOptions\ExecuteOptions@SAVE + \fi +\fi +\providecommand{\inputWebCfg}{% + \let\bWebCustomize\relax + \let\eWebCustomize\endinput + \let\ExecuteOptions@SAVE\ExecuteOptions + \let\ExecuteOptions\@gobble + \makeatletter + \InputIfFileExists{web.cfg}{}{}\makeatother + \let\ExecuteOptions\ExecuteOptions@SAVE + \let\bWebCustomize\endinput + \let\eWebCustomize\relax +} +\@onlypreamble\inputWebCfg \ProcessOptionsX \ifx\web@Hypdfencoding\@empty\else \let\aeb@useunicode\@gobble\fi @@ -1710,8 +1725,25 @@ \def\web@toc@part#1#2#3{\par\noindent {\bfseries\hyperlink{#3}{#1}}\par\smallskip} \def\web@toc@chapter#1#2#3{\global\let\isChapter\web@YES - \par\mbox{}{\bfseries\makebox[0pt][r]{\hyperlink{#3}% - {\numberline\web@finalDot}\space}\web@title}\par\smallskip + \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 + }% + \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 -- cgit v1.2.3