version 1.120, 2010/12/20 13:07:55 |
version 1.124, 2010/12/27 21:41:05 |
Line 72 static const struct htmldata htmltags[TAG_MAX] = { |
|
Line 72 static const struct htmldata htmltags[TAG_MAX] = { |
|
{"pre", HTML_CLRLINE }, /* TAG_PRE */ |
{"pre", HTML_CLRLINE }, /* TAG_PRE */ |
{"b", 0 }, /* TAG_B */ |
{"b", 0 }, /* TAG_B */ |
{"i", 0 }, /* TAG_I */ |
{"i", 0 }, /* TAG_I */ |
{"u", 0 }, /* TAG_U */ |
{"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", /* ATTR_HTTPEQUIV */ |
"http-equiv", /* ATTR_HTTPEQUIV */ |
"content", /* ATTR_CONTENT */ |
"content", /* ATTR_CONTENT */ |
Line 256 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 298 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 486 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 553 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 773 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); |