Diff for /modules/damieng/clean_xml/loncapa.xsd between versions 1.18 and 1.19

version 1.18, 2015/12/23 19:38:13 version 1.19, 2017/01/05 16:55:16
Line 147 Line 147
     </xs:annotation>      </xs:annotation>
     <xs:complexType mixed="true">      <xs:complexType mixed="true">
       <xs:choice maxOccurs="unbounded" minOccurs="0">        <xs:choice maxOccurs="unbounded" minOccurs="0">
           <xs:element ref="head"/>
         <xs:group ref="text-with-parts"/>          <xs:group ref="text-with-parts"/>
         <xs:group ref="inserts"/>          <xs:group ref="inserts"/>
         <xs:element ref="allow"/>          <xs:element ref="allow"/>
Line 2250 Line 2251
     <xs:annotation>      <xs:annotation>
       <xs:documentation>        <xs:documentation>
         Query for a chemical reaction.          Query for a chemical reaction.
           An internal textline element is necessary for the student's response to go in.
       </xs:documentation>        </xs:documentation>
     </xs:annotation>      </xs:annotation>
     <xs:complexType mixed="true">      <xs:complexType mixed="true">
Line 2262 Line 2264
         <xs:group ref="text-only"/>          <xs:group ref="text-only"/>
       </xs:choice>        </xs:choice>
       <xs:attributeGroup ref="response-identification"/>        <xs:attributeGroup ref="response-identification"/>
       <xs:attribute name="answer" type="xs:string" use="required"/>        <xs:attribute name="answer" type="xs:string" use="required">
           <xs:annotation>
             <xs:documentation>
               The correct answer.
               Chemical reactions use the following syntax:
               - Reactants are separated from products by '-&gt;'.
               - Individual reactants and products are separated by ' +' (leading space is obligatory).
               - Numbers preceding the first symbol of a chemical specie are considered to be stoichiometric coefficients.
               - Numbers appearing after the first symbol of a chemical specie are considered to be subscripts.
               - Superscripts are initialized by '^' and terminated by a space.
               - Ionic charges are superscripts composed of a number followed by a sign (i.e. '^2+').
             </xs:documentation>
           </xs:annotation>
         </xs:attribute>
       <xs:attribute name="initial" type="xs:string">        <xs:attribute name="initial" type="xs:string">
         <xs:annotation>          <xs:annotation>
           <xs:documentation>            <xs:documentation>
             Initial Reaction              Initial reaction displayed to students. See the answer attribute for the syntax.
           </xs:documentation>            </xs:documentation>
         </xs:annotation>          </xs:annotation>
       </xs:attribute>        </xs:attribute>
Line 2509 Line 2524
       </xs:documentation>        </xs:documentation>
     </xs:annotation>      </xs:annotation>
     <xs:complexType>      <xs:complexType>
         <xs:attribute name="id" type="xs:string">
           <xs:annotation>
             <xs:documentation>
               Id that will be part of the HTML input element id.
               This can be used to get a reference to the input element in Javascript.
             </xs:documentation>
           </xs:annotation>
         </xs:attribute>
       <xs:attribute default="20" name="size" type="int-or-perl">        <xs:attribute default="20" name="size" type="int-or-perl">
         <xs:annotation>          <xs:annotation>
           <xs:documentation>            <xs:documentation>
Line 5485 Line 5508
       <xs:sequence>        <xs:sequence>
         <xs:element ref="head"/>          <xs:element ref="head"/>
         <xs:element ref="body"/>          <xs:element ref="body"/>
           <xs:element ref="allow" minOccurs="0" maxOccurs="unbounded"/>
       </xs:sequence>        </xs:sequence>
       <xs:attributeGroup ref="i18n"/>        <xs:attributeGroup ref="i18n"/>
       <xs:attribute name="id" type="xs:ID"/>        <xs:attribute name="id" type="xs:ID"/>
Line 5510 Line 5534
     <xs:complexType>      <xs:complexType>
       <xs:sequence>        <xs:sequence>
         <xs:group ref="head.misc"/>          <xs:group ref="head.misc"/>
         <xs:choice>          <xs:choice minOccurs="0">
           <xs:sequence>            <xs:sequence>
             <xs:element ref="title"/>              <xs:element ref="title"/>
             <xs:group ref="head.misc"/>              <xs:group ref="head.misc"/>
Line 5522 Line 5546
           <xs:sequence>            <xs:sequence>
             <xs:element ref="base"/>              <xs:element ref="base"/>
             <xs:group ref="head.misc"/>              <xs:group ref="head.misc"/>
             <xs:element ref="title"/>              <xs:sequence minOccurs="0">
             <xs:group ref="head.misc"/>                <xs:element ref="title"/>
                 <xs:group ref="head.misc"/>
               </xs:sequence>
           </xs:sequence>            </xs:sequence>
         </xs:choice>          </xs:choice>
       </xs:sequence>        </xs:sequence>
Line 6839 Line 6865
       </xs:documentation>        </xs:documentation>
     </xs:annotation>      </xs:annotation>
   </xs:element>    </xs:element>
   <xs:element name="pre" type="inlineBaseType">    <xs:element name="pre">
     <xs:annotation>      <xs:annotation>
       <xs:documentation>        <xs:documentation>
         The HTML &lt;pre&gt; Element (or HTML Preformatted Text) represents preformatted text. Text within this element is typically displayed in a non-proportional font exactly as it is laid out in the file. Whitespaces inside this element are displayed as typed.          The HTML &lt;pre&gt; Element (or HTML Preformatted Text) represents preformatted text. Text within this element is typically displayed in a non-proportional font exactly as it is laid out in the file. Whitespaces inside this element are displayed as typed.
       </xs:documentation>        </xs:documentation>
     </xs:annotation>      </xs:annotation>
       <xs:complexType mixed="true">
         <xs:choice maxOccurs="unbounded" minOccurs="0">
           <xs:group ref="inlines"/>
         </xs:choice>
         <xs:attribute fixed="preserve" ref="xml:space"/>
       </xs:complexType>
   </xs:element>    </xs:element>
   <xs:element name="code" type="inlineBaseType">    <xs:element name="code" type="inlineBaseType">
     <xs:annotation>      <xs:annotation>

Removed from v.1.18  
changed lines
  Added in v.1.19


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>