--- modules/damieng/clean_xml/loncapa.xsd	2015/05/06 20:20:25	1.10
+++ modules/damieng/clean_xml/loncapa.xsd	2015/05/19 13:55:42	1.14
@@ -718,7 +718,7 @@
     <xs:attribute name="texoptions">
       <xs:annotation>
         <xs:documentation>
-          Print options
+          Set to "nochoice" to avoid the display of the list of option values when printing.
         </xs:documentation>
       </xs:annotation>
       <xs:simpleType>
@@ -754,6 +754,36 @@
         </xs:union>
       </xs:simpleType>
     </xs:attribute>
+    <xs:attribute name="noprompt">
+      <xs:annotation>
+        <xs:documentation>
+          Set to "nochoice" to omit "Select all that are ... ".
+        </xs:documentation>
+      </xs:annotation>
+      <xs:simpleType>
+        <xs:union memberTypes="perl">
+          <xs:simpleType>
+            <xs:restriction base="xs:string">
+              <xs:enumeration value="nochoice"/>
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:union>
+      </xs:simpleType>
+    </xs:attribute>
+    <xs:attribute name="mincheck" type="xs:int">
+      <xs:annotation>
+        <xs:documentation>
+          Minimum boxes required to check.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="maxcheck" type="xs:int">
+      <xs:annotation>
+        <xs:documentation>
+          Maximum boxes permitted to check.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
   </xs:complexType>
   <xs:complexType name="optionresponse--conceptgroup">
     <xs:annotation>
@@ -2517,7 +2547,12 @@
   <xs:element name="hintgroup">
     <xs:annotation>
       <xs:documentation>
-        The first part of the hint is the condition, which includes a specification of the foil(s) and foil answer(s) required to trigger the hint. The answers specified in the hint condition are compared with the user's submission, and if the condition is met, the hint action included in the conditional hint block will be executed (for example this could be the display of a block of text). You can set multiple hint conditions for a particular problem. Hint conditions are identified by a name. The corresponding hint action includes this hint condition name in the "on" parameter. When a hint condition evaluates to true, the corresponding hint action is triggered. Besides providing hint actions within &lt;hintpart on="NAME"&gt; &lt;/hintpart&gt; tags for each named (NAME) hint condition, a hint can be designated for display if none of the conditional hints evaluate to true. The default hint is not displayed if the conditions were met for any of the conditional hints. The default hint action is included between &lt;hintpart on="default"&gt; &lt;/hintpart&gt; tags.
+        This element can either contain a simple hint displayed when the submitted answer for the part is not correct, or a more complex structure to display different hints for different submitted answers.
+        
+        To display different hints based on the submitted answer, the hint group has to contain hint conditions (&lt;*hint&gt; elements) and conditional hints (&lt;hintpart&gt; elements).
+        A hint condition defines the foil(s) and foil answer(s) required to trigger a hint, and has a name attribute to identify it.
+        A conditional hint (&lt;hintpart&gt;) defines what will be displayed if a particular hint condition is met. It includes a reference to the hint condition in the "on" attribute.
+        A default conditional hint can be defined by using on="default" in a &lt;hintpart&gt;. The contents of this hint will be displayed if none of the other conditional hints is triggered.
       </xs:documentation>
     </xs:annotation>
     <xs:complexType mixed="true">
@@ -2548,7 +2583,7 @@
       <xs:documentation>
         Conditional Hint
         
-        When a hint element named the same as the on attribute evaluates to be correct, the hintpart will show.
+        When a hint condition named the same as the on attribute evaluates to be correct, the contents of this element will be displayed.
         If no other hintpart is to show then all hintparts with an on value set to “default” will show.
       </xs:documentation>
     </xs:annotation>
@@ -2616,11 +2651,11 @@
       <xs:documentation>
         Radiobutton Hint Condition
         
-        The radiobutton hint element takes two parameters: answer and name. The name is the name of the hint condition, and the answer is an array. The first element of the array will be 'foil'; the remaining elements are the names of the foils that you require to have been checked by the student for the hint to be displayed. For example, if you create a radiobutton response problem with six foils named: granite, gabbro, gneiss, shale, sandstone and schist, and you want your hint named: igneous to be displayed when either granite or basalt had been checked your radiobutton hint would be as follows:
+        The radiobutton hint element takes two attributes: answer and name. The name is the name of the hint condition, and the answer is an array. The first element of the array will be 'foil'; the remaining elements are the names of the foils that you require to have been checked by the student for the hint to be displayed. For example, if you create a radiobutton response problem with six foils named: granite, gabbro, gneiss, shale, sandstone and schist, and you want your hint named: igneous to be displayed when either granite or basalt had been checked your radiobutton hint would be as follows:
         
         &lt;radiobuttonhint answer="('foil','granite','gabbro')" name="igneous"&gt;&lt;/radiobuttonhint&gt;
         
-        In order to trigger display of this hint you also need to create a &lt;hintpart&gt; &lt;/hintpart&gt; block that will include a textblock that contains the text of the actual hint.
+        In order to trigger display of this hint you also need to create a hint condition (&lt;hintpart&gt;) that will include the text of the actual hint.
       </xs:documentation>
     </xs:annotation>
     <xs:complexType>
@@ -2635,12 +2670,17 @@
           </xs:documentation>
         </xs:annotation>
       </xs:attribute>
-      <xs:attribute name="answer" type="xs:string">
+      <xs:attribute name="answer">
         <xs:annotation>
           <xs:documentation>
             should be at least a two element list: first the type (foil or concept) and then either the foil name(s) or the concept string(s), e.g., “(’foil’,’greaterthan’,’equal’)” if the condition should be triggered by the foils named “greaterthan” or “equal”
           </xs:documentation>
         </xs:annotation>
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:pattern value="\(\s*'.*'\s*\)"/>
+          </xs:restriction>
+        </xs:simpleType>
       </xs:attribute>
     </xs:complexType>
   </xs:element>
@@ -2649,7 +2689,10 @@
       <xs:documentation>
         Option Response Hint Condition
         
-        There are two types of option response hint conditions: one for standalone foils and one for concept groups. In both cases the option hint element includes two parameters: answer and name for standalone foils, and concept and name for foils grouped together in a concept group. For the answer parameter, the names and submitted values for each of the foils that are being included in the hint condition are provided in a hash, i.e., in the format: ('Foil1'= &gt; 'True','Foil2'= &gt; 'False'). In the case of a conditional hint for a concept group, the format of the concept parameter is also a hash that links the name of each concept group included in the hint condition to either 'correct' or 'incorrect' - e.g., &lt; optionhint concept="('buoyancy'= &gt; 'correct','density'= &gt; 'correct')" name="fluids" / &gt; If 'correct' is specified for a named concept then when the conditional hint is evaluated answers for each of the foils selected by a student must be correct for the hint action to be triggered. If anything other than 'correct' is provided in the concept hash in the optionhint element then then students answers will be compared with the set answers for the foils in the concept group and as long as at least one answer is incorrect (i.e., the concept group was not correctly answered) then the corresponding hint action will be triggered. 
+        There are two types of option response hint conditions: one for standalone foils and one for concept groups. In both cases the option hint element includes two parameters: answer and name for standalone foils, and concept and name for foils grouped together in a concept group.
+        For the answer parameter, the names and submitted values for each of the foils that are being included in the hint condition are provided in a hash, i.e., in the format: ('Foil1'=&gt; 'True','Foil2'=&gt; 'False').
+        In the case of a conditional hint for a concept group, the format of the concept parameter is also a hash that links the name of each concept group included in the hint condition to either 'correct' or 'incorrect' - e.g., &lt;optionhint concept="('buoyancy'=&gt; 'correct','density'=&gt; 'correct')" name="fluids" /&gt;.
+        If 'correct' is specified for a named concept then when the conditional hint is evaluated answers for each of the foils selected by a student must be correct for the hint action to be triggered. If anything other than 'correct' is provided in the concept hash in the optionhint element then then students answers will be compared with the set answers for the foils in the concept group and as long as at least one answer is incorrect (i.e., the concept group was not correctly answered) then the corresponding hint action will be triggered.
       </xs:documentation>
     </xs:annotation>
     <xs:complexType>
@@ -2664,8 +2707,32 @@
           </xs:documentation>
         </xs:annotation>
       </xs:attribute>
-      <xs:attribute name="answer" type="xs:string"/>
-      <xs:attribute name="concept" type="xs:string"/>
+      <xs:attribute name="answer">
+        <xs:annotation>
+          <xs:documentation>
+            Perl hash with foil names as keys and submitted values as values.
+            Example: ('foil1'=&gt; 'true', 'foil2'=&gt; 'false')
+          </xs:documentation>
+        </xs:annotation>
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:pattern value="\(\s*'.*'\s*\)"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="concept">
+        <xs:annotation>
+          <xs:documentation>
+            Perl hash with concept names as keys and either 'correct' or 'incorrect' as values.
+            Example: ('buoyancy'=&gt;'correct', 'density'=&gt; 'correct')
+          </xs:documentation>
+        </xs:annotation>
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:pattern value="\(\s*'.*'\s*\)"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
     </xs:complexType>
   </xs:element>
   <xs:element name="numericalhint">
@@ -2819,7 +2886,7 @@
       <xs:documentation>
         Custom Hint Condition
         
-        Define the hint condition within an answer block inside of the customhint block. The condition is defined like how an answer is defined in customresponse where you need to return EXACT ANS to indicate when customhint criteria are met.
+        Define the hint condition within an answer element inside the customhint element. The condition is defined in the same way an answer is defined in customresponse, where you need to return EXACT_ANS to indicate when the customhint criteria are met.
       </xs:documentation>
     </xs:annotation>
     <xs:complexType>
@@ -6647,7 +6714,7 @@
           </xs:documentation>
         </xs:annotation>
       </xs:attribute>
-      <xs:attribute name="uriprint" type="xs:string">
+      <xs:attribute name="uriprint">
         <xs:annotation>
           <xs:documentation>
             Attribute specific to LON-CAPA.
@@ -6663,7 +6730,7 @@
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
-      <xs:attribute name="anchorprint" type="xs:string">
+      <xs:attribute name="anchorprint">
         <xs:annotation>
           <xs:documentation>
             Attribute specific to LON-CAPA.
@@ -7848,6 +7915,9 @@
       </xs:documentation>
     </xs:annotation>
     <xs:complexType mixed="true">
+      <xs:choice maxOccurs="unbounded" minOccurs="0">
+        <xs:group ref="blocks-with-text"/>
+      </xs:choice>
       <xs:attributeGroup ref="coreattrs"/>
       <xs:attribute name="name" type="xs:NMTOKEN"/>
       <xs:attribute name="src" type="xs:anyURI"/>