version 1.299, 2018/05/08 21:42:34 |
version 1.309, 2018/06/25 16:54:59 |
Line 502 cond_id(const struct roff_node *n) |
|
Line 502 cond_id(const struct roff_node *n) |
|
(n->parent->tok == MDOC_Xo && |
(n->parent->tok == MDOC_Xo && |
n->parent->parent->prev == NULL && |
n->parent->parent->prev == NULL && |
n->parent->parent->parent->tok == MDOC_It))) |
n->parent->parent->parent->tok == MDOC_It))) |
return html_make_id(n); |
return html_make_id(n, 1); |
return NULL; |
return NULL; |
} |
} |
|
|
Line 513 mdoc_sh_pre(MDOC_ARGS) |
|
Line 513 mdoc_sh_pre(MDOC_ARGS) |
|
|
|
switch (n->type) { |
switch (n->type) { |
case ROFFT_HEAD: |
case ROFFT_HEAD: |
id = html_make_id(n); |
id = html_make_id(n, 1); |
print_otag(h, TAG_H1, "cTi", "Sh", id); |
print_otag(h, TAG_H1, "cTi", "Sh", id); |
if (id != NULL) |
if (id != NULL) |
print_otag(h, TAG_A, "chR", "permalink", id); |
print_otag(h, TAG_A, "chR", "permalink", id); |
free(id); |
|
break; |
break; |
case ROFFT_BODY: |
case ROFFT_BODY: |
if (n->sec == SEC_AUTHORS) |
if (n->sec == SEC_AUTHORS) |
Line 537 mdoc_ss_pre(MDOC_ARGS) |
|
Line 536 mdoc_ss_pre(MDOC_ARGS) |
|
if (n->type != ROFFT_HEAD) |
if (n->type != ROFFT_HEAD) |
return 1; |
return 1; |
|
|
id = html_make_id(n); |
id = html_make_id(n, 1); |
print_otag(h, TAG_H2, "cTi", "Ss", id); |
print_otag(h, TAG_H2, "cTi", "Ss", id); |
if (id != NULL) |
if (id != NULL) |
print_otag(h, TAG_A, "chR", "permalink", id); |
print_otag(h, TAG_A, "chR", "permalink", id); |
free(id); |
|
return 1; |
return 1; |
} |
} |
|
|
Line 553 mdoc_fl_pre(MDOC_ARGS) |
|
Line 551 mdoc_fl_pre(MDOC_ARGS) |
|
if ((id = cond_id(n)) != NULL) |
if ((id = cond_id(n)) != NULL) |
print_otag(h, TAG_A, "chR", "permalink", id); |
print_otag(h, TAG_A, "chR", "permalink", id); |
print_otag(h, TAG_CODE, "cTi", "Fl", id); |
print_otag(h, TAG_CODE, "cTi", "Fl", id); |
free(id); |
|
|
|
print_text(h, "\\-"); |
print_text(h, "\\-"); |
if (!(n->child == NULL && |
if (!(n->child == NULL && |
Line 573 mdoc_cm_pre(MDOC_ARGS) |
|
Line 570 mdoc_cm_pre(MDOC_ARGS) |
|
if ((id = cond_id(n)) != NULL) |
if ((id = cond_id(n)) != NULL) |
print_otag(h, TAG_A, "chR", "permalink", id); |
print_otag(h, TAG_A, "chR", "permalink", id); |
print_otag(h, TAG_CODE, "cTi", "Cm", id); |
print_otag(h, TAG_CODE, "cTi", "Cm", id); |
free(id); |
|
return 1; |
return 1; |
} |
} |
|
|
Line 583 mdoc_nd_pre(MDOC_ARGS) |
|
Line 579 mdoc_nd_pre(MDOC_ARGS) |
|
if (n->type != ROFFT_BODY) |
if (n->type != ROFFT_BODY) |
return 1; |
return 1; |
|
|
/* XXX: this tag in theory can contain block elements. */ |
|
|
|
print_text(h, "\\(em"); |
print_text(h, "\\(em"); |
print_otag(h, TAG_SPAN, "cT", "Nd"); |
/* Cannot use TAG_SPAN because it may contain blocks. */ |
|
print_otag(h, TAG_DIV, "cT", "Nd"); |
return 1; |
return 1; |
} |
} |
|
|
Line 700 mdoc_it_pre(MDOC_ARGS) |
|
Line 695 mdoc_it_pre(MDOC_ARGS) |
|
print_otag(h, TAG_DT, ""); |
print_otag(h, TAG_DT, ""); |
break; |
break; |
case ROFFT_BODY: |
case ROFFT_BODY: |
print_otag(h, TAG_DD, "sw*+l", bl->norm->Bl.width); |
print_otag(h, TAG_DD, ""); |
break; |
break; |
default: |
default: |
break; |
break; |
Line 713 mdoc_it_pre(MDOC_ARGS) |
|
Line 708 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, "sw*+-l", |
t = print_otag(h, TAG_DT, ""); |
bl->norm->Bl.width); |
|
print_text(h, "\\ "); |
print_text(h, "\\ "); |
print_tagq(h, t); |
print_tagq(h, t); |
t = print_otag(h, TAG_DD, ""); |
t = print_otag(h, TAG_DD, ""); |
print_text(h, "\\ "); |
print_text(h, "\\ "); |
print_tagq(h, t); |
print_tagq(h, t); |
} |
} |
print_otag(h, TAG_DT, "sw*+-l", bl->norm->Bl.width); |
print_otag(h, TAG_DT, ""); |
break; |
break; |
case ROFFT_BODY: |
case ROFFT_BODY: |
if (n->child == NULL) { |
if (n->child == NULL) { |
print_otag(h, TAG_DD, "ss?", |
print_otag(h, TAG_DD, "s", "width", "auto"); |
"width", "auto"); |
|
print_text(h, "\\ "); |
print_text(h, "\\ "); |
} else |
} else |
print_otag(h, TAG_DD, ""); |
print_otag(h, TAG_DD, ""); |
Line 755 mdoc_it_pre(MDOC_ARGS) |
|
Line 748 mdoc_it_pre(MDOC_ARGS) |
|
static int |
static int |
mdoc_bl_pre(MDOC_ARGS) |
mdoc_bl_pre(MDOC_ARGS) |
{ |
{ |
char cattr[21]; |
char cattr[28]; |
struct tag *t; |
|
struct mdoc_bl *bl; |
struct mdoc_bl *bl; |
size_t i; |
|
enum htmltag elemtype; |
enum htmltag elemtype; |
|
|
bl = &n->norm->Bl; |
|
|
|
switch (n->type) { |
switch (n->type) { |
case ROFFT_BODY: |
case ROFFT_BODY: |
return 1; |
return 1; |
|
|
case ROFFT_HEAD: |
case ROFFT_HEAD: |
if (bl->type != LIST_column || bl->ncols == 0) |
|
return 0; |
|
|
|
/* |
|
* For each column, print out the <COL> tag with our |
|
* suggested width. The last column gets min-width, as |
|
* in terminal mode it auto-sizes to the width of the |
|
* screen and we want to preserve that behaviour. |
|
*/ |
|
|
|
t = print_otag(h, TAG_COLGROUP, ""); |
|
for (i = 0; i < bl->ncols - 1; i++) |
|
print_otag(h, TAG_COL, "sw+w", bl->cols[i]); |
|
print_otag(h, TAG_COL, "swW", bl->cols[i]); |
|
print_tagq(h, t); |
|
return 0; |
return 0; |
|
|
default: |
default: |
break; |
break; |
} |
} |
|
|
|
bl = &n->norm->Bl; |
switch (bl->type) { |
switch (bl->type) { |
case LIST_bullet: |
case LIST_bullet: |
elemtype = TAG_UL; |
elemtype = TAG_UL; |
Line 825 mdoc_bl_pre(MDOC_ARGS) |
|
Line 798 mdoc_bl_pre(MDOC_ARGS) |
|
break; |
break; |
case LIST_tag: |
case LIST_tag: |
if (bl->offs) |
if (bl->offs) |
print_otag(h, TAG_DIV, "cswl", "Bl-tag", bl->offs); |
print_otag(h, TAG_DIV, "c", "Bd-indent"); |
print_otag(h, TAG_DL, "csw*+l", bl->comp ? |
print_otag(h, TAG_DL, "c", bl->comp ? |
"Bl-tag Bl-compact" : "Bl-tag", bl->width); |
"Bl-tag Bl-compact" : "Bl-tag"); |
return 1; |
return 1; |
case LIST_column: |
case LIST_column: |
elemtype = TAG_TABLE; |
elemtype = TAG_TABLE; |
Line 836 mdoc_bl_pre(MDOC_ARGS) |
|
Line 809 mdoc_bl_pre(MDOC_ARGS) |
|
default: |
default: |
abort(); |
abort(); |
} |
} |
|
if (bl->offs != NULL) |
|
(void)strlcat(cattr, " Bd-indent", sizeof(cattr)); |
if (bl->comp) |
if (bl->comp) |
(void)strlcat(cattr, " Bl-compact", sizeof(cattr)); |
(void)strlcat(cattr, " Bl-compact", sizeof(cattr)); |
print_otag(h, elemtype, "cswl", cattr, bl->offs); |
print_otag(h, elemtype, "c", cattr); |
return 1; |
return 1; |
} |
} |
|
|
Line 870 mdoc_d1_pre(MDOC_ARGS) |
|
Line 845 mdoc_d1_pre(MDOC_ARGS) |
|
if (n->type != ROFFT_BLOCK) |
if (n->type != ROFFT_BLOCK) |
return 1; |
return 1; |
|
|
print_otag(h, TAG_DIV, "c", "D1"); |
print_otag(h, TAG_DIV, "c", "Bd Bd-indent"); |
|
|
if (n->tok == MDOC_Dl) |
if (n->tok == MDOC_Dl) |
print_otag(h, TAG_CODE, "c", "Li"); |
print_otag(h, TAG_CODE, "c", "Li"); |
Line 883 mdoc_sx_pre(MDOC_ARGS) |
|
Line 858 mdoc_sx_pre(MDOC_ARGS) |
|
{ |
{ |
char *id; |
char *id; |
|
|
id = html_make_id(n); |
id = html_make_id(n, 0); |
print_otag(h, TAG_A, "cThR", "Sx", id); |
print_otag(h, TAG_A, "cThR", "Sx", id); |
free(id); |
free(id); |
return 1; |
return 1; |
Line 892 mdoc_sx_pre(MDOC_ARGS) |
|
Line 867 mdoc_sx_pre(MDOC_ARGS) |
|
static int |
static int |
mdoc_bd_pre(MDOC_ARGS) |
mdoc_bd_pre(MDOC_ARGS) |
{ |
{ |
int comp, offs, sv; |
int comp, sv; |
struct roff_node *nn; |
struct roff_node *nn; |
|
|
if (n->type == ROFFT_HEAD) |
if (n->type == ROFFT_HEAD) |
Line 917 mdoc_bd_pre(MDOC_ARGS) |
|
Line 892 mdoc_bd_pre(MDOC_ARGS) |
|
|
|
if (n->norm->Bd.offs == NULL || |
if (n->norm->Bd.offs == NULL || |
! strcmp(n->norm->Bd.offs, "left")) |
! strcmp(n->norm->Bd.offs, "left")) |
offs = 0; |
print_otag(h, TAG_DIV, "c", "Bd"); |
else if ( ! strcmp(n->norm->Bd.offs, "indent")) |
|
offs = INDENT; |
|
else if ( ! strcmp(n->norm->Bd.offs, "indent-two")) |
|
offs = INDENT * 2; |
|
else |
else |
offs = -1; |
print_otag(h, TAG_DIV, "c", "Bd Bd-indent"); |
|
|
if (offs == -1) |
|
print_otag(h, TAG_DIV, "cswl", "Bd", n->norm->Bd.offs); |
|
else |
|
print_otag(h, TAG_DIV, "cshl", "Bd", offs); |
|
|
|
if (n->norm->Bd.type != DISP_unfilled && |
if (n->norm->Bd.type != DISP_unfilled && |
n->norm->Bd.type != DISP_literal) |
n->norm->Bd.type != DISP_literal) |
return 1; |
return 1; |
Line 980 mdoc_bd_pre(MDOC_ARGS) |
|
Line 946 mdoc_bd_pre(MDOC_ARGS) |
|
static int |
static int |
mdoc_pa_pre(MDOC_ARGS) |
mdoc_pa_pre(MDOC_ARGS) |
{ |
{ |
print_otag(h, TAG_I, "cT", "Pa"); |
print_otag(h, TAG_SPAN, "cT", "Pa"); |
return 1; |
return 1; |
} |
} |
|
|
static int |
static int |
mdoc_ad_pre(MDOC_ARGS) |
mdoc_ad_pre(MDOC_ARGS) |
{ |
{ |
print_otag(h, TAG_I, "c", "Ad"); |
print_otag(h, TAG_SPAN, "c", "Ad"); |
return 1; |
return 1; |
} |
} |
|
|
Line 1031 mdoc_dv_pre(MDOC_ARGS) |
|
Line 997 mdoc_dv_pre(MDOC_ARGS) |
|
if ((id = cond_id(n)) != NULL) |
if ((id = cond_id(n)) != NULL) |
print_otag(h, TAG_A, "chR", "permalink", id); |
print_otag(h, TAG_A, "chR", "permalink", id); |
print_otag(h, TAG_CODE, "cTi", "Dv", id); |
print_otag(h, TAG_CODE, "cTi", "Dv", id); |
free(id); |
|
return 1; |
return 1; |
} |
} |
|
|
Line 1043 mdoc_ev_pre(MDOC_ARGS) |
|
Line 1008 mdoc_ev_pre(MDOC_ARGS) |
|
if ((id = cond_id(n)) != NULL) |
if ((id = cond_id(n)) != NULL) |
print_otag(h, TAG_A, "chR", "permalink", id); |
print_otag(h, TAG_A, "chR", "permalink", id); |
print_otag(h, TAG_CODE, "cTi", "Ev", id); |
print_otag(h, TAG_CODE, "cTi", "Ev", id); |
free(id); |
|
return 1; |
return 1; |
} |
} |
|
|
Line 1056 mdoc_er_pre(MDOC_ARGS) |
|
Line 1020 mdoc_er_pre(MDOC_ARGS) |
|
(n->parent->tok == MDOC_It || |
(n->parent->tok == MDOC_It || |
(n->parent->tok == MDOC_Bq && |
(n->parent->tok == MDOC_Bq && |
n->parent->parent->parent->tok == MDOC_It)) ? |
n->parent->parent->parent->tok == MDOC_It)) ? |
html_make_id(n) : NULL; |
html_make_id(n, 1) : NULL; |
|
|
if (id != NULL) |
if (id != NULL) |
print_otag(h, TAG_A, "chR", "permalink", id); |
print_otag(h, TAG_A, "chR", "permalink", id); |
print_otag(h, TAG_CODE, "cTi", "Er", id); |
print_otag(h, TAG_CODE, "cTi", "Er", id); |
free(id); |
|
return 1; |
return 1; |
} |
} |
|
|
Line 1211 mdoc_fn_pre(MDOC_ARGS) |
|
Line 1174 mdoc_fn_pre(MDOC_ARGS) |
|
|
|
for (n = n->child->next; n; n = n->next) { |
for (n = n->child->next; n; n = n->next) { |
if (NODE_SYNPRETTY & n->flags) |
if (NODE_SYNPRETTY & n->flags) |
t = print_otag(h, TAG_VAR, "cTss?", "Fa", |
t = print_otag(h, TAG_VAR, "cTs", "Fa", |
"white-space", "nowrap"); |
"white-space", "nowrap"); |
else |
else |
t = print_otag(h, TAG_VAR, "cT", "Fa"); |
t = print_otag(h, TAG_VAR, "cT", "Fa"); |
Line 1412 mdoc_ic_pre(MDOC_ARGS) |
|
Line 1375 mdoc_ic_pre(MDOC_ARGS) |
|
if ((id = cond_id(n)) != NULL) |
if ((id = cond_id(n)) != NULL) |
print_otag(h, TAG_A, "chR", "permalink", id); |
print_otag(h, TAG_A, "chR", "permalink", id); |
print_otag(h, TAG_CODE, "cTi", "Ic", id); |
print_otag(h, TAG_CODE, "cTi", "Ic", id); |
free(id); |
|
return 1; |
return 1; |
} |
} |
|
|
Line 1444 mdoc_bf_pre(MDOC_ARGS) |
|
Line 1406 mdoc_bf_pre(MDOC_ARGS) |
|
return 1; |
return 1; |
|
|
if (FONT_Em == n->norm->Bf.font) |
if (FONT_Em == n->norm->Bf.font) |
cattr = "Em"; |
cattr = "Bf Em"; |
else if (FONT_Sy == n->norm->Bf.font) |
else if (FONT_Sy == n->norm->Bf.font) |
cattr = "Sy"; |
cattr = "Bf Sy"; |
else if (FONT_Li == n->norm->Bf.font) |
else if (FONT_Li == n->norm->Bf.font) |
cattr = "Li"; |
cattr = "Bf Li"; |
else |
else |
cattr = "No"; |
cattr = "Bf No"; |
|
|
/* |
/* Cannot use TAG_SPAN because it may contain blocks. */ |
* We want this to be inline-formatted, but needs to be div to |
print_otag(h, TAG_DIV, "c", cattr); |
* accept block children. |
|
*/ |
|
|
|
print_otag(h, TAG_DIV, "css?hl", cattr, "display", "inline", 1); |
|
return 1; |
return 1; |
} |
} |
|
|
Line 1468 mdoc_ms_pre(MDOC_ARGS) |
|
Line 1426 mdoc_ms_pre(MDOC_ARGS) |
|
|
|
if ((id = cond_id(n)) != NULL) |
if ((id = cond_id(n)) != NULL) |
print_otag(h, TAG_A, "chR", "permalink", id); |
print_otag(h, TAG_A, "chR", "permalink", id); |
print_otag(h, TAG_B, "cTi", "Ms", id); |
print_otag(h, TAG_SPAN, "cTi", "Ms", id); |
free(id); |
|
return 1; |
return 1; |
} |
} |
|
|
Line 1510 mdoc_no_pre(MDOC_ARGS) |
|
Line 1467 mdoc_no_pre(MDOC_ARGS) |
|
if ((id = cond_id(n)) != NULL) |
if ((id = cond_id(n)) != NULL) |
print_otag(h, TAG_A, "chR", "permalink", id); |
print_otag(h, TAG_A, "chR", "permalink", id); |
print_otag(h, TAG_SPAN, "ci", "No", id); |
print_otag(h, TAG_SPAN, "ci", "No", id); |
free(id); |
|
return 1; |
return 1; |
} |
} |
|
|
Line 1522 mdoc_li_pre(MDOC_ARGS) |
|
Line 1478 mdoc_li_pre(MDOC_ARGS) |
|
if ((id = cond_id(n)) != NULL) |
if ((id = cond_id(n)) != NULL) |
print_otag(h, TAG_A, "chR", "permalink", id); |
print_otag(h, TAG_A, "chR", "permalink", id); |
print_otag(h, TAG_CODE, "ci", "Li", id); |
print_otag(h, TAG_CODE, "ci", "Li", id); |
free(id); |
|
return 1; |
return 1; |
} |
} |
|
|
Line 1678 mdoc_quote_pre(MDOC_ARGS) |
|
Line 1633 mdoc_quote_pre(MDOC_ARGS) |
|
case MDOC_Op: |
case MDOC_Op: |
print_text(h, "\\(lB"); |
print_text(h, "\\(lB"); |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
print_otag(h, TAG_SPAN, "c", "Op"); |
/* Cannot use TAG_SPAN because it may contain blocks. */ |
|
print_otag(h, TAG_IDIV, "c", "Op"); |
break; |
break; |
case MDOC_En: |
case MDOC_En: |
if (NULL == n->norm->Es || |
if (NULL == n->norm->Es || |