version 1.113, 2010/10/01 21:51:13 |
version 1.124, 2010/12/27 21:41:05 |
Line 57 static const struct htmldata htmltags[TAG_MAX] = { |
|
Line 57 static const struct htmldata htmltags[TAG_MAX] = { |
|
{"br", HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_BR */ |
{"br", HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_BR */ |
{"a", 0}, /* TAG_A */ |
{"a", 0}, /* TAG_A */ |
{"table", HTML_CLRLINE}, /* TAG_TABLE */ |
{"table", HTML_CLRLINE}, /* TAG_TABLE */ |
|
{"tbody", HTML_CLRLINE}, /* TAG_TBODY */ |
{"col", HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_COL */ |
{"col", HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_COL */ |
{"tr", HTML_CLRLINE}, /* TAG_TR */ |
{"tr", HTML_CLRLINE}, /* TAG_TR */ |
{"td", HTML_CLRLINE}, /* TAG_TD */ |
{"td", HTML_CLRLINE}, /* TAG_TD */ |
{"li", HTML_CLRLINE}, /* TAG_LI */ |
{"li", HTML_CLRLINE}, /* TAG_LI */ |
{"ul", HTML_CLRLINE}, /* TAG_UL */ |
{"ul", HTML_CLRLINE}, /* TAG_UL */ |
{"ol", HTML_CLRLINE}, /* TAG_OL */ |
{"ol", HTML_CLRLINE}, /* TAG_OL */ |
|
{"dl", HTML_CLRLINE}, /* TAG_DL */ |
|
{"dt", HTML_CLRLINE}, /* TAG_DT */ |
|
{"dd", HTML_CLRLINE}, /* TAG_DD */ |
|
{"blockquote", HTML_CLRLINE}, /* TAG_BLOCKQUOTE */ |
|
{"p", HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_P */ |
|
{"pre", HTML_CLRLINE }, /* TAG_PRE */ |
|
{"b", 0 }, /* TAG_B */ |
|
{"i", 0 }, /* TAG_I */ |
|
{"code", 0 }, /* TAG_CODE */ |
|
{"small", 0 }, /* TAG_SMALL */ |
}; |
}; |
|
|
static const char *const htmlfonts[HTMLFONT_MAX] = { |
|
"roman", |
|
"bold", |
|
"italic" |
|
}; |
|
|
|
static const char *const htmlattrs[ATTR_MAX] = { |
static const char *const htmlattrs[ATTR_MAX] = { |
"http-equiv", |
"http-equiv", /* ATTR_HTTPEQUIV */ |
"content", |
"content", /* ATTR_CONTENT */ |
"name", |
"name", /* ATTR_NAME */ |
"rel", |
"rel", /* ATTR_REL */ |
"href", |
"href", /* ATTR_HREF */ |
"type", |
"type", /* ATTR_TYPE */ |
"media", |
"media", /* ATTR_MEDIA */ |
"class", |
"class", /* ATTR_CLASS */ |
"style", |
"style", /* ATTR_STYLE */ |
"width", |
"width", /* ATTR_WIDTH */ |
"valign", |
"id", /* ATTR_ID */ |
"target", |
"summary", /* ATTR_SUMMARY */ |
"id", |
"align", /* ATTR_ALIGN */ |
"summary", |
|
}; |
}; |
|
|
static void print_spec(struct html *, enum roffdeco, |
static void print_spec(struct html *, enum roffdeco, |
Line 121 ml_alloc(char *outopts, enum htmltype type) |
|
Line 125 ml_alloc(char *outopts, enum htmltype type) |
|
|
|
h->type = type; |
h->type = type; |
h->tags.head = NULL; |
h->tags.head = NULL; |
h->ords.head = NULL; |
|
h->symtab = chars_init(CHARS_HTML); |
h->symtab = chars_init(CHARS_HTML); |
|
|
while (outopts && *outopts) |
while (outopts && *outopts) |
|
|
html_free(void *p) |
html_free(void *p) |
{ |
{ |
struct tag *tag; |
struct tag *tag; |
struct ord *ord; |
|
struct html *h; |
struct html *h; |
|
|
h = (struct html *)p; |
h = (struct html *)p; |
|
|
while ((ord = h->ords.head) != NULL) { |
|
h->ords.head = ord->next; |
|
free(ord); |
|
} |
|
|
|
while ((tag = h->tags.head) != NULL) { |
while ((tag = h->tags.head) != NULL) { |
h->tags.head = tag->next; |
h->tags.head = tag->next; |
free(tag); |
free(tag); |
Line 254 print_res(struct html *h, const char *p, size_t len) |
|
Line 251 print_res(struct html *h, const char *p, size_t len) |
|
} |
} |
|
|
|
|
struct tag * |
|
print_ofont(struct html *h, enum htmlfont font) |
|
{ |
|
struct htmlpair tag; |
|
|
|
h->metal = h->metac; |
|
h->metac = font; |
|
|
|
/* FIXME: DECO_ROMAN should just close out preexisting. */ |
|
|
|
if (h->metaf && h->tags.head == h->metaf) |
|
print_tagq(h, h->metaf); |
|
|
|
PAIR_CLASS_INIT(&tag, htmlfonts[font]); |
|
h->metaf = print_otag(h, TAG_SPAN, 1, &tag); |
|
return(h->metaf); |
|
} |
|
|
|
|
|
static void |
static void |
print_metaf(struct html *h, enum roffdeco deco) |
print_metaf(struct html *h, enum roffdeco deco) |
{ |
{ |
Line 296 print_metaf(struct html *h, enum roffdeco deco) |
|
Line 274 print_metaf(struct html *h, enum roffdeco deco) |
|
/* NOTREACHED */ |
/* NOTREACHED */ |
} |
} |
|
|
(void)print_ofont(h, font); |
if (h->metaf) { |
|
print_tagq(h, h->metaf); |
|
h->metaf = NULL; |
|
} |
|
|
|
h->metal = h->metac; |
|
h->metac = font; |
|
|
|
if (HTMLFONT_NONE != font) |
|
h->metaf = HTMLFONT_BOLD == font ? |
|
print_otag(h, TAG_B, 0, NULL) : |
|
print_otag(h, TAG_I, 0, NULL); |
} |
} |
|
|
|
|
Line 450 print_otag(struct html *h, enum htmltag tag, |
|
Line 439 print_otag(struct html *h, enum htmltag tag, |
|
putchar('>'); |
putchar('>'); |
|
|
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
|
|
|
if ((HTML_AUTOCLOSE | HTML_CLRLINE) & htmltags[tag].flags) |
|
putchar('\n'); |
|
|
return(t); |
return(t); |
} |
} |
|
|
Line 480 print_xmltype(struct html *h) |
|
Line 473 print_xmltype(struct html *h) |
|
{ |
{ |
|
|
if (HTML_XHTML_1_0_STRICT == h->type) |
if (HTML_XHTML_1_0_STRICT == h->type) |
printf("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); |
puts("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); |
} |
} |
|
|
|
|
Line 547 print_text(struct html *h, const char *word) |
|
Line 540 print_text(struct html *h, const char *word) |
|
printf(" "); |
printf(" "); |
} |
} |
|
|
|
assert(NULL == h->metaf); |
|
if (HTMLFONT_NONE != h->metac) |
|
h->metaf = HTMLFONT_BOLD == h->metac ? |
|
print_otag(h, TAG_B, 0, NULL) : |
|
print_otag(h, TAG_I, 0, NULL); |
|
|
assert(word); |
assert(word); |
if ( ! print_encode(h, word, 0)) |
if ( ! print_encode(h, word, 0)) |
if ( ! (h->flags & HTML_NONOSPACE)) |
if ( ! (h->flags & HTML_NONOSPACE)) |
h->flags &= ~HTML_NOSPACE; |
h->flags &= ~HTML_NOSPACE; |
|
|
|
if (h->metaf) { |
|
print_tagq(h, h->metaf); |
|
h->metaf = NULL; |
|
} |
|
|
h->flags &= ~HTML_IGNDELIM; |
h->flags &= ~HTML_IGNDELIM; |
|
|
/* |
/* |
Line 767 html_idcat(char *dst, const char *src, int sz) |
|
Line 771 html_idcat(char *dst, const char *src, int sz) |
|
{ |
{ |
int ssz; |
int ssz; |
|
|
assert(sz); |
assert(sz > 2); |
|
|
/* Cf. <http://www.w3.org/TR/html4/types.html#h-6.2>. */ |
/* Cf. <http://www.w3.org/TR/html4/types.html#h-6.2>. */ |
|
|
for ( ; *dst != '\0' && sz; dst++, sz--) |
|
/* Jump to end. */ ; |
|
|
|
assert(sz > 2); |
|
|
|
/* We can't start with a number (bah). */ |
/* We can't start with a number (bah). */ |
|
|
*dst++ = 'x'; |
if ('#' == *dst) { |
*dst = '\0'; |
dst++; |
sz--; |
sz--; |
|
} |
|
if ('\0' == *dst) { |
|
*dst++ = 'x'; |
|
*dst = '\0'; |
|
sz--; |
|
} |
|
|
|
for ( ; *dst != '\0' && sz; dst++, sz--) |
|
/* Jump to end. */ ; |
|
|
for ( ; *src != '\0' && sz > 1; src++) { |
for ( ; *src != '\0' && sz > 1; src++) { |
ssz = snprintf(dst, (size_t)sz, "%.2x", *src); |
ssz = snprintf(dst, (size_t)sz, "%.2x", *src); |