2020-03-10 14:47:00

3 files changed, 27 insertions, 9 deletions

diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 682160a36..5c13c209d 100644
--- a/tex/context/base/mkii/cont-new.mkii
+++ b/tex/context/base/mkii/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2020.02.17 12:06}
+\newcontextversion{2020.03.10 14:44}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/mkii/context.mkii b/tex/context/base/mkii/context.mkii
index bc6869fec..db1940639 100644
--- a/tex/context/base/mkii/context.mkii
+++ b/tex/context/base/mkii/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2020.02.17 12:06}
+\edef\contextversion{2020.03.10 14:44}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkii/syst-new.mkii b/tex/context/base/mkii/syst-new.mkii
index 34b535b90..5a515dbab 100644
--- a/tex/context/base/mkii/syst-new.mkii
+++ b/tex/context/base/mkii/syst-new.mkii
@@ -315,17 +315,25 @@
 
 % awaiting the definitive implementation
 
+\let\normalelapsedtime\elapsedtime
+
 \ifx\resettimer\undefined
   \let\resettimer \relax
   \newcount\elapsedtime
 \fi
 
 \newcount\featuretest
-
-\def\testfeature#1#2%
-  {\def\dotestfeature
-     {\advance\featuretest \plusone
-      \ifnum\featuretest>#1\else#2\expandafter\dotestfeature\fi}%
+\newcount\noffeaturetest
+\newcount\featuretesttime
+
+\def\testfeature#1#2% brought in sync with mkiv
+  {\noffeaturetest#1\relax
+   \def\dotestfeature
+     {\advance\featuretest\plusone
+      \ifnum\featuretest>\noffeaturetest\else#2\expandafter\dotestfeature\fi}%
+   \def\notestfeature
+     {\advance\featuretest\plusone
+      \ifnum\featuretest>\noffeaturetest\else\expandafter\notestfeature\fi}%
    \retestfeature}
 
 \def\retestfeature % timer support is new per 10/5/2005
@@ -333,12 +341,22 @@
    \ifcase\interactionmode\let\wait\relax\fi
    \writestatus\m!systems{starting feature test}\wait
    \resettimer
+   \bgroup
+   \featuretest\zerocount \notestfeature
+   \global\featuretesttime\normalelapsedtime
+   \egroup
+   \resettimer
+   \bgroup
    \featuretest\zerocount \dotestfeature
-   \writestatus\m!systems{feature test done (\elapsedseconds s)}%
+   \egroup
+   \global\featuretesttime\numexpr\normalelapsedtime-\featuretesttime\relax
+   \writestatus\m!systems{feature test done (used: \elapsedseconds s)}%
    \wait
    \egroup}
 
-\def\elapsedseconds{\expandafter\withoutpt\the\dimexpr\elapsedtime sp\relax}
+\def\elapsedseconds{\expandafter\withoutpt\the\dimexpr\featuretesttime sp\relax}
+
+\let\elapsedtime\elapsedseconds
 
 \def\showtimer#1%
   {\writestatus{runtime}{\elapsedseconds\space s / #1}}