X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=dump.c;h=1cdb749f81fc714f09876a9701391cb48416e2bb;hb=2aed65a53e0d5ae8d7abc77f6cbd7cf055b37ceb;hp=b21de36fea8643197e81b04db1aaf878fe4e3784;hpb=f2d438b574d40b387270a342cc152d02273242f6;p=pspp

diff --git a/dump.c b/dump.c
index b21de36fea..1cdb749f81 100644
--- a/dump.c
+++ b/dump.c
@@ -1,3 +1,5 @@
+#include <assert.h>
+#include <float.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -5,10 +7,13 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include "u8-mbtouc.h"
 
 static uint8_t *data;
 static size_t n;
 
+int version;
+
 static bool
 all_ascii(const uint8_t *p, size_t n)
 {
@@ -25,13 +30,6 @@ try_find(const char *target, size_t target_len)
   return pos ? pos - data : 0;
 }
 
-static size_t
-try_find_tail(const char *target, size_t target_len)
-{
-  size_t pos = try_find(target, target_len);
-  return pos ? pos + target_len : 0;
-}
-
 static size_t
 find(const char *target, size_t target_len)
 {
@@ -44,18 +42,6 @@ find(const char *target, size_t target_len)
   return pos;
 }
 
-static size_t
-find_tail(const char *target, size_t target_len)
-{
-  size_t pos = try_find_tail(target, target_len);
-  if (!pos)
-    {
-      fprintf (stderr, "not found\n");
-      exit(1);
-    }
-  return pos;
-}
-
 size_t pos;
 
 #define XSTR(x) #x
@@ -125,7 +111,13 @@ match_byte_assert(uint8_t b, const char *where)
 #define match_byte_assert(b) match_byte_assert(b, WHERE)
 
 static void
-dump_raw(FILE *stream, int start, int end, const char *separator)
+newline(FILE *stream, int pos)
+{
+  fprintf(stream, "\n%08x: ", pos);
+}
+
+static void
+dump_raw(FILE *stream, int start, int end)
 {
   for (size_t i = start; i < end; )
     {
@@ -137,7 +129,8 @@ dump_raw(FILE *stream, int start, int end, const char *separator)
           && i + 4 + data[i] + data[i + 1] * 256 <= end
           && all_ascii(&data[i + 4], data[i] + data[i + 1] * 256))
         {
-          fprintf(stream, "%s\"", separator);
+          newline(stream, i);
+          fprintf(stream, "\"");
           fwrite(&data[i + 4], 1, data[i] + data[i + 1] * 256, stream);
           fputs("\" ", stream);
 
@@ -151,8 +144,9 @@ dump_raw(FILE *stream, int start, int end, const char *separator)
           double d;
 
           memcpy (&d, &data[i + 4], 8);
-          fprintf (stream, "F40.%d(%.*f)%s", data[i], data[i], d, separator);
+          fprintf (stream, "F40.%d(%.*f)", data[i], data[i], d);
           i += 12;
+          newline (stream, i);
         }
       else if (i + 12 <= end
                && data[i + 1] == 40
@@ -162,8 +156,9 @@ dump_raw(FILE *stream, int start, int end, const char *separator)
           double d;
 
           memcpy (&d, &data[i + 4], 8);
-          fprintf (stream, "PCT40.%d(%.*f)%s", data[i], data[i], d, separator);
+          fprintf (stream, "PCT40.%d(%.*f)", data[i], data[i], d);
           i += 12;
+          newline(stream, i);
         }
       else if (i + 4 <= end
                && (data[i] && data[i] != 88 && data[i] != 0x41)
@@ -184,6 +179,22 @@ dump_raw(FILE *stream, int start, int end, const char *separator)
 
 }
 
+static bool __attribute__((unused))
+all_utf8(const char *p_)
+{
+  const uint8_t *p = (const uint8_t *) p_;
+  size_t len = strlen ((char *) p);
+  for (size_t ofs = 0, mblen; ofs < len; ofs += mblen)
+    {
+      ucs4_t uc;
+
+      mblen = u8_mbtouc (&uc, p + ofs, len - ofs);
+      if ((uc < 32 && uc != '\n') || uc == 127 || uc == 0xfffd)
+        return false;
+    }
+  return true;
+}
+
 static char *
 get_string(const char *where)
 {
@@ -207,96 +218,247 @@ get_string(const char *where)
 }
 #define get_string() get_string(WHERE)
 
-static void
-dump_nested(void)
+static char *
+dump_nested_string(void)
 {
-  int subn = get_u32 ();
-#if 0
-  fprintf (stderr, "nested %d bytes: ", subn);
-  dump_raw(stderr, pos, pos + subn, "");
-  putc('\n', stderr);
-#endif
-  pos += subn;
+  char *s = NULL;
+
+  match_byte_assert (0);
+  match_byte_assert (0);
+  int outer_end = pos + get_u32();
+  int inner_end = pos + get_u32();
+  if (pos != inner_end)
+    {
+      match_u32_assert(0);
+      if (match_byte(0x31))
+        s = get_string();
+      else
+        match_byte_assert(0x58);
+      if (pos != inner_end)
+        {
+          fprintf(stderr, "inner end discrepancy\n");
+          exit(1);
+        }
+    }
+  match_byte_assert(0x58);
+  match_byte_assert(0x58);
+  if (pos != outer_end)
+    {
+      fprintf(stderr, "outer end discrepancy\n");
+      exit(1);
+    }
+
+  return s;
 }
 
 static void
-dump_value_31(void)
+dump_optional_value(FILE *stream)
 {
   if (match_byte (0x31))
     {
       if (match_u32 (0))
         {
           if (match_u32 (1))
-            get_string();
+            {
+              /* Only "a" observed as a sample value (although it appears 44 times in the corpus). */
+              get_string();
+            }
           else
             match_u32_assert (0);
-          dump_nested();
+
+          if (version == 1)
+            {
+              /* We only have one SPV file for this version (with many
+                 tables). */
+              match_byte(0);
+              if (!match_u32(1))
+                match_u32_assert(2);
+              match_byte(0);
+              match_byte(0);
+              if (!match_u32(0) && !match_u32(1) && !match_u32(2) && !match_u32(3) && !match_u32(4) && !match_u32(5) && !match_u32(6) && !match_u32(7) && !match_u32(8) && !match_u32(9))
+                match_u32_assert(10);
+              match_byte(0);
+              match_byte(0);
+              return;
+            }
+
+          int outer_end = pos + get_u32();
+          int inner_end = pos + get_u32();
+          if (pos != inner_end)
+            {
+              match_u32_assert(0);
+              if (match_byte(0x31))
+                {
+                  /* Appears to be a template string, e.g. '^1 cells (^2) expf < 5. Min exp = ^3...'.
+                     Probably doesn't actually appear in output because many examples look unpolished,
+                     e.g. 'partial list cases value ^1 shown upper...' */
+                  get_string();
+                }
+              else
+                match_byte_assert(0x58);
+              if (pos != inner_end)
+                {
+                  fprintf(stderr, "inner end discrepancy\n");
+                  exit(1);
+                }
+            }
+
+          if (match_byte(0x31))
+            {
+              /* Only one example in the corpus. */
+              match_byte(1);
+              match_byte(0);
+              match_byte(0);
+              match_byte(0);
+              match_byte_assert(1);
+              get_string();     /* foreground */
+              get_string();     /* background */
+              get_string();     /* font */
+              if (!match_byte(14))
+                match_byte_assert(12); /* size? */
+            }
+          else
+            match_byte_assert(0x58);
+          if (match_byte(0x31))
+            {
+              /* Only two SPV files have anything like this, so it's hard to
+                 generalize. */
+              match_u32_assert(0);
+              match_u32_assert(0);
+              match_u32_assert(0);
+              match_u32_assert(0);
+              match_byte_assert(1);
+              match_byte_assert(0);
+              if (!match_byte(8) && !match_byte(1))
+                match_byte_assert(2);
+              match_byte_assert(0);
+              match_byte_assert(8);
+              match_byte_assert(0);
+              match_byte_assert(10);
+              match_byte_assert(0);
+            }
+          else
+            match_byte_assert(0x58);
+          if (pos != outer_end)
+            {
+              fprintf(stderr, "outer end discrepancy\n");
+              exit(1);
+            }
         }
       else if (match_u32 (1))
         {
-          printf("(footnote %d) ", get_u32());
-          match_byte_assert (0);
-          match_byte_assert (0);
-          dump_nested();
+          fprintf(stream, "(footnote %d) ", get_u32());
+          dump_nested_string();
         }
       else if (match_u32 (2))
         {
-          printf("(special 2)");
-          match_byte_assert(0);
-          match_byte_assert(0);
-          if (!match_u32 (2))
-            match_u32_assert(1);
-          match_byte_assert(0);
+          fprintf(stream, "(special 2)");
+          if (!match_byte(0))
+            match_byte_assert(2);
           match_byte_assert(0);
-          dump_nested();
+          if (!match_u32 (2) && !match_u32(1))
+            match_u32_assert(3);
+          dump_nested_string(); /* Our corpus doesn't contain any examples with strings though. */
         }
       else
         {
           match_u32_assert(3);
-          printf("(special 3)");
+          fprintf(stream, "(special 3)");
           match_byte_assert(0);
           match_byte_assert(0);
           match_byte_assert(1);
           match_byte_assert(0);
-          dump_nested();
-          dump_nested();
+          match_u32_assert(2);
+          dump_nested_string(); /* Our corpus doesn't contain any examples with strings though. */
         }
     }
   else
     match_byte_assert (0x58);
 }
 
-static void
-dump_value__(int level, bool match1)
+static const char *
+format_to_string (int type)
 {
-  for (int i = 0; i <= level; i++)
-    printf ("    ");
+  static char tmp[16];
+  switch (type)
+    {
+    case 1: return "A";
+    case 2: return "AHEX";
+    case 3: return "COMMA";
+    case 4: return "DOLLAR";
+    case 5: case 40: return "F";
+    case 6: return "IB";
+    case 7: return "PIBHEX";
+    case 8: return "P";
+    case 9: return "PIB";
+    case 10: return "PK";
+    case 11: return "RB";
+    case 12: return "RBHEX";
+    case 15: return "Z";
+    case 16: return "N";
+    case 17: return "E";
+    case 20: return "DATE";
+    case 21: return "TIME";
+    case 22: return "DATETIME";
+    case 23: return "ADATE";
+    case 24: return "JDATE";
+    case 25: return "DTIME";
+    case 26: return "WKDAY";
+    case 27: return "MONTH";
+    case 28: return "MOYR";
+    case 29: return "QYR";
+    case 30: return "WKYR";
+    case 31: return "PCT";
+    case 32: return "DOT";
+    case 33: return "CCA";
+    case 34: return "CCB";
+    case 35: return "CCC";
+    case 36: return "CCD";
+    case 37: return "CCE";
+    case 38: return "EDATE";
+    case 39: return "SDATE";
+    default:
+      abort();
+      sprintf(tmp, "<%d>", type);
+      return tmp;
+    }
+}
 
+static void
+dump_value(FILE *stream, int level)
+{
   match_byte(0);
   match_byte(0);
   match_byte(0);
   match_byte(0);
 
+  for (int i = 0; i <= level; i++)
+    fprintf (stream, "    ");
+
   if (match_byte (3))
     {
-      char *s1 = get_string();
-      dump_value_31();
-      char *s2 = get_string();
-      char *s3 = get_string();
-      if (strcmp(s1, s3))
-        printf("strings \"%s\", \"%s\" and \"%s\"", s1, s2, s3);
-      else
-        printf("string \"%s\" and \"%s\"", s1, s2);
+      char *text = get_string();
+      dump_optional_value(stream);
+      char *identifier = get_string();
+      char *text_eng = get_string();
+      fprintf (stream, "<string c=\"%s\"", text_eng);
+      if (identifier[0])
+        fprintf (stream, " identifier=\"%s\"", identifier);
+      if (strcmp(text_eng, text))
+        fprintf (stream, " local=\"%s\"", text);
+      fprintf (stream, "/>\n");
       if (!match_byte (0))
         match_byte_assert(1);
-      if (match1)
-        match_byte (1);
     }
   else if (match_byte (5))
     {
-      dump_value_31();
-      printf ("variable \"%s\"", get_string());
-      get_string();
+      dump_optional_value(stream);
+      char *name = get_string ();
+      char *label = get_string ();
+      fprintf (stream, "<variable name=\"%s\"", name);
+      if (label[0])
+        fprintf (stream, " label=\"%s\"", label);
+      fprintf (stream, "/>\n");
       if (!match_byte(1) && !match_byte(2))
         match_byte_assert(3);
     }
@@ -306,13 +468,18 @@ dump_value__(int level, bool match1)
       char *var, *vallab;
       double value;
 
-      match_byte_assert (0x58);
+      dump_optional_value (stream);
       format = get_u32 ();
       value = get_double ();
       var = get_string ();
       vallab = get_string ();
-      printf ("value %g format %d(%d.%d) var \"%s\" vallab \"%s\"",
-              value, format >> 16, (format >> 8) & 0xff, format & 0xff, var, vallab);
+      fprintf (stream, "<numeric-datum value=\"%.*g\" format=\"%s%d.%d\"",
+              DBL_DIG, value, format_to_string(format >> 16), (format >> 8) & 0xff, format & 0xff);
+      if (var[0])
+        fprintf (stream, " variable=\"%s\"", var);
+      if (vallab[0])
+        fprintf (stream, " label=\"%s\"/>\n", vallab);
+      fprintf (stream, "/>\n");
       if (!match_byte (1) && !match_byte(2))
         match_byte_assert (3);
     }
@@ -328,28 +495,32 @@ dump_value__(int level, bool match1)
       if (!match_byte(1) && !match_byte(2))
         match_byte_assert (3);
       value = get_string ();
-      printf ("value \"%s\" format %d(%d.%d) var \"%s\" vallab \"%s\"",
-              value, format >> 16, (format >> 8) & 0xff, format & 0xff, var, vallab);
+      fprintf (stream, "<string-datum value=\"%s\" format=\"%s%d.%d\"",
+              value, format_to_string(format >> 16), (format >> 8) & 0xff, format & 0xff);
+      if (var[0])
+        fprintf (stream, " variable=\"%s\"", var);
+      if (vallab[0])
+        fprintf (stream, " label=\"%s\"/>\n", vallab);
+      fprintf (stream, "/>\n");
     }
   else if (match_byte (1))
     {
       unsigned int format;
       double value;
 
-      dump_value_31();
+      dump_optional_value(stream);
       format = get_u32 ();
       value = get_double ();
-      printf ("value %g format %d(%d.%d)", value, format >> 16, (format >> 8) & 0xff, format & 0xff);
-      if (match1)
-        match_byte (1);
+      fprintf (stream, "<number value=\"%.*g\" format=\"%s%d.%d\"/>\n",
+               DBL_DIG, value, format_to_string(format >> 16), (format >> 8) & 0xff, format & 0xff);
     }
   else
     {
-      dump_value_31();
+      dump_optional_value(stream);
 
       char *base = get_string();
       int x = get_u32();
-      printf ("\"%s\" with %d variables:\n", base, x);
+      fprintf (stream, "<template format=\"%s\">\n", base);
       for (int i = 0; i < x; i++)
         {
           int y = get_u32();
@@ -357,15 +528,18 @@ dump_value__(int level, bool match1)
             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 <= level + 1; j++)
+            fprintf (stream, "    ");
+          fprintf (stream, "<substitution index=\"%d\">\n", i + 1);
           for (int j = 0; j < y; j++)
-            {
-              dump_value__ (level + 1, false);
-              putchar('\n');
-            }
+            dump_value (stream, level + 2);
+          for (int j = 0; j <= level + 1; j++)
+            fprintf (stream, "    ");
+          fprintf (stream, "</substitution>\n");
         }
+      for (int j = 0; j <= level; j++)
+        fprintf (stream, "    ");
+      fprintf (stream, "</template>\n");
     }
 }
 
@@ -395,53 +569,94 @@ check_permutation(int *a, int n, const char *name)
 }
 
 static void
-dump_category(int level, int *indexes, int *n_indexes)
+dump_category(FILE *stream, int level, int *indexes, int *n_indexes, int max_indexes)
 {
-  dump_value__ (level, true);
-  match_byte(0);
-  match_byte(0);
-  match_byte(0);
+  for (int i = 0; i <= level; i++)
+    fprintf (stream, "    ");
+  printf ("<category>\n");
+  dump_value (stream, level + 1);
 
-  if (match_u32 (1))
-    match_byte (0);
-  else if (match_byte (1))
-    {
-      match_byte (0);
-      if (!match_u32 (2))
-        match_u32_assert (1);
-      match_byte (0);
-    }
-  else if (!match_u32(2))
-    match_u32_assert (0);
+  int merge = data[pos];
+  if (!match_byte(0))
+    match_byte_assert (1);
+
+  match_byte_assert (0);
+
+  int unindexed = data[pos];
+  if (!match_byte(0))
+    match_byte_assert (1);
+
+  int x = get_u32 ();
+  pos -= 4;
+  if (!match_u32 (0))
+    match_u32_assert (2);
 
   int indx = get_u32();
   int n_categories = get_u32();
-  if (indx != -1)
+  if (indx == -1)
+    {
+      if (merge)
+        {
+          for (int i = 0; i <= level + 1; i++)
+            fprintf (stream, "    ");
+          fprintf (stream, "<merge/>\n");
+        }
+    }
+  else
     {
+      if (merge)
+        {
+          fprintf(stderr, "index not -1 but merged\n");
+          exit(1);
+        }
+      if (x != 2)
+        {
+          fprintf(stderr, "index not -1 but x != 2\n");
+          exit(1);
+        }
       if (n_categories != 0)
         {
           fprintf(stderr, "index not -1 but subcategories\n");
           exit(1);
         }
+      if (*n_indexes >= max_indexes)
+        {
+          fprintf(stderr, "too many categories (increase max_indexes)\n");
+          exit(1);
+        }
       indexes[(*n_indexes)++] = indx;
     }
-  if (n_categories > 0)
-    printf (", %d subcategories:", n_categories);
-  else
-    printf (", index %d", indx);
-  printf("\n");
+
+  int expected_unindexed = indx == -1;
+  if (unindexed != expected_unindexed)
+    {
+      fprintf(stderr, "unindexed (%d) mismatch with indx (%d)\n",
+              unindexed, indx);
+      exit(1);
+    }
+
+  if (n_categories == 0)
+    {
+      for (int i = 0; i <= level + 1; i++)
+        fprintf (stream, "    ");
+      fprintf (stream, "<category-index>%d</category-index>\n", indx);
+    }
   for (int i = 0; i < n_categories; i++)
-    dump_category (level + 1, indexes, n_indexes);
+    dump_category (stream, level + 1, indexes, n_indexes, max_indexes);
+  for (int i = 0; i <= level; i++)
+    fprintf (stream, "    ");
+  printf ("</category>\n");
 }
 
 static void
-dump_dim(void)
+dump_dim(int indx)
 {
   int n_categories;
-  printf("next dim\n");
-  dump_value__ (0, false);
 
-  /* This byte is usually 0x02 but 0x00 and 0x75 (!) have also been spotted. */
+  printf ("<dimension index=\"%d\">\n", indx);
+  dump_value (stdout, 0);
+
+  /* This byte is usually 0 but many other values have been spotted. */
   pos++;
 
   if (!match_byte(0) && !match_byte(1))
@@ -453,16 +668,17 @@ dump_dim(void)
   if (!match_byte(0))
     match_byte_assert(1);
   match_byte_assert(1);
-  static int dim_indx = 0;
-  match_u32_assert(dim_indx++);
+  if (!match_u32(UINT32_MAX))
+    match_u32_assert(indx);
   n_categories = get_u32();
-  printf("%d nested categories\n", n_categories);
 
-  int indexes[1024];
+  int indexes[2048];
   int n_indexes = 0;
   for (int i = 0; i < n_categories; i++)
-    dump_category (0, indexes, &n_indexes);
+    dump_category (stdout, 0, indexes, &n_indexes, sizeof indexes / sizeof *indexes);
   check_permutation(indexes, n_indexes, "categories");
+
+  fprintf (stdout, "</dimension>\n");
 }
 
 int n_dims;
@@ -470,138 +686,152 @@ static void
 dump_dims(void)
 {
   n_dims = get_u32();
-  printf ("%u dimensions\n", n_dims);
   for (int i = 0; i < n_dims; i++)
-    {
-      printf("\n");
-      dump_dim ();
-    }
+    dump_dim (i);
 }
 
 static void
 dump_data(void)
 {
   /* The first three numbers add to the number of dimensions. */
-  int t = get_u32();
-  t += get_u32();
-  match_u32_assert(n_dims - t);
+  int l = get_u32();
+  int r = get_u32();
+  int c = n_dims - l - r;
+  match_u32_assert(c);
 
   /* The next n_dims numbers are a permutation of the dimension numbers. */
   int a[n_dims];
   for (int i = 0; i < n_dims; i++)
-    a[i] = get_u32();
+    {
+      int dim = get_u32();
+      a[i] = dim;
+
+      const char *name = i < l ? "layer" : i < l + r ? "row" : "column";
+      printf ("<%s dimension=\"%d\"/>\n", name, dim);
+    }
   check_permutation(a, n_dims, "dimensions");
 
   int x = get_u32();
-  printf ("%d data values, starting at %08x\n", x, pos);
+  printf ("<data>\n");
   for (int i = 0; i < x; i++)
     {
-      printf("%08x, index %d:\n", pos, get_u32());
+      printf ("    <datum index=\"%d\">\n", get_u32());
       match_u32_assert(0);
-      dump_value__(0, false);
-      putchar('\n');
+      if (version == 1)
+        match_byte(0);
+      dump_value(stdout, 1);
+      fprintf (stdout, "    </datum>\n");
     }
+  printf ("</data>\n");
 }
 
 static void
 dump_title(void)
 {
-  pos = 0x27;
-  dump_value__(0, true); putchar('\n');
-  dump_value__(0, true); putchar('\n');
+  printf ("<title-local>\n");
+  dump_value(stdout, 0);
+  match_byte(1);
+  printf ("</title-local>\n");
+
+  printf ("<subtype>\n");
+  dump_value(stdout, 0);
+  match_byte(1);
+  printf ("</subtype>\n");
+
   match_byte_assert(0x31);
-  dump_value__(0, true); putchar('\n');
+
+  printf ("<title-c>\n");
+  dump_value(stdout, 0);
+  match_byte(1);
+  printf ("</title-c>\n");
+
   match_byte(0);
   match_byte_assert(0x58);
   if (match_byte(0x31))
     {
-      dump_value__(0, false); putchar('\n');
+      printf ("<caption>\n");
+      dump_value(stdout, 0);
+      printf ("</caption>\n");
     }
   else
     match_byte_assert(0x58);
 
-
   int n_footnotes = get_u32();
-  if (n_footnotes >= 20)
+  for (int i = 0; i < n_footnotes; i++)
     {
-      fprintf(stderr, "%08x: %d footnotes\n", pos - 4, n_footnotes);
-      exit(1);
-    }
-
-  printf("------\n%d footnotes\n", n_footnotes);
-  if (n_footnotes < 20)
-    {
-      for (int i = 0; i < n_footnotes; i++)
-        {
-          printf("footnote %d:\n", i);
-          dump_value__(0, false);
-          if (match_byte (0x31))
-            {
-              /* Custom footnote marker string. */
-              match_byte_assert(3);
-              get_string();
-              match_byte_assert(0x58);
-              match_u32_assert(0);
-              get_string();
-            }
-          else
-            match_byte_assert (0x58);
-          printf("(%d)\n", get_u32());
-        }
+      printf ("<footnote index=\"%d\">\n", i);
+      dump_value(stdout, 0);
+      /* Custom footnote marker string. */
+      if (match_byte (0x31))
+        dump_value(stdout, 0);
+      else
+        match_byte_assert (0x58);
+      get_u32 ();
+      printf ("</footnote>\n");
     }
 }
 
-static int
-find_dimensions(void)
-{
-  {
-    const char dimensions[] = "-,,,.\0";
-    int x = try_find_tail(dimensions, sizeof dimensions - 1);
-    if (x)
-      return x;
-  }
-
-  const char dimensions[] = "-,,, .\0";
-  return find_tail(dimensions, sizeof dimensions - 1);
-}
-
 static void
 dump_fonts(void)
 {
-  printf("fonts: offset=%08x\n", pos);
   match_byte(0);
   for (int i = 1; i <= 8; i++)
     {
-      printf("%08x: font %d, ", pos, i);
+      printf ("<style index=\"%d\"", i);
       match_byte_assert(i);
       match_byte_assert(0x31);
-      printf("%s, ", get_string());
+      printf(" font=\"%s\"", get_string());
       match_byte_assert(0);
       match_byte_assert(0);
-      if (!match_byte(0x40) && !match_byte(0x20) && !match_byte(0x80) && !match_byte(0x10))
+      if (!match_byte(0x40) && !match_byte(0x20) && !match_byte(0x80) && !match_byte(0x10) && !match_byte(0x70))
         match_byte_assert(0x50);
-      if (!match_byte(0x41))
-        match_byte_assert(0x51);
-      if (!match_u32(0))
-        match_u32_assert(1);
+      match_byte_assert(0x41);
+      if (!match_u32(0) && !match_u32(1))
+        match_u32_assert(2);
       match_byte_assert(0);
 
       /* OK, this seems really unlikely to be totally correct, but it matches my corpus... */
       if (!match_u32(0) && !match_u32(2))
-        match_u32_assert(0xfaad);
+        {
+          if (i == 7)
+            match_u32_assert(0xfaad);
+          else
+            match_u32_assert(0);
+        }
 
       if (!match_u32(0) && !match_u32(1) && !match_u32(2))
         match_u32_assert(3);
-      printf ("%s, ", get_string());
-      printf ("%s, ", get_string());
+      printf (" fgcolor=\"%s\"", get_string());
+      printf (" bgcolor=\"%s\"", get_string());
       match_u32_assert(0);
       match_u32_assert(0);
       match_byte_assert(0);
-      get_u32();
-      get_u32();
-      get_u32();
-      get_u32();
-      putchar('\n');
+
+      if (version > 1)
+        {
+          if (i != 3)
+            {
+              if (!match_u32(8))
+                match_u32_assert(5);
+              if (!match_u32(10) && !match_u32(11) && !match_u32(5))
+                match_u32_assert(9);
+              if (!match_u32(0))
+                match_u32_assert(1);
+            }
+          else
+            {
+              get_u32();
+              if (!match_u32(-1) && !match_u32(8))
+                match_u32_assert(24);
+              if (!match_u32(-1) && !match_u32(2))
+                match_u32_assert(3);
+            }
+
+          /* Who knows? Ranges from -1 to 8 with no obvious pattern. */
+          get_u32();
+        }
+
+      printf ("/>\n");
     }
 
   match_u32_assert(240);
@@ -612,17 +842,23 @@ dump_fonts(void)
 
   if (match_u32(117))
     pos += 117;
+  else if (match_u32(142))
+    pos += 142;
+  else if (match_u32(143))
+    pos += 143;
+  else if (match_u32(150))
+    pos += 150;
   else
     {
-      match_u32_assert(142);
-      pos += 142;
+      match_u32_assert(16);
+      pos += 16;
     }
 
   int count = get_u32();
   pos += 4 * count;
 
-  char *encoding = get_string();
-  printf("encoding=%s\n", encoding);
+  const char *encoding = get_string();
+  printf ("<encoding>%s</encoding>\n", encoding);
 
   if (!match_u32(0))
     match_u32_assert(UINT32_MAX);
@@ -631,25 +867,43 @@ dump_fonts(void)
   match_byte_assert(0);
   if (!match_byte(0))
     match_byte_assert(1);
-  if (!match_byte(0x99) && !match_byte(0x98))
-    match_byte_assert(0x97);
-  match_byte_assert(7);
-  match_byte_assert(0);
-  match_byte_assert(0);
+  if (version > 1)
+    {
+      if (!match_byte(0x97) && !match_byte(0x98) && !match_byte(0x99))
+        match_byte_assert(0x9a);
+      match_byte_assert(7);
+      match_byte_assert(0);
+      match_byte_assert(0);
+    }
+  else
+    match_u32_assert(UINT32_MAX);
+
+  int decimal = data[pos];
+  int grouping = data[pos + 1];
   if (match_byte('.'))
-    match_byte_assert(',');
+    {
+      if (!match_byte(',') && !match_byte('\''))
+        match_byte_assert(' ');
+    }
   else
     {
       match_byte_assert(',');
-      if (!match_byte('.'))
-        match_byte_assert(' ');
+      if (!match_byte('.') && !match_byte(' '))
+        match_byte_assert(0);
+    }
+  printf("<format decimal=\"%c\" grouping=\"", decimal);
+  if (grouping)
+    putchar(grouping);
+  printf("\"/>\n");
+  if (match_u32(5))
+    {
+      for (int i = 0; i < 5; i++)
+        printf("<CC%c>%s</CC%c>\n", 'A' + i, get_string(), 'A' + i);
     }
-  match_u32_assert(5);
-  for (int i = 0; i < 5; i++)
-    get_string();
-  pos += get_u32();
-  if (pos != find_dimensions())
-    fprintf (stderr, "%08x / %08x\n", pos, find_dimensions());
+  else
+    match_u32_assert(0);
+  int skip = get_u32();
+  pos += skip;
 }
 
 int
@@ -681,83 +935,137 @@ main(int argc, char *argv[])
       exit(1);
     }
 
-  if (argc > 1)
+  if (argc != 2)
     {
-      if (!strcmp(argv[1], "title0"))
-        {
-          pos = 0x27;
-          if (match_byte (0x03)
-              || (match_byte (0x05) && match_byte (0x58)))
-            printf ("%s\n", get_string());
-          else
-            printf ("<unknown>\n");
-          return 0;
-        }
-      else if (!strcmp(argv[1], "title"))
-        {
-          dump_title();
-          exit(0);
-        }
-      else if (!strcmp(argv[1], "titleraw"))
-        {
-          const char fonts[] = "\x01\x31\x09\0\0\0SansSerif";
-          start = 0x27;
-          n = find(fonts, sizeof fonts - 1);
-        }
-      else if (!strcmp(argv[1], "fonts"))
-        {
-          const char fonts[] = "\x01\x31\x09\0\0\0SansSerif";
-          const char styles[] = "\xf0\0\0\0";
-          start = find(fonts, sizeof fonts - 1);
-          n = find(styles, sizeof styles - 1);
-        }
-      else if (!strcmp(argv[1], "styles"))
-        {
-          const char styles[] = "\xf0\0\0\0";
-          const char dimensions[] = "-,,,.\0";
-          start = find(styles, sizeof styles - 1);
-          n = find(dimensions, sizeof dimensions - 1) + sizeof dimensions - 1;
-        }
-      else if (!strcmp(argv[1], "dimensions") || !strcmp(argv[1], "all"))
-        {
-          pos = 0;
-          match_byte_assert(1);
-          match_byte_assert(0);
-          match_u32_assert(3);
-          match_byte_assert(1);
-          if (!match_byte(0))
-            match_byte_assert(1);
-          match_byte_assert(0);
-          match_byte_assert(0);
-          if (!match_byte(0))
-            match_byte_assert(1);
-          pos++;
-          match_byte_assert(0);
-          match_byte_assert(0);
-          match_byte_assert(0);
-          dump_title ();
-          dump_fonts();
-          dump_dims ();
-          printf("\n\ndata:\n");
-          dump_data ();
-          match_byte (1);
-          if (pos != n)
-            {
-              fprintf (stderr, "%x / %x\n", pos, n);
-              exit(1);
-            }
-          exit(0);
-        }
+      fprintf (stderr, "usage: %s TYPE < .bin", argv[0]);
+      exit (1);
+    }
+
+  if (!strcmp(argv[1], "title0"))
+    {
+      pos = 0x27;
+      if (match_byte (0x03)
+          || (match_byte (0x05) && match_byte (0x58)))
+        printf ("%s\n", get_string());
       else
+        printf ("<unknown>\n");
+      return 0;
+    }
+  else if (!strcmp(argv[1], "title"))
+    {
+      pos = 0x27;
+      dump_title();
+      exit(0);
+    }
+  else if (!strcmp(argv[1], "titleraw"))
+    {
+      const char fonts[] = "\x01\x31\x09\0\0\0SansSerif";
+      start = 0x27;
+      n = find(fonts, sizeof fonts - 1);
+    }
+  else if (!strcmp(argv[1], "fonts"))
+    {
+      const char fonts[] = "\x01\x31\x09\0\0\0SansSerif";
+      const char styles[] = "\xf0\0\0\0";
+      start = find(fonts, sizeof fonts - 1);
+      n = find(styles, sizeof styles - 1);
+    }
+  else if (!strcmp(argv[1], "styles"))
+    {
+      const char styles[] = "\xf0\0\0\0";
+      const char dimensions[] = "-,,,.\0";
+      start = find(styles, sizeof styles - 1);
+      n = find(dimensions, sizeof dimensions - 1) + sizeof dimensions - 1;
+    }
+  else if (!strcmp(argv[1], "dimensions") || !strcmp(argv[1], "all"))
+    {
+      pos = 0;
+      match_byte_assert(1);
+      match_byte_assert(0);
+
+      /* This might be a version number of some kind, because value 1 seems
+         to only appear in an SPV file that also required its own weird
+         special cases in dump_optional_value(). */
+      version = get_u32();
+      pos -= 4;
+      if (!match_u32(1))
+        match_u32_assert(3);
+
+      match_byte_assert(1);
+      if (!match_byte(0))
+        match_byte_assert(1);
+
+      /* Offset 8. */
+      match_byte_assert(0);
+      match_byte_assert(0);
+      if (!match_byte(0))
+        match_byte_assert(1);
+
+      /* Offset 11. */
+      pos++;
+      match_byte_assert(0);
+      match_byte_assert(0);
+      match_byte_assert(0);
+
+      /* Offset 15. */
+      pos++;
+      if (!match_byte(0))
+        match_byte_assert(1);
+      match_byte_assert(0);
+      match_byte_assert(0);
+
+      /* Offset 19. */
+      pos++;
+      if (!match_byte(0))
+        match_byte_assert(1);
+      match_byte_assert(0);
+      match_byte_assert(0);
+
+      /* Offset 23. */
+      pos++;
+      if (!match_byte(0))
+        match_byte_assert(1);
+      match_byte_assert(0);
+      match_byte_assert(0);
+
+      /* Offset 27. */
+      pos++;
+      pos++;
+      match_byte_assert(0);
+      match_byte_assert(0);
+
+      /* Offset 31.
+
+         This is the tableId, e.g. -4154297861994971133 would be 0xdca00003.
+         We don't have enough context to validate it. */
+      pos += 4;
+
+      /* Offset 35. */
+      pos += 4;
+
+      dump_title ();
+      dump_fonts();
+      dump_dims ();
+      dump_data ();
+      match_byte (1);
+      if (pos != n)
         {
-          fprintf (stderr, "unknown section %s\n", argv[1]);
+          fprintf (stderr, "%x / %x\n", pos, n);
           exit(1);
         }
+      exit(0);
     }
-  else
-    start = 0x27;
+  else if (!strcmp(argv[1], "raw"))
+    {
+      start = 0x27;
 
-  dump_raw(stdout, start, n, "\n");
+      dump_raw(stdout, start, n);
+    }
+  else
+    {
+      fprintf (stderr, "unknown section %s\n", argv[1]);
+      exit(1);
+    }
 
   return 0;
 }