diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base/m-educat.tex')
| -rw-r--r-- | Master/texmf-dist/tex/context/base/m-educat.tex | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/Master/texmf-dist/tex/context/base/m-educat.tex b/Master/texmf-dist/tex/context/base/m-educat.tex index ddfb72ff4ed..93b1a6c5db3 100644 --- a/Master/texmf-dist/tex/context/base/m-educat.tex +++ b/Master/texmf-dist/tex/context/base/m-educat.tex @@ -5,18 +5,18 @@ %D subtitle=Educational Extras, %D author=Hans Hagen, %D date=\currentdate, -%D copyright={PRAGMA / Hans Hagen \& Ton Otten}] +%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] %C %C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. %D This module will collect a few macros cq.\ definitions %D meant for educational use. Most of the code has been laying %D around for some time and has been (or is still) used in -%D \PRAGMA\ projects. +%D \PRAGMA\ projects. -\unprotect +\unprotect \definesystemvariable{iv} @@ -28,10 +28,10 @@ [\c!location=\v!text, \c!n=0, \c!frame=\v!off, - \c!framecolor=answerlinecolor, + \c!framecolor=answerlinecolor, \c!rulethickness=2pt, \c!background=\v!color, - \c!backgroundcolor=answerareacolor, + \c!backgroundcolor=answerareacolor, \c!alternative=2] % betweenline % n=gedwongen @@ -48,23 +48,23 @@ \dontcomplain \setupanswerarea [\c!n=0,\c!m=,#1,\c!location=\v!text]% - \doifelsenothing{\backgroundvariable\c!m} + \doifelsenothing{\textbackgroundparameter\c!m} {\expandafter\donoanswerspace} {\expandafter\dodoanswerspace}% [#1]} \def\donoanswerspace[#1]#2% {\setupthinrules - [\c!alternative=\backgroundvariable\c!alternative, - \c!color=\backgroundvariable\c!framecolor, - \c!background=\backgroundvariable\c!background, - \c!backgroundcolor=\backgroundvariable\c!backgroundcolor, - \c!rulethickness=\backgroundvariable\c!rulethickness]% - \doifelse{\backgroundvariable\c!n}{*} + [\c!alternative=\textbackgroundparameter\c!alternative, + \c!color=\textbackgroundparameter\c!framecolor, + \c!background=\textbackgroundparameter\c!background, + \c!backgroundcolor=\textbackgroundparameter\c!backgroundcolor, + \c!rulethickness=\textbackgroundparameter\c!rulethickness]% + \doifelse{\textbackgroundparameter\c!n}{*} {\thinrule \par} - {\scratchcounter0\backgroundvariable\c!n\relax - % tricky, guess + {\scratchcounter0\textbackgroundparameter\c!n\relax + % tricky, guess \def\processisolatedword##1% {\setbox\scratchbox=\hbox{##1}% \vbox{\hsize\wd\scratchbox\thinrule @@ -74,7 +74,7 @@ \vbox{\hsize\wd\scratchbox\thinrule}% \fi}}% \processisolatedwords{#2}\processisolatedword - % so far + % so far \ifcase\scratchcounter \else \ifnum\scratchcounter<3 \nobreak \vbox{\hsize\scratchcounter em\thinrule}% \else % more @@ -87,11 +87,11 @@ \def\dodoanswerspace[#1]#2% m case {\getvalue{\e!start\v!answerarea}% #2% - \doifelse{\backgroundvariable\c!m}{*} + \doifelse{\textbackgroundparameter\c!m}{*} {\hfill\strut \getvalue{\e!stop\v!answerarea}% \par} - {\scratchcounter0\backgroundvariable\c!m\relax + {\scratchcounter0\textbackgroundparameter\c!m\relax \ifcase\scratchcounter \else \ifnum\scratchcounter<3 \nobreak \hbox to \scratchcounter em{\strut\hss}% \else % more @@ -110,43 +110,43 @@ \dontcomplain \setupanswerarea [\c!n=0,\c!m=,#1,\c!location=\v!text]% - \doifnot{\backgroundvariable\c!option}\v!joinedup\softbreak - \doifelsenothing{\backgroundvariable\c!m} + \doifnot{\textbackgroundparameter\c!option}\v!joinedup\softbreak + \doifelsenothing{\textbackgroundparameter\c!m} {\expandafter\donostartanswerlines} {\expandafter\dodostartanswerlines}% [#1]} \def\donostartanswerlines[#1]% {\setupthinrules - [\c!alternative=\backgroundvariable\c!alternative, - \c!color=\backgroundvariable\c!framecolor, - \c!background=\backgroundvariable\c!background, - \c!backgroundcolor=\backgroundvariable\c!backgroundcolor, - \c!rulethickness=\backgroundvariable\c!rulethickness]% - \thinrules[\c!n=\backgroundvariable\c!n]\par + [\c!alternative=\textbackgroundparameter\c!alternative, + \c!color=\textbackgroundparameter\c!framecolor, + \c!background=\textbackgroundparameter\c!background, + \c!backgroundcolor=\textbackgroundparameter\c!backgroundcolor, + \c!rulethickness=\textbackgroundparameter\c!rulethickness]% + \thinrules[\c!n=\textbackgroundparameter\c!n]\par \endgroup \grabuntil{\e!stop\e!answerlines}} \def\dodostartanswerlines[#1]% - {\begingroup + {\begingroup \getvalue{\e!start\v!answerarea}% \ignorespaces} -\setvalue{\e!stop\e!answerlines}% - {\scratchcounter0\backgroundvariable\c!m\relax - % a \softbreak is more efficient in pos dan \par +\setvalue{\e!stop\e!answerlines}% + {\scratchcounter0\textbackgroundparameter\c!m\relax + % a \softbreak is more efficient in pos dan \par \ifcase\scratchcounter % nothing \or - \softbreak + \softbreak \else - \softbreak + \softbreak \advance \scratchcounter \minusone \dorecurse\scratchcounter{\strut\hfill\strut\softbreak}% \fi \strut\hfill\strut \getvalue{\e!stop\v!answerarea}% - \par\endgroup\endgroup} + \par\endgroup\endgroup} \setvalue\e!answerlines {\dosingleempty\doanswerlines} @@ -174,19 +174,19 @@ test test test \answerspace [n=10] {Whow}. test test test test tets test test \answerspace [n=10] {Whow}. test test test test tets test test \answerspace [n=10] {Whow}. test test test test tets test test \answerspace [n=10] {Whow}. -test test test test test test \answerspace [n=*] {Whow.} +test test test test test test \answerspace [n=*] {Whow.} test test test test test test test \startanswerlines -[n=3] What A Junk Answer \stopanswerlines +[n=3] What A Junk Answer \stopanswerlines test test test test test test test \startanswerlines -[n=3,alternative=0] What A Junk Answer \stopanswerlines +[n=3,alternative=0] What A Junk Answer \stopanswerlines test test test test test test test \startanswerlines -[n=3,alternative=1] What A Junk Answer \stopanswerlines +[n=3,alternative=1] What A Junk Answer \stopanswerlines test test test test test test test \startanswerlines -[n=3,alternative=2] What A Junk Answer \stopanswerlines +[n=3,alternative=2] What A Junk Answer \stopanswerlines \startitemize[paragraph] \item \startanswerlines [option=seried,n=2] xxx \stopanswerlines @@ -196,20 +196,20 @@ test test test \answerspace [m=10] {Whow}. test test test test tets test test \answerspace [m=10] {Whow}. test test test test tets test test \answerspace [m=10] {Whow}. test test test test tets test test \answerspace [m=10] {Whow}. -test test test test test test \answerspace [m=*] {Whow.} +test test test test test test \answerspace [m=*] {Whow.} test test test test test test test \startanswerlines -[m=2] What A Junk Answer \stopanswerlines +[m=2] What A Junk Answer \stopanswerlines test test test test test test test \startanswerlines -[m=2,alternative=0] What A Junk Answer \stopanswerlines - +[m=2,alternative=0] What A Junk Answer \stopanswerlines + test test test test test test test \startanswerlines -[m=2,alternative=1] What A Junk Answer \stopanswerlines +[m=2,alternative=1] What A Junk Answer \stopanswerlines test test test test test test test \startanswerlines -[m=2,alternative=2] What A Junk Answer \stopanswerlines - +[m=2,alternative=2] What A Junk Answer \stopanswerlines + \startitemize[paragraph] \item \startanswerlines [option=seried,m=2] xxx \stopanswerlines \stopitemize |