X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=dump.c;h=7f3c2b8c75174a045f9666ff379af99efaef5aa3;hb=75a05a0a68046957d9801db0bfc02b0108736e36;hp=c57057f025a59bf2d61fc865ecb8319147fb52dc;hpb=adc35059e3ae7e8968bc6c7a835abc412920e9b5;p=pspp

diff --git a/dump.c b/dump.c
index c57057f025..7f3c2b8c75 100644
--- a/dump.c
+++ b/dump.c
@@ -1,4 +1,6 @@
 #include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
 #include <float.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -6,57 +8,64 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
+#include <time.h>
 #include <unistd.h>
 #include "u8-mbtouc.h"
 
+static const char *filename;
 static uint8_t *data;
 static size_t n;
 
 int version;
 
-static bool
-all_ascii(const uint8_t *p, size_t n)
+size_t pos;
+
+#define XSTR(x) #x
+#define STR(x) XSTR(x)
+#define WHERE __FILE__":" STR(__LINE__)
+
+static uint8_t
+get_byte(void)
 {
-  for (size_t i = 0; i < n; i++)
-    if (p[i] < 32 || p[i] > 126)
-      return false;
-  return true;
+  return data[pos++];
 }
 
-static size_t
-try_find(const char *target, size_t target_len)
+static unsigned int
+get_u32(void)
 {
-  const uint8_t *pos = (const uint8_t *) memmem (data, n, target, target_len);
-  return pos ? pos - data : 0;
+  uint32_t x;
+  memcpy(&x, &data[pos], 4);
+  pos += 4;
+  return x;
 }
 
-static size_t
-find(const char *target, size_t target_len)
+static unsigned long long int
+get_u64(void)
 {
-  size_t pos = try_find(target, target_len);
-  if (!pos)
-    {
-      fprintf (stderr, "not found\n");
-      exit(1);
-    }
-  return pos;
+  uint64_t x;
+  memcpy(&x, &data[pos], 8);
+  pos += 8;
+  return x;
 }
 
-size_t pos;
-
-#define XSTR(x) #x
-#define STR(x) XSTR(x)
-#define WHERE __FILE__":" STR(__LINE__)
-
 static unsigned int
-get_u32(void)
+get_be32(void)
 {
   uint32_t x;
-  memcpy(&x, &data[pos], 4);
+  x = (data[pos] << 24) | (data[pos + 1] << 16) | (data[pos + 2] << 8) | data[pos + 3];
   pos += 4;
   return x;
 }
 
+static unsigned int
+get_u16(void)
+{
+  uint16_t x;
+  memcpy(&x, &data[pos], 2);
+  pos += 2;
+  return x;
+}
+
 static double
 get_double(void)
 {
@@ -66,6 +75,15 @@ get_double(void)
   return x;
 }
 
+static double __attribute__((unused))
+get_float(void)
+{
+  float x;
+  memcpy(&x, &data[pos], 4);
+  pos += 4;
+  return x;
+}
+
 static bool
 match_u32(uint32_t x)
 {
@@ -87,6 +105,48 @@ match_u32_assert(uint32_t x, const char *where)
 }
 #define match_u32_assert(x) match_u32_assert(x, WHERE)
 
+static bool __attribute__((unused))
+match_u64(uint64_t x)
+{
+  if (get_u64() == x)
+    return true;
+  pos -= 8;
+  return false;
+}
+
+static void __attribute__((unused))
+match_u64_assert(uint64_t x, const char *where)
+{
+  unsigned long long int y = get_u64();
+  if (x != y)
+    {
+      fprintf(stderr, "%s: 0x%x: expected u64:%llu, got u64:%llu\n", where, pos - 8, x, y);
+      exit(1);
+    }
+}
+#define match_u64_assert(x) match_u64_assert(x, WHERE)
+
+static bool __attribute__((unused))
+match_be32(uint32_t x)
+{
+  if (get_be32() == x)
+    return true;
+  pos -= 4;
+  return false;
+}
+
+static void
+match_be32_assert(uint32_t x, const char *where)
+{
+  unsigned int y = get_be32();
+  if (x != y)
+    {
+      fprintf(stderr, "%s: 0x%x: expected be%u, got be%u\n", where, pos - 4, x, y);
+      exit(1);
+    }
+}
+#define match_be32_assert(x) match_be32_assert(x, WHERE)
+
 static bool
 match_byte(uint8_t b)
 {
@@ -110,73 +170,13 @@ match_byte_assert(uint8_t b, const char *where)
 }
 #define match_byte_assert(b) match_byte_assert(b, WHERE)
 
-static void
-newline(FILE *stream, int pos)
-{
-  fprintf(stream, "\n%08x: ", pos);
-}
-
-static void
-dump_raw(FILE *stream, int start, int end)
+static bool
+get_bool(void)
 {
-  for (size_t i = start; i < end; )
-    {
-      if (i + 5 <= n
-          && data[i]
-          //&& !data[i + 1]
-          && !data[i + 2]
-          && !data[i + 3]
-          && i + 4 + data[i] + data[i + 1] * 256 <= end
-          && all_ascii(&data[i + 4], data[i] + data[i + 1] * 256))
-        {
-          newline(stream, i);
-          fprintf(stream, "\"");
-          fwrite(&data[i + 4], 1, data[i] + data[i + 1] * 256, stream);
-          fputs("\" ", stream);
-
-          i += 4 + data[i] + data[i + 1] * 256;
-        }
-      else if (i + 12 <= end
-               && data[i + 1] == 40
-               && data[i + 2] == 5
-               && data[i + 3] == 0)
-        {
-          double d;
-
-          memcpy (&d, &data[i + 4], 8);
-          fprintf (stream, "F40.%d(%.*f)", data[i], data[i], d);
-          i += 12;
-          newline (stream, i);
-        }
-      else if (i + 12 <= end
-               && data[i + 1] == 40
-               && data[i + 2] == 31
-               && data[i + 3] == 0)
-        {
-          double d;
-
-          memcpy (&d, &data[i + 4], 8);
-          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)
-               && !data[i + 1]
-               && !data[i + 2]
-               && !data[i + 3])
-        {
-          fprintf (stream, "i%d ", data[i]);
-          i += 4;
-        }
-      else
-        {
-          fprintf(stream, "%02x ", data[i]);
-          i++;
-        }
-    }
-
-
+  if (match_byte(0))
+    return false;
+  match_byte_assert(1);
+  return true;
 }
 
 static bool __attribute__((unused))
@@ -218,6 +218,29 @@ get_string(const char *where)
 }
 #define get_string() get_string(WHERE)
 
+static char *
+get_string_be(const char *where)
+{
+  if (1
+      /*data[pos + 1] == 0 && data[pos + 2] == 0 && data[pos + 3] == 0*/
+      /*&& all_ascii(&data[pos + 4], data[pos])*/)
+    {
+      int len = data[pos + 2] * 256 + data[pos + 3];
+      char *s = malloc(len + 1);
+
+      memcpy(s, &data[pos + 4], len);
+      s[len] = 0;
+      pos += 4 + len;
+      return s;
+    }
+  else
+    {
+      fprintf(stderr, "%s: 0x%x: expected string\n", where, pos);
+      exit(1);
+    }
+}
+#define get_string_be() get_string_be(WHERE)
+
 static int
 get_end(void)
 {
@@ -225,63 +248,108 @@ get_end(void)
   return pos + len;
 }
 
-static char *
-dump_counted_string(void)
-{
-  char *s = NULL;
-  int inner_end = get_end();
-  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);
-        }
-    }
-  return s;
-}
-
 static void __attribute__((unused))
-hex_dump(int ofs, int n)
+hex_dump(FILE *stream, int ofs, int n)
 {
   for (int i = 0; i < n; i++)
     {
       int c = data[ofs + i];
 #if 1
       if (i && !(i % 16))
-        fprintf(stderr, "-");
+        putc('-', stream);
       else
-        fprintf(stderr, " ");
+        putc(' ', stream);
 #endif
-      fprintf(stderr, "%02x", c);
-      //fprintf(stderr, "%c", c >= 32 && c < 127 ? c : '.');
+      fprintf(stream, "%02x", c);
+    }
+  for (int i = 0; i < n; i++)
+    {
+      int c = data[ofs + i];
+      putc(c >= 32 && c < 127 ? c : '.', stream);
+    }
+  putc('\n', stream);
+}
+
+static char *
+dump_counted_string(void)
+{
+  int inner_end = get_end();
+  if (pos == inner_end)
+    return NULL;
+
+  if (match_u32(5))
+    {
+      match_u32_assert(0);
+      match_byte_assert(0x58);
+    }
+  else
+    match_u32_assert(0);
+
+  char *s = NULL;
+  if (match_byte(0x31))
+    s = get_string();
+  else
+    match_byte_assert(0x58);
+  if (pos != inner_end)
+    {
+      fprintf(stderr, "inner end discrepancy\n");
+      exit(1);
     }
-  fprintf(stderr, "\n");
+  return s;
 }
 
 static void
 dump_style(FILE *stream)
 {
-  match_byte(1);
-  match_byte(0);
-  match_byte(0);
-  match_byte(0);
-  match_byte_assert(1);
+  if (match_byte(0x58))
+    return;
+
+  match_byte_assert(0x31);
+  if (get_bool())
+    printf (" bold=\"yes\"");
+  if (get_bool())
+    printf (" italic=\"yes\"");
+  if (get_bool())
+    printf (" underline=\"yes\"");
+  if (!get_bool())
+    printf (" show=\"no\"");
   char *fg = get_string();     /* foreground */
   char *bg = get_string();     /* background */
   char *font = get_string();     /* font */
-  int size = data[pos];
-  if (!match_byte(14))
-    match_byte_assert(12); /* size? */
-  fprintf(stream, " fgcolor=\"%s\" bgcolor=\"%s\" font=\"%s\" size=\"%d\"",
+  int size = get_byte() * (72. / 96.);
+  fprintf(stream, " fgcolor=\"%s\" bgcolor=\"%s\" font=\"%s\" size=\"%dpt\"",
           fg, bg, font, size);
 }
 
+static void
+dump_style2(FILE *stream)
+{
+  if (match_byte(0x58))
+    return;
+
+  match_byte_assert(0x31);
+  uint32_t halign = get_u32();
+  printf (" halign=\"%s\"",
+          halign == 0 ? "center"
+          : halign == 2 ? "left"
+          : halign == 4 ? "right"
+          : halign == 6 ? "decimal"
+          : halign == 0xffffffad ? "mixed"
+          : "<error>");
+  int valign = get_u32();
+  printf (" valign=\"%s\"",
+          valign == 0 ? "center"
+          : valign == 1 ? "top"
+          : valign == 3 ? "bottom"
+          : "<error>");
+  printf (" offset=\"%gpt\"", get_double());
+  int l = get_u16();
+  int r = get_u16();
+  int t = get_u16();
+  int b = get_u16();
+  printf (" margins=\"%d %d %d %d\"", l, r, t, b);
+}
+
 static char *
 dump_nested_string(FILE *stream)
 {
@@ -293,10 +361,7 @@ dump_nested_string(FILE *stream)
   s = dump_counted_string();
   if (s)
     fprintf(stream, " \"%s\"", s);
-  if (match_byte(0x31))
-    dump_style(stream);
-  else
-    match_byte_assert(0x58);
+  dump_style(stream);
   match_byte_assert(0x58);
   if (pos != outer_end)
     {
@@ -354,30 +419,8 @@ dump_value_modifier(FILE *stream)
           if (template)
             fprintf(stream, " template=\"%s\"", template);
 
-          if (match_byte(0x31))
-            dump_style(stream);
-          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);
+          dump_style(stream);
+          dump_style2(stream);
           if (pos != outer_end)
             {
               fprintf(stderr, "outer end discrepancy\n");
@@ -385,33 +428,20 @@ dump_value_modifier(FILE *stream)
             }
           fprintf(stream, "/>\n");
         }
-      else if (match_u32 (1))
-        {
-          fprintf(stream, "<footnote-ref index=%d", get_u32());
-          dump_nested_string(stream);
-          fprintf(stream, "/>\n");
-        }
-      else if (match_u32 (2))
-        {
-          fprintf(stream, "<special2 %d %d", data[pos], data[pos + 2]);
-          if (!match_byte(0) && !match_byte(1))
-            match_byte_assert(2);
-          match_byte_assert(0);
-          if (!match_u32 (2) && !match_u32(1))
-            match_u32_assert(3);
-          dump_nested_string(stream);
-          fprintf(stream, "/>\n");
-        }
       else
         {
-          fprintf(stream, "<special3");
-          match_u32_assert(3);
-          match_byte_assert(0);
+          int count = get_u32();
+          fprintf(stream, "<footnote-ref indexes=\"");
+          for (int i = 0; i < count; i++)
+            {
+              if (i)
+                putc(' ', stream);
+              fprintf(stream, "%d", get_u16());
+            }
+          putc('"', stream);
           match_byte_assert(0);
-          match_byte_assert(1);
           match_byte_assert(0);
-          match_u32_assert(2);
-          dump_nested_string(stream); /* Our corpus doesn't contain any examples with strings though. */
+          dump_nested_string(stream);
           fprintf(stream, "/>\n");
         }
     }
@@ -478,6 +508,7 @@ dump_value(FILE *stream, int level)
   for (int i = 0; i <= level; i++)
     fprintf (stream, "    ");
 
+  printf ("%02x: value (%d)\n", pos, data[pos]);
   if (match_byte (1))
     {
       unsigned int format;
@@ -559,6 +590,7 @@ dump_value(FILE *stream, int level)
     }
   else
     {
+      printf ("else %#x\n", pos);
       dump_value_modifier(stream);
 
       char *base = get_string();
@@ -612,22 +644,17 @@ check_permutation(int *a, int n, const char *name)
 }
 
 static void
-dump_category(FILE *stream, int level, int *indexes, int *n_indexes, int max_indexes)
+dump_category(FILE *stream, int level, int **indexes, int *allocated_indexes,
+              int *n_indexes)
 {
   for (int i = 0; i <= level; i++)
     fprintf (stream, "    ");
   printf ("<category>\n");
   dump_value (stream, level + 1);
 
-  int merge = data[pos];
-  if (!match_byte(0))
-    match_byte_assert (1);
-
+  bool merge = get_bool();
   match_byte_assert (0);
-
-  int unindexed = data[pos];
-  if (!match_byte(0))
-    match_byte_assert (1);
+  int unindexed = get_bool();
 
   int x = get_u32 ();
   pos -= 4;
@@ -644,38 +671,20 @@ dump_category(FILE *stream, int level, int *indexes, int *n_indexes, int max_ind
             fprintf (stream, "    ");
           fprintf (stream, "<merge/>\n");
         }
+      assert (unindexed);
     }
   else
     {
-      if (merge)
+      assert (!merge);
+      assert (!unindexed);
+      assert (x == 2);
+      assert (n_categories == 0);
+      if (*n_indexes >= *allocated_indexes)
         {
-          fprintf(stderr, "index not -1 but merged\n");
-          exit(1);
+          *allocated_indexes = *allocated_indexes ? 2 * *allocated_indexes : 16;
+          *indexes = realloc(*indexes, *allocated_indexes * sizeof **indexes);
         }
-      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;
-    }
-
-  int expected_unindexed = indx == -1;
-  if (unindexed != expected_unindexed)
-    {
-      fprintf(stderr, "unindexed (%d) mismatch with indx (%d)\n",
-              unindexed, indx);
-      exit(1);
+      (*indexes)[(*n_indexes)++] = indx;
     }
 
   if (n_categories == 0)
@@ -685,7 +694,7 @@ dump_category(FILE *stream, int level, int *indexes, int *n_indexes, int max_ind
       fprintf (stream, "<category-index>%d</category-index>\n", indx);
     }
   for (int i = 0; i < n_categories; i++)
-    dump_category (stream, level + 1, indexes, n_indexes, max_indexes);
+    dump_category (stream, level + 1, indexes, allocated_indexes, n_indexes);
   for (int i = 0; i <= level; i++)
     fprintf (stream, "    ");
   printf ("</category>\n");
@@ -699,26 +708,36 @@ dump_dim(int indx)
   printf ("<dimension index=\"%d\">\n", indx);
   dump_value (stdout, 0);
 
-  /* This byte is usually 0 but many other values have been spotted. */
+  /* This byte is usually 0 but many other values have been spotted.
+     No visible effect. */
   pos++;
 
+  /* This byte can cause data to be oddly replicated. */
   if (!match_byte(0) && !match_byte(1))
     match_byte_assert(2);
+
   if (!match_u32(0))
     match_u32_assert(2);
-  if (!match_byte(0))
-    match_byte_assert(1);
-  if (!match_byte(0))
-    match_byte_assert(1);
+
+  bool show_dim_label = get_bool();
+  if (show_dim_label)
+    printf("  <show-dim-label/>\n");
+
+  bool hide_all_labels = get_bool();
+  if (hide_all_labels)
+    printf("  <hide-all-labels/>\n");
+
   match_byte_assert(1);
   if (!match_u32(UINT32_MAX))
     match_u32_assert(indx);
+
   n_categories = get_u32();
 
-  int indexes[2048];
+  int *indexes = NULL;
   int n_indexes = 0;
+  int allocated_indexes = 0;
   for (int i = 0; i < n_categories; i++)
-    dump_category (stdout, 0, indexes, &n_indexes, sizeof indexes / sizeof *indexes);
+    dump_category (stdout, 0, &indexes, &allocated_indexes, &n_indexes);
   check_permutation(indexes, n_indexes, "categories");
 
   fprintf (stdout, "</dimension>\n");
@@ -805,8 +824,14 @@ dump_title(void)
   match_byte(1);
   printf ("</title-c>\n");
 
-  match_byte(0);
-  match_byte_assert(0x58);
+  if (match_byte(0x31))
+    {
+      printf ("<user-caption>\n");
+      dump_value(stdout, 0);
+      printf ("</user-caption>\n");
+    }
+  else
+    match_byte_assert(0x58);
   if (match_byte(0x31))
     {
       printf ("<caption>\n");
@@ -823,10 +848,22 @@ dump_title(void)
       dump_value(stdout, 0);
       /* Custom footnote marker string. */
       if (match_byte (0x31))
-        dump_value(stderr, 0);
+        dump_value(stdout, 0);
       else
         match_byte_assert (0x58);
-      get_u32 ();
+      int n = get_u32();
+      if (n >= 0)
+        {
+          /* Appears to be the number of references to a footnote. */
+          printf ("  <references n=\"%d\"/>\n", n);
+        }
+      else if (n == -2)
+        {
+          /* The user deleted the footnote references. */
+          printf ("  <deleted/>\n");
+        }
+      else
+        assert(0);
       printf ("</footnote>\n");
     }
 }
@@ -841,99 +878,143 @@ dump_fonts(void)
       match_byte_assert(i);
       match_byte_assert(0x31);
       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) && !match_byte(0x70))
-        match_byte_assert(0x50);
-      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))
-        {
-          if (i == 7)
-            match_u32_assert(0xfaad);
-          else
-            match_u32_assert(0);
-        }
+      printf(" size=\"%gpt\"", get_float());
+
+      int style = get_u32();
+      if (style & 1)
+        printf(" bold=\"true\"");
+      if (style & 2)
+        printf(" italic=\"true\"");
+
+      bool underline = data[pos++];
+      if (underline)
+        printf(" underline=\"true\"");
+
+      int halign = get_u32();
+      printf(" halign=%d", halign);
+
+      int valign = get_u32();
+      printf(" valign=%d", valign);
 
-      if (!match_u32(0) && !match_u32(1) && !match_u32(2))
-        match_u32_assert(3);
       printf (" fgcolor=\"%s\"", get_string());
       printf (" bgcolor=\"%s\"", get_string());
-      match_u32_assert(0);
-      match_u32_assert(0);
-      match_byte_assert(0);
+
+      if (!match_byte(0))
+        match_byte_assert(1);
+
+      char *alt_fgcolor = get_string();
+      if (alt_fgcolor[0])
+        printf (" altfg=\"%s\"", alt_fgcolor);
+      char *alt_bgcolor = get_string();
+      if (alt_bgcolor[0])
+        printf (" altbg=\"%s\"", alt_bgcolor);
 
       if (version > 1)
         {
-          if (i != 3)
+          printf(" margins=\"");
+          for (int i = 0; i < 4; i++)
             {
-              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(1))
-                match_u32_assert(2);
+              if (i)
+                putchar(' ');
+              printf("%d", get_u32());
             }
-          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();
+          putchar('"');
         }
 
       printf ("/>\n");
     }
 
-  match_u32_assert(240);
-  pos += 240;
+  int x1 = get_u32();
+  int x1_end = pos + x1;
+  printf("<borders>\n");
+  match_be32_assert(1);
+  int n_borders = get_be32();
+  for (int i = 0; i < n_borders; i++)
+    {
+      int type = get_be32();
+      int stroke = get_be32();
+      int color = get_be32();
+      printf("  <border type=\"%d\" stroke=\"%s\" color=\"#%06x\"/>\n",
+             type,
+             (stroke == 0 ? "none"
+              : stroke == 1 ? "solid"
+              : stroke == 2 ? "dashed"
+              : stroke == 3 ? "thick"
+              : stroke == 4 ? "thin"
+              : stroke == 5 ? "double"
+              : "<error>"),
+             color);
+    }
+  bool grid = get_byte();
+  pos += 3;
+  printf("  <grid show=\"%s\"/>\n", grid ? "yes" : "no");
+  printf("</borders>\n");
+  assert(pos == x1_end);
 
-  match_u32_assert(18);
-  pos += 18;
+  int skip = get_u32();
+  assert(skip == 18 || skip == 25);
+  pos += skip;
 
   int x3 = get_u32();
+  int x3_end = pos + x3;
   if (version == 3)
     {
-      assert(x3 >= 117);
-      int len = data[pos + 0x34];
-      if (len)
-        printf("<tablelook>%.*s</tablelook>\n", len, &data[pos + 0x35]);
+      match_be32_assert(1);
+      get_be32();
+      printf("<settings layer=\"%d\"", get_be32());
+      if (!get_bool())
+        printf(" skipempty=\"false\"");
+      if (!get_bool())
+        printf(" showdimensionincorner=\"false\"");
+      if (!get_bool())
+        printf(" markers=\"numeric\"");
+      if (!get_bool())
+        printf(" footnoteposition=\"subscript\"");
+      get_byte();
+      int nbytes = get_be32();
+      int end = pos + nbytes;
+      printf("\n");
+      while (pos + 4 <= end)
+        printf(" %d", get_be32());
+      pos = end;
+      printf("\n");
+      pos += nbytes;
+      char *notes = get_string_be();
+      if (notes[0])
+        printf(" notes=\"%s\"", notes);
+      char *look = get_string_be();
+      if (look[0])
+        printf(" look=\"%s\"", look);
+      printf(">\n");
     }
-  pos += x3;
+  pos = x3_end;
 
+  /* Manual column widths, if present. */
   int count = get_u32();
-  pos += 4 * count;
+  if (count > 0)
+    {
+      printf("<columnwidths>");
+      for (int i = 0; i < count; i++)
+        {
+          if (i)
+            putchar(' ');
+          printf("%d", get_u32());
+        }
+      printf("</columnwidths>\n");
+    }
 
   const char *locale = get_string();
   printf ("<locale>%s</locale>\n", locale);
 
-  if (!match_u32(0))
-    match_u32_assert(UINT32_MAX);
+  printf ("<layer>%d</layer>\n", get_u32());
   if (!match_byte(0))
     match_byte_assert(1);
-  match_byte_assert(0);
   if (!match_byte(0))
     match_byte_assert(1);
-  if (version > 1)
-    {
-      if (!match_byte(0x97) && !match_byte(0x98)
-          && !match_byte(0x99) && !match_byte(0x9a))
-        match_byte_assert(0x9b);
-      match_byte_assert(7);
-      match_byte_assert(0);
-      match_byte_assert(0);
-    }
-  else
-    match_u32_assert(UINT32_MAX);
+  if (!match_byte(0))
+    match_byte_assert(1);
+  printf("<epoch>%d</epoch>\n", get_u32());
 
   int decimal = data[pos];
   int grouping = data[pos + 1];
@@ -945,12 +1026,12 @@ dump_fonts(void)
   else
     {
       match_byte_assert(',');
-      if (!match_byte('.') && !match_byte(' '))
+      if (!match_byte('.') && !match_byte(' ') && !match_byte(','))
         match_byte_assert(0);
     }
-  printf("<format decimal=\"%c\" grouping=\"", decimal);
+  printf("<format decimal=\"%c\"", decimal);
   if (grouping)
-    putchar(grouping);
+    printf(" grouping=\"%c\"", grouping);
   printf("\"/>\n");
   if (match_u32(5))
     {
@@ -963,12 +1044,63 @@ dump_fonts(void)
   /* The last chunk is an outer envelope that contains two inner envelopes.
      The second inner envelope has some interesting data like the encoding and
      the locale. */
+  int outer_end = get_end();
   if (version == 3)
     {
-      int outer_end = get_end();
-
       /* First inner envelope: byte*33 int[n] int*[n]. */
+      int inner_len = get_u32();
+      int inner_end = pos + inner_len;
+      int array_start = pos + 33;
+      match_byte_assert(0);
+      pos++;                    /* 0, 1, 10 seen. */
+      get_bool();
+
+      /* 0=en 1=de 2=es 3=it 5=ko 6=pl 8=zh-tw 10=pt_BR 11=fr */
+      printf("lang=%d ", get_byte());
+
+      printf ("variable_mode=%d\n", get_byte());
+      printf ("value_mode=%d\n", get_byte());
+      if (!match_u64(0))
+        match_u64_assert(UINT64_MAX);
+      match_u32_assert(0);
+      match_u32_assert(0);
+      match_u32_assert(0);
+      match_u32_assert(0);
+      match_byte_assert(0);
+      get_bool();
+      match_byte_assert(1);
+      pos = array_start;
+
+      assert(get_end() == inner_end);
+      printf("<heights>");
+      int n_heights = get_u32();
+      for (int i = 0; i < n_heights; i++)
+        {
+          if (i)
+            putchar(' ');
+          printf("%d", get_u32());
+        }
+      printf("</heights>\n");
+
+      int n_style_map = get_u32();
+      for (int i = 0; i < n_style_map; i++)
+        {
+          uint64_t cell = get_u64();
+          int style = get_u16();
+          printf("<style-map cell=\"%llu\" style=\"%d\"/>\n", cell, style);
+        }
+
+      int n_styles = get_u32();
+      for (int i = 0; i < n_styles; i++)
+        {
+          printf("<cell-style index=\"%d\"", i);
+          dump_style(stdout);
+          dump_style2(stdout);
+          printf("/>\n");
+        }
+
       pos = get_end();
+      assert(pos == inner_end);
 
       /* Second inner envelope. */
       assert(get_end() == outer_end);
@@ -982,25 +1114,17 @@ dump_fonts(void)
       match_byte_assert(0);
 
       printf("<command>%s</command>\n", get_string());
-      printf("<subcommand>%s</subcommand>\n", get_string());
+      printf("<command-local>%s</command-local>\n", get_string());
       printf("<language>%s</language>\n", get_string());
       printf("<charset>%s</charset>\n", get_string());
       printf("<locale>%s</locale>\n", get_string());
 
-      if (!match_byte(0))
-        match_byte_assert(1);
-      match_byte_assert(0);
-      if (!match_byte(0))
-        match_byte_assert(1);
-      if (!match_byte(0))
-        match_byte_assert(1);
+      get_bool();
+      get_bool();
+      get_bool();
+      get_bool();
 
-      if (!match_byte(0x97) && !match_byte(0x98)
-          && !match_byte(0x99) && !match_byte(0x9a))
-        match_byte_assert(0x9b);
-      match_byte_assert(7);
-      match_byte_assert(0);
-      match_byte_assert(0);
+      printf("<epoch2>%d</epoch2>\n", get_u32());
 
       if (match_byte('.'))
         {
@@ -1010,13 +1134,13 @@ dump_fonts(void)
       else
         {
           match_byte_assert(',');
-          if (!match_byte('.') && !match_byte(' '))
+          if (!match_byte('.') && !match_byte(' ') && !match_byte(','))
             match_byte_assert(0);
         }
 
-      pos += 8;
-      match_byte_assert(1);
+      printf ("small: %g\n", get_double());
 
+      match_byte_assert(1);
       if (outer_end - pos > 6)
         {
           /* There might be a pair of strings representing a dataset and
@@ -1036,7 +1160,13 @@ dump_fonts(void)
               printf("<datafile>%s</datafile>\n", get_string());
 
               match_u32_assert(0);
-              get_u32();
+
+              time_t date = get_u32();
+              struct tm tm = *localtime(&date);
+              char s[128];
+              strftime(s, sizeof s, "%a, %d %b %Y %H:%M:%S %z", &tm);
+              printf("<date>%s</date>\n", s);
+
               match_u32_assert(0);
             }
         }
@@ -1049,35 +1179,84 @@ dump_fonts(void)
       else
         match_u32_assert(0);
 
-      match_byte_assert(0x2e);
-      if (!match_byte(0))
-        match_byte_assert(1);
+      match_byte_assert('.');
+      get_bool();
 
       if (pos < outer_end)
         {
-          match_u32_assert(2000000);
+          get_u32();
           match_u32_assert(0);
         }
       assert(pos == outer_end);
 
       pos = outer_end;
     }
-  else
-    match_u32_assert(0);
+  else if (outer_end != pos)
+    {
+      pos += 14;
+      printf("<command>%s</command>\n", get_string());
+      printf("<command-local>%s</command-local>\n", get_string());
+      printf("<language>%s</command>\n", get_string());
+      printf("<charset>%s</charset>\n", get_string());
+      printf("<locale>%s</locale>\n", get_string());
+      get_bool();
+      match_byte_assert(0);
+      get_bool();
+      get_bool();
+
+      printf("<epoch2>%d</epoch2>\n", get_u32());
+      int decimal = data[pos];
+      int grouping = data[pos + 1];
+      if (match_byte('.'))
+        {
+          if (!match_byte(',') && !match_byte('\''))
+            match_byte_assert(' ');
+        }
+      else
+        {
+          match_byte_assert(',');
+          if (!match_byte('.') && !match_byte(' ') && !match_byte(','))
+            match_byte_assert(0);
+        }
+      printf("<format decimal=\"%c\"", decimal);
+      if (grouping)
+        printf(" grouping=\"%c\"", 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);
+        }
+      else
+        match_u32_assert(0);
+
+      match_byte_assert('.');
+      get_bool();
+
+      assert(pos == outer_end);
+      pos = outer_end;
+    }
 }
 
 int
 main(int argc, char *argv[])
 {
-  size_t start;
-  struct stat s;
+  if (argc != 2)
+    {
+      fprintf (stderr, "usage: %s FILE.bin", argv[0]);
+      exit (1);
+    }
 
-  if (isatty(STDIN_FILENO))
+  filename = argv[1];
+  int fd = open(filename, O_RDONLY);
+  if (fd < 0)
     {
-      fprintf(stderr, "redirect stdin from a .bin file\n");
-      exit(1);
+      fprintf (stderr, "%s: open failed (%s)", filename, strerror (errno));
+      exit (1);
     }
-  if (fstat(STDIN_FILENO, &s))
+
+  struct stat s;
+  if (fstat(fd, &s))
     {
       perror("fstat");
       exit(1);
@@ -1089,143 +1268,56 @@ main(int argc, char *argv[])
       perror("malloc");
       exit(1);
     }
-  if (read(STDIN_FILENO, data, n) != n)
+  if (read(fd, data, n) != n)
     {
       perror("read");
       exit(1);
     }
+  close(fd);
 
-  if (argc != 2)
-    {
-      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_value_modifier(). */
-      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;
+  pos = 0;
+  match_byte_assert(1);
+  match_byte_assert(0);
 
-      dump_title ();
-      dump_fonts();
-      dump_dims ();
-      dump_data ();
-      match_byte (1);
-      if (pos != n)
-        {
-          fprintf (stderr, "%x / %x\n", pos, n);
-          exit(1);
-        }
-      exit(0);
-    }
-  else if (!strcmp(argv[1], "raw"))
-    {
-      start = 0x27;
+  version = get_u32();
+  assert(version == 1 || version == 3);
 
-      dump_raw(stdout, start, n);
-    }
-  else
+  match_byte_assert(1);
+  bool number_footnotes = get_bool();
+  printf("<footnote markers=\"%s\"/>\n",
+         number_footnotes ? "number" : "letter");
+  bool rotate_inner_column_labels = get_bool();
+  bool rotate_outer_row_labels = get_bool();
+  printf("x=%d\n", get_bool());
+  printf("<rotate-labels inner-column=\"%s\" outer-row=\"%s\"/>",
+         rotate_inner_column_labels ? "yes" : "no",
+         rotate_outer_row_labels ? "yes" : "no");
+  //fprintf(stderr, "option-number=%d\n", get_u32());
+  get_u32();
+
+  int min_col_width = get_u32();
+  int max_col_width = get_u32();
+  int min_row_width = get_u32();
+  int max_row_width = get_u32();
+  printf("<label-width min-col=\"%d\" max-col=\"%d\" min-row=\"%d\" "
+         "max-row=\"%d\"/>\n",
+         min_col_width, max_col_width,
+         min_row_width, max_row_width);
+
+  /* Offset 31. */
+  printf("<tableid>%lld</tableid>", get_u64());
+
+  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);
 
   return 0;
 }