1 files changed, 59 insertions, 55 deletions
diff --git a/context/data/cont-en.tws b/context/data/cont-en.tws
index 05b6edd35..4b0c5a23f 100644
--- a/context/data/cont-en.tws
+++ b/context/data/cont-en.tws
@@ -532,7 +532,7 @@ var:sc:yes,no::
 stopsetup
 
 startsetup
-com:kap:
+com:cap:
 typ:arg/:
 val:*text::
 stopsetup
@@ -1072,6 +1072,20 @@ val:*text::
 stopsetup
 
 startsetup
+com:ininner:
+typ:val/ref/arg/:
+val:+,-,low::
+val:*text::
+stopsetup
+
+startsetup
+com:inouter:
+typ:val/ref/arg/:
+val:+,-,low::
+val:*text::
+stopsetup
+
+startsetup
 com:column:
 typ::
 stopsetup
@@ -1314,12 +1328,6 @@ typ::
 stopsetup
 
 startsetup
-com:redo:
-typ:val/:
-val:repeat/*text::
-stopsetup
-
-startsetup
 com:setupdescriptions:
 typ:vals/vars/:
 val:*name::
@@ -1332,7 +1340,8 @@ var:sample:*text::
 var:text:*text::
 var:align:left,middle,right::
 var:margin:standard,yes,no,*dimension::
-var:location:left,right,top,serried, inmargin,inleft,inright,hanging::
+var:location:left,right,top,serried,command, inmargin,inleft,inright,hanging::
+var:headcommand:::
 var:hang:fit,broad,*number::
 var:before:*command::
 var:inbetween:*command::
@@ -1874,6 +1883,9 @@ startsetup
 com:setupoppositeplacing:
 typ:var/:
 var:state:start,stop::
+var:before:*command::
+var:inbetween:*command::
+var:after:*command::
 stopsetup
 
 startsetup
@@ -2022,6 +2034,13 @@ ivr:setuplist::
 stopsetup
 
 startsetup
+com:placecombinedlist:
+typ:val/vars/:
+val:*name::
+ivr:setupcombinedlist::
+stopsetup
+
+startsetup
 com:definelist:
 typ:val/val/vars/:
 val:*name::
@@ -2569,6 +2588,13 @@ val:*name::
 stopsetup
 
 startsetup
+com:placeregister:
+typ:val/vars/:
+val:*name::
+ivr:setupregister::
+stopsetup
+
+startsetup
 com:see<<register>>:
 typ:val/arg/idxs/:
 val:*text::
@@ -2947,6 +2973,20 @@ val:*name::
 stopsetup
 
 startsetup
+com:bypassblocks:
+typ:vals/vals/:
+val:*name::
+val:*name::
+stopsetup
+
+startsetup
+com:forceblocks:
+typ:vals/vals/:
+val:*name::
+val:*name::
+stopsetup
+
+startsetup
 com:selectblocks:
 typ:vals/vals/var/:
 val:*name::
@@ -2994,7 +3034,7 @@ stopsetup
 startsetup
 com:place<<float>>:
 typ:val/refs/arg/arg/:
-val:left,right,here,top,bottom, inleft,inright,inmargin,margin, leftmargin,rightmargin,leftedge,rightedge, innermargin,outermargin,inneredge,outeredge, inner,outer,regel,high,low,fit, page,opposite,always,force,tall,reset, line,height,depth:here:
+val:left,right,here,top,bottom, inleft,inright,inmargin,margin, leftmargin,rightmargin,leftedge,rightedge, innermargin,outermargin,inneredge,outeredge, inner,outer,line,high,low,fit, page,opposite,always,force,tall,reset, line,height,depth:here:
 val:*text::
 val:*text::
 stopsetup
@@ -3058,8 +3098,8 @@ typ:vars/:
 var:bet:*text::
 var:ken:*text::
 var:dat:*text::
-var:from:*text::
-var:to:*text::
+var:van:*text::
+var:aan:*text::
 var:ref:*text::
 stopsetup
 
@@ -3221,48 +3261,12 @@ val:*name::
 stopsetup
 
 startsetup
-com:letters:
-typ:val/:
-val:*name::
-stopsetup
-
-startsetup
 com:labels:
 typ:val/:
 val:*name::
 stopsetup
 
 startsetup
-com:setupcorrespondence:
-typ:vals/:
-val:formeel,informeel,rekening,ls, high,middle,low:formeel,low:
-stopsetup
-
-startsetup
-com:setupsheets:
-typ:vars/:
-var:alternative:*number::
-var:text:*text::
-var:size:small,medium,big::
-var:style:normal,bold,slanted,boldslanted,type,cap,small...,*command::
-var:number:*number,joinedup::
-stopsetup
-
-startsetup
-com:sheet:
-typ:val/:
-val:*text::
-stopsetup
-
-startsetup
-com:setupstickers:
-typ:vars/:
-var:alternative:a::
-var:n:*number,all::
-var:location:margin,left,right,middle::
-stopsetup
-
-startsetup
 com:definetabulate:
 typ:val/val/val/:
 val:*name::
@@ -3461,13 +3465,13 @@ stopsetup
 startsetup
 com:setupcombinations:
 typ:vars/:
-var:before:commando::
-var:inbetween:commando::
-var:after:commando::
+var:before:command::
+var:inbetween:command::
+var:after:command::
 var:distance:*dimension::
 var:height:*dimension,fit::
 var:width:*dimension,fit::
-var:location:boven,midden,onder,links,rechts::
+var:location:top,middle,bottom,left,right::
 var:align:no,left,right,middle,normal::
 var:style:normal,bold,slanted,boldslanted,type,cap,small...*command::
 var:color:*name::
@@ -3560,7 +3564,7 @@ var:keyword:*text::
 stopsetup
 
 startsetup
-com:setupinteractionmenu:
+com:defineinteractionmenu:
 typ:vals/vars/:
 val:left,right,top,bottom,*name::
 var:before:*command::
@@ -3654,8 +3658,8 @@ typ:vars/:
 var:state:start,stop::
 var:alternative:a,b,c,d,e,f,g::
 var:symbol:yes,no::
-var:width:*dimension,hoogte,fit::
-var:height:*dimension,hoogte,fit::
+var:width:*dimension,height,fit::
+var:height:*dimension,height,fit::
 var:depth:*dimension::
 var:color:*name::
 var:step:*number,small,medium,big::
@@ -3676,7 +3680,7 @@ startsetup
 com:setupsynchronizationbar:
 typ:vars/:
 var:alternative:page,local::
-var:width:*dimension,hoogte,fit::
+var:width:*dimension,height,fit::
 var:height:*dimension::
 var:style:normal,bold,slanted,boldslanted,type,cap,small...,*command::
 var:color:*name::