1 files changed, 17 insertions, 28 deletions
diff --git a/tex/context/base/m-quest.tex b/tex/context/base/m-quest.tex
index eb9787b81..f56ee90b3 100644
--- a/tex/context/base/m-quest.tex
+++ b/tex/context/base/m-quest.tex
@@ -153,19 +153,19 @@
 
 \def\dostelinvullenin[#1]%
   {\getparameters[\??iv][#1]%
-   \doif{\@@ivstatus}{\v!reset}
-     {\global\invulput=0
-      \global\invulget=0
+   \doif\@@ivstatus\v!reset
+     {\global\invulput\zerocount
+      \global\invulget\zerocount
       \let\@@ivstatus\empty}} 
 
-\def\definieerinvulwoord%
+\def\definieerinvulwoord
   {\dosingleempty\dodefinieerinvulwoord}
 
 \def\dodefinieerinvulwoord[#1]#2%
   {\iffirstargument
      \setgvalue{\r!fillin#1}{\simpleinvulwoord{#2}}%
    \else
-     \global\advance\invulput by 1
+     \global\advance\invulput \plusone
      \setgvalue{\r!fillin\the\invulput}{\simpleinvulwoord{#2}}%
    \fi
    \ifvoorlopig \ifnum\invulput>0
@@ -175,27 +175,22 @@
    \fi \fi}
 
 \def\dosimpleinvulwoord#1%
-  {\ifnum\@@ivnummer>0 \advance\invulteller by 1 \fi
+  {\ifnum\@@ivnummer>0 \advance\invulteller \plusone \fi
    \ifnum\invulteller=\@@ivnummer\relax 
      \bgroup
-     \doconvertfont
-       {\@@ivletter}
+     \doconvertfont\@@ivletter
        {\@@ivlinks
-        \doifelse{\@@ivstatus}{\v!leeg}
-          {\doifelse{\@@ivlijn}{\v!aan}
-             {\let\next\leeginvulwoord}
-             {\let\next\geeninvulwoord}}
-          {\doifelse{\@@ivlijn}{\v!aan}
-             {\let\next\underbar}
-             {\let\next\firstofoneargument}}%
-        \next{#1}%
+        \doifelse\@@ivstatus\v!leeg
+          {\doifelse\@@ivlijn\v!aan\leeginvulwoord\geeninvulwoord}
+          {\doifelse\@@ivlijn\v!aan\underbar      \firstofoneargument}%
+        {#1}%
         \@@ivrechts}%
      \egroup
    \fi}%
 
 \def\simpleinvulwoord#1%
   {\ifnum\@@ivnummer>0
-     \invulteller=0 
+     \invulteller\zerocount
      \processcommalist[#1]\dosimpleinvulwoord
    \else
      \dosimpleinvulwoord{#1}%
@@ -204,17 +199,11 @@
 \def\complexinvulwoord[#1]%
   {\bgroup
    \doifsomething{#1}
-     {\global\advance\invulget by 1
-      \doconvertfont
-        {\@@ivletter}
-        {\@@ivlinks
-         \getvalue{\r!fillin\the\invulget}%
-         \@@ivrechts}}
-     {\doconvertfont
-        {\@@ivletter}
-        {\@@ivlinks
-         \getvalue{\r!fillin#1}%
-         \@@ivrechts}}%
+     {\global\advance\invulget \plusone
+      \doconvertfont\@@ivletter
+        {\@@ivlinks\getvalue{\r!fillin\the\invulget}\@@ivrechts}}
+     {\doconvertfont\@@ivletter
+        {\@@ivlinks\getvalue{\r!fillin           #1}\@@ivrechts}}%
    \egroup}
 
 \definecomplexorsimple\invulwoord