version 1.138, 2017/05/04 22:16:09 |
version 1.143, 2017/06/08 12:54:58 |
Line 69 static int man_ign_pre(MAN_ARGS); |
|
Line 69 static int man_ign_pre(MAN_ARGS); |
|
static int man_in_pre(MAN_ARGS); |
static int man_in_pre(MAN_ARGS); |
static void man_root_post(MAN_ARGS); |
static void man_root_post(MAN_ARGS); |
static void man_root_pre(MAN_ARGS); |
static void man_root_pre(MAN_ARGS); |
static int man_sp_pre(MAN_ARGS); |
|
|
|
static const struct htmlman __mans[MAN_MAX - MAN_TH] = { |
static const struct htmlman __mans[MAN_MAX - MAN_TH] = { |
{ NULL, NULL }, /* TH */ |
{ NULL, NULL }, /* TH */ |
Line 92 static const struct htmlman __mans[MAN_MAX - MAN_TH] = |
|
Line 91 static const struct htmlman __mans[MAN_MAX - MAN_TH] = |
|
{ 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 */ |
{ man_sp_pre, NULL }, /* sp */ |
|
{ NULL, NULL }, /* nf */ |
{ NULL, NULL }, /* nf */ |
{ NULL, NULL }, /* fi */ |
{ NULL, NULL }, /* fi */ |
{ NULL, NULL }, /* RE */ |
{ NULL, NULL }, /* RE */ |
Line 102 static const struct htmlman __mans[MAN_MAX - MAN_TH] = |
|
Line 100 static const struct htmlman __mans[MAN_MAX - MAN_TH] = |
|
{ man_ign_pre, NULL }, /* PD */ |
{ man_ign_pre, NULL }, /* PD */ |
{ man_ign_pre, NULL }, /* AT */ |
{ man_ign_pre, NULL }, /* AT */ |
{ man_in_pre, NULL }, /* in */ |
{ man_in_pre, NULL }, /* in */ |
{ man_ign_pre, NULL }, /* ft */ |
|
{ man_OP_pre, NULL }, /* OP */ |
{ man_OP_pre, NULL }, /* OP */ |
{ NULL, NULL }, /* EX */ |
{ NULL, NULL }, /* EX */ |
{ NULL, NULL }, /* EE */ |
{ NULL, NULL }, /* EE */ |
{ man_UR_pre, NULL }, /* UR */ |
{ man_UR_pre, NULL }, /* UR */ |
{ NULL, NULL }, /* UE */ |
{ NULL, NULL }, /* UE */ |
{ man_ign_pre, NULL }, /* ll */ |
|
}; |
}; |
static const struct htmlman *const mans = __mans - MAN_TH; |
static const struct htmlman *const mans = __mans - MAN_TH; |
|
|
Line 255 print_man_node(MAN_ARGS) |
|
Line 251 print_man_node(MAN_ARGS) |
|
case ROFFT_TEXT: |
case ROFFT_TEXT: |
if (fillmode(h, want_fillmode) == MAN_fi && |
if (fillmode(h, want_fillmode) == MAN_fi && |
want_fillmode == MAN_fi && |
want_fillmode == MAN_fi && |
n->flags & NODE_LINE && *n->string == ' ') |
n->flags & NODE_LINE && *n->string == ' ' && |
|
(h->flags & HTML_NONEWLINE) == 0) |
print_otag(h, TAG_BR, ""); |
print_otag(h, TAG_BR, ""); |
if (*n->string != '\0') |
if (*n->string != '\0') |
break; |
break; |
Line 306 print_man_node(MAN_ARGS) |
|
Line 303 print_man_node(MAN_ARGS) |
|
t = h->tag; |
t = h->tag; |
if (n->tok < ROFF_MAX) { |
if (n->tok < ROFF_MAX) { |
roff_html_pre(h, n); |
roff_html_pre(h, n); |
|
child = 0; |
break; |
break; |
} |
} |
|
|
Line 360 fillmode(struct html *h, int want) |
|
Line 358 fillmode(struct html *h, int want) |
|
static int |
static int |
a2width(const struct roff_node *n, struct roffsu *su) |
a2width(const struct roff_node *n, struct roffsu *su) |
{ |
{ |
|
|
if (n->type != ROFFT_TEXT) |
if (n->type != ROFFT_TEXT) |
return 0; |
return 0; |
if (a2roffsu(n->string, su, SCALE_EN)) |
return a2roffsu(n->string, su, SCALE_EN) != NULL; |
return 1; |
|
|
|
return 0; |
|
} |
} |
|
|
static void |
static void |
Line 413 man_root_post(MAN_ARGS) |
|
Line 407 man_root_post(MAN_ARGS) |
|
if (man->os) |
if (man->os) |
print_text(h, man->os); |
print_text(h, man->os); |
print_tagq(h, t); |
print_tagq(h, t); |
} |
|
|
|
|
|
static int |
|
man_sp_pre(MAN_ARGS) |
|
{ |
|
struct roffsu su; |
|
|
|
SCALE_VS_INIT(&su, 1); |
|
if (NULL != (n = n->child)) |
|
if ( ! a2roffsu(n->string, &su, SCALE_VS)) |
|
su.scale = 1.0; |
|
|
|
print_otag(h, TAG_DIV, "suh", &su); |
|
|
|
/* So the div isn't empty: */ |
|
print_text(h, "\\~"); |
|
|
|
return 0; |
|
} |
} |
|
|
static int |
static int |