version 1.300, 2018/05/09 00:46:10 |
version 1.306, 2018/06/10 16:15:43 |
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 699 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 712 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) { |
Line 754 mdoc_it_pre(MDOC_ARGS) |
|
Line 749 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 tag *t; |
struct mdoc_bl *bl; |
struct mdoc_bl *bl; |
size_t i; |
size_t i; |
Line 824 mdoc_bl_pre(MDOC_ARGS) |
|
Line 819 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 835 mdoc_bl_pre(MDOC_ARGS) |
|
Line 830 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 869 mdoc_d1_pre(MDOC_ARGS) |
|
Line 866 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 882 mdoc_sx_pre(MDOC_ARGS) |
|
Line 879 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 891 mdoc_sx_pre(MDOC_ARGS) |
|
Line 888 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 916 mdoc_bd_pre(MDOC_ARGS) |
|
Line 913 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 979 mdoc_bd_pre(MDOC_ARGS) |
|
Line 967 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 1030 mdoc_dv_pre(MDOC_ARGS) |
|
Line 1018 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 1042 mdoc_ev_pre(MDOC_ARGS) |
|
Line 1029 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 1055 mdoc_er_pre(MDOC_ARGS) |
|
Line 1041 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 1411 mdoc_ic_pre(MDOC_ARGS) |
|
Line 1396 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 1463 mdoc_ms_pre(MDOC_ARGS) |
|
Line 1447 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 1505 mdoc_no_pre(MDOC_ARGS) |
|
Line 1488 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 1517 mdoc_li_pre(MDOC_ARGS) |
|
Line 1499 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; |
} |
} |
|
|