version 1.191, 2015/04/18 16:06:40 |
version 1.192, 2015/04/18 16:34:25 |
Line 1107 mpages_merge(struct mparse *mp) |
|
Line 1107 mpages_merge(struct mparse *mp) |
|
struct ohash_info str_info; |
struct ohash_info str_info; |
struct mpage *mpage, *mpage_dest; |
struct mpage *mpage, *mpage_dest; |
struct mlink *mlink, *mlink_dest; |
struct mlink *mlink, *mlink_dest; |
struct roff_man *mdoc; |
|
struct roff_man *man; |
struct roff_man *man; |
char *sodest; |
char *sodest; |
char *cp; |
char *cp; |
Line 1135 mpages_merge(struct mparse *mp) |
|
Line 1134 mpages_merge(struct mparse *mp) |
|
ohash_init(&names, 4, &str_info); |
ohash_init(&names, 4, &str_info); |
ohash_init(&strings, 6, &str_info); |
ohash_init(&strings, 6, &str_info); |
mparse_reset(mp); |
mparse_reset(mp); |
mdoc = NULL; |
|
man = NULL; |
man = NULL; |
sodest = NULL; |
sodest = NULL; |
|
|
Line 1151 mpages_merge(struct mparse *mp) |
|
Line 1149 mpages_merge(struct mparse *mp) |
|
*/ |
*/ |
if (mlink->dform != FORM_CAT || mlink->fform != FORM_CAT) { |
if (mlink->dform != FORM_CAT || mlink->fform != FORM_CAT) { |
mparse_readfd(mp, fd, mlink->file); |
mparse_readfd(mp, fd, mlink->file); |
mparse_result(mp, &mdoc, &man, &sodest); |
mparse_result(mp, &man, &sodest); |
} |
} |
|
|
if (sodest != NULL) { |
if (sodest != NULL) { |
Line 1195 mpages_merge(struct mparse *mp) |
|
Line 1193 mpages_merge(struct mparse *mp) |
|
mpage->mlinks = NULL; |
mpage->mlinks = NULL; |
} |
} |
goto nextpage; |
goto nextpage; |
} else if (mdoc != NULL) { |
} else if (man != NULL && man->macroset == MACROSET_MDOC) { |
mpage->form = FORM_SRC; |
mpage->form = FORM_SRC; |
mpage->sec = mdoc_meta(mdoc)->msec; |
mpage->sec = mdoc_meta(man)->msec; |
mpage->sec = mandoc_strdup( |
mpage->sec = mandoc_strdup( |
mpage->sec == NULL ? "" : mpage->sec); |
mpage->sec == NULL ? "" : mpage->sec); |
mpage->arch = mdoc_meta(mdoc)->arch; |
mpage->arch = mdoc_meta(man)->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(mdoc_meta(mdoc)->title); |
mandoc_strdup(mdoc_meta(man)->title); |
} else if (man != NULL) { |
} 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(man)->msec); |
mpage->arch = mandoc_strdup(mlink->arch); |
mpage->arch = mandoc_strdup(mlink->arch); |
Line 1231 mpages_merge(struct mparse *mp) |
|
Line 1229 mpages_merge(struct mparse *mp) |
|
} |
} |
|
|
assert(mpage->desc == NULL); |
assert(mpage->desc == NULL); |
if (mdoc != NULL) |
if (man != NULL && man->macroset == MACROSET_MDOC) |
parse_mdoc(mpage, mdoc_meta(mdoc), mdoc_node(mdoc)); |
parse_mdoc(mpage, mdoc_meta(man), mdoc_node(man)); |
else if (man != NULL) |
else if (man != NULL) |
parse_man(mpage, man_meta(man), man_node(man)); |
parse_man(mpage, man_meta(man), man_node(man)); |
else |
else |