Index: openacs-4/packages/xowf/xowf.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/xowf.info,v
diff -u -N -r1.12.2.49 -r1.12.2.50
--- openacs-4/packages/xowf/xowf.info	16 Sep 2021 18:16:44 -0000	1.12.2.49
+++ openacs-4/packages/xowf/xowf.info	17 Sep 2021 19:39:29 -0000	1.12.2.50
@@ -10,16 +10,16 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowf</auto-mount>
 
-    <version name="5.10.1d1" url="http://openacs.org/repository/download/apm/xowf-5.10.1d1.apm">
+    <version name="5.10.1d2" url="http://openacs.org/repository/download/apm/xowf-5.10.1d2.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>XoWiki Content Flow - an XoWiki based workflow system implementing state-based behavior of wiki pages and forms</summary>
         <release-date>2021-09-15</release-date>
         <vendor url="http://wu.ac.at">WU Vienna</vendor>
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xowf" version="5.10.1d1"/>
-        <requires url="xowiki" version="5.10.0"/>
+        <provides url="xowf" version="5.10.1d2"/>
+        <requires url="xowiki" version="5.10.1d2"/>
         <requires url="xotcl-core" version="5.10.0"/>
         <requires url="acs-tcl" version="5.10.0"/>
         <requires url="acs-automated-testing" version="5.10.0"/>
Index: openacs-4/packages/xowf/tcl/test-item-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/tcl/test-item-procs.tcl,v
diff -u -N -r1.7.2.161 -r1.7.2.162
--- openacs-4/packages/xowf/tcl/test-item-procs.tcl	16 Sep 2021 18:35:52 -0000	1.7.2.161
+++ openacs-4/packages/xowf/tcl/test-item-procs.tcl	17 Sep 2021 19:39:30 -0000	1.7.2.162
@@ -198,6 +198,10 @@
   #
   test_item set richtextWidget {richtext,editor=ckeditor4,ck_package=basic,displayMode=inline,extraPlugins=}
 
+  test_item instproc makeSpec {-name:required dict} {
+    return [list [list $name [:dict_to_fc $dict]]]
+  }
+
   test_item instproc feed_back_definition {} {
     #
     # Return the definition of the feed_back widgets depending on the
@@ -289,7 +293,8 @@
         set can_shuffle false
         set typeSpecificComponentSpec {{max_nr_submission_files {number,form_item_wrapper_CSSclass=form-inline,min=1,default=1,label=Maximale Anzahl von Abgaben}}}
       }
-      section {
+      section -
+      case {
         set interaction_class test_section
         set options ""
         set auto_correct false
@@ -335,7 +340,15 @@
       set shuffleSpec ""
     }
 
-    if {${:question_type} eq "section"} {
+    #
+    # Default towcol spec
+    #
+    dict set twocolDict label #xowf.Twocol_layout#
+    dict set twocolDict default f
+    dict set twocolDict form_item_wrapper_CSSclass form-inline
+    dict set twocolDict _type boolean_checkbox
+
+    if {${:question_type} in {section case}} {
       #
       # Don't show "minutes" and "points" in the full composite test
       # item form but still define it, such we can compute and update
@@ -345,10 +358,22 @@
       set pointsSpec {
         {minutes hidden}
         {points hidden}
+      }
+      set typeSpecificComponentSpec {
         {show_minutes boolean_checkbox,form_item_wrapper_CSSclass=form-inline,default=t,label=#xowf.Composite_Show_minutes#}
         {show_points boolean_checkbox,form_item_wrapper_CSSclass=form-inline,default=f,label=#xowf.Composite_Show_points#}
         {show_title boolean_checkbox,form_item_wrapper_CSSclass=form-inline,default=f,label=#xowf.Composite_Show_title#}
       }
+      #
+      # Things different between "section" and "case".
+      #
+      switch ${:question_type} {
+        "section" {}
+        "case" {
+          dict set twocolDict default t
+        }
+        default {error "this can't happen"}
+      }
     } else {
       set pointsSpec {
         {minutes number,form_item_wrapper_CSSclass=form-inline,min=1,default=2,label=#xowf.Minutes#}
@@ -360,8 +385,8 @@
       $pointsSpec
       $shuffleSpec
       $gradingSpec
-      {twocol boolean_checkbox,horizontal=true,label=#xowf.Twocol_layout#,default=f,form_item_wrapper_CSSclass=form-inline}
       $typeSpecificComponentSpec
+      [:makeSpec -name twocol $twocolDict]
       {interaction {$interaction_class,$options,feedback_level=${:feedback_level},auto_correct=${:auto_correct},label=}}
       [:feed_back_definition]
     }]