eqexam update

4 files changed, 27 insertions, 10 deletions

diff --git a/texmf-dist/tex/latex/eqexam/aebrandom.def b/texmf-dist/tex/latex/eqexam/aebrandom.def
index af61be1f..5e53a8e3 100644
--- a/texmf-dist/tex/latex/eqexam/aebrandom.def
+++ b/texmf-dist/tex/latex/eqexam/aebrandom.def
@@ -18,7 +18,7 @@
 %% License, or (at your option) any later version.      %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \ProvidesFile{aebrandom.def}
- [2019/10/13 v8.5.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/eqexam/eqexam.def b/texmf-dist/tex/latex/eqexam/eqexam.def
index 0e3705d0..ab303d3c 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/10/13 v8.5.3 %
+ [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
@@ -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/eqexam/eqexam.sty b/texmf-dist/tex/latex/eqexam/eqexam.sty
index d95a5941..105f605b 100644
--- a/texmf-dist/tex/latex/eqexam/eqexam.sty
+++ b/texmf-dist/tex/latex/eqexam/eqexam.sty
@@ -19,8 +19,8 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{eqexam}
-  [2019/10/29 v5.1.6 An Exam Construction Package (dps)]
-\def\eqexamdefReq{2019/02/11}
+  [2019/12/17 v5.1.7 An Exam Construction Package (dps)]
+\def\eqexamdefReq{2019/12/17}
 \RequirePackage{ifpdf}[2006/02/20]
 \RequirePackage{ifxetex}[2006/08/21]
 \usepackage{xkeyval}
diff --git a/texmf-dist/tex/latex/eqexam/eqtextb.def b/texmf-dist/tex/latex/eqexam/eqtextb.def
index 470a959a..6a292bf4 100644
--- a/texmf-dist/tex/latex/eqexam/eqtextb.def
+++ b/texmf-dist/tex/latex/eqexam/eqtextb.def
@@ -622,7 +622,9 @@
 \def\eqExtArg{\theeqquestionnoi}
 \if\load@exerquiz\eqe@NO\DoNotFitItIn\fi
 \let\fillInFormatDefault\@empty
-\def\exerSolnsHeadnToc{}
+\def\fbInsSolnsStyle{\def\exerSolnsHeadnToc{}}
+\def\autoInsSolns{\let\fbInsSolnsStyle\relax}
+\AtBeginDocument{\fbInsSolnsStyle}
 \renewcommand{\exerSolnInput}{%
     \global\let\webnewpage\relax
     \ifsolutionsonly\else\immediate\closeout\ex@solns\fi