From 0784d4f4be084db2317f5ff1636f8dc9f7b8dc58 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sun, 2 Nov 2014 15:10:07 -0800 Subject: [PATCH] Fixed all the cases with reasonable numbers of footnotes. --- dump.c | 281 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- notes | 15 +++ 2 files changed, 292 insertions(+), 4 deletions(-) diff --git a/dump.c b/dump.c index 46fba9a884..cd4d362121 100644 --- a/dump.c +++ b/dump.c @@ -1264,6 +1264,246 @@ dump_title_value(int level) } } +static void +dump_footnote_value(int level) +{ + for (int i = 0; i <= level; i++) + printf (" "); + + match_byte (0); + match_byte (0); + match_byte (0); + match_byte (0); + if (match_byte (3)) + { + get_string(); + if (match_byte (0x31)) + { + if (match_u32 (1)) + { + printf("(footnote %d) ", get_u32()); + match_byte_assert (0); + match_byte_assert (0); + int subn = get_u32 (); + printf ("nested %d bytes", subn); + pos += subn; + } + else if (match_u32 (2)) + { + printf("(special 2)"); + match_byte_assert(0); + match_byte_assert(0); + match_u32_assert(1); + match_byte_assert(0); + match_byte_assert(0); + int subn = get_u32 (); + printf ("nested %d bytes", subn); + pos += subn; + } + else + { + match_u32_assert(3); + printf("(special 3)"); + match_byte_assert(0); + match_byte_assert(0); + match_byte_assert(1); + match_byte_assert(0); + int subn = get_u32 (); + printf ("nested %d bytes, ", subn); + pos += subn; + subn = get_u32 (); + printf ("nested %d bytes, ", subn); + pos += subn; + } + } + else + 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); + } + else if (match_byte (5)) + { + match_byte_assert (0x58); + printf ("variable \"%s\"", get_string()); + 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)) + { + unsigned int format; + char *var, *vallab; + double value; + + match_byte_assert (0x58); + 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); + if (!match_byte (1) && !match_byte(2)) + match_byte_assert (3); + match_byte (0); + match_byte (0); + match_byte (0); + match_byte (0); + match_byte (0); + match_byte (0); + match_byte (0); + } + else if (match_byte (4)) + { + unsigned int format; + char *var, *vallab, *value; + + match_byte_assert (0x58); + format = get_u32 (); + vallab = get_string (); + var = get_string (); + 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); + match_byte (0); + match_byte (0); + match_byte (0); + match_byte (0); + } + else if (match_byte (1)) + { + unsigned int format; + double value; + + if (match_byte (0x31)) + { + if (match_u32 (1)) + { + printf("(footnote %d) ", get_u32()); + match_byte_assert (0); + match_byte_assert (0); + int subn = get_u32 (); + printf ("nested %d bytes", subn); + pos += subn; + } + } + else + match_byte_assert (0x58); + format = get_u32 (); + value = get_double (); + printf ("value %g format %d(%d.%d)", value, format >> 16, (format >> 8) & 0xff, format & 0xff); + } + else if (match_byte (0x31)) + { + if (match_u32 (1)) + { + printf("(footnote %d) ", get_u32()); + match_byte_assert (0); + match_byte_assert (0); + int subn = get_u32 (); + printf ("nested %d bytes", subn); + pos += subn; + } + else + { + match_u32_assert (0); + match_u32_assert (0); + int subn = get_u32 (); + printf ("nested %d bytes", subn); + pos += subn; + } + char *base = get_string(); + int x = get_u32(); + printf ("\"%s\"; %d variables:\n", base, x); + 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++) + { + 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_footnote_value (level+1); + putchar('\n'); + } + } + } + else + { + + match_byte_assert (0x58); + char *base = get_string(); + int x = get_u32(); + printf ("\"%s\" with %d variables:\n", base, x); + 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++) + { + 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_footnote_value (level+1); + putchar('\n'); + } + } + } +} + static void dump_title(void) { @@ -1283,15 +1523,48 @@ dump_title(void) int n_footnotes = get_u32(); - fprintf(stderr, "%d footnotes\n", n_footnotes); + if (n_footnotes >= 20) + fprintf(stderr, "%d footnotes\n", n_footnotes); printf("------\n%d footnotes\n", n_footnotes); - if (n_footnotes < 10) + if (n_footnotes < 20) { for (int i = 0; i < n_footnotes; i++) { printf("footnote %d:\n", i); - dump_value(0); - if (match_byte (0x31)) + dump_footnote_value(0); + match_byte(0); + match_byte(0); + match_byte(0); + match_byte(0); + if (match_byte (1)) + { + unsigned int format; + double value; + + if (match_byte (0x31)) + { + if (match_u32 (1)) + { + printf("(footnote %d) ", get_u32()); + match_byte_assert (0); + match_byte_assert (0); + int subn = get_u32 (); + printf ("nested %d bytes", subn); + pos += subn; + } + } + else + match_byte_assert (0x58); + format = get_u32 (); + value = get_double (); + printf ("value %g format %d(%d.%d)", value, format >> 16, (format >> 8) & 0xff, format & 0xff); + match_byte (1); + match_byte (0); + match_byte (0); + match_byte (0); + match_byte (1); + } + else if (match_byte (0x31)) { match_byte_assert(3); get_string(); diff --git a/notes b/notes index 584631f4b0..6c6dfced5b 100644 --- a/notes +++ b/notes @@ -361,6 +361,21 @@ web/1ae63a04381624dac939ac62eca63fec/00000000054_lightTableData.bin: 03 "Correlation is significant at the 0.05 level (2-tailed)." 58 00 00 00 00 "Correlation is significant at the 0.05 level (2-tailed)." 01 31 03 "*" 58 00 00 00 00 "*" 00 i2 03 "Correlation is significant at the 0.01 level (2-tailed)." 58 00 00 00 00 "Correlation is significant at the 0.01 level (2-tailed)." 01 31 03 "**" 58 00 00 00 00 "**" 00 i4 +web/7e29c00c8c2a7e490636b7f74598b6a4/0000000011163_lightTableData.bin: + +00 31 i0 i0 i60: (i54: (00 00 00 00 31 "^1 is constant when [%1 = %2:, ^1 = ^2:]2 ...") 58 58) "^1 is constant when [%1 = %2:, ^1 = ^2:]2. It has been omitted." i2 + i0 05 58 "meaning14" "level of enjoyment" 02 + i2 i0 + 05 58 "meaning13" "none of these" i2 00 + 02 58 F40.2(1.00) "meaning13" 00 00 00 00 02 58 i1 + +web/e6f958867667aa56d033d54211ff2aec/00000000015_lightTableData.bin: + +00 58 "^1 cells (^2) have expected count less than 5. The minimum expected count is ^3." i3 + i0 01 58 F40.0(18) + i0 01 58 PCT40.1(75.0) + i0 01 58 F(8.5)(something) + Fonts ----- -- 2.30.2