summaryrefslogtreecommitdiff
path: root/tex/context/base/core-fld.tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex/context/base/core-fld.tex')
-rw-r--r--tex/context/base/core-fld.tex174
1 files changed, 86 insertions, 88 deletions
diff --git a/tex/context/base/core-fld.tex b/tex/context/base/core-fld.tex
index 765e79788..3e2dc0795 100644
--- a/tex/context/base/core-fld.tex
+++ b/tex/context/base/core-fld.tex
@@ -1,5 +1,5 @@
%D \module
-%D [ file=core-fld,
+%D [ filefile=core-fld,
%D version=1997.05.18,
%D title=\CONTEXT\ Core Macros,
%D subtitle=Fill||in fields,
@@ -58,23 +58,23 @@
\def\preparefieldvariables % evt \def's at the outer level (test) or \edef's here for fast testing
{\let\@@DriverFieldNumber \@@fdn
- \let\@@DriverFieldStyle \@@fdletter
- \let\@@DriverFieldColor \@@fdkleur
- \let\@@DriverFieldBackgroundColor\@@fdveldachtergrondkleur
- \let\@@DriverFieldFrameColor \@@fdveldkaderkleur
- \let\@@DriverFieldLayer \@@fdveldlaag
- \let\@@DriverFieldOption \@@fdoptie
- \let\@@DriverFieldAlign \@@fduitlijnen
- \let\@@DriverFieldClickIn \@@fdklikin
- \let\@@DriverFieldClickOut \@@fdklikuit
- \let\@@DriverFieldRegionIn \@@fdgebiedin
- \let\@@DriverFieldRegionOut \@@fdgebieduit
- \let\@@DriverFieldAfterKey \@@fdnatoets
- \let\@@DriverFieldFormat \@@fdformatteer
- \let\@@DriverFieldValidate \@@fdvalideer
- \let\@@DriverFieldCalculate \@@fdbereken
+ \let\@@DriverFieldStyle \@@fdstyle
+ \let\@@DriverFieldColor \@@fdcolor
+ \let\@@DriverFieldBackgroundColor\@@fdfieldbackgroundcolor
+ \let\@@DriverFieldFrameColor \@@fdfieldframecolor
+ \let\@@DriverFieldLayer \@@fdfieldlayer
+ \let\@@DriverFieldOption \@@fdoption
+ \let\@@DriverFieldAlign \@@fdalign
+ \let\@@DriverFieldClickIn \@@fdclickin
+ \let\@@DriverFieldClickOut \@@fdclickout
+ \let\@@DriverFieldRegionIn \@@fdregionin
+ \let\@@DriverFieldRegionOut \@@fdregionout
+ \let\@@DriverFieldAfterKey \@@fdafterkey
+ \let\@@DriverFieldFormat \@@fdformat
+ \let\@@DriverFieldValidate \@@fdvalidate
+ \let\@@DriverFieldCalculate \@@fdcalculate
\let\@@DriverFieldFocusIn \@@fdfocusin
- \let\@@DriverFieldFocusOut \@@fdfocusuit}
+ \let\@@DriverFieldFocusOut \@@fdfocusout}
% todo : remove arguments, consider DriverField a namespace
@@ -304,7 +304,7 @@
\def\logfields
{\dosingleempty\doLogFields}
-%D \starttypen
+%D \starttyping
%D \definefield [name] [type] [group] [values] [default]
%D
%D \definefield [WWWW] [text] [textsetup] [default text]
@@ -327,7 +327,7 @@
%D
%D \field[XXXX]
%D \fitfield[XXXX]
-%D \stoptypen
+%D \stoptyping
\newif\ifdefinemainfield \definemainfieldfalse
@@ -337,7 +337,7 @@
%D The first alternative used a two pass data list and was
%D implemented as follows:
%D
-%D \starttypen
+%D \starttyping
%D \def\getmainfieldkids#1%
%D {\let\@@DriverFieldKids\empty
%D \ifdefinemainfield
@@ -351,24 +351,24 @@
%D \exitloop
%D \fi}%
%D \fi}
-%D \stoptypen
+%D \stoptyping
%D
%D However, the next alternative is much faster when we have
%D a field with thousands of clones, something not that
%D imaginary.
%D
-%D \starttypen
+%D \starttyping
%D \def\getmainfieldkids#1%
%D {\let\@@DriverFieldKids\empty
%D \ifdefinemainfield
%D \definerawpasslist{fld:#1}% runtime defined by system
%D \moverawpasslist{fld:#1}\@@DriverFieldKids
%D \fi}
-%D \stoptypen
+%D \stoptyping
%D
%D The data is written by file using:
%D
-%D \starttypen
+%D \starttyping
%D \newcounter\nofmainfieldkids
%D
%D \def\setmainfieldkid#1#2%
@@ -378,7 +378,7 @@
%D {fld:#1}%
%D {\nofmainfieldkids}%
%D {#2}}}
-%D \stoptypen
+%D \stoptyping
%D
%D The trade of of this mechanism is that for each cloned or
%D copied field, the uitlity file is to be read in order to
@@ -670,7 +670,7 @@
\else\ifcase\@@DriverFieldFree\relax
\doifdefinedelse{\strippedcsname\setupfield\@@DriverFieldGroup}
{\let\dosetupfield=#1\getvalue{\strippedcsname\setupfield\@@DriverFieldGroup}}
- {#1[\@@DriverFieldName][\v!label,\v!kader,\v!horizontaal][][][]}%
+ {#1[\@@DriverFieldName][\v!label,\v!frame,\v!horizontal][][][]}%
\iftrialtypesetting\else
\def\@@DriverFieldFree{1}%
\changefield{#2}%
@@ -801,78 +801,78 @@
[ \v!reset=>\ShowFieldLabelfalse\ShowFieldFramefalse
\HorizontalFieldfalse\VerticalFieldfalse,
\v!label=>\ShowFieldLabeltrue,
- \v!kader=>\ShowFieldFrametrue,
- \v!horizontaal=>\HorizontalFieldtrue,
- \v!vertikaal=>\VerticalFieldtrue]%
+ \v!frame=>\ShowFieldFrametrue,
+ \v!horizontal=>\HorizontalFieldtrue,
+ \v!vertical=>\VerticalFieldtrue]%
\ifVerticalField
\getparameters[\??fd]
- [\c!afstand=\!!zeropoint,\c!tussen=\vskip\@@localoffset,
- \c!uitlijnen=\v!rechts,\c!breedte=20em]%
+ [\c!distance=\!!zeropoint,\c!inbetween=\vskip\@@localoffset,
+ \c!align=\v!right,\c!width=20em]%
\else\ifHorizontalField
\getparameters[\??fd]
- [\c!afstand=\@@localoffset,\c!tussen=,\c!uitlijnen=\c!links,
- \c!hoogte=10ex]%
+ [\c!distance=\@@localoffset,\c!inbetween=,\c!align=\c!left,
+ \c!height=10ex]%
\else
\getparameters[\??fd]
- [\c!afstand=\!!zeropoint,\c!tussen=,\c!uitlijnen=\c!links]%
+ [\c!distance=\!!zeropoint,\c!inbetween=,\c!align=\c!left]%
\fi\fi
\getparameters[\??fd]
- [\c!n=,\c!voor=,\c!na=\vss,\c!letter=,\c!kleur=,#3]%
+ [\c!n=,\c!before=,\c!after=\vss,\c!style=,\c!color=,#3]%
\reshapeframeboxfalse % else ugly spacing
\ifShowFieldFrame
- \localframed[\??fd][\c!strut=\v!nee,\c!uitlijnen=]\bgroup
+ \localframed[\??fd][\c!strut=\v!no,\c!align=]\bgroup
\else
\vbox\bgroup
\fi
- \mindermeldingen
+ \dontcomplain
\ifShowFieldLabel
\setbox0=\hbox
{\reshapeframeboxtrue % else wrong dimensions
\framed
- [\c!letter=,\c!kleur=,\c!uitlijnen=\c!rechts,#4]
+ [\c!style=,\c!color=,\c!align=\c!right,#4]
{\@@DriverFieldLabel}}%
\fi
\setbox2=\hbox
{\reshapeframeboxtrue % else wrong dimensions
\ifVerticalField
- \setupframed[\c!hoogte=6ex,\c!breedte=\hsize]%
+ \setupframed[\c!height=6ex,\c!width=\hsize]%
\else\ifHorizontalField
- \setupframed[\c!hoogte=\vsize,\c!breedte=20em]%
+ \setupframed[\c!height=\vsize,\c!width=20em]%
\else
- \setupframed[\c!hoogte=2cm,\c!breedte=2cm]%
+ \setupframed[\c!height=2cm,\c!width=2cm]%
\fi\fi
\framed
- [\c!uitlijnen=\v!rechts,\c!strut=\v!nee,#5]
+ [\c!align=\v!right,\c!strut=\v!no,#5]
{\getparameters
[\??fd]
- [\c!kleur=,\c!letter=,\c!uitlijnen=\v!rechts,\c!optie=,
- \c!klikin=,\c!klikuit=,\c!gebiedin=,\c!gebieduit=,
- \c!natoets=,\c!formatteer=,\c!valideer=,\c!bereken=,
- \c!focusin=,\c!focusuit=,
- \c!veldoffset=\!!zeropoint,\c!veldachtergrondkleur=,
- \c!veldkaderkleur=,\c!veldlaag=,#5]%
+ [\c!color=,\c!style=,\c!align=\v!right,\c!option=,
+ \c!clickin=,\c!clickout=,\c!regionin=,\c!regionout=,
+ \c!afterkey=,\c!format=,\c!validate=,\c!calculate=,
+ \c!focusin=,\c!focusout=,
+ \c!fieldoffset=\!!zeropoint,\c!fieldbackgroundcolor=,
+ \c!fieldframecolor=,\c!fieldlayer=,#5]%
\scratchdimen\framedwidth \edef\@@DriverFieldWidth {\the\scratchdimen}%
\scratchdimen\framedheight\edef\@@DriverFieldHeight{\the\scratchdimen}%
\vfill
- \hbox{\lower\@@fdveldoffset\hbox{\typesetfield}}
+ \hbox{\lower\@@fdfieldoffset\hbox{\typesetfield}}
\vss}}%
\ifShowFieldLabel
\ifVerticalField
\vbox
{\copy0
- \@@fdtussen
+ \@@fdinbetween
\copy2}%
\else
\hbox
{\vbox \ifdim\ht2>\ht0 to \ht2 \fi
- {\@@fdvoor
+ {\@@fdbefore
\copy0
- \@@fdna}%
- \hskip\@@fdafstand
+ \@@fdafter}%
+ \hskip\@@fddistance
\vbox \ifdim\ht0>\ht2 to \ht0 \fi
- {\@@fdvoor
+ {\@@fdbefore
\box2
- \@@fdna}}%
+ \@@fdafter}}%
\fi
\else
\box2
@@ -884,12 +884,12 @@
\localframed
[\??fd]
[\c!n=1024, % beware: weblink plug in truncates
- \c!strut=\v!nee,\c!kleur=,\c!letter=,\c!optie=,
- \c!klikin=,\c!klikuit=,\c!gebiedin=,\c!gebieduit=,
- \c!focusin=,\c!focusuit=,
- \c!natoets=,\c!formatteer=,\c!valideer=,\c!bereken=,
- \c!veldoffset=\!!zeropoint,\c!veldachtergrondkleur=,
- \c!veldkaderkleur=,\c!veldlaag=,#5,\c!uitlijnen=]
+ \c!strut=\v!no,\c!color=,\c!style=,\c!option=,
+ \c!clickin=,\c!clickout=,\c!regionin=,\c!regionout=,
+ \c!focusin=,\c!focusout=,
+ \c!afterkey=,\c!format=,\c!validate=,\c!calculate=,
+ \c!fieldoffset=\!!zeropoint,\c!fieldbackgroundcolor=,
+ \c!fieldframecolor=,\c!fieldlayer=,#5,\c!align=]
{\dogetcommacommandelement1\from\@@DriverFieldValues\to\@@DriverFieldValue
\ifx\@@DriverFieldValue\empty
\let\@@DriverFieldValue\@@DriverFieldDefault
@@ -933,13 +933,13 @@
\setupfield
[systemfield]
[\c!n=1024, % beware: weblink plugin truncates
- \c!plaats=\v!laag,\c!strut=\v!ja,\c!veldoffset=0pt,
- \c!hoogte=1.2\openlineheight,\c!breedte=\dimen0,\c!offset=\v!overlay,
- \c!letter=,\c!uitlijnen=\v!midden,\c!kader=\v!uit,
- \c!kleur=red,\c!veldachtergrondkleur=\s!white,\c!veldkaderkleur=blue,
- \c!valideer=JS(Check_Answer{\currentsystemfield,\therightanswer})]%
+ \c!location=\v!low,\c!strut=\v!yes,\c!fieldoffset=0pt,
+ \c!height=1.2\openlineheight,\c!width=\dimen0,\c!offset=\v!overlay,
+ \c!style=,\c!align=\v!middle,\c!frame=\v!off,
+ \c!color=red,\c!fieldbackgroundcolor=\s!white,\c!fieldframecolor=blue,
+ \c!validate=JS(Check_Answer{\currentsystemfield,\therightanswer})]%
\switchtobodyfont
- [\c!klein]%
+ [\c!small]%
\hbox to \wd0
{\copy0\hskip-\wd0\hss\field[\currentsystemfield]\hss}}}
@@ -953,42 +953,42 @@
\setupfields[\v!reset]%
\useJSscripts[fld]%
\setbox0\hbox
- {\mindermeldingen
+ {\dontcomplain
\nextsystemfield
\setbox0=\hbox{#2}%
\definesymbol
[\currentsystemfield:txt]
- [{\inframed[\c!kader=\v!uit,\c!achtergrond=\v!raster]{#3}}]%
+ [{\inframed[\c!frame=\v!off,\c!background=\v!screen]{#3}}]%
\setbox2\hbox{\symbol[\currentsystemfield:txt]}%
\definefield
[\currentsystemfield:txt][check]
[dummy][\currentsystemfield:txt][\currentsystemfield:txt]%
\setupfield
[dummy]
- [\c!kader=\v!uit,
- \c!gebieduit=JS(Hide_Field{\currentsystemfield:txt}),
- \c!optie=\v!verborgen]%
+ [\c!frame=\v!off,
+ \c!regionout=JS(Hide_Field{\currentsystemfield:txt}),
+ \c!option=\v!hidden]%
\hbox to \zeropoint
{\dimen0\wd2\advance\dimen0 -\wd0
- \doifelse{#1}\v!links
+ \doifelse{#1}\v!left
{\hskip-\dimen0}
- {\doif{#1}\v!midden
+ {\doif{#1}\v!middle
{\hskip-.5\dimen0}}%
\lower\openlineheight\hbox to \zeropoint
{\fitfield[\currentsystemfield:txt]}}%
\dimen0=\ifdim\wd0=\zeropoint 3em\else\wd0\fi
\definesymbol
[\currentsystemfield:but]
- [{\framed[\c!hoogte=2ex,\c!breedte=\dimen0,\c!kader=\v!uit]{}}]%
+ [{\framed[\c!height=2ex,\c!width=\dimen0,\c!frame=\v!off]{}}]%
\definefield
[\currentsystemfield:but][push]
[dummy][\currentsystemfield:but][\currentsystemfield:but]%
\setupfield
[dummy]
- [\c!kader=\v!uit,
- \c!optie=,
- \c!gebiedin=JS(Vide_Field{\currentsystemfield:txt}),
- \c!gebieduit=JS(Hide_Field{\currentsystemfield:txt})]%
+ [\c!frame=\v!off,
+ \c!option=,
+ \c!regionin=JS(Vide_Field{\currentsystemfield:txt}),
+ \c!regionout=JS(Hide_Field{\currentsystemfield:txt})]%
\lower2ex\hbox to \zeropoint
{\fitfield[\currentsystemfield:but]}%
#2}%
@@ -1008,19 +1008,19 @@
{\bgroup
\getparameters[\??fd][\c!start=1,#3]%
\setupfields[\v!reset]%
- \definesymbol[\v!leeg][]%
+ \definesymbol[\v!empty][]%
\useJSscripts[fld][FieldStack]%
\newcounter\stackedfieldnumber
\def\dododofieldstack##1%
{\increment\stackedfieldnumber
\ifnum\stackedfieldnumber=\@@fdstart\relax
- \definefield[#1:\stackedfieldnumber][check][#1][##1,\v!leeg][##1]%
+ \definefield[#1:\stackedfieldnumber][check][#1][##1,\v!empty][##1]%
\else
- \definefield[#1:\stackedfieldnumber][check][#1][##1,\v!leeg][\v!leeg]%
+ \definefield[#1:\stackedfieldnumber][check][#1][##1,\v!empty][\v!empty]%
\fi}%
\processcommalist[#2]\dododofieldstack
\setupfield[#1][\v!reset]% added
- \setupfield[#1][\c!optie=\v!alleenleesbaar,#3]% #3 swapped
+ \setupfield[#1][\c!option=\v!readonly,#3]% #3 swapped
\newcounter\stackedfieldnumber
\def\dododofieldstack##1%
{\doglobal\increment\stackedfieldnumber
@@ -1049,13 +1049,11 @@
{\dodoubleargument\getparameters[\??fr]}
\def\checksubmitform#1%
- {\setsubmitoutputformat\@@frmethode}
+ {\setsubmitoutputformat\@@frmethod}
\setexecutecommandcheck {submitform} \checksubmitform
\setupforms
- [\c!methode=HTML]
+ [\c!method=HTML]
-\protect
-
-\endinput
+\protect \endinput