--- modules/damieng/clean_xml/loncapa.xsd	2015/05/13 19:08:29	1.12
+++ modules/damieng/clean_xml/loncapa.xsd	2015/08/12 14:58:57	1.17
@@ -1463,7 +1463,28 @@
           </xs:documentation>
         </xs:annotation>
       </xs:attribute>
-      <xs:attribute name="libraries" type="xs:string"/>
+      <xs:attribute name="libraries" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>
+            Comma-separated list of libraries.
+            
+            The following libraries can be used with Maxima:
+            absimp, affine, atensor, atrig1, augmented_lagrangian,
+            contrib_ode, ctensor, descriptive, diag, eigen, facexp, fft,
+            fourie, functs, ggf, grobner, impdiff, ineq, interpol,
+            itensor, lapack, lbfgs, lindstedt, linearalgebra, lsquares,
+            makeOrders, mnewton, mchrpl, ntrig, orthopoly,
+            quadpack, rducon, romberg, scifac, simplex, solve_rec,
+            sqdnst, stats, sterling, sym, units, vect, zeilberger
+            
+            The following libraries can be used with R:
+            alr3, boot, car, class, cluster, datasets, Hmisc,
+            KernSmooth, leaps, lmtest, MASS, methods, mgcv,
+            nlme, nnet, qAnalyst, quadprog, rpart, SuppDists,
+            spatial, splines, stats, stats4, survival, tseries, zoo
+          </xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
     </xs:complexType>
   </xs:element>
   <xs:complexType mixed="true" name="mathresponse--answer">
@@ -2720,7 +2741,7 @@
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
-      <xs:attribute name="concept" type="xs:string">
+      <xs:attribute name="concept">
         <xs:annotation>
           <xs:documentation>
             Perl hash with concept names as keys and either 'correct' or 'incorrect' as values.
@@ -3143,23 +3164,6 @@
           </xs:documentation>
         </xs:annotation>
       </xs:attribute>
-      <xs:attribute default="noborder" name="box_border">
-        <xs:annotation>
-          <xs:documentation>
-            Draw border for boxes
-          </xs:documentation>
-        </xs:annotation>
-        <xs:simpleType>
-          <xs:union memberTypes="perl">
-            <xs:simpleType>
-              <xs:restriction base="xs:string">
-                <xs:enumeration value="border"/>
-                <xs:enumeration value="noborder"/>
-              </xs:restriction>
-            </xs:simpleType>
-          </xs:union>
-        </xs:simpleType>
-      </xs:attribute>
       <xs:attribute default="on" name="border" type="onoff-or-perl">
         <xs:annotation>
           <xs:documentation>
@@ -3288,48 +3292,6 @@
           </xs:union>
         </xs:simpleType>
       </xs:attribute>
-      <xs:attribute name="pattern">
-        <xs:annotation>
-          <xs:documentation>
-            Pattern value for boxes
-          </xs:documentation>
-        </xs:annotation>
-        <xs:simpleType>
-          <xs:union memberTypes="perl">
-            <xs:simpleType>
-              <xs:restriction base="xs:int">
-                <xs:minInclusive value="0"/>
-                <xs:maxInclusive value="6"/>
-              </xs:restriction>
-            </xs:simpleType>
-          </xs:union>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute default="0" name="solid" type="int-or-perl">
-        <xs:annotation>
-          <xs:documentation>
-            The density of fill style for boxes
-          </xs:documentation>
-        </xs:annotation>
-      </xs:attribute>
-      <xs:attribute default="empty" name="fillstyle">
-        <xs:annotation>
-          <xs:documentation>
-            Filled style for boxes
-          </xs:documentation>
-        </xs:annotation>
-        <xs:simpleType>
-          <xs:union memberTypes="perl">
-            <xs:simpleType>
-              <xs:restriction base="xs:string">
-                <xs:enumeration value="empty"/>
-                <xs:enumeration value="solid"/>
-                <xs:enumeration value="pattern"/>
-              </xs:restriction>
-            </xs:simpleType>
-          </xs:union>
-        </xs:simpleType>
-      </xs:attribute>
       <xs:attribute default="Cartesian" name="plottype">
         <xs:annotation>
           <xs:documentation>
@@ -3431,6 +3393,37 @@
           </xs:union>
         </xs:simpleType>
       </xs:attribute>
+      <xs:attribute default="1" name="major_ticscale" type="real-or-perl">
+        <xs:annotation>
+          <xs:documentation>
+            Size of major tic marks (plot coordinates)
+          </xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute default="0.5" name="minor_ticscale" type="real-or-perl">
+        <xs:annotation>
+          <xs:documentation>
+            Size of minor tic mark (plot coordinates)
+          </xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute default="noborder" name="box_border">
+        <xs:annotation>
+          <xs:documentation>
+            Draw border for boxes
+          </xs:documentation>
+        </xs:annotation>
+        <xs:simpleType>
+          <xs:union memberTypes="perl">
+            <xs:simpleType>
+              <xs:restriction base="xs:string">
+                <xs:enumeration value="border"/>
+                <xs:enumeration value="noborder"/>
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:union>
+        </xs:simpleType>
+      </xs:attribute>
       <xs:attribute name="boxwidth" type="xs:string">
         <xs:annotation>
           <xs:documentation>
@@ -3438,20 +3431,48 @@
           </xs:documentation>
         </xs:annotation>
       </xs:attribute>
-      <xs:attribute default="1" name="major_ticscale" type="real-or-perl">
+      <xs:attribute default="empty" name="fillstyle">
         <xs:annotation>
           <xs:documentation>
-            Size of major tic marks (plot coordinates)
+            Fill style for boxes
           </xs:documentation>
         </xs:annotation>
+        <xs:simpleType>
+          <xs:union memberTypes="perl">
+            <xs:simpleType>
+              <xs:restriction base="xs:string">
+                <xs:enumeration value="empty"/>
+                <xs:enumeration value="solid"/>
+                <xs:enumeration value="pattern"/>
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:union>
+        </xs:simpleType>
       </xs:attribute>
-      <xs:attribute default="0.5" name="minor_ticscale" type="real-or-perl">
+      <xs:attribute default="0" name="solid" type="int-or-perl">
         <xs:annotation>
           <xs:documentation>
-            Size of minor tic mark (plot coordinates)
+            Density of fill style for boxes
           </xs:documentation>
         </xs:annotation>
       </xs:attribute>
+      <xs:attribute name="pattern">
+        <xs:annotation>
+          <xs:documentation>
+            Pattern value for boxes
+          </xs:documentation>
+        </xs:annotation>
+        <xs:simpleType>
+          <xs:union memberTypes="perl">
+            <xs:simpleType>
+              <xs:restriction base="xs:int">
+                <xs:minInclusive value="0"/>
+                <xs:maxInclusive value="6"/>
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:union>
+        </xs:simpleType>
+      </xs:attribute>
     </xs:complexType>
   </xs:element>
   <xs:group name="gnuplot-children">
@@ -5086,13 +5107,19 @@
           </xs:documentation>
         </xs:annotation>
       </xs:attribute>
-      <xs:attribute default="reaction" name="options">
+      <xs:attribute name="options">
+        <xs:annotation>
+          <xs:documentation>
+            Comma-separated list of options:
+            reaction: is a reaction (note: setting this option is only useful for the editor, it does not change the resulting image)
+            border: draws a border around the image
+          </xs:documentation>
+        </xs:annotation>
         <xs:simpleType>
           <xs:union memberTypes="perl">
             <xs:simpleType>
               <xs:restriction base="xs:string">
-                <xs:enumeration value="reaction"/>
-                <xs:enumeration value="border"/>
+                <xs:pattern value="reaction|border|reaction\s*,\s*border|border\s*,\s*reaction"/>
               </xs:restriction>
             </xs:simpleType>
           </xs:union>
@@ -6714,7 +6741,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.
@@ -6730,7 +6757,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.
@@ -7096,7 +7123,13 @@
           </xs:union>
         </xs:simpleType>
       </xs:attribute>
-      <xs:attribute default="no" name="encrypturl" type="yesno-or-perl"/>
+      <xs:attribute default="no" name="encrypturl" type="yesno-or-perl">
+        <xs:annotation>
+          <xs:documentation>
+            LON-CAPA specific attribute. If set to yes, the file URL will be hidden.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
     </xs:complexType>
   </xs:element>
   <xs:element name="figure">
@@ -7915,6 +7948,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"/>