Index: openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml,v
diff -u -r1.2.2.45 -r1.2.2.46
--- openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml	18 Mar 2021 17:43:50 -0000	1.2.2.45
+++ openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml	29 Mar 2021 09:08:27 -0000	1.2.2.46
@@ -125,7 +125,8 @@
   <msg key="inclass-exam-submit">Submit and Finish Exam</msg>
   <msg key="inclass-exam-already_answered">You have finished this exam.</msg>
 
-  <msg key="short_text_question">Short Text Question</msg>
+  <msg key="composite_question">Composite Question</msg>
+  <msg key="short_text_question">Short Text Question</msg>  
   <msg key="sc_question">Single Choice Question</msg>
   <msg key="mc_question">Multiple Choice Question</msg>
   <msg key="text_question">Text Question</msg>
@@ -151,11 +152,14 @@
   <msg key="menu-New-Item-CodeInteraction">Code Interaction</msg>
   <msg key="menu-New-Item-UploadInteraction">Upload Interaction</msg>
   <msg key="menu-New-Item-ReorderInteraction">Ordering Interaction</msg>
+  <msg key="menu-New-Item-CompositeInteraction">Composite Interaction 2</msg>
 
   <msg key="menu-New-App-OnlineExam">Online Exam</msg>
   <msg key="menu-New-App-InclassQuiz">Inclass Quiz</msg>
   <msg key="menu-New-App-InclassExam">Inclass Exam</msg>
 
+  <msg key="menu-New-Assignment-TopicAssignment">Topic Assignment</msg>  
+
   <msg key="inclass-exam-draft_exam">Draft Inclass Exam (not published)</msg>
   <msg key="inclass-exam-open">Inclass Exam open (published)</msg>
   <msg key="inclass-exam-closed">Inclass Exam closed</msg>
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 -r1.7.2.115 -r1.7.2.116
--- openacs-4/packages/xowf/tcl/test-item-procs.tcl	29 Mar 2021 09:06:52 -0000	1.7.2.115
+++ openacs-4/packages/xowf/tcl/test-item-procs.tcl	29 Mar 2021 09:08:27 -0000	1.7.2.116
@@ -2821,7 +2821,7 @@
       set questions [lmap ref $names {
         if {![string match "*/*" $ref]} {
           #
-          # In case, '$ref' rfers to a site-wide page, a prefix with
+          # In case, '$ref' refers to a site-wide page, a prefix with
           # the parent name would not help. In these cases, we expect
           # to have the parent obj not instantiated.
           #
@@ -2972,7 +2972,7 @@
       -obj:object
       {-position:integer 0}
       -form_obj:object
-      {-do_substitutions:switch 1}      
+      {-do_substitutions:switch 1}
     } {
       #
       # Substitute everything item-specific in the text, including