version 1.196, 2017/01/18 19:22:21 |
version 1.199, 2017/01/19 16:59:30 |
Line 75 static const struct htmldata htmltags[TAG_MAX] = { |
|
Line 75 static const struct htmldata htmltags[TAG_MAX] = { |
|
{"dl", HTML_NLALL | HTML_INDENT}, |
{"dl", HTML_NLALL | HTML_INDENT}, |
{"dt", HTML_NLAROUND}, |
{"dt", HTML_NLAROUND}, |
{"dd", HTML_NLAROUND | HTML_INDENT}, |
{"dd", HTML_NLAROUND | HTML_INDENT}, |
{"blockquote", HTML_NLALL | HTML_INDENT}, |
|
{"pre", HTML_NLALL | HTML_NOINDENT}, |
{"pre", HTML_NLALL | HTML_NOINDENT}, |
{"b", 0}, |
{"b", 0}, |
{"i", 0}, |
{"i", 0}, |
Line 114 static const char *const roffscales[SCALE_MAX] = { |
|
Line 113 static const char *const roffscales[SCALE_MAX] = { |
|
}; |
}; |
|
|
static void a2width(const char *, struct roffsu *); |
static void a2width(const char *, struct roffsu *); |
static void html_endline(struct html *); |
static void print_byte(struct html *, char); |
static void html_indent(struct html *); |
static void print_endline(struct html *); |
|
static void print_endword(struct html *); |
|
static void print_indent(struct html *); |
|
static void print_word(struct html *, const char *); |
|
|
static void print_ctag(struct html *, struct tag *); |
static void print_ctag(struct html *, struct tag *); |
static int print_escape(char); |
static int print_escape(struct html *, char); |
static int print_encode(struct html *, const char *, const char *, int); |
static int print_encode(struct html *, const char *, const char *, int); |
static void print_href(struct html *, const char *, const char *, int); |
static void print_href(struct html *, const char *, const char *, int); |
static void print_metaf(struct html *, enum mandoc_esc); |
static void print_metaf(struct html *, enum mandoc_esc); |
Line 169 print_gen_head(struct html *h) |
|
Line 172 print_gen_head(struct html *h) |
|
|
|
t = print_otag(h, TAG_STYLE, ""); |
t = print_otag(h, TAG_STYLE, ""); |
print_text(h, "table.head, table.foot { width: 100%; }"); |
print_text(h, "table.head, table.foot { width: 100%; }"); |
html_endline(h); |
print_endline(h); |
print_text(h, "td.head-rtitle, td.foot-os { text-align: right; }"); |
print_text(h, "td.head-rtitle, td.foot-os { text-align: right; }"); |
html_endline(h); |
print_endline(h); |
print_text(h, "td.head-vol { text-align: center; }"); |
print_text(h, "td.head-vol { text-align: center; }"); |
html_endline(h); |
print_endline(h); |
print_text(h, "table.foot td { width: 50%; }"); |
print_text(h, "table.foot td { width: 50%; }"); |
html_endline(h); |
print_endline(h); |
print_text(h, "table.head td { width: 33%; }"); |
print_text(h, "table.head td { width: 33%; }"); |
html_endline(h); |
print_endline(h); |
print_text(h, "div.spacer { margin: 1em 0; }"); |
print_text(h, "div.Pp { margin: 1ex 0ex; }"); |
print_tagq(h, t); |
print_tagq(h, t); |
|
|
if (h->style) |
if (h->style) |
Line 288 html_strlen(const char *cp) |
|
Line 291 html_strlen(const char *cp) |
|
} |
} |
|
|
static int |
static int |
print_escape(char c) |
print_escape(struct html *h, char c) |
{ |
{ |
|
|
switch (c) { |
switch (c) { |
case '<': |
case '<': |
printf("<"); |
print_word(h, "<"); |
break; |
break; |
case '>': |
case '>': |
printf(">"); |
print_word(h, ">"); |
break; |
break; |
case '&': |
case '&': |
printf("&"); |
print_word(h, "&"); |
break; |
break; |
case '"': |
case '"': |
printf("""); |
print_word(h, """); |
break; |
break; |
case ASCII_NBRSP: |
case ASCII_NBRSP: |
printf(" "); |
print_word(h, " "); |
break; |
break; |
case ASCII_HYPH: |
case ASCII_HYPH: |
putchar('-'); |
print_byte(h, '-'); |
break; |
break; |
case ASCII_BREAK: |
case ASCII_BREAK: |
break; |
break; |
Line 321 print_escape(char c) |
|
Line 324 print_escape(char c) |
|
static int |
static int |
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]; |
size_t sz; |
size_t sz; |
int c, len, nospace; |
int c, len, nospace; |
const char *seq; |
const char *seq; |
Line 340 print_encode(struct html *h, const char *p, const char |
|
Line 344 print_encode(struct html *h, const char *p, const char |
|
continue; |
continue; |
} |
} |
|
|
sz = strcspn(p, rejs); |
for (sz = strcspn(p, rejs); sz-- && p < pend; p++) |
if (p + sz > pend) |
if (*p == ' ') |
sz = pend - p; |
print_endword(h); |
|
else |
|
print_byte(h, *p); |
|
|
fwrite(p, 1, sz, stdout); |
|
p += (int)sz; |
|
|
|
if (p >= pend) |
if (p >= pend) |
break; |
break; |
|
|
if (print_escape(*p++)) |
if (print_escape(h, *p++)) |
continue; |
continue; |
|
|
esc = mandoc_escape(&p, &seq, &len); |
esc = mandoc_escape(&p, &seq, &len); |
Line 409 print_encode(struct html *h, const char *p, const char |
|
Line 412 print_encode(struct html *h, const char *p, const char |
|
if ((c < 0x20 && c != 0x09) || |
if ((c < 0x20 && c != 0x09) || |
(c > 0x7E && c < 0xA0)) |
(c > 0x7E && c < 0xA0)) |
c = 0xFFFD; |
c = 0xFFFD; |
if (c > 0x7E) |
if (c > 0x7E) { |
printf("&#%d;", c); |
(void)snprintf(numbuf, sizeof(numbuf), "&#%d;", c); |
else if ( ! print_escape(c)) |
print_word(h, numbuf); |
putchar(c); |
} else if (print_escape(h, c) == 0) |
|
print_byte(h, c); |
} |
} |
|
|
return nospace; |
return nospace; |
Line 428 print_href(struct html *h, const char *name, const cha |
|
Line 432 print_href(struct html *h, const char *name, const cha |
|
print_encode(h, pp, p, 1); |
print_encode(h, pp, p, 1); |
if (man && p[1] == 'S') { |
if (man && p[1] == 'S') { |
if (sec == NULL) |
if (sec == NULL) |
putchar('1'); |
print_byte(h, '1'); |
else |
else |
print_encode(h, sec, NULL, 1); |
print_encode(h, sec, NULL, 1); |
} else if ((man && p[1] == 'N') || |
} else if ((man && p[1] == 'N') || |
Line 447 print_otag(struct html *h, enum htmltag tag, const cha |
|
Line 451 print_otag(struct html *h, enum htmltag tag, const cha |
|
{ |
{ |
va_list ap; |
va_list ap; |
struct roffsu mysu, *su; |
struct roffsu mysu, *su; |
|
char numbuf[16]; |
struct tag *t; |
struct tag *t; |
const char *attr; |
const char *attr; |
char *s; |
char *s; |
Line 466 print_otag(struct html *h, enum htmltag tag, const cha |
|
Line 471 print_otag(struct html *h, enum htmltag tag, const cha |
|
t = NULL; |
t = NULL; |
|
|
if (tflags & HTML_NLBEFORE) |
if (tflags & HTML_NLBEFORE) |
html_endline(h); |
print_endline(h); |
if (h->flags & HTML_NLDONE) |
if (h->col == 0) |
html_indent(h); |
print_indent(h); |
else if ((h->flags & HTML_NOSPACE) == 0) { |
else if ((h->flags & HTML_NOSPACE) == 0) { |
if (h->flags & HTML_KEEP) |
if (h->flags & HTML_KEEP) |
printf(" "); |
print_word(h, " "); |
else { |
else { |
if (h->flags & HTML_PREKEEP) |
if (h->flags & HTML_PREKEEP) |
h->flags |= HTML_KEEP; |
h->flags |= HTML_KEEP; |
putchar(' '); |
print_endword(h); |
} |
} |
} |
} |
|
|
Line 486 print_otag(struct html *h, enum htmltag tag, const cha |
|
Line 491 print_otag(struct html *h, enum htmltag tag, const cha |
|
|
|
/* Print out the tag name and attributes. */ |
/* Print out the tag name and attributes. */ |
|
|
printf("<%s", htmltags[tag].name); |
print_byte(h, '<'); |
|
print_word(h, htmltags[tag].name); |
|
|
va_start(ap, fmt); |
va_start(ap, fmt); |
|
|
have_style = 0; |
have_style = 0; |
while (*fmt != '\0') { |
while (*fmt != '\0') { |
if (*fmt == 's') { |
if (*fmt == 's') { |
printf(" style=\""); |
print_word(h, " style=\""); |
have_style = 1; |
have_style = 1; |
fmt++; |
fmt++; |
break; |
break; |
Line 516 print_otag(struct html *h, enum htmltag tag, const cha |
|
Line 522 print_otag(struct html *h, enum htmltag tag, const cha |
|
default: |
default: |
abort(); |
abort(); |
} |
} |
printf(" %s=\"", attr); |
print_byte(h, ' '); |
|
print_word(h, attr); |
|
print_byte(h, '='); |
|
print_byte(h, '"'); |
switch (*fmt) { |
switch (*fmt) { |
case 'M': |
case 'M': |
print_href(h, s, va_arg(ap, char *), 1); |
print_href(h, s, va_arg(ap, char *), 1); |
Line 527 print_otag(struct html *h, enum htmltag tag, const cha |
|
Line 536 print_otag(struct html *h, enum htmltag tag, const cha |
|
fmt++; |
fmt++; |
break; |
break; |
case 'R': |
case 'R': |
putchar('#'); |
print_byte(h, '#'); |
fmt++; |
fmt++; |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
default: |
default: |
print_encode(h, s, NULL, 1); |
print_encode(h, s, NULL, 1); |
break; |
break; |
} |
} |
putchar('"'); |
print_byte(h, '"'); |
} |
} |
|
|
/* Print out styles. */ |
/* Print out styles. */ |
Line 593 print_otag(struct html *h, enum htmltag tag, const cha |
|
Line 602 print_otag(struct html *h, enum htmltag tag, const cha |
|
attr = "min-width"; |
attr = "min-width"; |
break; |
break; |
case '?': |
case '?': |
printf("%s: %s;", s, va_arg(ap, char *)); |
print_word(h, s); |
|
print_byte(h, ':'); |
|
print_byte(h, ' '); |
|
print_word(h, va_arg(ap, char *)); |
|
print_byte(h, ';'); |
|
if (*fmt != '\0') |
|
print_byte(h, ' '); |
continue; |
continue; |
default: |
default: |
abort(); |
abort(); |
Line 603 print_otag(struct html *h, enum htmltag tag, const cha |
|
Line 618 print_otag(struct html *h, enum htmltag tag, const cha |
|
v = 1.0; |
v = 1.0; |
else if (su->unit == SCALE_BU) |
else if (su->unit == SCALE_BU) |
v /= 24.0; |
v /= 24.0; |
printf("%s: %.2f%s;", attr, v, roffscales[su->unit]); |
print_word(h, attr); |
|
print_byte(h, ':'); |
|
print_byte(h, ' '); |
|
(void)snprintf(numbuf, sizeof(numbuf), "%.2f", v); |
|
print_word(h, numbuf); |
|
print_word(h, roffscales[su->unit]); |
|
print_byte(h, ';'); |
|
if (*fmt != '\0') |
|
print_byte(h, ' '); |
} |
} |
if (have_style) |
if (have_style) |
putchar('"'); |
print_byte(h, '"'); |
|
|
va_end(ap); |
va_end(ap); |
|
|
/* Accommodate for "well-formed" singleton escaping. */ |
/* Accommodate for "well-formed" singleton escaping. */ |
|
|
if (HTML_AUTOCLOSE & htmltags[tag].flags) |
if (HTML_AUTOCLOSE & htmltags[tag].flags) |
putchar('/'); |
print_byte(h, '/'); |
|
|
putchar('>'); |
print_byte(h, '>'); |
|
|
if (tflags & HTML_NLBEGIN) |
if (tflags & HTML_NLBEGIN) |
html_endline(h); |
print_endline(h); |
else |
else |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
|
|
Line 651 print_ctag(struct html *h, struct tag *tag) |
|
Line 674 print_ctag(struct html *h, struct tag *tag) |
|
if (tflags & HTML_NOINDENT) |
if (tflags & HTML_NOINDENT) |
h->noindent--; |
h->noindent--; |
if (tflags & HTML_NLEND) |
if (tflags & HTML_NLEND) |
html_endline(h); |
print_endline(h); |
html_indent(h); |
print_indent(h); |
printf("</%s>", htmltags[tag->tag].name); |
print_byte(h, '<'); |
|
print_byte(h, '/'); |
|
print_word(h, htmltags[tag->tag].name); |
|
print_byte(h, '>'); |
if (tflags & HTML_NLAFTER) |
if (tflags & HTML_NLAFTER) |
html_endline(h); |
print_endline(h); |
|
|
h->tags.head = tag->next; |
h->tags.head = tag->next; |
free(tag); |
free(tag); |
Line 664 print_ctag(struct html *h, struct tag *tag) |
|
Line 690 print_ctag(struct html *h, struct tag *tag) |
|
void |
void |
print_gen_decls(struct html *h) |
print_gen_decls(struct html *h) |
{ |
{ |
|
print_word(h, "<!DOCTYPE html>"); |
puts("<!DOCTYPE html>"); |
print_endline(h); |
h->flags |= HTML_NLDONE; |
|
} |
} |
|
|
void |
void |
print_text(struct html *h, const char *word) |
print_text(struct html *h, const char *word) |
{ |
{ |
if ((h->flags & (HTML_NLDONE | HTML_NOSPACE)) == 0) { |
if (h->col && (h->flags & HTML_NOSPACE) == 0) { |
if ( ! (HTML_KEEP & h->flags)) { |
if ( ! (HTML_KEEP & h->flags)) { |
if (HTML_PREKEEP & h->flags) |
if (HTML_PREKEEP & h->flags) |
h->flags |= HTML_KEEP; |
h->flags |= HTML_KEEP; |
putchar(' '); |
print_endword(h); |
} else |
} else |
printf(" "); |
print_word(h, " "); |
} |
} |
|
|
assert(NULL == h->metaf); |
assert(NULL == h->metaf); |
Line 694 print_text(struct html *h, const char *word) |
|
Line 719 print_text(struct html *h, const char *word) |
|
print_otag(h, TAG_I, ""); |
print_otag(h, TAG_I, ""); |
break; |
break; |
default: |
default: |
html_indent(h); |
print_indent(h); |
break; |
break; |
} |
} |
|
|
Line 743 print_paragraph(struct html *h) |
|
Line 768 print_paragraph(struct html *h) |
|
{ |
{ |
struct tag *t; |
struct tag *t; |
|
|
t = print_otag(h, TAG_DIV, "c", "spacer"); |
t = print_otag(h, TAG_DIV, "c", "Pp"); |
print_tagq(h, t); |
print_tagq(h, t); |
} |
} |
|
|
|
|
|
/*********************************************************************** |
|
* Low level output functions. |
|
* They implement line breaking using a short static buffer. |
|
***********************************************************************/ |
|
|
/* |
/* |
|
* Buffer one HTML output byte. |
|
* If the buffer is full, flush and deactivate it and start a new line. |
|
* If the buffer is inactive, print directly. |
|
*/ |
|
static void |
|
print_byte(struct html *h, char c) |
|
{ |
|
if ((h->flags & HTML_BUFFER) == 0) { |
|
putchar(c); |
|
h->col++; |
|
return; |
|
} |
|
|
|
if (h->col + h->bufcol < sizeof(h->buf)) { |
|
h->buf[h->bufcol++] = c; |
|
return; |
|
} |
|
|
|
putchar('\n'); |
|
h->col = 0; |
|
print_indent(h); |
|
putchar(' '); |
|
putchar(' '); |
|
fwrite(h->buf, h->bufcol, 1, stdout); |
|
putchar(c); |
|
h->col = (h->indent + 1) * 2 + h->bufcol + 1; |
|
h->bufcol = 0; |
|
h->flags &= ~HTML_BUFFER; |
|
} |
|
|
|
/* |
* If something was printed on the current output line, end it. |
* If something was printed on the current output line, end it. |
* Not to be called right after html_indent(). |
* Not to be called right after print_indent(). |
*/ |
*/ |
static void |
static void |
html_endline(struct html *h) |
print_endline(struct html *h) |
{ |
{ |
if (h->flags & HTML_NLDONE) |
if (h->col == 0) |
return; |
return; |
|
|
|
if (h->bufcol) { |
|
putchar(' '); |
|
fwrite(h->buf, h->bufcol, 1, stdout); |
|
h->bufcol = 0; |
|
} |
putchar('\n'); |
putchar('\n'); |
h->flags |= HTML_NLDONE | HTML_NOSPACE; |
h->col = 0; |
|
h->flags |= HTML_NOSPACE; |
|
h->flags &= ~HTML_BUFFER; |
} |
} |
|
|
/* |
/* |
|
* Flush the HTML output buffer. |
|
* If it is inactive, activate it. |
|
*/ |
|
static void |
|
print_endword(struct html *h) |
|
{ |
|
if (h->noindent) { |
|
print_byte(h, ' '); |
|
return; |
|
} |
|
|
|
if ((h->flags & HTML_BUFFER) == 0) { |
|
h->col++; |
|
h->flags |= HTML_BUFFER; |
|
} else if (h->bufcol) { |
|
putchar(' '); |
|
fwrite(h->buf, h->bufcol, 1, stdout); |
|
h->col += h->bufcol + 1; |
|
} |
|
h->bufcol = 0; |
|
} |
|
|
|
/* |
* If at the beginning of a new output line, |
* If at the beginning of a new output line, |
* perform indentation and mark the line as containing output. |
* perform indentation and mark the line as containing output. |
* Make sure to really produce some output right afterwards, |
* Make sure to really produce some output right afterwards, |
* but do not use print_otag() for producing it. |
* but do not use print_otag() for producing it. |
*/ |
*/ |
static void |
static void |
html_indent(struct html *h) |
print_indent(struct html *h) |
{ |
{ |
int i; |
size_t i; |
|
|
if ((h->flags & HTML_NLDONE) == 0) |
if (h->col) |
return; |
return; |
|
|
if (h->noindent == 0) |
if (h->noindent == 0) { |
for (i = 0; i < h->indent * 2; i++) |
h->col = h->indent * 2; |
|
for (i = 0; i < h->col; i++) |
putchar(' '); |
putchar(' '); |
h->flags &= ~(HTML_NLDONE | HTML_NOSPACE); |
} |
|
h->flags &= ~HTML_NOSPACE; |
|
} |
|
|
|
/* |
|
* Print or buffer some characters |
|
* depending on the current HTML output buffer state. |
|
*/ |
|
static void |
|
print_word(struct html *h, const char *cp) |
|
{ |
|
while (*cp != '\0') |
|
print_byte(h, *cp++); |
} |
} |
|
|
/* |
/* |