[sbml-svn] SF.net SVN: sbml:[12209] trunk/specifications/RelaxNG/sbml-mathml

[<sar...@us...>]

Revision: 12209
          http://sbml.svn.sourceforge.net/sbml/?rev=12209&view=rev
Author:   sarahkeating
Date:     2010-11-22 16:03:22 +0000 (Mon, 22 Nov 2010)

Log Message:
-----------
working on cn element

Modified Paths:
--------------
    trunk/specifications/RelaxNG/sbml-mathml/mml-attributes.rng
    trunk/specifications/RelaxNG/sbml-mathml/mml-basetypes.rng
    trunk/specifications/RelaxNG/sbml-mathml/mml-node.rng

Modified: trunk/specifications/RelaxNG/sbml-mathml/mml-attributes.rng
===================================================================
--- trunk/specifications/RelaxNG/sbml-mathml/mml-attributes.rng	2010-11-22 14:48:48 UTC (rev 12208)
+++ trunk/specifications/RelaxNG/sbml-mathml/mml-attributes.rng	2010-11-22 16:03:22 UTC (rev 12209)
@@ -30,14 +30,16 @@
  
  <define name="cn_attrib" combine="interleave">
   <ref name="mathml_attrib"/>
+  <optional>
   <attribute name="type">
    <choice>
-    <value type="NMTOKENS">e-notation</value>
-    <value type="NMTOKENS">rational</value>
-    <value type="NMTOKENS">integer</value>
-    <value type="NMTOKENS">real</value>
+    <value type="NMTOKEN">rational</value>
+    <value type="NMTOKEN">e-notation</value>
+    <value type="NMTOKEN">integer</value>
+    <value type="NMTOKEN">real</value>
    </choice>
   </attribute>
+  </optional>
  </define>
  
  

Modified: trunk/specifications/RelaxNG/sbml-mathml/mml-basetypes.rng
===================================================================
--- trunk/specifications/RelaxNG/sbml-mathml/mml-basetypes.rng	2010-11-22 14:48:48 UTC (rev 12208)
+++ trunk/specifications/RelaxNG/sbml-mathml/mml-basetypes.rng	2010-11-22 16:03:22 UTC (rev 12209)
@@ -26,6 +26,11 @@
   <data type="string"/>
  </define>
  
+ <define name="cn.datatype">
+  <ref name="cn_attrib"/>
+  <data type="double"></data>
+ </define>
+ 
  <define name="true.datatype">
   <ref name="mathml_attrib"/>
  </define>

Modified: trunk/specifications/RelaxNG/sbml-mathml/mml-node.rng
===================================================================
--- trunk/specifications/RelaxNG/sbml-mathml/mml-node.rng	2010-11-22 14:48:48 UTC (rev 12208)
+++ trunk/specifications/RelaxNG/sbml-mathml/mml-node.rng	2010-11-22 16:03:22 UTC (rev 12209)
@@ -14,9 +14,9 @@
      <element name="ci">
      <ref name="ci.datatype"></ref>
      </element>
-<!--    <element name="cn">
+    <element name="cn">
      <ref name="cn.datatype"/>
-    </element> -->
+    </element>
    <element name="true">
     <ref name="true.datatype"></ref>
    </element>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.