version 1.281, 2017/05/04 17:48:29 |
version 1.287, 2017/05/12 17:58:21 |
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 237 static const struct htmlmdoc __mdocs[MDOC_MAX - MDOC_D |
|
Line 236 static const struct htmlmdoc __mdocs[MDOC_MAX - MDOC_D |
|
{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}, /* 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; |
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 394 print_mdoc_node(MDOC_ARGS) |
|
Line 391 print_mdoc_node(MDOC_ARGS) |
|
} |
} |
assert(h->tblt == NULL); |
assert(h->tblt == NULL); |
if (n->tok < ROFF_MAX) { |
if (n->tok < ROFF_MAX) { |
switch(n->tok) { |
roff_html_pre(h, n); |
case ROFF_br: |
child = 0; |
mdoc_sp_pre(meta, n, h); |
|
break; |
|
default: |
|
abort(); |
|
} |
|
break; |
break; |
} |
} |
assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX); |
assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX); |
Line 776 mdoc_it_pre(MDOC_ARGS) |
|
Line 768 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 784 mdoc_it_pre(MDOC_ARGS) |
|
Line 776 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 847 mdoc_bl_pre(MDOC_ARGS) |
|
Line 839 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 894 mdoc_bl_pre(MDOC_ARGS) |
|
Line 886 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 1015 mdoc_bd_pre(MDOC_ARGS) |
|
Line 1007 mdoc_bd_pre(MDOC_ARGS) |
|
* anyway, so don't sweat it. |
* anyway, so don't sweat it. |
*/ |
*/ |
switch (nn->tok) { |
switch (nn->tok) { |
case MDOC_Sm: |
|
case ROFF_br: |
case ROFF_br: |
case MDOC_sp: |
case ROFF_sp: |
|
case MDOC_Sm: |
case MDOC_Bl: |
case MDOC_Bl: |
case MDOC_D1: |
case MDOC_D1: |
case MDOC_Dl: |
case MDOC_Dl: |
Line 1329 mdoc_pp_pre(MDOC_ARGS) |
|
Line 1321 mdoc_pp_pre(MDOC_ARGS) |
|
|
|
print_paragraph(h); |
print_paragraph(h); |
return 0; |
return 0; |
} |
|
|
|
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 |
static int |