DO REPEAT: Order PRINT output correctly.

[pspp] / src / output / spv / light-binary.grammar

diff --git a/src/output/spv/light-binary.grammar b/src/output/spv/light-binary.grammar
index cf6e6c5fc30a877a318553e4884f0e2253b16a51..105e1dbca244a35d2723aee7a1ded4b4f2401a8a 100644 (file)
--- a/src/output/spv/light-binary.grammar
+++ b/src/output/spv/light-binary.grammar
@@ -29,8 +29,8 @@ Header =>
    bool[rotate-outer-row-labels]
    bool[x2]
    int32[x3]
-   int32[min-col-width] int32[max-col-width]
-   int32[min-row-height] int32[max-row-height]
+   int32[min-col-heading-width] int32[max-col-heading-width]
+   int32[min-row-heading-width] int32[max-row-heading-width]
    int64[table-id]
 
 Titles =>
@@ -121,12 +121,14 @@ X0 => byte*14 Y1 Y2
 Y1 =>
    string[command] string[command-local]
    string[language] string[charset] string[locale]
-   bool[x10] bool[x11] bool[x12] bool[x13]
+   bool[x10] bool[include-leading-zero] bool[x12] bool[x13]
    Y0
 Y2 => CustomCurrency byte[missing] bool[x17]
 
 X1 =>
-   bool[x14] byte[x15] bool[x16]
+   bool[x14]
+   byte[show-title]
+   bool[x16]
    byte[lang]
    byte[show-variables]
    byte[show-values]
@@ -148,7 +150,7 @@ X3 =>
    double[small] 01
    (string[dataset] string[datafile] i0 int32[date] i0)?
    Y2
-   (int32[x22] i0)?
+   (int32[x22] i0 01?)?
 
 Dimensions => int32[n-dims] Dimension*[n-dims]
 Dimension =>