Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.180.2.22 -r1.180.2.23
--- openacs-4/packages/xowiki/xowiki.info	30 Sep 2019 21:24:38 -0000	1.180.2.22
+++ openacs-4/packages/xowiki/xowiki.info	18 Oct 2019 08:30:41 -0000	1.180.2.23
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="5.10.0d39" url="http://openacs.org/repository/download/apm/xowiki-5.10.0d39.apm">
+    <version name="5.10.0d40" url="http://openacs.org/repository/download/apm/xowiki-5.10.0d40.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>A xotcl-based enterprise wiki system with multiple object types</summary>
         <release-date>2017-08-06</release-date>
@@ -55,7 +55,7 @@
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xowiki" version="5.10.0d39"/>
+        <provides url="xowiki" version="5.10.0d40"/>
         <requires url="xotcl-core" version="5.10.0d21"/>
 	<requires url="acs-datetime" version="5.9.1"/>
         <requires url="acs-kernel" version="5.9.1"/>
Index: openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml,v
diff -u -r1.71.2.4 -r1.71.2.5
--- openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml	22 Aug 2019 13:31:00 -0000	1.71.2.4
+++ openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml	18 Oct 2019 08:30:41 -0000	1.71.2.5
@@ -100,6 +100,10 @@
   <msg key="Form_pretty_name">Wiki Form</msg>
   <msg key="Form_pretty_plural">Wiki Forms</msg>
   <msg key="formfield-author">Author</msg>
+  <msg key="formfield-correct_when-help_text">Condition, when
+  the answer is correct, specified as a predicate followed by arguments (Tcl
+  words). The predefined predicates are "eq", "gt", "ge", "lt",
+  "le", "btwn", "in", "match", "answer_words"</msg>  
   <msg key="formfield-image_url-help_text">HTTP Url of the Image (you might drag an image displayed by a web-browser here)</msg>
   <msg key="formfield-import_archive-help_text">Select the Name of a .zip or .tar.gz File</msg>
   <msg key="formfield-import_archive-label">Import Archive</msg>
Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -r1.284.2.37 -r1.284.2.38
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	15 Oct 2019 21:12:11 -0000	1.284.2.37
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	18 Oct 2019 08:30:41 -0000	1.284.2.38
@@ -1115,7 +1115,9 @@
   }
   import_archive instproc initialize {} {
     next
-    if {[:help_text] eq ""} {:help_text "#xowiki.formfield-import_archive-help_text#"}
+    if {${:help_text} eq ""} {
+      set :help_text "#xowiki.formfield-import_archive-help_text#"
+    }
   }
   import_archive instproc pretty_value {v} {
     set package_id [${:object} package_id]
@@ -1278,6 +1280,20 @@
 
   ###########################################################
   #
+  # ::xowiki::formfield::correct_when
+  #
+  ###########################################################
+
+  Class create correct_when -superclass text
+  correct_when instproc initialize {} {
+    next
+    if {${:help_text} eq ""} {
+      set :help_text "#xowiki.formfield-correct_when-help_text#"
+    }    
+  }
+  
+  ###########################################################
+  #
   # ::xowiki::formfield::color
   #
   ###########################################################
@@ -3204,7 +3220,9 @@
 
   youtube_url instproc initialize {} {
     next
-    if {[:help_text] eq ""} {:help_text "#xowiki.formfield-youtube_url-help_text#"}
+    if {${:help_text} eq ""} {
+      set :help_text "#xowiki.formfield-youtube_url-help_text#"
+    }
   }
   youtube_url instproc pretty_value {v} {
     if {$v eq ""} {
@@ -3237,7 +3255,9 @@
       }
   image_url instproc initialize {} {
     next
-    if {[:help_text] eq ""} {:help_text "#xowiki.formfield-image_url-help_text#"}
+    if {${:help_text} eq ""} {
+      set :help_text "#xowiki.formfield-image_url-help_text#"
+    }
   }
   image_url instproc entry_name {value} {
     set value [string map [list %2e .] $value]