changeset 1256:38a6b618440f octave-forge

Update xmlwrite according to the new DTD
author mazet
date Sat, 31 Jan 2004 21:39:08 +0000
parents 49e6eee5f7ff
children 7a2af2b41ce2
files main/miscellaneous/octave.dtd main/miscellaneous/xmlwrite.m
diffstat 2 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/main/miscellaneous/octave.dtd	Fri Jan 30 22:08:34 2004 +0000
+++ b/main/miscellaneous/octave.dtd	Sat Jan 31 21:39:08 2004 +0000
@@ -1,4 +1,4 @@
-<!ELEMENT data (scalar | complex | string | array | structure | list | cell)*>
+<!ELEMENT octave (scalar | complex | string | array | structure | list | cell)>
 
 <!ELEMENT scalar (#PCDATA)>
 <!ATTLIST scalar
@@ -15,7 +15,6 @@
 
 <!ELEMENT array (string, string+)>
 <!ATTLIST array
-	length CDATA #REQUIRED
 	rows CDATA #REQUIRED
 	name CDATA #IMPLIED>
 
--- a/main/miscellaneous/xmlwrite.m	Fri Jan 30 22:08:34 2004 +0000
+++ b/main/miscellaneous/xmlwrite.m	Sat Jan 31 21:39:08 2004 +0000
@@ -55,8 +55,8 @@
 
     ## XML header
     fprintf (fd, "<?xml version=\"1.0\"?>\n");
-    fprintf (fd, "<!DOCTYPE data SYSTEM \"octave.dtd\">\n");
-    fprintf (fd, "<data>\n");
+    fprintf (fd, "<!DOCTYPE octave SYSTEM \"octave.dtd\">\n");
+    fprintf (fd, "<octave>\n");
     indent = "  ";
   else
     isopen = true;
@@ -124,7 +124,7 @@
     elseif isnan(value)
       ## Not-A-Number type
       
-      fprintf (fd, "%s<scalar% value=\"nan\"/>%s", indent, opt, separator);
+      fprintf (fd, "%s<scalar%s value=\"nan\"/>%s", indent, opt, separator);
       
     elseif isna(value)
       ## Not-Avaliable
@@ -199,7 +199,7 @@
   nb++;
   
   if !isopen
-    fprintf (fd, "</data>\n");
+    fprintf (fd, "</octave>\n");
     fclose(fd);
   endif