From 73bc20120de24beb33241993dcdeef1cc0614ba6 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sun, 2 Nov 2014 15:33:25 -0800 Subject: [PATCH] All pass (dimensions, data, title, footnotes!). --- dump.c | 30 ++++++------------------------ notes | 8 ++++++++ 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/dump.c b/dump.c index 7a6b6aabb9..310b6a15f5 100644 --- a/dump.c +++ b/dump.c @@ -1321,15 +1321,8 @@ dump_footnote_value(int level) match_byte_assert (0x58); get_string(); printf("string \"%s\"", get_string()); - match_byte (0); - match_byte (0); - match_byte (0); - match_byte (1); - match_byte (1); - match_byte (0); - match_byte (0); - match_byte (0); - match_byte (1); + if (!match_byte (0)) + match_byte_assert (1); } else if (match_byte (5)) { @@ -1338,10 +1331,6 @@ dump_footnote_value(int level) 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)) { @@ -1451,11 +1440,8 @@ dump_footnote_value(int level) 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); + if (!match_byte(1)) + match_byte_assert(0); } else dump_footnote_value (level+1); @@ -1491,11 +1477,7 @@ dump_footnote_value(int level) 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); + match_byte_assert(0); } else dump_footnote_value (level+1); @@ -1517,7 +1499,7 @@ dump_title(void) match_byte_assert(0x58); if (match_byte(0x31)) { - dump_title_value(0); putchar('\n'); + dump_footnote_value(0); putchar('\n'); } else match_byte_assert(0x58); diff --git a/notes b/notes index 6c6dfced5b..772dbb8a6a 100644 --- a/notes +++ b/notes @@ -376,6 +376,14 @@ web/e6f958867667aa56d033d54211ff2aec/00000000015_lightTableData.bin: i0 01 58 PCT40.1(75.0) i0 01 58 F(8.5)(something) +smekens/default/00000000016_lightTableData.bin: + + 03 "Extraction Method: Principal Axis Factoring." 58 "" "Extraction Method: Principal Axis Factoring." 00 + + i1 00 + 58 "^1 factors extracted. ^2 iterations required." i2 i0 01 58 F40.0(4) i0 01 58 F40.0(9) + + Fonts ----- -- 2.30.2