version 1.261, 2017/01/25 02:14:43 |
version 1.264, 2017/01/29 14:02:42 |
Line 349 print_mdoc_node(MDOC_ARGS) |
|
Line 349 print_mdoc_node(MDOC_ARGS) |
|
return; |
return; |
|
|
child = 1; |
child = 1; |
t = h->tags.head; |
t = h->tag; |
n->flags &= ~NODE_ENDED; |
n->flags &= ~NODE_ENDED; |
|
|
switch (n->type) { |
switch (n->type) { |
Line 389 print_mdoc_node(MDOC_ARGS) |
|
Line 389 print_mdoc_node(MDOC_ARGS) |
|
*/ |
*/ |
if (h->tblt != NULL) { |
if (h->tblt != NULL) { |
print_tblclose(h); |
print_tblclose(h); |
t = h->tags.head; |
t = h->tag; |
} |
} |
assert(h->tblt == NULL); |
assert(h->tblt == NULL); |
if (mdocs[n->tok].pre && (n->end == ENDBODY_NOT || n->child)) |
if (mdocs[n->tok].pre && (n->end == ENDBODY_NOT || n->child)) |
Line 507 mdoc_sh_pre(MDOC_ARGS) |
|
Line 507 mdoc_sh_pre(MDOC_ARGS) |
|
char *id; |
char *id; |
|
|
switch (n->type) { |
switch (n->type) { |
case ROFFT_BLOCK: |
case ROFFT_HEAD: |
return 1; |
id = make_id(n); |
|
print_otag(h, TAG_H1, "ci", "Sh", id); |
|
free(id); |
|
break; |
case ROFFT_BODY: |
case ROFFT_BODY: |
if (n->sec == SEC_AUTHORS) |
if (n->sec == SEC_AUTHORS) |
h->flags &= ~(HTML_SPLIT|HTML_NOSPLIT); |
h->flags &= ~(HTML_SPLIT|HTML_NOSPLIT); |
return 1; |
break; |
default: |
default: |
break; |
break; |
} |
} |
|
|
if ((id = make_id(n)) != NULL) { |
|
print_otag(h, TAG_H1, "ci", "Sh", id); |
|
free(id); |
|
} else |
|
print_otag(h, TAG_H1, "c", "Sh"); |
|
|
|
return 1; |
return 1; |
} |
} |
|
|
Line 534 mdoc_ss_pre(MDOC_ARGS) |
|
Line 530 mdoc_ss_pre(MDOC_ARGS) |
|
if (n->type != ROFFT_HEAD) |
if (n->type != ROFFT_HEAD) |
return 1; |
return 1; |
|
|
if ((id = make_id(n)) != NULL) { |
id = make_id(n); |
print_otag(h, TAG_H2, "ci", "Ss", id); |
print_otag(h, TAG_H2, "ci", "Ss", id); |
free(id); |
free(id); |
} else |
|
print_otag(h, TAG_H2, "c", "Ss"); |
|
|
|
return 1; |
return 1; |
} |
} |
|
|
Line 749 mdoc_it_pre(MDOC_ARGS) |
|
Line 742 mdoc_it_pre(MDOC_ARGS) |
|
print_otag(h, TAG_B, "c", cattr); |
print_otag(h, TAG_B, "c", cattr); |
break; |
break; |
case ROFFT_BODY: |
case ROFFT_BODY: |
if (bl->norm->Bl.width == NULL) |
print_otag(h, TAG_DD, "cswl", cattr, |
print_otag(h, TAG_DD, "c", cattr); |
bl->norm->Bl.width); |
else |
|
print_otag(h, TAG_DD, "cswl", cattr, |
|
bl->norm->Bl.width); |
|
break; |
break; |
default: |
default: |
break; |
break; |
Line 765 mdoc_it_pre(MDOC_ARGS) |
|
Line 755 mdoc_it_pre(MDOC_ARGS) |
|
if (h->style != NULL && !bl->norm->Bl.comp && |
if (h->style != NULL && !bl->norm->Bl.comp && |
(n->parent->prev == NULL || |
(n->parent->prev == NULL || |
n->parent->prev->body->child != NULL)) { |
n->parent->prev->body->child != NULL)) { |
if (bl->norm->Bl.width == NULL) |
t = print_otag(h, TAG_DT, "csWl", |
t = print_otag(h, TAG_DT, "c", cattr); |
cattr, bl->norm->Bl.width); |
else |
|
t = print_otag(h, TAG_DT, "csWl", |
|
cattr, bl->norm->Bl.width); |
|
print_text(h, "\\ "); |
print_text(h, "\\ "); |
print_tagq(h, t); |
print_tagq(h, t); |
t = print_otag(h, TAG_DD, "c", cattr); |
t = print_otag(h, TAG_DD, "c", cattr); |
print_text(h, "\\ "); |
print_text(h, "\\ "); |
print_tagq(h, t); |
print_tagq(h, t); |
} |
} |
if (bl->norm->Bl.width == NULL) |
print_otag(h, TAG_DT, "csWl", cattr, |
print_otag(h, TAG_DT, "c", cattr); |
bl->norm->Bl.width); |
else |
|
print_otag(h, TAG_DT, "csWl", cattr, |
|
bl->norm->Bl.width); |
|
break; |
break; |
case ROFFT_BODY: |
case ROFFT_BODY: |
if (n->child == NULL) { |
if (n->child == NULL) { |
Line 817 mdoc_it_pre(MDOC_ARGS) |
|
Line 801 mdoc_it_pre(MDOC_ARGS) |
|
static int |
static int |
mdoc_bl_pre(MDOC_ARGS) |
mdoc_bl_pre(MDOC_ARGS) |
{ |
{ |
|
struct mdoc_bl *bl; |
const char *cattr; |
const char *cattr; |
int i; |
size_t i; |
enum htmltag elemtype; |
enum htmltag elemtype; |
|
|
|
bl = &n->norm->Bl; |
|
|
if (n->type == ROFFT_BODY) { |
if (n->type == ROFFT_BODY) { |
if (LIST_column == n->norm->Bl.type) |
if (bl->type == LIST_column) |
print_otag(h, TAG_TBODY, ""); |
print_otag(h, TAG_TBODY, ""); |
return 1; |
return 1; |
} |
} |
|
|
if (n->type == ROFFT_HEAD) { |
if (n->type == ROFFT_HEAD) { |
if (LIST_column != n->norm->Bl.type) |
if (bl->type != LIST_column || bl->ncols == 0) |
return 0; |
return 0; |
|
|
/* |
/* |
Line 838 mdoc_bl_pre(MDOC_ARGS) |
|
Line 825 mdoc_bl_pre(MDOC_ARGS) |
|
* screen and we want to preserve that behaviour. |
* screen and we want to preserve that behaviour. |
*/ |
*/ |
|
|
for (i = 0; i < (int)n->norm->Bl.ncols - 1; i++) |
for (i = 0; i < bl->ncols - 1; i++) |
print_otag(h, TAG_COL, "sww", n->norm->Bl.cols[i]); |
print_otag(h, TAG_COL, "sww", bl->cols[i]); |
print_otag(h, TAG_COL, "swW", n->norm->Bl.cols[i]); |
print_otag(h, TAG_COL, "swW", bl->cols[i]); |
|
|
return 0; |
return 0; |
} |
} |
|
|
switch (n->norm->Bl.type) { |
switch (bl->type) { |
case LIST_bullet: |
case LIST_bullet: |
elemtype = TAG_UL; |
elemtype = TAG_UL; |
cattr = "Bl-bullet"; |
cattr = "Bl-bullet"; |
Line 881 mdoc_bl_pre(MDOC_ARGS) |
|
Line 867 mdoc_bl_pre(MDOC_ARGS) |
|
break; |
break; |
case LIST_tag: |
case LIST_tag: |
cattr = "Bl-tag"; |
cattr = "Bl-tag"; |
if (n->norm->Bl.offs) |
if (bl->offs) |
print_otag(h, TAG_DIV, "cswl", cattr, |
print_otag(h, TAG_DIV, "cswl", cattr, bl->offs); |
n->norm->Bl.offs); |
print_otag(h, TAG_DL, "cswl", cattr, bl->width); |
if (n->norm->Bl.width == NULL) |
|
print_otag(h, TAG_DL, "c", cattr); |
|
else |
|
print_otag(h, TAG_DL, "cswl", cattr, |
|
n->norm->Bl.width); |
|
return 1; |
return 1; |
case LIST_column: |
case LIST_column: |
elemtype = TAG_TABLE; |
elemtype = TAG_TABLE; |
Line 897 mdoc_bl_pre(MDOC_ARGS) |
|
Line 878 mdoc_bl_pre(MDOC_ARGS) |
|
default: |
default: |
abort(); |
abort(); |
} |
} |
|
print_otag(h, elemtype, "cswl", cattr, bl->offs); |
if (n->norm->Bl.offs) |
|
print_otag(h, elemtype, "cswl", cattr, n->norm->Bl.offs); |
|
else |
|
print_otag(h, elemtype, "c", cattr); |
|
|
|
return 1; |
return 1; |
} |
} |
|
|
Line 940 mdoc_sx_pre(MDOC_ARGS) |
|
Line 916 mdoc_sx_pre(MDOC_ARGS) |
|
{ |
{ |
char *id; |
char *id; |
|
|
if ((id = make_id(n)) != NULL) { |
id = make_id(n); |
print_otag(h, TAG_A, "chR", "Sx", id); |
print_otag(h, TAG_A, "chR", "Sx", id); |
free(id); |
free(id); |
} else |
|
print_otag(h, TAG_A, "c", "Sx"); |
|
|
|
return 1; |
return 1; |
} |
} |
|
|