version 1.131, 2011/03/22 14:05:45 |
version 1.135, 2011/04/30 22:14:02 |
Line 94 static const char *const htmlattrs[ATTR_MAX] = { |
|
Line 94 static const char *const htmlattrs[ATTR_MAX] = { |
|
}; |
}; |
|
|
static void print_num(struct html *, const char *, size_t); |
static void print_num(struct html *, const char *, size_t); |
static void print_spec(struct html *, enum roffdeco, |
static void print_spec(struct html *, const char *, size_t); |
const char *, size_t); |
|
static void print_res(struct html *, const char *, size_t); |
static void print_res(struct html *, const char *, size_t); |
static void print_ctag(struct html *, enum htmltag); |
static void print_ctag(struct html *, enum htmltag); |
static void print_doctype(struct html *); |
static void print_doctype(struct html *); |
static void print_xmltype(struct html *); |
static void print_xmltype(struct html *); |
static int print_encode(struct html *, const char *, int); |
static int print_encode(struct html *, const char *, int); |
static void print_metaf(struct html *, enum roffdeco); |
static void print_metaf(struct html *, enum mandoc_esc); |
static void print_attr(struct html *, |
static void print_attr(struct html *, |
const char *, const char *); |
const char *, const char *); |
static void *ml_alloc(char *, enum htmltype); |
static void *ml_alloc(char *, enum htmltype); |
Line 123 ml_alloc(char *outopts, enum htmltype type) |
|
Line 122 ml_alloc(char *outopts, enum htmltype type) |
|
|
|
h->type = type; |
h->type = type; |
h->tags.head = NULL; |
h->tags.head = NULL; |
h->symtab = chars_init(CHARS_HTML); |
h->symtab = mchars_init(); |
|
|
while (outopts && *outopts) |
while (outopts && *outopts) |
switch (getsubopt(&outopts, UNCONST(toks), &v)) { |
switch (getsubopt(&outopts, UNCONST(toks), &v)) { |
Line 173 html_free(void *p) |
|
Line 172 html_free(void *p) |
|
} |
} |
|
|
if (h->symtab) |
if (h->symtab) |
chars_free(h->symtab); |
mchars_free(h->symtab); |
|
|
free(h); |
free(h); |
} |
} |
Line 215 print_num(struct html *h, const char *p, size_t len) |
|
Line 214 print_num(struct html *h, const char *p, size_t len) |
|
{ |
{ |
const char *rhs; |
const char *rhs; |
|
|
rhs = chars_num2char(p, len); |
rhs = mchars_num2char(p, len); |
if (rhs) |
if (rhs) |
putchar((int)*rhs); |
putchar((int)*rhs); |
} |
} |
|
|
static void |
static void |
print_spec(struct html *h, enum roffdeco d, const char *p, size_t len) |
print_spec(struct html *h, const char *p, size_t len) |
{ |
{ |
int cp; |
int cp; |
const char *rhs; |
const char *rhs; |
size_t sz; |
size_t sz; |
|
|
if ((cp = chars_spec2cp(h->symtab, p, len)) > 0) { |
if ((cp = mchars_spec2cp(h->symtab, p, len)) > 0) { |
printf("&#%d;", cp); |
printf("&#%d;", cp); |
return; |
return; |
} else if (-1 == cp && DECO_SSPECIAL == d) { |
} else if (-1 == cp && 1 == len) { |
fwrite(p, 1, len, stdout); |
fwrite(p, 1, len, stdout); |
return; |
return; |
} else if (-1 == cp) |
} else if (-1 == cp) |
return; |
return; |
|
|
if (NULL != (rhs = chars_spec2str(h->symtab, p, len, &sz))) |
if (NULL != (rhs = mchars_spec2str(h->symtab, p, len, &sz))) |
fwrite(rhs, 1, sz, stdout); |
fwrite(rhs, 1, sz, stdout); |
} |
} |
|
|
Line 248 print_res(struct html *h, const char *p, size_t len) |
|
Line 247 print_res(struct html *h, const char *p, size_t len) |
|
const char *rhs; |
const char *rhs; |
size_t sz; |
size_t sz; |
|
|
if ((cp = chars_res2cp(h->symtab, p, len)) > 0) { |
if ((cp = mchars_res2cp(h->symtab, p, len)) > 0) { |
printf("&#%d;", cp); |
printf("&#%d;", cp); |
return; |
return; |
} else if (-1 == cp) |
} else if (-1 == cp) |
return; |
return; |
|
|
if (NULL != (rhs = chars_res2str(h->symtab, p, len, &sz))) |
if (NULL != (rhs = mchars_res2str(h->symtab, p, len, &sz))) |
fwrite(rhs, 1, sz, stdout); |
fwrite(rhs, 1, sz, stdout); |
} |
} |
|
|
|
|
static void |
static void |
print_metaf(struct html *h, enum roffdeco deco) |
print_metaf(struct html *h, enum mandoc_esc deco) |
{ |
{ |
enum htmlfont font; |
enum htmlfont font; |
|
|
switch (deco) { |
switch (deco) { |
case (DECO_PREVIOUS): |
case (ESCAPE_FONTPREV): |
font = h->metal; |
font = h->metal; |
break; |
break; |
case (DECO_ITALIC): |
case (ESCAPE_FONTITALIC): |
font = HTMLFONT_ITALIC; |
font = HTMLFONT_ITALIC; |
break; |
break; |
case (DECO_BOLD): |
case (ESCAPE_FONTBOLD): |
font = HTMLFONT_BOLD; |
font = HTMLFONT_BOLD; |
break; |
break; |
case (DECO_ROMAN): |
case (ESCAPE_FONTROMAN): |
font = HTMLFONT_NONE; |
font = HTMLFONT_NONE; |
break; |
break; |
default: |
default: |
Line 303 print_encode(struct html *h, const char *p, int norecu |
|
Line 302 print_encode(struct html *h, const char *p, int norecu |
|
size_t sz; |
size_t sz; |
int len, nospace; |
int len, nospace; |
const char *seq; |
const char *seq; |
enum roffdeco deco; |
enum mandoc_esc esc; |
static const char rejs[6] = { '\\', '<', '>', '&', ASCII_HYPH, '\0' }; |
static const char rejs[6] = { '\\', '<', '>', '&', ASCII_HYPH, '\0' }; |
|
|
nospace = 0; |
nospace = 0; |
|
|
for (; *p; p++) { |
while ('\0' != *p) { |
sz = strcspn(p, rejs); |
sz = strcspn(p, rejs); |
|
|
fwrite(p, 1, sz, stdout); |
fwrite(p, 1, sz, stdout); |
p += /* LINTED */ |
p += (int)sz; |
sz; |
|
|
|
if ('<' == *p) { |
if ('\0' == *p) |
|
break; |
|
|
|
switch (*p++) { |
|
case ('<'): |
printf("<"); |
printf("<"); |
continue; |
continue; |
} else if ('>' == *p) { |
case ('>'): |
printf(">"); |
printf(">"); |
continue; |
continue; |
} else if ('&' == *p) { |
case ('&'): |
printf("&"); |
printf("&"); |
continue; |
continue; |
} else if (ASCII_HYPH == *p) { |
case (ASCII_HYPH): |
/* |
|
* Note: "soft hyphens" aren't graphically |
|
* displayed when not breaking the text; we want |
|
* them to be displayed. |
|
*/ |
|
/*printf("­");*/ |
|
putchar('-'); |
putchar('-'); |
continue; |
continue; |
} else if ('\0' == *p) |
default: |
break; |
break; |
|
} |
|
|
seq = ++p; |
esc = mandoc_escape(&p, &seq, &len); |
len = a2roffdeco(&deco, &seq, &sz); |
if (ESCAPE_ERROR == esc) |
|
break; |
|
|
switch (deco) { |
switch (esc) { |
case (DECO_NUMBERED): |
case (ESCAPE_NUMBERED): |
print_num(h, seq, sz); |
print_num(h, seq, len); |
break; |
break; |
case (DECO_RESERVED): |
case (ESCAPE_PREDEF): |
print_res(h, seq, sz); |
print_res(h, seq, len); |
break; |
break; |
case (DECO_SSPECIAL): |
case (ESCAPE_SPECIAL): |
/* FALLTHROUGH */ |
print_spec(h, seq, len); |
case (DECO_SPECIAL): |
|
print_spec(h, deco, seq, sz); |
|
break; |
break; |
case (DECO_PREVIOUS): |
case (ESCAPE_FONTPREV): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (DECO_BOLD): |
case (ESCAPE_FONTBOLD): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (DECO_ITALIC): |
case (ESCAPE_FONTITALIC): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (DECO_ROMAN): |
case (ESCAPE_FONTROMAN): |
if (norecurse) |
if (norecurse) |
break; |
break; |
print_metaf(h, deco); |
print_metaf(h, esc); |
break; |
break; |
|
case (ESCAPE_NOSPACE): |
|
if ('\0' == *p) |
|
nospace = 1; |
|
break; |
default: |
default: |
break; |
break; |
} |
} |
|
|
p += len - 1; |
|
|
|
if (DECO_NOSPACE == deco && '\0' == *(p + 1)) |
|
nospace = 1; |
|
} |
} |
|
|
return(nospace); |
return(nospace); |
Line 432 print_otag(struct html *h, enum htmltag tag, |
|
Line 427 print_otag(struct html *h, enum htmltag tag, |
|
print_attr(h, "lang", "en"); |
print_attr(h, "lang", "en"); |
} |
} |
|
|
/* Accomodate for XML "well-formed" singleton escaping. */ |
/* Accommodate for XML "well-formed" singleton escaping. */ |
|
|
if (HTML_AUTOCLOSE & htmltags[tag].flags) |
if (HTML_AUTOCLOSE & htmltags[tag].flags) |
switch (h->type) { |
switch (h->type) { |