Lots more titles work.

diff --git a/dump.c b/dump.c
index 745cff4c2e4315e41955472234b07daca14425b8..3047e3d8ad0835485133dff9d8b4bebba9843cc1 100644 (file)
--- a/dump.c
+++ b/dump.c
@@ -1076,10 +1076,6 @@ dump_title_value(int level)
       get_string();
       if (!match_byte(1) && !match_byte(2))
         match_byte_assert(3);
       get_string();
       if (!match_byte(1) && !match_byte(2))
         match_byte_assert(3);

-      match_byte (0);
-      match_byte (0);
-      match_byte (0);
-      match_byte (0);

     }
   else if (match_byte (2))
     {
     }
   else if (match_byte (2))
     {


@@ -1188,44 +1184,36 @@ dump_title_value(int level)
       char *base = get_string();
       int x = get_u32();
       printf ("\"%s\"; %d variables:\n", base, x);
       char *base = get_string();
       int x = get_u32();
       printf ("\"%s\"; %d variables:\n", base, x);

-      if (match_u32(0))
-        {
-          for (int i = 0; i < x; i++)
-            {
-              dump_title_value (level+1);
-              putchar('\n');
-            }
-        }
-      else
+      for (int i = 0; i < x; i++)

         {
         {

-          for (int i = 0; i < x; i++)
+          int y = get_u32();
+          if (!y)
+            y = 1;
+          else
+            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++)

             {
             {

-              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))

                 {
                 {

-                  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_title_value (level+1);
-                  putchar('\n');
+                  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_title_value (level+1);
+              putchar('\n');

             }
         }
     }
             }
         }
     }


@@ -1269,13 +1257,17 @@ static void
 dump_title(void)
 {
   pos = 0x27;
 dump_title(void)
 {
   pos = 0x27;

-  dump_title_value(0); putchar('\n');
-  dump_title_value(0); putchar('\n');
+  dump_title_value(0); putchar('\n'); putchar('\n');
+  dump_title_value(0); putchar('\n'); putchar('\n');

   match_byte_assert(0x31);
   match_byte_assert(0x31);

-  dump_title_value(0); putchar('\n');
+  dump_title_value(0); putchar('\n'); putchar('\n');

   match_byte_assert(0x58);
   match_byte_assert(0x58);

-  match_byte_assert(0x31);
-  dump_title_value(0); putchar('\n');
+  if (match_byte(0x31))
+    {
+      dump_title_value(0); putchar('\n');
+    }
+  else
+    match_byte_assert(0x58);

 }
 
 int
 }
 
 int

diff --git a/notes b/notes
index f6f1a886590a59500f2894ee48ee4d6be9082084..2b730e298cc1135477a81ce8c0dd1e343fe7bae1 100644 (file)
--- a/notes
+++ b/notes
@@ -231,15 +231,48 @@ smekens/default/00000000018_lightTableData.bin:
 
     03 "Factor Transformation Matrix" 58 "" "Factor Transformation Matrix" 01
     03 "Factor Transformation Matrix" 58 "" "Factor Transformation Matrix" 01
 
     03 "Factor Transformation Matrix" 58 "" "Factor Transformation Matrix" 01
     03 "Factor Transformation Matrix" 58 "" "Factor Transformation Matrix" 01

-    31 03 "Factor Transformation Matrix" 58 "" "Factor Transformation Matrix" 01
+    31
+    03 "Factor Transformation Matrix" 58 "" "Factor Transformation Matrix" 01

     58 31
     00 58 "^1 \n ^2" i2 ""
        03 "Extraction Method: Principal Axis Factoring. " 58 "" "Extraction Method: Principal Axis Factoring. " i0 00
        03 "Rotation Method: Varimax with Kaiser Normalization. " 58 "" "Rotation Method: Varimax with Kaiser Normalization. " 
     i0 00 
 
     58 31
     00 58 "^1 \n ^2" i2 ""
        03 "Extraction Method: Principal Axis Factoring. " 58 "" "Extraction Method: Principal Axis Factoring. " i0 00
        03 "Rotation Method: Varimax with Kaiser Normalization. " 58 "" "Rotation Method: Varimax with Kaiser Normalization. " 
     i0 00 
 

+smekens/default/00000000011_lightNotesData.bin:
+
+    03 "Notes" 58 "notes" "Notes" 01
+    03 "Notes" 58 "" "Notes" 01
+    31
+    03 "Notes" 58 "notes" "Notes" 01
+    58 58
+    i0

 
 

+web/e5cce7d8b3200a550c0c018fff441e16/000000000344_lightTableData.bin:
+
+    03 "Omnibus Test" 31 i2 00 00 i1 00 00 i11: (i5: (00 00 00 00 58) 58 58) 00 00 00 00 "Omnibus Test" 01
+    03 "OmnibusTest" 58 00 00 00 00 "OmnibusTest" 01
+    31
+    03 "Omnibus Test" 31 i2 00 00 i1 00 00 i11: (i5: (00 00 00 00 58) 58 58) 00 00 00 00 "Omnibus Test" 01
+    58 31
+    00 31 i0 i0 i45: (i39: (00 00 00 00 31 "Dependent ^1 Model [%1:, ^1:]2") 58 58) "Dependent Variable\: ^1\nModel\: [%1:, ^1:]2" i2
+       i0 05 58 "Condom_Casual" "4. How often have you used condoms when you had sex with casual partners?" 02
+       i14 00 00 00 00 03 "(Intercept)" 58 00 00 00 00 "(Intercept)" 00 00 00 00 00 03 

 
 

+germano/Crosstabs/00000000014_lightTableData.bin:
+
+    00 31 i0 i0 i43: (i37: (00 00 00 00 31 "[%1: * ^1:]1 Crosstabulation") 58 58) "[%1: * ^1:]1 Crosstabulation" i1 i2 i0
+       05 58 "cond" 00 00 00 00 i3 00
+       05 58 "fobia" 00 00 00 00 03
+    03 "Crosstabulation" 58 "" "Crosstabulation" 01
+    31
+    00 31 i0 i0 i43: (i37: (00 00 00 00 31 "[%1: * ^1:]1 Crosstabulation") 58 58) "[%1: * ^1:]1 Crosstabulation" i1 i2 i0
+       05 58 "cond" 00 00 00 00 i3 00
+       05 58 "fobia" 00 00 00 00 03
+    58 31
+    00 31 i0 i0 i43: (i37: (00 00 00 00 31 "col prop test on ^1 at ^2...") 58 58) "Each subscript letter denotes a subset of ^1 categories whose column proportions do not differ significantly from each other at the ^2 level." i2
+       i0 05 58 "fobia" 00 00 00 00 i3 00
+       01 58 02 06 05 00 9a 99 99 99 99 99 a9 i63 00 

 
 Fonts
 -----
 
 Fonts
 -----