version 1.285, 2017/05/05 15:17:32 |
version 1.289, 2017/05/30 16:31:29 |
Line 359 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 585 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 601 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 768 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 776 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 839 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 886 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 1326 mdoc_pp_pre(MDOC_ARGS) |
|
Line 1309 mdoc_pp_pre(MDOC_ARGS) |
|
static int |
static int |
mdoc_lk_pre(MDOC_ARGS) |
mdoc_lk_pre(MDOC_ARGS) |
{ |
{ |
|
const struct roff_node *link, *descr, *punct; |
struct tag *t; |
struct tag *t; |
|
|
if ((n = n->child) == NULL) |
if ((link = n->child) == NULL) |
return 0; |
return 0; |
|
|
|
/* Find beginning of trailing punctuation. */ |
|
punct = n->last; |
|
while (punct != link && punct->flags & NODE_DELIMC) |
|
punct = punct->prev; |
|
punct = punct->next; |
|
|
/* Link target and link text. */ |
/* Link target and link text. */ |
t = print_otag(h, TAG_A, "cTh", "Lk", n->string); |
t = print_otag(h, TAG_A, "cTh", "Lk", link->string); |
if (n->next == NULL || n->next->flags & NODE_DELIMC) |
for (descr = link->next; descr != punct; descr = descr->next) { |
print_text(h, n->string); |
if (descr->flags & (NODE_DELIMC | NODE_DELIMO)) |
for (n = n->next; n != NULL && !(n->flags & NODE_DELIMC); n = n->next) |
h->flags |= HTML_NOSPACE; |
print_text(h, n->string); |
print_text(h, descr->string); |
|
} |
print_tagq(h, t); |
print_tagq(h, t); |
|
|
/* Trailing punctuation. */ |
/* Trailing punctuation. */ |
while (n != NULL) { |
while (punct != NULL) { |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
print_text(h, n->string); |
print_text(h, punct->string); |
n = n->next; |
punct = punct->next; |
} |
} |
return 0; |
return 0; |
} |
} |