version 1.240, 2018/10/02 12:33:37 |
version 1.246, 2018/12/15 19:30:26 |
Line 136 html_alloc(const struct manoutput *outopts) |
|
Line 136 html_alloc(const struct manoutput *outopts) |
|
h->base_includes = outopts->includes; |
h->base_includes = outopts->includes; |
if (outopts->fragment) |
if (outopts->fragment) |
h->oflags |= HTML_FRAGMENT; |
h->oflags |= HTML_FRAGMENT; |
|
if (outopts->toc) |
|
h->oflags |= HTML_TOC; |
|
|
mandoc_ohash_init(&id_unique, 4, 0); |
mandoc_ohash_init(&id_unique, 4, 0); |
|
|
Line 226 print_metaf(struct html *h, enum mandoc_esc deco) |
|
Line 228 print_metaf(struct html *h, enum mandoc_esc deco) |
|
case ESCAPE_FONTBI: |
case ESCAPE_FONTBI: |
font = HTMLFONT_BI; |
font = HTMLFONT_BI; |
break; |
break; |
|
case ESCAPE_FONTCW: |
|
font = HTMLFONT_CW; |
|
break; |
case ESCAPE_FONT: |
case ESCAPE_FONT: |
case ESCAPE_FONTROMAN: |
case ESCAPE_FONTROMAN: |
font = HTMLFONT_NONE; |
font = HTMLFONT_NONE; |
Line 253 print_metaf(struct html *h, enum mandoc_esc deco) |
|
Line 258 print_metaf(struct html *h, enum mandoc_esc deco) |
|
h->metaf = print_otag(h, TAG_B, ""); |
h->metaf = print_otag(h, TAG_B, ""); |
print_otag(h, TAG_I, ""); |
print_otag(h, TAG_I, ""); |
break; |
break; |
|
case HTMLFONT_CW: |
|
h->metaf = print_otag(h, TAG_SPAN, "c", "Li"); |
|
break; |
default: |
default: |
break; |
break; |
} |
} |
|
|
print_encode(struct html *h, const char *p, const char *pend, int norecurse) |
print_encode(struct html *h, const char *p, const char *pend, int norecurse) |
{ |
{ |
char numbuf[16]; |
char numbuf[16]; |
struct tag *t; |
|
const char *seq; |
const char *seq; |
size_t sz; |
size_t sz; |
int c, len, breakline, nospace; |
int c, len, breakline, nospace; |
Line 375 print_encode(struct html *h, const char *p, const char |
|
Line 382 print_encode(struct html *h, const char *p, const char |
|
|
|
if (breakline && |
if (breakline && |
(p >= pend || *p == ' ' || *p == ASCII_NBRSP)) { |
(p >= pend || *p == ' ' || *p == ASCII_NBRSP)) { |
t = print_otag(h, TAG_DIV, ""); |
print_otag(h, TAG_BR, ""); |
print_text(h, "\\~"); |
|
print_tagq(h, t); |
|
breakline = 0; |
breakline = 0; |
while (p < pend && (*p == ' ' || *p == ASCII_NBRSP)) |
while (p < pend && (*p == ' ' || *p == ASCII_NBRSP)) |
p++; |
p++; |
Line 397 print_encode(struct html *h, const char *p, const char |
|
Line 402 print_encode(struct html *h, const char *p, const char |
|
continue; |
continue; |
|
|
esc = mandoc_escape(&p, &seq, &len); |
esc = mandoc_escape(&p, &seq, &len); |
if (ESCAPE_ERROR == esc) |
|
break; |
|
|
|
switch (esc) { |
switch (esc) { |
case ESCAPE_FONT: |
case ESCAPE_FONT: |
case ESCAPE_FONTPREV: |
case ESCAPE_FONTPREV: |
case ESCAPE_FONTBOLD: |
case ESCAPE_FONTBOLD: |
case ESCAPE_FONTITALIC: |
case ESCAPE_FONTITALIC: |
case ESCAPE_FONTBI: |
case ESCAPE_FONTBI: |
|
case ESCAPE_FONTCW: |
case ESCAPE_FONTROMAN: |
case ESCAPE_FONTROMAN: |
if (0 == norecurse) |
if (0 == norecurse) { |
|
h->flags |= HTML_NOSPACE; |
print_metaf(h, esc); |
print_metaf(h, esc); |
|
h->flags &= ~HTML_NOSPACE; |
|
} |
continue; |
continue; |
case ESCAPE_SKIPCHAR: |
case ESCAPE_SKIPCHAR: |
h->flags |= HTML_SKIPCHAR; |
h->flags |= HTML_SKIPCHAR; |
continue; |
continue; |
|
case ESCAPE_ERROR: |
|
continue; |
default: |
default: |
break; |
break; |
} |
} |
Line 437 print_encode(struct html *h, const char *p, const char |
|
Line 445 print_encode(struct html *h, const char *p, const char |
|
if (c <= 0) |
if (c <= 0) |
continue; |
continue; |
break; |
break; |
|
case ESCAPE_UNDEF: |
|
c = *seq; |
|
break; |
case ESCAPE_DEVICE: |
case ESCAPE_DEVICE: |
print_word(h, "html"); |
print_word(h, "html"); |
continue; |
continue; |
Line 511 print_otag(struct html *h, enum htmltag tag, const cha |
|
Line 522 print_otag(struct html *h, enum htmltag tag, const cha |
|
struct tag *t; |
struct tag *t; |
const char *attr; |
const char *attr; |
char *arg1, *arg2; |
char *arg1, *arg2; |
int tflags; |
int style_written, tflags; |
|
|
tflags = htmltags[tag].flags; |
tflags = htmltags[tag].flags; |
|
|
Line 551 print_otag(struct html *h, enum htmltag tag, const cha |
|
Line 562 print_otag(struct html *h, enum htmltag tag, const cha |
|
|
|
va_start(ap, fmt); |
va_start(ap, fmt); |
|
|
while (*fmt != '\0') { |
while (*fmt != '\0' && *fmt != 's') { |
|
|
/* Parse attributes and arguments. */ |
/* Parse attributes and arguments. */ |
|
|
Line 567 print_otag(struct html *h, enum htmltag tag, const cha |
|
Line 578 print_otag(struct html *h, enum htmltag tag, const cha |
|
case 'i': |
case 'i': |
attr = "id"; |
attr = "id"; |
break; |
break; |
case 's': |
|
attr = "style"; |
|
arg2 = va_arg(ap, char *); |
|
break; |
|
case '?': |
case '?': |
attr = arg1; |
attr = arg1; |
arg1 = va_arg(ap, char *); |
arg1 = va_arg(ap, char *); |
Line 610 print_otag(struct html *h, enum htmltag tag, const cha |
|
Line 617 print_otag(struct html *h, enum htmltag tag, const cha |
|
fmt++; |
fmt++; |
break; |
break; |
default: |
default: |
if (arg2 == NULL) |
print_encode(h, arg1, NULL, 1); |
print_encode(h, arg1, NULL, 1); |
|
else { |
|
print_word(h, arg1); |
|
print_byte(h, ':'); |
|
print_byte(h, ' '); |
|
print_word(h, arg2); |
|
print_byte(h, ';'); |
|
} |
|
break; |
break; |
} |
} |
print_byte(h, '"'); |
print_byte(h, '"'); |
} |
} |
|
|
|
style_written = 0; |
|
while (*fmt++ == 's') { |
|
arg1 = va_arg(ap, char *); |
|
arg2 = va_arg(ap, char *); |
|
if (arg2 == NULL) |
|
continue; |
|
print_byte(h, ' '); |
|
if (style_written == 0) { |
|
print_word(h, "style=\""); |
|
style_written = 1; |
|
} |
|
print_word(h, arg1); |
|
print_byte(h, ':'); |
|
print_byte(h, ' '); |
|
print_word(h, arg2); |
|
print_byte(h, ';'); |
|
} |
|
if (style_written) |
|
print_byte(h, '"'); |
|
|
va_end(ap); |
va_end(ap); |
|
|
/* Accommodate for "well-formed" singleton escaping. */ |
/* Accommodate for "well-formed" singleton escaping. */ |
Line 735 print_text(struct html *h, const char *word) |
|
Line 755 print_text(struct html *h, const char *word) |
|
case HTMLFONT_BI: |
case HTMLFONT_BI: |
h->metaf = print_otag(h, TAG_B, ""); |
h->metaf = print_otag(h, TAG_B, ""); |
print_otag(h, TAG_I, ""); |
print_otag(h, TAG_I, ""); |
|
break; |
|
case HTMLFONT_CW: |
|
h->metaf = print_otag(h, TAG_SPAN, "c", "Li"); |
break; |
break; |
default: |
default: |
print_indent(h); |
print_indent(h); |