--- loncom/homework/insertlist.xml	2007/04/20 21:46:18	1.5
+++ loncom/homework/insertlist.xml	2007/06/26 20:51:53	1.7
@@ -54,7 +54,7 @@
 		<description>Hint</description>
 		<color>#accacc</color>
 		<insert_sub>insert_hintgroup</insert_sub>
-		<allow>formulahint,hintpart,numericalhint,optionhint,radiobuttonhint,startouttext,stringhint</allow>
+		<allow>customhint,formulahint,hintpart,mathhint,numericalhint,optionhint,radiobuttonhint,startouttext,stringhint</allow>
 	</tag>
 	<tag name="hintpart">
 		<description>Conditional Hint</description>
@@ -92,6 +92,28 @@
 		<insert_sub>insert_stringhint</insert_sub>
 		<allow>responseparam</allow>
 	</tag>
+	<tag name="customhint">
+		<description>Custom Hint Condition</description>
+		<color>#ccaacc</color>
+		<insert_sub>insert_customhint</insert_sub>
+		<allow>responseparam,customhint::answer</allow>
+	</tag>
+	<tag name="customhint::answer">
+		<description>Hint algorithm</description>
+		<color>#ccccaa</color>
+		<insert_sub>insert_customhint_answer</insert_sub>
+	</tag>
+	<tag name="mathhint">
+		<description>Math Hint Condition</description>
+		<color>#ccaacc</color>
+		<insert_sub>insert_mathhint</insert_sub>
+		<allow>responseparam,mathhint::answer</allow>
+	</tag>
+	<tag name="mathhint::answer">
+		<description>Hint algorithm</description>
+		<color>#ccccaa</color>
+		<insert_sub>insert_mathhint_answer</insert_sub>
+	</tag>
 	<tag name="imageresponse::conceptgroup">
 		<description>Collection of similar foils</description>
 		<color>#99FFFF</color>
@@ -158,6 +180,21 @@
 		<color>#ccccaa</color>
 		<insert_sub>insert_customresponse_answer</insert_sub>
 	</tag>
+	<tag name="mathresponse">
+		<description>Response: Math</description>
+		<color>#44cc55</color>
+		<insert_sub>insert_mathresponse</insert_sub>
+		<help>
+			<file>Math_Response_Problems</file>
+			<description>How to write math responses</description>
+		</help>
+		<allow>mathresponse::answer,hintgroup,responseparam,textfield,textline</allow>
+	</tag>
+	<tag name="mathresponse::answer">
+		<description>Answer algorithm</description>
+		<color>#ccccaa</color>
+		<insert_sub>insert_mathresponse_answer</insert_sub>
+	</tag>
 	<tag name="textfield">
 		<description>Large Text Entry Area</description>
 		<color>#1144dd</color>
@@ -169,17 +206,23 @@
 		<color>#1144dd</color>
 		<insert_sub>default</insert_sub>
 	</tag>
+
 	<tag name="optionresponse::conceptgroup">
 		<description>Collection of similar foils</description>
 		<color>#EEEE00</color>
 		<insert_sub>Apache::optionresponse::insert_conceptgroup</insert_sub>
 		<allow>optionresponse::foil</allow>
 	</tag>
+	<tag name="optionresponse::drawoptionlist">
+		<description>Draw Option List</description>
+		<color>#88ee00</color>
+		<insert_sub>Apache::optionresponse::insert_drawoptionlist</insert_sub>
+	</tag>
 	<tag name="optionresponse::foil">
 		<description>Option response foil</description>
 		<color>#dd55ff</color>
 		<insert_sub>Apache::optionresponse::insert_foil</insert_sub>
-		<allow>block,display,gnuplot,img,import,organicstructure,parserlib,problemtype,randomlabel,randomlist,script,scriptlib,startouttext,tex,web,while,window</allow>
+		<allow>block,display,gnuplot,img,import,organicstructure,parserlib,problemtype,randomlabel,randomlist,script,scriptlib,startouttext,tex,web,while,window,optionresponse::drawoptionlist</allow>
 	</tag>
 	<tag name="optionresponse::foilgroup">
 		<description>Collection of Foils</description>
@@ -367,25 +410,25 @@
 		<description>Conditional Block</description>
 		<color>#FF3311</color>
 		<insert_sub>default</insert_sub>
-		<allow>block,customresponse,display,displayduedate,displaytitle,essayresponse,formularesponse,gnuplot,imageresponse,img,import,matchresponse,notsolved,numericalresponse,optionresponse,organicresponse,organicstructure,parserlib,part,postanswerdate,preduedate,problemtype,radiobuttonresponse,randomlabel,randomlist,rankresponse,reactionresponse,script,scriptlib,solved,startouttext,stringresponse,tex,web,while,window</allow>
+		<allow>block,customresponse,display,displayduedate,displaytitle,essayresponse,formularesponse,gnuplot,imageresponse,img,import,matchresponse,mathresponse,notsolved,numericalresponse,optionresponse,organicresponse,organicstructure,parserlib,part,postanswerdate,preduedate,problemtype,radiobuttonresponse,randomlabel,randomlist,rankresponse,reactionresponse,script,scriptlib,solved,startouttext,stringresponse,tex,web,while,window</allow>
 	</tag>
 	<tag name="library">
 		<description>Start of Library</description>
 		<color>#FFFFFF</color>
 		<insert_sub>default</insert_sub>
-		<allow>customresponse,display,displayduedate,displaytitle,essayresponse,formularesponse,gnuplot,imageresponse,img,import,matchresponse,notsolved,numericalresponse,optionresponse,organicresponse,organicstructure,parserlib,part,postanswerdate,preduedate,problemtype,radiobuttonresponse,randomlabel,randomlist,rankresponse,reactionresponse,script,scriptlib,solved,startouttext,stringresponse,tex,web,while,window</allow>
+		<allow>customresponse,display,displayduedate,displaytitle,essayresponse,formularesponse,gnuplot,imageresponse,img,import,matchresponse,mathresponse,notsolved,numericalresponse,optionresponse,organicresponse,organicstructure,parserlib,part,postanswerdate,preduedate,problemtype,radiobuttonresponse,randomlabel,randomlist,rankresponse,reactionresponse,script,scriptlib,solved,startouttext,stringresponse,tex,web,while,window</allow>
 	</tag>
 	<tag name="notsolved">
 		<description>Block For When Not Solved</description>
 		<color>#FFFFFF</color>
 		<insert_sub>default</insert_sub>
-		<allow>block,customresponse,display,displayduedate,displaytitle,essayresponse,formularesponse,gnuplot,imageresponse,img,import,matchresponse,numericalresponse,optionresponse,organicresponse,organicstructure,parserlib,postanswerdate,preduedate,problemtype,radiobuttonresponse,randomlabel,randomlist,rankresponse,reactionresponse,script,scriptlib,startouttext,stringresponse,tex,web,while,window</allow>
+		<allow>block,customresponse,display,displayduedate,displaytitle,essayresponse,formularesponse,gnuplot,imageresponse,img,import,matchresponse,mathresponse,numericalresponse,optionresponse,organicresponse,organicstructure,parserlib,postanswerdate,preduedate,problemtype,radiobuttonresponse,randomlabel,randomlist,rankresponse,reactionresponse,script,scriptlib,startouttext,stringresponse,tex,web,while,window</allow>
 	</tag>
 	<tag name="part">
 		<description>Problem Part</description>
 		<color>#F0F0F0</color>
 		<insert_sub>default</insert_sub>
-		<allow>block,customresponse,display,displayduedate,displaytitle,essayresponse,formularesponse,gnuplot,imageresponse,img,import,matchresponse,notsolved,numericalresponse,optionresponse,organicresponse,organicstructure,parameter,parserlib,postanswerdate,preduedate,problemtype,radiobuttonresponse,randomlabel,randomlist,rankresponse,reactionresponse,script,scriptlib,solved,startouttext,stringresponse,tex,while,window</allow>
+		<allow>block,customresponse,display,displayduedate,displaytitle,essayresponse,formularesponse,gnuplot,imageresponse,img,import,matchresponse,mathresponse,notsolved,numericalresponse,optionresponse,organicresponse,organicstructure,parameter,parserlib,postanswerdate,preduedate,problemtype,radiobuttonresponse,randomlabel,randomlist,rankresponse,reactionresponse,script,scriptlib,solved,startouttext,stringresponse,tex,while,window</allow>
 	</tag>
 	<tag name="postanswerdate">
 		<description>After Answer Date Block</description>
@@ -397,13 +440,13 @@
 		<description>Before Due Date Block</description>
 		<color>#FFaaaa</color>
 		<insert_sub>default</insert_sub>
-		<allow>block,customresponse,display,displayduedate,displaytitle,essayresponse,formularesponse,gnuplot,imageresponse,img,import,matchresponse,notsolved,numericalresponse,optionresponse,organicresponse,organicstructure,parserlib,problemtype,radiobuttonresponse,randomlabel,randomlist,rankresponse,reactionresponse,script,scriptlib,solved,startouttext,stringresponse,tex,while,window</allow>
+		<allow>block,customresponse,display,displayduedate,displaytitle,essayresponse,formularesponse,gnuplot,imageresponse,img,import,matchresponse,mathresponse,notsolved,numericalresponse,optionresponse,organicresponse,organicstructure,parserlib,problemtype,radiobuttonresponse,randomlabel,randomlist,rankresponse,reactionresponse,script,scriptlib,solved,startouttext,stringresponse,tex,while,window</allow>
 	</tag>
 	<tag name="problem">
 		<description>Start of Homework</description>
 		<color>#FFFFFF</color>
 		<insert_sub>default</insert_sub>
-		<allow>allow,block,customresponse,display,displayduedate,displaytitle,essayresponse,formularesponse,gnuplot,imageresponse,img,import,matchresponse,notsolved,numericalresponse,optionresponse,organicresponse,organicstructure,parameter,parserlib,part,postanswerdate,preduedate,problemtype,radiobuttonresponse,randomlabel,randomlist,rankresponse,reactionresponse,script,scriptlib,solved,startouttext,stringresponse,tex,while,window</allow>
+		<allow>allow,block,customresponse,display,displayduedate,displaytitle,essayresponse,formularesponse,gnuplot,imageresponse,img,import,matchresponse,mathresponse,notsolved,numericalresponse,optionresponse,organicresponse,organicstructure,parameter,parserlib,part,postanswerdate,preduedate,problemtype,radiobuttonresponse,randomlabel,randomlist,rankresponse,reactionresponse,script,scriptlib,solved,startouttext,stringresponse,tex,while,window</allow>
 	</tag>
         <tag name="allow">
                 <description>File Dependencies</dscription>
@@ -414,7 +457,7 @@
 		<description>Problem Type Block</description>
 		<color>#EE9955</color>
 		<insert_sub>default</insert_sub>
-		<allow>block,customresponse,display,displayduedate,displaytitle,essayresponse,formularesponse,gnuplot,imageresponse,img,import,matchresponse,notsolved,numericalresponse,optionresponse,organicresponse,organicstructure,parserlib,postanswerdate,preduedate,problemtype,radiobuttonresponse,randomlabel,randomlist,rankresponse,reactionresponse,script,scriptlib,solved,startouttext,stringresponse,tex,web,while,window</allow>
+		<allow>block,customresponse,display,displayduedate,displaytitle,essayresponse,formularesponse,gnuplot,imageresponse,img,import,matchresponse,mathresponse,notsolved,numericalresponse,optionresponse,organicresponse,organicstructure,parserlib,postanswerdate,preduedate,problemtype,radiobuttonresponse,randomlabel,randomlist,rankresponse,reactionresponse,script,scriptlib,solved,startouttext,stringresponse,tex,web,while,window</allow>
 	</tag>
 	<tag name="randomlabel">
 		<description>Randomly labeled image</description>
@@ -443,7 +486,7 @@
 		<description>Randomly Parsed Block</description>
 		<color>#FFFFFF</color>
 		<insert_sub>default</insert_sub>
-		<allow>block,customresponse,display,essayresponse,formularesponse,gnuplot,imageresponse,img,import,notsolved,numericalresponse,optionresponse,organicresponse,organicstructure,parserlib,postanswerdate,preduedate,problemtype,radiobuttonresponse,randomlist,rankresponse::foilgroup,reactionresponse,script,scriptlib,solved,stringresponse,tex,while,window</allow>
+		<allow>block,customresponse,display,essayresponse,formularesponse,gnuplot,imageresponse,img,import,matchresponse,mathresponse,notsolved,numericalresponse,optionresponse,organicresponse,organicstructure,parserlib,postanswerdate,preduedate,problemtype,radiobuttonresponse,randomlist,rankresponse::foilgroup,reactionresponse,script,scriptlib,solved,stringresponse,tex,while,window</allow>
 	</tag>
 	<tag name="solved">
 		<description>Block For After Solved</description>