--- modules/damieng/clean_xml/loncapa.xsd	2015/04/30 20:43:16	1.6
+++ modules/damieng/clean_xml/loncapa.xsd	2015/05/01 20:32:24	1.7
@@ -1347,6 +1347,8 @@
             3. followed by any number of the following two things, separated by semi-colons:
             (a) a comma-separated list of as many numbers as there are variables, which specifies one sampling point, OR
             (b) a comma-separated list of as many numbers as there are variables, followed by a colon, followed by another list of as many numbers as there are variables, followed by a #, followed by an integer.
+            
+            a) specifies one point to sample. b) specifies a range for each variable, and the system will take as many random samples from that range as the number after the #.
           </xs:documentation>
         </xs:annotation>
       </xs:attribute>
@@ -4794,19 +4796,6 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  <xs:element name="script">
-    <xs:annotation>
-      <xs:documentation>
-        Perl Script Block
-        
-        If the attribute type is set to “loncapa/perl” the enclosed data is a Perl script which is evaluated inside the Perl safe space. The return value of the script is ignored.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType mixed="true">
-      <xs:attribute default="text/javascript" name="type" type="xs:string"/>
-      <xs:attribute fixed="preserve" ref="xml:space"/>
-    </xs:complexType>
-  </xs:element>
   <xs:element name="languageblock">
     <xs:annotation>
       <xs:documentation>
@@ -5377,7 +5366,7 @@
   <xs:group name="head.misc">
     <xs:sequence>
       <xs:choice maxOccurs="unbounded" minOccurs="0">
-        <xs:element name="script" type="htmlScript"/>
+        <xs:element ref="script"/>
         <xs:element ref="style"/>
         <xs:element name="meta" type="htmlMeta">
           <xs:annotation>
@@ -5586,64 +5575,72 @@
       <xs:attribute fixed="preserve" ref="xml:space"/>
     </xs:complexType>
   </xs:element>
-  <xs:complexType mixed="true" name="htmlScript">
+  <xs:element name="script">
     <xs:annotation>
       <xs:documentation>
+        Perl Script Block or Javascript
+        
+        If the attribute type is set to “loncapa/perl” the enclosed data is a Perl script which is evaluated inside the Perl safe space. The return value of the script is ignored.
+        
         The HTML &lt;script&gt; element is used to embed or reference an executable script within an HTML or XHTML document.
         
         Scripts without async or defer attributes, as well as inline scripts, are fetched and executed immediately, before the browser continues to parse the page.
       </xs:documentation>
     </xs:annotation>
-    <xs:attribute name="id" type="xs:ID"/>
-    <xs:attribute name="charset" type="xs:string"/>
-    <xs:attribute name="src" type="xs:anyURI">
-      <xs:annotation>
-        <xs:documentation>
-          This attribute specifies the URI of an external script; this can be used as an alternative to embedding a script directly within a document. script elements with an src attribute specified should not have a script embedded within its tags.
-        </xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute default="text/javascript" name="type" type="xs:string">
-      <xs:annotation>
-        <xs:documentation>
-          This attribute identifies the scripting language of code embedded within a script element or referenced via the element’s src attribute. This is specified as a MIME type; examples of supported MIME types include text/javascript, text/ecmascript, application/javascript, and application/ecmascript.
-        </xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="language" type="xs:string">
-      <xs:annotation>
-        <xs:documentation>
-          Like the type attribute, this attribute identifies the scripting language in use. Unlike the type attribute, however, this attribute’s possible values were never standardized. The type attribute should be used instead.
-        </xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="defer">
-      <xs:annotation>
-        <xs:documentation>
-          This Boolean attribute is set to indicate to a browser that the script is meant to be executed after the document has been parsed. Since this feature hasn't yet been implemented by all other major browsers, authors should not assume that the script’s execution will actually be deferred. The defer attribute shouldn't be used on scripts that don't have the src attribute. Since Gecko 1.9.2, the defer attribute is ignored on scripts that don't have the src attribute. However, in Gecko 1.9.1 even inline scripts are deferred if the defer attribute is set.
-        </xs:documentation>
-      </xs:annotation>
-      <xs:simpleType>
-        <xs:restriction base="xs:token">
-          <xs:enumeration value="defer"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="async">
-      <xs:annotation>
-        <xs:documentation>
-          HTML5 only.
-          Set this Boolean attribute to indicate that the browser should, if possible, execute the script asynchronously. It has no effect on inline scripts (i.e., scripts that don't have the src attribute).
-        </xs:documentation>
-      </xs:annotation>
-      <xs:simpleType>
-        <xs:restriction base="xs:token">
-          <xs:enumeration value="async"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute fixed="preserve" ref="xml:space"/>
-  </xs:complexType>
+    <xs:complexType mixed="true">
+      <xs:attribute name="id" type="xs:ID"/>
+      <xs:attribute name="charset" type="xs:string"/>
+      <xs:attribute name="src" type="xs:anyURI">
+        <xs:annotation>
+          <xs:documentation>
+            This attribute specifies the URI of an external script; this can be used as an alternative to embedding a script directly within a document. script elements with an src attribute specified should not have a script embedded within its tags.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute default="text/javascript" name="type" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>
+            This attribute identifies the scripting language of code embedded within a script element or referenced via the element’s src attribute. This is specified as a MIME type; examples of supported MIME types include text/javascript, text/ecmascript, application/javascript, and application/ecmascript.
+            
+            If the attribute type is set to “loncapa/perl” the enclosed data is a Perl script which is evaluated inside the Perl safe space. The return value of the script is ignored.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="language" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>
+            Like the type attribute, this attribute identifies the scripting language in use. Unlike the type attribute, however, this attribute’s possible values were never standardized. The type attribute should be used instead.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="defer">
+        <xs:annotation>
+          <xs:documentation>
+            This Boolean attribute is set to indicate to a browser that the script is meant to be executed after the document has been parsed. Since this feature hasn't yet been implemented by all other major browsers, authors should not assume that the script’s execution will actually be deferred. The defer attribute shouldn't be used on scripts that don't have the src attribute. Since Gecko 1.9.2, the defer attribute is ignored on scripts that don't have the src attribute. However, in Gecko 1.9.1 even inline scripts are deferred if the defer attribute is set.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="defer"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="async">
+        <xs:annotation>
+          <xs:documentation>
+            HTML5 only.
+            Set this Boolean attribute to indicate that the browser should, if possible, execute the script asynchronously. It has no effect on inline scripts (i.e., scripts that don't have the src attribute).
+          </xs:documentation>
+        </xs:annotation>
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="async"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute fixed="preserve" ref="xml:space"/>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="noscript">
     <xs:annotation>
       <xs:documentation>