64-bit fixes. [jmk] --rw-rw-r-- M 107020 glenda sys 14280 Nov 19 20:27 sys/src/cmd/troff2html/troff2html.c /n/sourcesdump/2005/1119/plan9/sys/src/cmd/troff2html/troff2html.c:7,19 - /n/sourcesdump/2005/1120/plan9/sys/src/cmd/troff2html/troff2html.c:7,22 Wid = 20, /* tmac.anhtml sets page width to 20" so we can recognize .nf text */ }; - typedef ulong Char; + typedef uintptr Char; typedef struct Troffchar Troffchar; typedef struct Htmlchar Htmlchar; typedef struct Font Font; typedef struct HTMLfont HTMLfont; - /* a Char is 32 bits. low 16 bits are the rune. higher are attributes */ + /* + * a Char is >= 32 bits. low 16 bits are the rune. higher are attributes. + * must be able to hold a pointer. + */ enum { Italic = 16, /n/sourcesdump/2005/1119/plan9/sys/src/cmd/troff2html/troff2html.c:66,77 - /n/sourcesdump/2005/1120/plan9/sys/src/cmd/troff2html/troff2html.c:69,80 /* R must be first; it's the default representation for fonts we don't recognize */ HTMLfont htmlfonts[] = { - "R", nil, 0, - "LucidaSans", nil, 0, - "I", "i", Italic, + "R", nil, 0, + "LucidaSans", nil, 0, + "I", "i", Italic, "LucidaSansI", "i", Italic, - "CW", "tt", CW, - "LucidaCW", "tt", CW, + "CW", "tt", CW, + "LucidaCW", "tt", CW, nil, nil, }; /n/sourcesdump/2005/1119/plan9/sys/src/cmd/troff2html/troff2html.c:78,121 - /n/sourcesdump/2005/1120/plan9/sys/src/cmd/troff2html/troff2html.c:81,124 #define TABLE "
\n", /* indent1 */ - "<+table border=0 cellpadding=0 cellspacing=0> | |
\n", /* indent2 */ - "<+table border=0 cellpadding=0 cellspacing=0> | |
\n", /* indent3 */ + "<+table border=0 cellpadding=0 cellspacing=0> | |
\n", /* indent1 */ + "<+table border=0 cellpadding=0 cellspacing=0> | |
\n", /* indent2 */ + "<+table border=0 cellpadding=0 cellspacing=0> | |
\n", /* indent3 */
0,
0,
0,
" ", /* heading 25 */
- " ")==0){ /* avoid triggering extra |