From 037d980bc744e857c5ae07ccea5907ce0f03fa8b Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 9 Jan 2020 19:21:46 +0900 Subject: eqexam update --- texmf-dist/tex/latex/eqexam/aebrandom.def | 10 +++--- texmf-dist/tex/latex/eqexam/eqalone.def | 2 +- texmf-dist/tex/latex/eqexam/eqexam.def | 42 ++++++++++++----------- texmf-dist/tex/latex/eqexam/eqexam.sty | 52 +++++++++++++++-------------- texmf-dist/tex/latex/eqexam/eqtextb.def | 2 +- texmf-dist/tex/latex/eqexam/flextended.def | 2 +- texmf-dist/tex/latex/eqexam/fortextbook.sty | 2 +- 7 files changed, 58 insertions(+), 54 deletions(-) (limited to 'texmf-dist/tex/latex') diff --git a/texmf-dist/tex/latex/eqexam/aebrandom.def b/texmf-dist/tex/latex/eqexam/aebrandom.def index 5e53a8e3..2906805a 100644 --- a/texmf-dist/tex/latex/eqexam/aebrandom.def +++ b/texmf-dist/tex/latex/eqexam/aebrandom.def @@ -8,7 +8,7 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Exerquiz.sty package, %% -%% Copyright (C) 1999-2019 D. P. Story %% +%% Copyright (C) 1999-2020 D. P. Story %% %% dpstory@uakron.edu %% %% %% %% This program can redistributed and/or modified under %% @@ -18,7 +18,7 @@ %% License, or (at your option) any later version. %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ProvidesFile{aebrandom.def} - [2019/12/17 v8.5.5 % + [2020/01/01 v8.5.8 % Exerquiz support for randomization (dps)] \@ifundefined{nextrandom}{\input{random.tex}}{} \def\nextrandom{\begingroup @@ -89,11 +89,11 @@ } \def\aeb@randomizeChoices#1{% \setrannum{\aeb@ranChoice}{1}{#1} - \count0=0 \aeb@hold=\expandafter{\@temphold}\def\@temphold{}% + \eqtmpcnta\z@\aeb@hold=\expandafter{\@temphold}\def\@temphold{}% \expandafter\@tfor\expandafter \@temp\expandafter:\expandafter=\the\aeb@hold \do {% - \advance\count0by1 - \ifnum\count0=\aeb@ranChoice + \advance\eqtmpcnta\@ne + \ifnum\eqtmpcnta=\aeb@ranChoice\relax \aeb@hold=\expandafter\expandafter\expandafter {\expandafter\@tempholdrandom\@temp}% \edef\@tempholdrandom{\the\aeb@hold}% diff --git a/texmf-dist/tex/latex/eqexam/eqalone.def b/texmf-dist/tex/latex/eqexam/eqalone.def index de2a0a65..7c4a5f6f 100644 --- a/texmf-dist/tex/latex/eqexam/eqalone.def +++ b/texmf-dist/tex/latex/eqexam/eqalone.def @@ -8,7 +8,7 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% eqexam.sty package, %% -%% Copyright (C) 2005--2018 D. P. Story %% +%% Copyright (C) 2005--2020 D. P. Story %% %% dpstory@uakron.edu %% %% %% %% This program can redistributed and/or modified under %% diff --git a/texmf-dist/tex/latex/eqexam/eqexam.def b/texmf-dist/tex/latex/eqexam/eqexam.def index ab303d3c..53d9fc0f 100644 --- a/texmf-dist/tex/latex/eqexam/eqexam.def +++ b/texmf-dist/tex/latex/eqexam/eqexam.def @@ -7,7 +7,7 @@ %% exerquiz.dtx (with options: `eqexam') %% \ProvidesFile{eqexam.def} - [2019/12/17 v8.5.5 % + [2020/01/01 v8.5.8 % Exerquiz support file for eqexam (dps)] \let\eq@YES=y \let\eq@NO=n \let\eq@One=1 \let\eq@Zero=0 @@ -96,6 +96,7 @@ \newcounter{@exno} \setcounter{@exno}{0} % running exno \newcounter{quizno} \setcounter{quizno}{0} \renewcommand\thequizno{\alph{quizno}} +\newcount\eqtmpcnta \newcounter{eqpointvalue} \setcounter{eqpointvalue}{0} \newlength\eq@tmplength \newlength\eqtmplength @@ -1173,8 +1174,8 @@ {% \xdef\eq@pageThisQ{\the\c@page}% \let\@currentQues\@empty - {\count0=\@shortquizCnt \advance\count0by1\relax - \xdef\@shortquizCnt{\the\count0}}% + {\eqtmpcnta\@shortquizCnt\relax\advance\eqtmpcnta\@ne + \xdef\@shortquizCnt{\the\eqtmpcnta}}% \goodbreak\@ifstar{\sqForms\@shortquiz}% {\if\aeb@FLOverride\eq@f\def\sqstar{*}\else \def\sqstar{}\sqLinks\fi\@shortquiz}% @@ -1182,8 +1183,8 @@ \newenvironment{shortquiz*} {% \xdef\eq@pageThisQ{\the\c@page}% - {\count0=\@shortquizCnt\advance\count0by1\relax - \xdef\@shortquizCnt{\the\count0 }}% + {\eqtmpcnta\@shortquizCnt\relax\advance\eqtmpcnta\@ne + \xdef\@shortquizCnt{\the\eqtmpcnta}}% \sqForms\@shortquiz }{\aeb@endshortquiz} \def\@shortquiz{\@ifnextchar[% @@ -1674,20 +1675,21 @@ \ifx\bChoiceLabel\@empty\else \processLabeledAns\fi }{\expandafter\@findendans\@gobble}}% -\def\defineEachAns#1{\advance\count0by1\relax +\def\defineEachAns#1{\advance\eqtmpcnta\@ne \@temptokena={#1}\csarg\xdef - {SavedAns\bChoiceLabel-Idx\the\count0}{\the\@temptokena}% + {SavedAns\bChoiceLabel-Idx\the\eqtmpcnta}{\the\@temptokena}% \ifsolutionsonly\else {\let\\\relax\eq@IWDefs{\string - \csarg\string\gdef{SavedAns\bChoiceLabel-Idx\the\count0}% + \csarg\string\gdef{SavedAns\bChoiceLabel-Idx\the\eqtmpcnta}% {\the\@temptokena}}}\fi } -\def\defineEachChoice#1{\advance\count0by1\relax +\def\defineEachChoice#1{\advance\eqtmpcnta\@ne \@temptokena={#1}\csarg\xdef - {SavedAlts\bChoiceLabel-Idx\the\count0}% + {SavedAlts\bChoiceLabel-Idx\the\eqtmpcnta}% {\the\@temptokena}\ifsolutionsonly\else {\let\\\relax\eq@IWDefs{\string - \csarg\string\gdef{SavedAlts\bChoiceLabel-Idx\the\count0}% + \csarg\string + \gdef{SavedAlts\bChoiceLabel-Idx\the\eqtmpcnta}% {\the\@temptokena}}}\fi } \def\processLabeledAns{% @@ -1703,24 +1705,24 @@ \xdef{SavedAns\bChoiceLabel}{\the\toks@}% \ifsolutionsonly\else{\let\\\relax\eq@IWDefs{\string \csarg\string\gdef{SavedAns\bChoiceLabel}{\the\toks@}}}\fi - \count0=0\relax\let\\\defineEachAns\the\toks@ - \xdef\@currNCntAns{\the\count0 }\csarg + \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\count0 }}}\fi + \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 - \count0=0\relax\let\\\defineEachChoice\the\toks@ - \count0=1\relax\toks@={}%{\ignorespaces\@gobble}% + \eqtmpcnta\z@\relax\let\\\defineEachChoice\the\toks@ + \eqtmpcnta\@ne\toks@={}%{\ignorespaces\@gobble}% \loop \edef\temp@exp{\the\toks@\noexpand\\{% - \noexpand\useSavedAlts[\the\count0]{\bChoiceLabel} - \noexpand\useSavedAns[\the\count0]{\bChoiceLabel}}}% + \noexpand\useSavedAlts[\the\eqtmpcnta]{\bChoiceLabel} + \noexpand\useSavedAns[\the\eqtmpcnta]{\bChoiceLabel}}}% \toks@=\expandafter{\temp@exp}% - \ifnum\count0<\@currNCntAns - \advance\count0by1 + \ifnum\eqtmpcnta<\@currNCntAns\relax + \advance\eqtmpcnta\@ne \repeat \csarg\xdef{SavedAltsAns\bChoiceLabel}{\the\toks@}% \ifsolutionsonly\else{\let\\\relax\eq@IWDefs{\string diff --git a/texmf-dist/tex/latex/eqexam/eqexam.sty b/texmf-dist/tex/latex/eqexam/eqexam.sty index 105f605b..18ef5a68 100644 --- a/texmf-dist/tex/latex/eqexam/eqexam.sty +++ b/texmf-dist/tex/latex/eqexam/eqexam.sty @@ -8,7 +8,7 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% eqexam.sty package, %% -%% Copyright (C) 2005--2018 D. P. Story %% +%% Copyright (C) 2005--2020 D. P. Story %% %% dpstory@uakron.edu %% %% %% %% This program can redistributed and/or modified under %% @@ -19,8 +19,8 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eqexam} - [2019/12/17 v5.1.7 An Exam Construction Package (dps)] -\def\eqexamdefReq{2019/12/17} + [2020/01/06 v5.1.8 An Exam Construction Package (dps)] +\def\eqexamdefReq{2020/01/01} \RequirePackage{ifpdf}[2006/02/20] \RequirePackage{ifxetex}[2006/08/21] \usepackage{xkeyval} @@ -377,6 +377,8 @@ \@ifundefined{if@fleqn}{\let\fleqnOn\relax\let\fleqnOff\relax} {\def\fleqnOn{\@fleqntrue}\def\fleqnOff{\@fleqnfalse}} \RequirePackage{aeb-comment} +\@ifundefined{BeforeIncludedComment}{\let\aebc@end\endgroup} + {\let\aebc@end\relax} \def\eqe@commentChkMsg{\@ifpackageloaded{comment} {\PackageWarningNoLine{eqexam} {The comment package is incompatible with the\MessageBreak @@ -384,28 +386,28 @@ \AtBeginDocument{\eqe@commentChkMsg} \AtEndDocument{\includeexersolutions} \@ifpackageloaded{web}{\let\load@web\eqe@YES}{% - \ifx\load@web\eqe@YES\ifnum\eqe@drivernum=5 - \PackageInfo{eqexam}{You have not selected a driver % - for eqexam. Perhaps the \MessageBreak - driver is introduced through web.cfg% - }\fi\expandafter\RequirePackage\expandafter[\eqe@webOpts]{web}% - \edef\@pdfcreator{\@pdfcreator, The eqexam Package}\fi + \ifx\load@web\eqe@YES\ifnum\eqe@drivernum=5 + \PackageInfo{eqexam}{You have not selected a driver % + for eqexam. Perhaps the \MessageBreak + driver is introduced through web.cfg}\fi + \expandafter\RequirePackage\expandafter[\eqe@webOpts]{web}% + \edef\@pdfcreator{\@pdfcreator, The eqexam Package}\fi } \@ifpackageloaded{exerquiz}{\let\load@exerquiz\eqe@YES}{% - \let\symbolchoice\@gobble - \ifx\load@exerquiz\eqe@YES\expandafter - \RequirePackage\expandafter[\eqe@eqOpts]{exerquiz}[2011/08/30] - \let\importdljs\eqe@YES\let\execjs\eqe@YES - \fi + \let\symbolchoice\@gobble + \ifx\load@exerquiz\eqe@YES\expandafter + \RequirePackage\expandafter[\eqe@eqOpts]{exerquiz}[2011/08/30] + \let\importdljs\eqe@YES\let\execjs\eqe@YES + \fi } \@ifpackageloaded{eforms}{}{% \let\symbolchoice\@gobble } \def\eqDvipsone{dvipsone} \@ifpackageloaded{hyperref} - {\ifx\eqDriverName\eqDvipsone - \renewcommand\@pdfviewparams{ null null null}\fi - }{\let\textorpdfstring\@firstoftwo} + {\ifx\eqDriverName\eqDvipsone + \renewcommand\@pdfviewparams{ null null null}\fi + }{\let\textorpdfstring\@firstoftwo} \let\eq@online\savedeq@online \let\ifeq@solutionsafter\savedifeq@solutionsafter \def\ifsolutionsafter{\ifeq@solutionsafter} % user interface @@ -687,12 +689,12 @@ \newif\ifeqlocalversion \eqlocalversionfalse \newif\if@templocalversion \@templocalversionfalse \def\eqe@initializeMultiVersions{% - \let\save@message\message\let\message\@gobble - \@tfor\eqe@tmp:=ABCDEFGHIJKLMNOPQRSTUVWXYZ\do{% - \expandafter\let\csname v\eqe@tmp\endcsname\@gobble - \expandafter\excludecomment\expandafter{ver\eqe@tmp}% - \expandafter\let\csname Afterver\eqe@tmp Comment\endcsname\relax - }\let\message\save@message + \let\save@message\message\let\message\@gobble + \@tfor\eqe@tmp:=ABCDEFGHIJKLMNOPQRSTUVWXYZ\do{% + \csarg\let{v\eqe@tmp}\@gobble + \edef\exp@temp{\noexpand\excludecomment{ver\eqe@tmp}}\exp@temp + \csarg\let{Afterver\eqe@tmp Comment}\aebc@end + }\let\message\save@message } \AtBeginDocument{\let\eqe@initializeMultiVersions\relax} \let\eqe@@onVersion\@empty @@ -709,7 +711,7 @@ \def\eqe@turnOffComment#1{% \csarg\let{v#1}\@gobble \edef\exp@temp{\noexpand\excludecomment{ver#1}}\exp@temp - \csarg\let{Afterver#1Comment}\relax + \csarg\let{Afterver#1Comment}\aebc@end } \def\forVersion#1% {% @@ -805,7 +807,7 @@ \let\save@message\message\let\message\@gobble \loop \stepcounter{eq@count}% - \csarg\let{Afterver\Alph{eq@count}Comment}\relax + \csarg\let{Afterver\Alph{eq@count}Comment}\aebc@end \lowercase {% \ifnum\value{eq@count}=\nLocalSelection diff --git a/texmf-dist/tex/latex/eqexam/eqtextb.def b/texmf-dist/tex/latex/eqexam/eqtextb.def index 6a292bf4..02683ff2 100644 --- a/texmf-dist/tex/latex/eqexam/eqtextb.def +++ b/texmf-dist/tex/latex/eqexam/eqtextb.def @@ -8,7 +8,7 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% eqexam.sty package, %% -%% Copyright (C) 2005--2018 D. P. Story %% +%% Copyright (C) 2005--2020 D. P. Story %% %% dpstory@uakron.edu %% %% %% %% This program can redistributed and/or modified under %% diff --git a/texmf-dist/tex/latex/eqexam/flextended.def b/texmf-dist/tex/latex/eqexam/flextended.def index 4cf9bf23..ab9942b6 100644 --- a/texmf-dist/tex/latex/eqexam/flextended.def +++ b/texmf-dist/tex/latex/eqexam/flextended.def @@ -8,7 +8,7 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% eqexam.sty package, %% -%% Copyright (C) 2005--2018 D. P. Story %% +%% Copyright (C) 2005--2020 D. P. Story %% %% dpstory@uakron.edu %% %% %% %% This program can redistributed and/or modified under %% diff --git a/texmf-dist/tex/latex/eqexam/fortextbook.sty b/texmf-dist/tex/latex/eqexam/fortextbook.sty index 34d3e2d0..4c8929e0 100644 --- a/texmf-dist/tex/latex/eqexam/fortextbook.sty +++ b/texmf-dist/tex/latex/eqexam/fortextbook.sty @@ -8,7 +8,7 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% eqexam.sty package, %% -%% Copyright (C) 2005--2018 D. P. Story %% +%% Copyright (C) 2005--2020 D. P. Story %% %% dpstory@uakron.edu %% %% %% %% This program can redistributed and/or modified under %% -- cgit v1.2.3