Fix most of what's left.

diff --git a/dump.c b/dump.c
index bd12c3eb23a22db2ea5fc968408e0ef3fe639a78..65bd4831cecba3a820e3fe7eb003d8db56ba91e3 100644 (file)
--- a/dump.c
+++ b/dump.c
@@ -205,7 +205,7 @@ dump_value(int level)
       match_byte (0);
       match_byte (0);
       match_byte (0);
-      match_byte (1) || match_byte(3);
+      match_byte (1);
       match_byte (1);
       match_byte (0);
       match_byte (0);
@@ -322,20 +322,48 @@ dump_value(int level)
     {
 
       match_byte_assert (0x58);
-      printf ("\"%s\" with substitutions:", get_string());
-      int total_subs = get_u32();
+      char *base = get_string();
       int x = get_u32();
-      if (x)
+      printf ("\"%s\" with %d variables:\n", base, x);
+      if (match_u32(0))
         {
-          total_subs = (total_subs - 1) + x;
-          match_u32_assert (0);
+          for (int i = 0; i < x; i++)
+            {
+              dump_value (level+1);
+              putchar('\n');
+            }
         }
-      printf (" (total %d)", total_subs);
-
-      for (int i = 0; i < total_subs; i++)
+      else
         {
-          putc ('\n', stdout);
-          dump_value (level + 1);
+          for (int i = 0; i < x; i++)
+            {
+              int y = get_u32();
+              match_u32_assert(0);
+              for (int j = 0; j <= level; j++)
+                printf ("    ");
+              printf("variable %d has %d values:\n", i, y);
+              for (int j = 0; j < y; j++)
+                {
+                  if (match_byte(3))
+                    {
+                      char *a = get_string();
+                      match_byte_assert(0x58);
+                      char *b = get_string();
+                      char *c = get_string();
+                      for (int k = 0; k <= level + 1; k++)
+                        printf ("    ");
+                      printf ("\"%s\", \"%s\", \"%s\"", a, b, c);
+                      match_byte(0);
+                      match_byte(0);
+                      match_byte(0);
+                      match_byte(0);
+                      match_byte(0);
+                    }
+                  else
+                    dump_value (level+1);
+                  putchar('\n');
+                }
+            }
         }
     }
 }

diff --git a/notes b/notes
index 3048de69c250c8cf87e3d054ae9141f74cdaf8d9..d5dd7b16211b8c2712d61c353be58cabb912c870 100644 (file)
--- a/notes
+++ b/notes
@@ -1215,17 +1215,22 @@ This one is just puzzling.
     03 "Source" 58 "source_of_variation" "Source" 01 00 00 i2 00 00 01 i2 i5 00
        58 "[%1: * ^1:]1" i1 i1 00 00 00 00
            03 "Word_Type" 58 00 00 00 00 "Word_Type" 00 00 00 00 i2 00 00 00 00 00 00 00 00 00
-       58 "[%1: * ^1:]1 *[: ^1:]2" i2 i1 00 00 00 00
-           03 "Word_Type" 58 00 00 00 00 "Word_Type" 00 i1 00 00 00 00
-           05 58 "Word_Color" 00 00 00 00 i1 i2 i1 00 00 00 00 00
-       58 "[%1: * ^1:]1 *[: ^1:]2" i2 i1 00 00 00 00
-           03 "Word_Type" 58 00 00 00 00 "Word_Type" 00 i1 00 00 00 00
-           05 58 "Order" 00 00 00 00 i1 i2 i2 00 00 00 00 00
-       58 "[%1: * ^1:]1 *[: ^1:]2" i2 i1 00 00 00 00
-           03 "Word_Type" 58 "" "Word_Type" 00 i3 00 00 00 00
-           05 58 "Word_Color" 00 00 00 00 i1 00
-       03 " * " 58 00 00 00 00 " * " 00 00 00 00 00
-       05 58 "Order" 00 00 00 00 i1 i2 i3 00 00 00 00 00 58 "Error([%1:*^1:]1)" i1 i1 00 00 00 00
+       58 "[%1: * ^1:]1 *[: ^1:]2" i2
+            i1 00 00 00 00
+               03 "Word_Type" 58 "" "Word_Type" 00
+            i1 00 00 00 00
+               05 58 "Word_Color" "" i1 i2 i1 00 00 00 00 00
+       58 "[%1: * ^1:]1 *[: ^1:]2" i2 i1 i0
+           03 "Word_Type" 58 "" "Word_Type" 00 i1 i0
+           05 58 "Order" "" i1                        i2 i2 i0 00
+       58 "[%1: * ^1:]1 *[: ^1:]2" i2
+            i1 i0
+                03 "Word_Type" 58 "" "Word_Type" 00
+            i3 i0
+               05 58 "Word_Color" "" i1 00
+               03 " * " 58 "" " * " i0 00
+               05 58 "Order" ""      i1                   i2 i3 i0
+        00 58 "Error([%1:*^1:]1)" i1 i1 00 00 00 00
            03 "Word_Type" 58 00 00 00 00 "Word_Type" 00 00 00 00 i2 i4 00 00 00 00
 
     03 "Statistics" 58 "statistics_10" "Statistics" 01 00 01 i2 01 00 01 i3 i6
@@ -1281,18 +1286,25 @@ i4
     03 "FWHM" 58 00 00 00 00 "FWHM" 00 00 00 00 i2 i3 00 00 00 00
 
 03 "Source" 58 "source_of_variation" "Source" 01 00 00 i2 00 00 01 i2 i21 00
-    58 "[%1: * ^1:]1" i1 i1 00 00 00 00
-        03 "Language" 58 00 00 00 00 "Language" 00 00 00 00 i2 00 00 00 00 00 00 00 00 00
-    58 "[%1: * ^1:]1 *[: ^1:]2" i2 i1 00 00 00 00
-       03 "Language" 58 00 00 00 00 "Language" 00 i1 00 00 00 00
-       05 58 "Gender" "Gender" i1 i2 i1 00 00 00 00 00
-    58 "Error([%1:*^1:]1)" i1 i1 00 00 00 00
-        03 "Language" 58 00 00 00 00 "Language" 00 00 00 00 i2 i2 00 00 00 00 00
-    58 "[%1: * ^1:]1" i1 i1 00 00 00 00
-        03 "Size_AOI" 58 00 00 00 00 "Size_AOI" 00 00 00 00 i2 i3 00 00 00 00 00
-    58 "[%1: * ^1:]1 *[: ^1:]2" i2 i1 00 00 00 00
-       03 "Size_AOI" 58 00 00 00 00 "Size_AOI" 00 i1 00 00 00 00
-       05 58 "Gender" "Gender" i1 i2 i4 00 00 00 00 00
+    58 "[%1: * ^1:]1" i1
+        i1 00 00 00 00
+            03 "Language" 58 00 00 00 00 "Language" 00 00 00 00 i2 00 00 00 00 00 00 00 00 00
+    58 "[%1: * ^1:]1 *[: ^1:]2" i2
+        i1 00 00 00 00
+            03 "Language" 58 00 00 00 00 "Language" 00
+        i1 00 00 00 00
+            05 58 "Gender" "Gender" i1 i2 i1 00 00 00 00 00
+    58 "Error([%1:*^1:]1)" i1
+        i1 00 00 00 00
+            03 "Language" 58 00 00 00 00 "Language" 00 00 00 00 i2 i2 00 00 00 00 00
+    58 "[%1: * ^1:]1" i1
+        i1 00 00 00 00
+            03 "Size_AOI" 58 00 00 00 00 "Size_AOI" 00 00 00 00 i2 i3 00 00 00 00 00
+    58 "[%1: * ^1:]1 *[: ^1:]2" i2
+        i1 00 00 00 00
+            03 "Size_AOI" 58 00 00 00 00 "Size_AOI" 00
+        i1 00 00 00 00
+            05 58 "Gender" "Gender" i1 i2 i4 00 00 00 00 00
     58 "Error([%1:*^1:]1)" i1 i1 00 00 00 00
         03 "Size_AOI" 58 00 00 00 00 "Size_AOI" 00 00 00 00 i2 i5 00 00 00 00 00
     58 "[%1: * ^1:]1" i1 i1 00 00 00 00
@@ -1305,10 +1317,12 @@ i4
     58 "[%1: * ^1:]1" i1 i2 00 00 00 00
         03 "Language" 58 00 00 00 00 "Language" 00 00 00 00 00
         03 "Size_AOI" 58 00 00 00 00 "Size_AOI" 00 00 00 00 i2 i9 00 00 00 00 00
-    58 "[%1: * ^1:]1 *[: ^1:]2" i2 i2 00 00 00 00
-       03 "Language" 58 00 00 00 00 "Language" 00 00 00 00 00
-       03 "Size_AOI" 58 00 00 00 00 "Size_AOI" 00 i1 00 00 00 00
-       05 58 "Gender" "Gender" i1 i2 i10 00 00 00 00 00
+    58 "[%1: * ^1:]1 *[: ^1:]2" i2
+        i2 00 00 00 00
+            03 "Language" 58 00 00 00 00 "Language" 00 00 00 00 00
+            03 "Size_AOI" 58 00 00 00 00 "Size_AOI" 00
+        i1 00 00 00 00
+           05 58 "Gender" "Gender" i1 i2 i10 00 00 00 00 00
     58 "Error([%1:*^1:]1)" i1 i2 00 00 00 00
        03 "Language" 58 00 00 00 00 "Language" 00 00 00 00 00
        03 "Size_AOI" 58 00 00 00 00 "Size_AOI" 00 00 00 00 i2 i11 00 00 00 00 00
@@ -1347,12 +1361,12 @@ i4
        03 "Area" 58 00 00 00 00 "Area" 00 00 00 00 i2 i20 00 00 00 00
 
     03 "Statistics" 58 "statistics_10" "Statistics" 01 00 01 i2 01 00 01 i3 i6
-    03 "Type III Sum of Squares" 58 "type_iii_sum_of_squares" "Type III Sum of Squares" i1 i2 00 00 00 00 00 00 00 00
-    03 "df" 58 "df" "df" i1 i2 i1 00 00 00 00
-    03 "Mean Square" 58 "mean_square" "Mean Square" i1 i2 i2 00 00 00 00
-    03 "F" 58 "f_value" "F" i1 i2 i3 00 00 00 00
-    03 "Sig." 58 "significance_level" "Sig." i1 i2 i4 00 00 00 00
-    03 "Partial Eta Squared" 58 "estimates_of_effect_size" "Partial Eta Squared" i1 i2 i5 00 00 00 00 00 00 00 00
+       03 "Type III Sum of Squares" 58 "type_iii_sum_of_squares" "Type III Sum of Squares" i1 i2 00 00 00 00 00 00 00 00
+       03 "df" 58 "df" "df" i1 i2 i1 00 00 00 00
+       03 "Mean Square" 58 "mean_square" "Mean Square" i1 i2 i2 00 00 00 00
+       03 "F" 58 "f_value" "F" i1 i2 i3 00 00 00 00
+       03 "Sig." 58 "significance_level" "Sig." i1 i2 i4 00 00 00 00
+       03 "Partial Eta Squared" 58 "estimates_of_effect_size" "Partial Eta Squared" i1 i2 i5 00 00 00 00 00 00 00 00
 
 
 Data: tdump21 (germano/Crosstabs.pdf)