--- modules/damieng/clean_xml/loncapa.xsd	2015/04/29 15:31:27	1.4
+++ modules/damieng/clean_xml/loncapa.xsd	2015/04/30 20:43:16	1.6
@@ -158,7 +158,7 @@
       <xs:documentation>
         Root for .library documents.
         A LON-CAPA .library file can contain just a script block, or just response items, or both.
-        Library content is loaded into a problem statement by using an &lt;import&gt; tag.
+        Library content is loaded into a problem statement by using an &lt;import&gt; element.
       </xs:documentation>
     </xs:annotation>
     <xs:complexType mixed="true">
@@ -430,7 +430,7 @@
     <xs:annotation>
       <xs:documentation>
         Query for a string.
-        An internal textline tag is necessary for the student’s response to go in. It can check the string for either case or order.
+        An internal textline element is necessary for the student’s response to go in. It can check the string for either case or order.
       </xs:documentation>
     </xs:annotation>
     <xs:complexType mixed="true">
@@ -1398,11 +1398,9 @@
         <xs:annotation>
           <xs:documentation>
             This attribute contains what is displayed when the problem is in "Show Answer" mode.
-            You will want to use it so that the students can see the correct answer after
-            the "Show Answer Date" configured when the problem is assigned in the course space.
+            You will want to use it so that the students can see the correct answer after the "Show Answer Date" configured when the problem is assigned in the course space.
             
-            This is usually the name of a Perl string variable (starting with '$')
-            created in a Perl script before the response.
+            This is usually the name of a Perl string variable (starting with '$') created in a Perl script before the response.
           </xs:documentation>
         </xs:annotation>
       </xs:attribute>
@@ -2315,7 +2313,7 @@
     <xs:annotation>
       <xs:documentation>
         Query for text or numbers.
-        Advanced type of response that implements a simple data storage and needs an input tag, such as textline, to work correctly.
+        Advanced type of response that implements a simple data storage and needs an input element, such as textline, to work correctly.
       </xs:documentation>
     </xs:annotation>
     <xs:complexType mixed="true">
@@ -2525,7 +2523,7 @@
       <xs:documentation>
         Conditional Hint
         
-        When a hint tag named the same as the on attribute evaluates to be correct, the hintpart will show.
+        When a hint element named the same as the on attribute evaluates to be correct, the hintpart will show.
         If no other hintpart is to show then all hintparts with an on value set to “default” will show.
       </xs:documentation>
     </xs:annotation>
@@ -2593,7 +2591,7 @@
       <xs:documentation>
         Radiobutton Hint Condition
         
-        The radiobutton hint tag 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 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:
         
         &lt;radiobuttonhint answer="('foil','granite','gabbro')" name="igneous"&gt;&lt;/radiobuttonhint&gt;
         
@@ -2626,7 +2624,7 @@
       <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 tag 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 tag 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>
@@ -2989,7 +2987,7 @@
   <xs:element name="gnuplot">
     <xs:annotation>
       <xs:documentation>
-        The gnuplot LON-CAPA tag allows an author to design a plot which will be created programatically at the time when it is requested for display by a student. This is intended for use in homework problems where a distinct plot should be rendered for each student. It can be used in conjunction with a script to generate curve data for random plots.
+        The gnuplot LON-CAPA element allows an author to design a plot which will be created programatically at the time when it is requested for display by a student. This is intended for use in homework problems where a distinct plot should be rendered for each student. It can be used in conjunction with a script to generate curve data for random plots.
       </xs:documentation>
     </xs:annotation>
     <xs:complexType>
@@ -3000,7 +2998,7 @@
         <xs:annotation>
           <xs:documentation>
             Brief description of the plot.
-            This text is used as the alt value of the img tag used to display the plot on a web page.
+            This text is used as the alt value of the img element used to display the plot on a web page.
           </xs:documentation>
         </xs:annotation>
       </xs:attribute>
@@ -3375,29 +3373,29 @@
       <xs:element name="axis" type="lonplot--axis">
         <xs:annotation>
           <xs:documentation>
-            The Plot Axes tag allows you to specify the domain and range of the data to display. It is closely tied with the Plot Ticks tags, which specify where the gridlines are drawn on the plot.
+            The Plot Axes element allows you to specify the domain and range of the data to display. It is closely tied with the Plot Ticks elements, which specify where the gridlines are drawn on the plot.
           </xs:documentation>
         </xs:annotation>
       </xs:element>
       <xs:element name="curve" type="lonplot--curve">
         <xs:annotation>
           <xs:documentation>
-            The curve tag is where you set the data to be plotted by gnuplot.
+            The curve element is where you set the data to be plotted by gnuplot.
           </xs:documentation>
         </xs:annotation>
       </xs:element>
       <xs:element name="key" type="lonplot--key">
         <xs:annotation>
           <xs:documentation>
-            The key tag causes a key to be drawn on the plot when it is generated. The key will contain an entry for each curve which has a name.
-            The key is the color of the foreground of the plot, specified in the gnuplot tag.
+            The key element causes a key to be drawn on the plot when it is generated. The key will contain an entry for each curve which has a name.
+            The key is the color of the foreground of the plot, specified in the gnuplot element.
           </xs:documentation>
         </xs:annotation>
       </xs:element>
       <xs:element name="label" type="lonplot--label">
         <xs:annotation>
           <xs:documentation>
-            The label tag allows the author to place text at any position on the plot. There may be many label tags on one plot and all the labels which fall within the plot will show. The color used will be to foreground color of the plot and the font will be the size specified for the plot, both of which are set in the gnuplot tag.
+            The label element allows the author to place text at any position on the plot. There may be many label elements on one plot and all the labels which fall within the plot will show. The color used will be to foreground color of the plot and the font will be the size specified for the plot, both of which are set in the gnuplot element.
           </xs:documentation>
         </xs:annotation>
       </xs:element>
@@ -3763,7 +3761,7 @@
     <xs:annotation>
       <xs:documentation>
         Causes a key to be drawn on the plot when it is generated. The key will contain an entry for each curve which has a name.
-        The key is the color of the foreground of the plot, specified in the gnuplot tag.
+        The key is the color of the foreground of the plot, specified in the gnuplot element.
       </xs:documentation>
     </xs:annotation>
     <xs:attribute name="title" type="xs:string">
@@ -3854,7 +3852,7 @@
       <xs:element name="tic">
         <xs:annotation>
           <xs:documentation>
-            The &lt;tic&gt; tag allows users to specify exact Tic positions and labels for each axis.
+            The &lt;tic&gt; element allows users to specify exact Tic positions and labels for each axis.
             In this version we only support level 0 tics (major tic).
             Each tic has associated with it a position and a label $current_tics is a reference to the current tick description hash.
             We add elements to an array in that has: ticspecs whose elements are 'pos' - the tick position and 'label' - the tic label.
@@ -3922,7 +3920,7 @@
     <xs:attribute default="off" name="rotate" type="onoff-or-perl">
       <xs:annotation>
         <xs:documentation>
-          For output devices that support it, this rotates the tic label by 90 degrees. This is most useful with large lables defined by the tic tag described below.
+          For output devices that support it, this rotates the tic label by 90 degrees. This is most useful with large lables defined by the tic element described below.
         </xs:documentation>
       </xs:annotation>
     </xs:attribute>
@@ -3960,7 +3958,7 @@
       <xs:documentation>
         Conditional Block
         
-        This has a required argument condition that is evaluated. If the condition is true, everything inside the tag is evaluated; otherwise, everything inside the block tag is skipped.
+        This has a required argument condition that is evaluated. If the condition is true, everything inside the element is evaluated; otherwise, everything inside the block element is skipped.
         
         When found inside the gnuplot element, a block can only have gnuplot children inside, with no text.
       </xs:documentation>
@@ -4268,7 +4266,7 @@
       <xs:documentation>
         Parameter for a part
         
-        parameter is exactly the same as responseparam, but should appear outside of a response tag.
+        parameter is exactly the same as responseparam, but should appear outside of a response element.
       </xs:documentation>
     </xs:annotation>
     <xs:complexType>
@@ -4443,7 +4441,7 @@
       <xs:documentation>
         Import a File
         
-        This causes the parse to read in the file named in the body of the tag and parse it as if the entire text of the file had existed at the location of the tag.
+        This causes the parse to read in the file named in the body of the element and parse it as if the entire text of the file had existed at the location of the element.
       </xs:documentation>
     </xs:annotation>
     <xs:complexType>
@@ -4476,7 +4474,7 @@
       <xs:documentation>
         Conditional Block
         
-        This has a required argument condition that is evaluated. If the condition is true, everything inside the tag is evaluated; otherwise, everything inside the block tag is skipped.
+        This has a required argument condition that is evaluated. If the condition is true, everything inside the element is evaluated; otherwise, everything inside the block element is skipped.
       </xs:documentation>
     </xs:annotation>
     <xs:attribute name="condition" type="xs:string">
@@ -4533,7 +4531,7 @@
       <xs:documentation>
         While Loop Block
         
-        This implements a while loop. The required attribute condition is a Perl scriptlet that when evaluated results in a true or false value. If true, the entirety of the text between the whiles is parsed. The condition is tested again, etc. If false, it goes to the next tag.
+        This implements a while loop. The required attribute condition is a Perl scriptlet that when evaluated results in a true or false value. If true, the entirety of the text between the whiles is parsed. The condition is tested again, etc. If false, it goes to the next element.
       </xs:documentation>
     </xs:annotation>
     <xs:complexType mixed="true">
@@ -4677,7 +4675,7 @@
       <xs:documentation>
         Randomly Parsed Block
         
-        The enclosed tags are parsed in a stable random order. The optional attribute show=“N” restricts the number of tags inside that are actually parsed to no more than N. N can equal the total tags inside. The randomlist tag can be used to randomize problem parts by wrapping the &lt;part&gt; tags with a randomlist tag. Note that when randomlist wraps &lt;part&gt; tags, that all students will work all parts only if show=“N” where N is the total number of parts wrapped. When N is less than the total number of parts wrapped, there will be gaps in the assessment chart, and also in the table of submissions for each student, corresponding to those parts which are never available to that particular student.
+        The enclosed elements are parsed in a stable random order. The optional attribute show=“N” restricts the number of elements inside that are actually parsed to no more than N. N can equal the total elements inside. The randomlist element can be used to randomize problem parts by wrapping the &lt;part&gt; elements with a randomlist element. Note that when randomlist wraps &lt;part&gt; elements, that all students will work all parts only if show=“N” where N is the total number of parts wrapped. When N is less than the total number of parts wrapped, there will be gaps in the assessment chart, and also in the table of submissions for each student, corresponding to those parts which are never available to that particular student.
       </xs:documentation>
     </xs:annotation>
     <xs:attribute name="show" type="int-or-perl">
@@ -4827,7 +4825,7 @@
     <xs:annotation>
       <xs:documentation>
         &lt;translated&gt; starts a block of a resource that has multiple translations.
-        See the &lt;lang&gt; tag as well.
+        See the &lt;lang&gt; element as well.
         When &lt;/translated&gt; is encountered if there is a translation for the currently preferred language, that is rendered inthe web/tex/webgrade targets. Otherwise, the default text is rendered.
         Note that &lt;lang&gt; is only registered for the duration of the &lt;translated&gt;...&lt;/translated&gt; block.
       </xs:documentation>
@@ -4842,7 +4840,7 @@
   <xs:element name="lang">
     <xs:annotation>
       <xs:documentation>
-        Specifies that the block contained within it is a translation for a specific language specified by the 'which' attribute. The 'other' attribute can be used by itself or in conjunction with which to specify this tag _may_ be used as a translation for some list of languages. e.g.:
+        Specifies that the block contained within it is a translation for a specific language specified by the 'which' attribute. The 'other' attribute can be used by itself or in conjunction with which to specify this element _may_ be used as a translation for some list of languages. e.g.:
         &lt;lang which='senisoUS' other='senisoCA,senisoAU,seniso'&gt;
         specifying that the block provides a translation for US (primary) Canadian, Australian and UK English.
       </xs:documentation>
@@ -5131,7 +5129,7 @@
       <xs:documentation>
         Display Script Result Block
         
-        The intervening Perl script is evaluated in the safe space and the return value of the script replaces the entire tag.
+        The intervening Perl script is evaluated in the safe space and the return value of the script replaces the entire element.
       </xs:documentation>
     </xs:annotation>
   </xs:element>
@@ -5216,7 +5214,13 @@
     </xs:annotation>
     <xs:complexType mixed="true">
       <xs:attribute name="style" type="xs:string"/>
-      <xs:attribute name="display" type="xs:string"/>
+      <xs:attribute name="display" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>
+            Option to force the math rendering for this element.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
     </xs:complexType>
   </xs:element>
   <xs:element name="chem" type="xs:string">
@@ -6596,28 +6600,28 @@
   <xs:element name="b" type="inlineBaseType">
     <xs:annotation>
       <xs:documentation>
-        Bold
+        The HTML &lt;b&gt; Element represents a span of text stylistically different from normal text, without conveying any special importance or relevance. It is typically used for keywords in a summary, product names in a review, or other spans of text whose typical presentation would be boldfaced. Another example of its use is to mark the lead sentence of each paragraph of an article.
       </xs:documentation>
     </xs:annotation>
   </xs:element>
   <xs:element name="i" type="inlineBaseType">
     <xs:annotation>
       <xs:documentation>
-        Italic
+        The HTML &lt;i&gt; Element represents a range of text that is set off from the normal text for some reason, for example, technical terms, foreign language phrases, or fictional character thoughts. It is typically displayed in italic type.
       </xs:documentation>
     </xs:annotation>
   </xs:element>
   <xs:element name="sup" type="inlineBaseType">
     <xs:annotation>
       <xs:documentation>
-        Superscript
+        The HTML Superscript Element (&lt;sup&gt;) defines a span of text that should be displayed, for typographic reasons, higher, and often smaller, than the main span of text.
       </xs:documentation>
     </xs:annotation>
   </xs:element>
   <xs:element name="sub" type="inlineBaseType">
     <xs:annotation>
       <xs:documentation>
-        Subscript
+        The HTML Subscript Element (&lt;sub&gt;) defines a span of text that should be displayed, for typographic reasons, lower, and often smaller, than the main span of text.
       </xs:documentation>
     </xs:annotation>
   </xs:element>