version 1.277, 2017/03/15 11:29:53 |
version 1.288, 2017/05/17 17:54:45 |
Line 108 static int mdoc_rs_pre(MDOC_ARGS); |
|
Line 108 static int mdoc_rs_pre(MDOC_ARGS); |
|
static int mdoc_sh_pre(MDOC_ARGS); |
static int mdoc_sh_pre(MDOC_ARGS); |
static int mdoc_skip_pre(MDOC_ARGS); |
static int mdoc_skip_pre(MDOC_ARGS); |
static int mdoc_sm_pre(MDOC_ARGS); |
static int mdoc_sm_pre(MDOC_ARGS); |
static int mdoc_sp_pre(MDOC_ARGS); |
|
static int mdoc_ss_pre(MDOC_ARGS); |
static int mdoc_ss_pre(MDOC_ARGS); |
static int mdoc_st_pre(MDOC_ARGS); |
static int mdoc_st_pre(MDOC_ARGS); |
static int mdoc_sx_pre(MDOC_ARGS); |
static int mdoc_sx_pre(MDOC_ARGS); |
Line 118 static int mdoc_vt_pre(MDOC_ARGS); |
|
Line 117 static int mdoc_vt_pre(MDOC_ARGS); |
|
static int mdoc_xr_pre(MDOC_ARGS); |
static int mdoc_xr_pre(MDOC_ARGS); |
static int mdoc_xx_pre(MDOC_ARGS); |
static int mdoc_xx_pre(MDOC_ARGS); |
|
|
static const struct htmlmdoc mdocs[MDOC_MAX] = { |
static const struct htmlmdoc __mdocs[MDOC_MAX - MDOC_Dd] = { |
{mdoc_ap_pre, NULL}, /* Ap */ |
|
{NULL, NULL}, /* Dd */ |
{NULL, NULL}, /* Dd */ |
{NULL, NULL}, /* Dt */ |
{NULL, NULL}, /* Dt */ |
{NULL, NULL}, /* Os */ |
{NULL, NULL}, /* Os */ |
Line 135 static const struct htmlmdoc mdocs[MDOC_MAX] = { |
|
Line 133 static const struct htmlmdoc mdocs[MDOC_MAX] = { |
|
{mdoc_it_pre, NULL}, /* It */ |
{mdoc_it_pre, NULL}, /* It */ |
{mdoc_ad_pre, NULL}, /* Ad */ |
{mdoc_ad_pre, NULL}, /* Ad */ |
{mdoc_an_pre, NULL}, /* An */ |
{mdoc_an_pre, NULL}, /* An */ |
|
{mdoc_ap_pre, NULL}, /* Ap */ |
{mdoc_ar_pre, NULL}, /* Ar */ |
{mdoc_ar_pre, NULL}, /* Ar */ |
{mdoc_cd_pre, NULL}, /* Cd */ |
{mdoc_cd_pre, NULL}, /* Cd */ |
{mdoc_cm_pre, NULL}, /* Cm */ |
{mdoc_cm_pre, NULL}, /* Cm */ |
Line 237 static const struct htmlmdoc mdocs[MDOC_MAX] = { |
|
Line 236 static const struct htmlmdoc mdocs[MDOC_MAX] = { |
|
{mdoc_quote_pre, mdoc_quote_post}, /* En */ |
{mdoc_quote_pre, mdoc_quote_post}, /* En */ |
{mdoc_xx_pre, NULL}, /* Dx */ |
{mdoc_xx_pre, NULL}, /* Dx */ |
{mdoc__x_pre, mdoc__x_post}, /* %Q */ |
{mdoc__x_pre, mdoc__x_post}, /* %Q */ |
{mdoc_sp_pre, NULL}, /* br */ |
|
{mdoc_sp_pre, NULL}, /* sp */ |
|
{mdoc__x_pre, mdoc__x_post}, /* %U */ |
{mdoc__x_pre, mdoc__x_post}, /* %U */ |
{NULL, NULL}, /* Ta */ |
{NULL, NULL}, /* Ta */ |
{mdoc_skip_pre, NULL}, /* ll */ |
|
}; |
}; |
|
static const struct htmlmdoc *const mdocs = __mdocs - MDOC_Dd; |
|
|
|
|
/* |
/* |
Line 362 print_mdoc_node(MDOC_ARGS) |
|
Line 359 print_mdoc_node(MDOC_ARGS) |
|
* Make sure that if we're in a literal mode already |
* Make sure that if we're in a literal mode already |
* (i.e., within a <PRE>) don't print the newline. |
* (i.e., within a <PRE>) don't print the newline. |
*/ |
*/ |
if (' ' == *n->string && NODE_LINE & n->flags) |
if (*n->string == ' ' && n->flags & NODE_LINE && |
if ( ! (HTML_LITERAL & h->flags)) |
(h->flags & (HTML_LITERAL | HTML_NONEWLINE)) == 0) |
print_otag(h, TAG_BR, ""); |
print_otag(h, TAG_BR, ""); |
if (NODE_DELIMC & n->flags) |
if (NODE_DELIMC & n->flags) |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
print_text(h, n->string); |
print_text(h, n->string); |
Line 393 print_mdoc_node(MDOC_ARGS) |
|
Line 390 print_mdoc_node(MDOC_ARGS) |
|
t = h->tag; |
t = h->tag; |
} |
} |
assert(h->tblt == NULL); |
assert(h->tblt == NULL); |
if (mdocs[n->tok].pre && (n->end == ENDBODY_NOT || n->child)) |
if (n->tok < ROFF_MAX) { |
|
roff_html_pre(h, n); |
|
child = 0; |
|
break; |
|
} |
|
assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX); |
|
if (mdocs[n->tok].pre != NULL && |
|
(n->end == ENDBODY_NOT || n->child != NULL)) |
child = (*mdocs[n->tok].pre)(meta, n, h); |
child = (*mdocs[n->tok].pre)(meta, n, h); |
break; |
break; |
} |
} |
Line 412 print_mdoc_node(MDOC_ARGS) |
|
Line 416 print_mdoc_node(MDOC_ARGS) |
|
case ROFFT_EQN: |
case ROFFT_EQN: |
break; |
break; |
default: |
default: |
if ( ! mdocs[n->tok].post || n->flags & NODE_ENDED) |
if (n->tok < ROFF_MAX || |
|
mdocs[n->tok].post == NULL || |
|
n->flags & NODE_ENDED) |
break; |
break; |
(*mdocs[n->tok].post)(meta, n, h); |
(*mdocs[n->tok].post)(meta, n, h); |
if (n->end != ENDBODY_NOT) |
if (n->end != ENDBODY_NOT) |
Line 501 mdoc_sh_pre(MDOC_ARGS) |
|
Line 507 mdoc_sh_pre(MDOC_ARGS) |
|
case ROFFT_HEAD: |
case ROFFT_HEAD: |
id = html_make_id(n); |
id = html_make_id(n); |
print_otag(h, TAG_H1, "cTi", "Sh", id); |
print_otag(h, TAG_H1, "cTi", "Sh", id); |
print_otag(h, TAG_A, "chR", "selflink", id); |
if (id != NULL) |
|
print_otag(h, TAG_A, "chR", "selflink", id); |
free(id); |
free(id); |
break; |
break; |
case ROFFT_BODY: |
case ROFFT_BODY: |
Line 524 mdoc_ss_pre(MDOC_ARGS) |
|
Line 531 mdoc_ss_pre(MDOC_ARGS) |
|
|
|
id = html_make_id(n); |
id = html_make_id(n); |
print_otag(h, TAG_H2, "cTi", "Ss", id); |
print_otag(h, TAG_H2, "cTi", "Ss", id); |
print_otag(h, TAG_A, "chR", "selflink", id); |
if (id != NULL) |
|
print_otag(h, TAG_A, "chR", "selflink", id); |
free(id); |
free(id); |
return 1; |
return 1; |
} |
} |
Line 577 mdoc_nd_pre(MDOC_ARGS) |
|
Line 585 mdoc_nd_pre(MDOC_ARGS) |
|
static int |
static int |
mdoc_nm_pre(MDOC_ARGS) |
mdoc_nm_pre(MDOC_ARGS) |
{ |
{ |
struct tag *t; |
|
int len; |
|
|
|
switch (n->type) { |
switch (n->type) { |
case ROFFT_HEAD: |
case ROFFT_HEAD: |
print_otag(h, TAG_TD, ""); |
print_otag(h, TAG_TD, ""); |
Line 593 mdoc_nm_pre(MDOC_ARGS) |
|
Line 598 mdoc_nm_pre(MDOC_ARGS) |
|
default: |
default: |
break; |
break; |
} |
} |
|
|
synopsis_pre(h, n); |
synopsis_pre(h, n); |
print_otag(h, TAG_TABLE, "c", "Nm"); |
print_otag(h, TAG_TABLE, "c", "Nm"); |
|
|
for (len = 0, n = n->head->child; n; n = n->next) |
|
if (n->type == ROFFT_TEXT) |
|
len += html_strlen(n->string); |
|
|
|
if (len == 0 && meta->name != NULL) |
|
len = html_strlen(meta->name); |
|
|
|
t = print_otag(h, TAG_COLGROUP, ""); |
|
/* Increase width to make even bold text fit. */ |
|
print_otag(h, TAG_COL, "shw", len + 2); |
|
print_otag(h, TAG_COL, ""); |
|
print_tagq(h, t); |
|
print_otag(h, TAG_TR, ""); |
print_otag(h, TAG_TR, ""); |
return 1; |
return 1; |
} |
} |
Line 760 mdoc_it_pre(MDOC_ARGS) |
|
Line 751 mdoc_it_pre(MDOC_ARGS) |
|
(n->parent->prev == NULL || |
(n->parent->prev == NULL || |
n->parent->prev->body == NULL || |
n->parent->prev->body == NULL || |
n->parent->prev->body->child != NULL)) { |
n->parent->prev->body->child != NULL)) { |
t = print_otag(h, TAG_DT, "csWl", |
t = print_otag(h, TAG_DT, "csw+-l", |
cattr, bl->norm->Bl.width); |
cattr, bl->norm->Bl.width); |
print_text(h, "\\ "); |
print_text(h, "\\ "); |
print_tagq(h, t); |
print_tagq(h, t); |
Line 768 mdoc_it_pre(MDOC_ARGS) |
|
Line 759 mdoc_it_pre(MDOC_ARGS) |
|
print_text(h, "\\ "); |
print_text(h, "\\ "); |
print_tagq(h, t); |
print_tagq(h, t); |
} |
} |
print_otag(h, TAG_DT, "csWl", cattr, |
print_otag(h, TAG_DT, "csw+-l", cattr, |
bl->norm->Bl.width); |
bl->norm->Bl.width); |
break; |
break; |
case ROFFT_BODY: |
case ROFFT_BODY: |
Line 831 mdoc_bl_pre(MDOC_ARGS) |
|
Line 822 mdoc_bl_pre(MDOC_ARGS) |
|
|
|
t = print_otag(h, TAG_COLGROUP, ""); |
t = print_otag(h, TAG_COLGROUP, ""); |
for (i = 0; i < bl->ncols - 1; i++) |
for (i = 0; i < bl->ncols - 1; i++) |
print_otag(h, TAG_COL, "sww", bl->cols[i]); |
print_otag(h, TAG_COL, "sw+w", bl->cols[i]); |
print_otag(h, TAG_COL, "swW", bl->cols[i]); |
print_otag(h, TAG_COL, "swW", bl->cols[i]); |
print_tagq(h, t); |
print_tagq(h, t); |
return 0; |
return 0; |
Line 878 mdoc_bl_pre(MDOC_ARGS) |
|
Line 869 mdoc_bl_pre(MDOC_ARGS) |
|
cattr = "Bl-tag"; |
cattr = "Bl-tag"; |
if (bl->offs) |
if (bl->offs) |
print_otag(h, TAG_DIV, "cswl", cattr, bl->offs); |
print_otag(h, TAG_DIV, "cswl", cattr, bl->offs); |
print_otag(h, TAG_DL, "cswl", cattr, bl->width); |
print_otag(h, TAG_DL, "csw+l", cattr, bl->width); |
return 1; |
return 1; |
case LIST_column: |
case LIST_column: |
elemtype = TAG_TABLE; |
elemtype = TAG_TABLE; |
Line 999 mdoc_bd_pre(MDOC_ARGS) |
|
Line 990 mdoc_bd_pre(MDOC_ARGS) |
|
* anyway, so don't sweat it. |
* anyway, so don't sweat it. |
*/ |
*/ |
switch (nn->tok) { |
switch (nn->tok) { |
|
case ROFF_br: |
|
case ROFF_sp: |
case MDOC_Sm: |
case MDOC_Sm: |
case MDOC_br: |
|
case MDOC_sp: |
|
case MDOC_Bl: |
case MDOC_Bl: |
case MDOC_D1: |
case MDOC_D1: |
case MDOC_Dl: |
case MDOC_Dl: |
Line 1316 mdoc_pp_pre(MDOC_ARGS) |
|
Line 1307 mdoc_pp_pre(MDOC_ARGS) |
|
} |
} |
|
|
static int |
static int |
mdoc_sp_pre(MDOC_ARGS) |
|
{ |
|
struct roffsu su; |
|
|
|
SCALE_VS_INIT(&su, 1); |
|
|
|
if (MDOC_sp == n->tok) { |
|
if (NULL != (n = n->child)) { |
|
if ( ! a2roffsu(n->string, &su, SCALE_VS)) |
|
su.scale = 1.0; |
|
else if (su.scale < 0.0) |
|
su.scale = 0.0; |
|
} |
|
} else |
|
su.scale = 0.0; |
|
|
|
print_otag(h, TAG_DIV, "suh", &su); |
|
|
|
/* So the div isn't empty: */ |
|
print_text(h, "\\~"); |
|
|
|
return 0; |
|
|
|
} |
|
|
|
static int |
|
mdoc_lk_pre(MDOC_ARGS) |
mdoc_lk_pre(MDOC_ARGS) |
{ |
{ |
if (NULL == (n = n->child)) |
struct tag *t; |
|
|
|
if ((n = n->child) == NULL) |
return 0; |
return 0; |
|
|
assert(n->type == ROFFT_TEXT); |
/* Link target and link text. */ |
|
t = print_otag(h, TAG_A, "cTh", "Lk", n->string); |
print_otag(h, TAG_A, "cTh", "Lk", n->string); |
if (n->next == NULL || n->next->flags & NODE_DELIMC) |
|
|
if (NULL == n->next) |
|
print_text(h, n->string); |
print_text(h, n->string); |
|
for (n = n->next; n != NULL && !(n->flags & NODE_DELIMC); n = n->next) |
for (n = n->next; n; n = n->next) |
|
print_text(h, n->string); |
print_text(h, n->string); |
|
print_tagq(h, t); |
|
|
|
/* Trailing punctuation. */ |
|
while (n != NULL) { |
|
h->flags |= HTML_NOSPACE; |
|
print_text(h, n->string); |
|
n = n->next; |
|
} |
return 0; |
return 0; |
} |
} |
|
|