version 1.192, 2015/04/18 16:34:25 |
version 1.194, 2015/04/23 16:17:44 |
Line 1195 mpages_merge(struct mparse *mp) |
|
Line 1195 mpages_merge(struct mparse *mp) |
|
goto nextpage; |
goto nextpage; |
} else if (man != NULL && man->macroset == MACROSET_MDOC) { |
} else if (man != NULL && man->macroset == MACROSET_MDOC) { |
mpage->form = FORM_SRC; |
mpage->form = FORM_SRC; |
mpage->sec = mdoc_meta(man)->msec; |
mpage->sec = man->meta.msec; |
mpage->sec = mandoc_strdup( |
mpage->sec = mandoc_strdup( |
mpage->sec == NULL ? "" : mpage->sec); |
mpage->sec == NULL ? "" : mpage->sec); |
mpage->arch = mdoc_meta(man)->arch; |
mpage->arch = man->meta.arch; |
mpage->arch = mandoc_strdup( |
mpage->arch = mandoc_strdup( |
mpage->arch == NULL ? "" : mpage->arch); |
mpage->arch == NULL ? "" : mpage->arch); |
mpage->title = |
mpage->title = mandoc_strdup(man->meta.title); |
mandoc_strdup(mdoc_meta(man)->title); |
|
} else if (man != NULL && man->macroset == MACROSET_MAN) { |
} else if (man != NULL && man->macroset == MACROSET_MAN) { |
mpage->form = FORM_SRC; |
mpage->form = FORM_SRC; |
mpage->sec = mandoc_strdup(man_meta(man)->msec); |
mpage->sec = mandoc_strdup(man->meta.msec); |
mpage->arch = mandoc_strdup(mlink->arch); |
mpage->arch = mandoc_strdup(mlink->arch); |
mpage->title = mandoc_strdup(man_meta(man)->title); |
mpage->title = mandoc_strdup(man->meta.title); |
} else { |
} else { |
mpage->form = FORM_CAT; |
mpage->form = FORM_CAT; |
mpage->sec = mandoc_strdup(mlink->dsec); |
mpage->sec = mandoc_strdup(mlink->dsec); |
Line 1230 mpages_merge(struct mparse *mp) |
|
Line 1229 mpages_merge(struct mparse *mp) |
|
|
|
assert(mpage->desc == NULL); |
assert(mpage->desc == NULL); |
if (man != NULL && man->macroset == MACROSET_MDOC) |
if (man != NULL && man->macroset == MACROSET_MDOC) |
parse_mdoc(mpage, mdoc_meta(man), mdoc_node(man)); |
parse_mdoc(mpage, &man->meta, man->first); |
else if (man != NULL) |
else if (man != NULL) |
parse_man(mpage, man_meta(man), man_node(man)); |
parse_man(mpage, &man->meta, man->first); |
else |
else |
parse_cat(mpage, fd); |
parse_cat(mpage, fd); |
if (mpage->desc == NULL) |
if (mpage->desc == NULL) |
Line 1477 parse_man(struct mpage *mpage, const struct roff_meta |
|
Line 1476 parse_man(struct mpage *mpage, const struct roff_meta |
|
*/ |
*/ |
|
|
title = NULL; |
title = NULL; |
man_deroff(&title, body); |
deroff(&title, body); |
if (NULL == title) |
if (NULL == title) |
return; |
return; |
|
|
Line 1721 parse_mdoc_Nd(struct mpage *mpage, const struct roff_m |
|
Line 1720 parse_mdoc_Nd(struct mpage *mpage, const struct roff_m |
|
{ |
{ |
|
|
if (n->type == ROFFT_BODY) |
if (n->type == ROFFT_BODY) |
mdoc_deroff(&mpage->desc, n); |
deroff(&mpage->desc, n); |
return(0); |
return(0); |
} |
} |
|
|