Some minor refinements from expanding the corpus.

[pspp] / spv-file-format.texi

diff --git a/spv-file-format.texi b/spv-file-format.texi
index 2ac8de6700de9a7c2f9e4eecb3067d6dbc7b5cae..1aef76c64750d0bef77720dadf166235531993dc 100644 (file)
--- a/spv-file-format.texi
+++ b/spv-file-format.texi
@@ -55,10 +55,12 @@ Same format used for tables, with a different name.
 The structure of a chart plus its data.  Charts do not have a
 ``light'' format.
 
-@item @var{prefix}_model.xml
-@itemx @var{prefix}_pmml.xml
-@itemx @var{prefix}_stats.xml
+@item @var{prefix}_model.scf
+@itemx @var{prefix}_pmml.scf
 Not yet investigated.  The corpus contains only one example of each.
+
+@itemx @var{prefix}_stats.xml
+Not yet investigated.  The corpus contains few examples.
 @end table
 
 The @file{@var{prefix}} in the names of the detail members is
@@ -417,7 +419,7 @@ x6 := 01 00 (03 | 04) 00 00 00
       byte*8 01
       (string[dataset] string[datafile] i0 int i0)?
       int[n-ccs] string*[n-ccs]
-      2e (00 | 01)
+      2e (00 | 01) (i2000000 i0)?
 @end example
 
 In every example in the corpus, @code{x1} is 240.  The meaning of the
@@ -632,19 +634,17 @@ substitution := i0 value
 opt-value := 31 i0 (i0 | i1 string) opt-value-i0-v1        /* @r{version 1} */
            | 31 i0 (i0 | i1 string) opt-value-i0-v3        /* @r{version 3} */
            | 31 i1 int32[footnote-number] nested-string
-           | 31 i2 (00 | 02) 00 (i1 | i2 | i3) nested-string
+           | 31 i2 (00 | 01 | 02) 00 (i1 | i2 | i3) nested-string
            | 31 i3 00 00 01 00 i2 nested-string
            | 58
 opt-value-i0-v1 := 00 (i1 | i2) 00 00 int32 00 00
 opt-value-i0-v3 := count(counted-string
-                         (58
-                          | 31 01? 00? 00? 00? 01
-                            string[fgcolor] string[bgcolor] string[typeface]
-                            byte)
+                         (58 | 31 style)
                          (58
                           | 31 i0 i0 i0 i0 01 00 (01 | 02 | 08)
                             00 08 00 0a 00))
 
-nested-string := 00 00 count(counted-string 58 58)
+style := 01? 00? 00? 00? 01 string[fgcolor] string[bgcolor] string[font] byte
+nested-string := 00 00 count(counted-string (58 | 31 style) 58)
 counted-string := count((i0 (58 | 31 string))?)
 @end example