version 1.158, 2018/12/03 21:00:10 |
version 1.162, 2018/12/31 07:08:12 |
Line 94 static const struct man_html_act man_html_acts[MAN_MAX |
|
Line 94 static const struct man_html_act man_html_acts[MAN_MAX |
|
{ man_I_pre, NULL }, /* I */ |
{ man_I_pre, NULL }, /* I */ |
{ man_alt_pre, NULL }, /* IR */ |
{ man_alt_pre, NULL }, /* IR */ |
{ man_alt_pre, NULL }, /* RI */ |
{ man_alt_pre, NULL }, /* RI */ |
{ NULL, NULL }, /* nf */ |
|
{ NULL, NULL }, /* fi */ |
|
{ NULL, NULL }, /* RE */ |
{ NULL, NULL }, /* RE */ |
{ man_RS_pre, NULL }, /* RS */ |
{ man_RS_pre, NULL }, /* RS */ |
{ man_ign_pre, NULL }, /* DT */ |
{ man_ign_pre, NULL }, /* DT */ |
Line 139 print_bvspace(struct html *h, const struct roff_node * |
|
Line 137 print_bvspace(struct html *h, const struct roff_node * |
|
} |
} |
|
|
void |
void |
html_man(void *arg, const struct roff_man *man) |
html_man(void *arg, const struct roff_meta *man) |
{ |
{ |
struct html *h; |
struct html *h; |
struct roff_node *n; |
struct roff_node *n; |
Line 154 html_man(void *arg, const struct roff_man *man) |
|
Line 152 html_man(void *arg, const struct roff_man *man) |
|
if (n->type == ROFFT_COMMENT) |
if (n->type == ROFFT_COMMENT) |
print_gen_comment(h, n); |
print_gen_comment(h, n); |
t = print_otag(h, TAG_HEAD, ""); |
t = print_otag(h, TAG_HEAD, ""); |
print_man_head(&man->meta, h); |
print_man_head(man, h); |
print_tagq(h, t); |
print_tagq(h, t); |
print_otag(h, TAG_BODY, ""); |
print_otag(h, TAG_BODY, ""); |
} |
} |
|
|
man_root_pre(&man->meta, h); |
man_root_pre(man, h); |
t = print_otag(h, TAG_DIV, "c", "manual-text"); |
t = print_otag(h, TAG_DIV, "c", "manual-text"); |
print_man_nodelist(&man->meta, n, h); |
print_man_nodelist(man, n, h); |
print_tagq(h, t); |
print_tagq(h, t); |
man_root_post(&man->meta, h); |
man_root_post(man, h); |
print_tagq(h, NULL); |
print_tagq(h, NULL); |
} |
} |
|
|
Line 192 print_man_nodelist(MAN_ARGS) |
|
Line 190 print_man_nodelist(MAN_ARGS) |
|
static void |
static void |
print_man_node(MAN_ARGS) |
print_man_node(MAN_ARGS) |
{ |
{ |
static int want_fillmode = MAN_fi; |
static int want_fillmode = ROFF_fi; |
static int save_fillmode; |
static int save_fillmode; |
|
|
struct tag *t; |
struct tag *t; |
Line 204 print_man_node(MAN_ARGS) |
|
Line 202 print_man_node(MAN_ARGS) |
|
*/ |
*/ |
|
|
switch (n->tok) { |
switch (n->tok) { |
case MAN_nf: |
case ROFF_nf: |
case MAN_EX: |
case MAN_EX: |
want_fillmode = MAN_nf; |
want_fillmode = ROFF_nf; |
return; |
return; |
case MAN_fi: |
case ROFF_fi: |
case MAN_EE: |
case MAN_EE: |
want_fillmode = MAN_fi; |
want_fillmode = ROFF_fi; |
if (fillmode(h, 0) == MAN_fi) |
if (fillmode(h, 0) == ROFF_fi) |
print_otag(h, TAG_BR, ""); |
print_otag(h, TAG_BR, ""); |
return; |
return; |
default: |
default: |
Line 232 print_man_node(MAN_ARGS) |
|
Line 230 print_man_node(MAN_ARGS) |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case MAN_SH: /* Section headers */ |
case MAN_SH: /* Section headers */ |
case MAN_SS: /* permanently cancel .nf. */ |
case MAN_SS: /* permanently cancel .nf. */ |
want_fillmode = MAN_fi; |
want_fillmode = ROFF_fi; |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case MAN_PP: /* These have no head. */ |
case MAN_PP: /* These have no head. */ |
case MAN_RS: /* They will simply */ |
case MAN_RS: /* They will simply */ |
case MAN_UR: /* reopen .nf in the body. */ |
case MAN_UR: /* reopen .nf in the body. */ |
case MAN_MT: |
case MAN_MT: |
fillmode(h, MAN_fi); |
fillmode(h, ROFF_fi); |
break; |
break; |
default: |
default: |
break; |
break; |
} |
} |
break; |
break; |
case ROFFT_TBL: |
case ROFFT_TBL: |
fillmode(h, MAN_fi); |
fillmode(h, ROFF_fi); |
break; |
break; |
case ROFFT_ELEM: |
case ROFFT_ELEM: |
/* |
/* |
Line 258 print_man_node(MAN_ARGS) |
|
Line 256 print_man_node(MAN_ARGS) |
|
fillmode(h, want_fillmode); |
fillmode(h, want_fillmode); |
break; |
break; |
case ROFFT_TEXT: |
case ROFFT_TEXT: |
if (fillmode(h, want_fillmode) == MAN_fi && |
if (fillmode(h, want_fillmode) == ROFF_fi && |
want_fillmode == MAN_fi && |
want_fillmode == ROFF_fi && |
n->flags & NODE_LINE && *n->string == ' ' && |
n->flags & NODE_LINE && *n->string == ' ' && |
(h->flags & HTML_NONEWLINE) == 0) |
(h->flags & HTML_NONEWLINE) == 0) |
print_otag(h, TAG_BR, ""); |
print_otag(h, TAG_BR, ""); |
if (want_fillmode == MAN_nf || *n->string != '\0') |
if (want_fillmode == ROFF_nf || *n->string != '\0') |
break; |
break; |
print_paragraph(h); |
print_paragraph(h); |
return; |
return; |
Line 336 print_man_node(MAN_ARGS) |
|
Line 334 print_man_node(MAN_ARGS) |
|
/* This will automatically close out any font scope. */ |
/* This will automatically close out any font scope. */ |
print_stagq(h, t); |
print_stagq(h, t); |
|
|
if (fillmode(h, 0) == MAN_nf && |
if (fillmode(h, 0) == ROFF_nf && |
n->next != NULL && n->next->flags & NODE_LINE) { |
n->next != NULL && n->next->flags & NODE_LINE) { |
/* In .nf = <pre>, print even empty lines. */ |
/* In .nf = <pre>, print even empty lines. */ |
h->col++; |
h->col++; |
Line 345 print_man_node(MAN_ARGS) |
|
Line 343 print_man_node(MAN_ARGS) |
|
} |
} |
|
|
/* |
/* |
* MAN_nf switches to no-fill mode, MAN_fi to fill mode. |
* ROFF_nf switches to no-fill mode, ROFF_fi to fill mode. |
* Other arguments do not switch. |
* Other arguments do not switch. |
* The old mode is returned. |
* The old mode is returned. |
*/ |
*/ |
Line 359 fillmode(struct html *h, int want) |
|
Line 357 fillmode(struct html *h, int want) |
|
if (pre->tag == TAG_PRE) |
if (pre->tag == TAG_PRE) |
break; |
break; |
|
|
had = pre == NULL ? MAN_fi : MAN_nf; |
had = pre == NULL ? ROFF_fi : ROFF_nf; |
|
|
if (want && want != had) { |
if (want && want != had) { |
if (want == MAN_nf) |
if (want == ROFF_nf) |
print_otag(h, TAG_PRE, ""); |
print_otag(h, TAG_PRE, ""); |
else |
else |
print_tagq(h, pre); |
print_tagq(h, pre); |