version 1.262, 2018/12/30 00:49:55 |
version 1.263, 2019/05/03 18:17:12 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2011-2018 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011-2019 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2016 Ed Maste <emaste@freebsd.org> |
* Copyright (c) 2016 Ed Maste <emaste@freebsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
Line 1186 mpages_merge(struct dba *dba, struct mparse *mp) |
|
Line 1186 mpages_merge(struct dba *dba, struct mparse *mp) |
|
mlink->next = mlink_dest->next; |
mlink->next = mlink_dest->next; |
mlink_dest->next = mpage->mlinks; |
mlink_dest->next = mpage->mlinks; |
mpage->mlinks = NULL; |
mpage->mlinks = NULL; |
|
goto nextpage; |
} |
} |
goto nextpage; |
meta->macroset = MACROSET_NONE; |
} else if (meta != NULL && meta->macroset == MACROSET_MDOC) { |
} |
|
if (meta != NULL && meta->macroset == MACROSET_MDOC) { |
mpage->form = FORM_SRC; |
mpage->form = FORM_SRC; |
mpage->sec = meta->msec; |
mpage->sec = meta->msec; |
mpage->sec = mandoc_strdup( |
mpage->sec = mandoc_strdup( |
Line 1208 mpages_merge(struct dba *dba, struct mparse *mp) |
|
Line 1210 mpages_merge(struct dba *dba, struct mparse *mp) |
|
} |
} |
|
|
assert(mpage->desc == NULL); |
assert(mpage->desc == NULL); |
if (meta == NULL) { |
if (meta == NULL || meta->sodest != NULL) { |
mpage->form = FORM_CAT; |
|
mpage->sec = mandoc_strdup(mlink->dsec); |
mpage->sec = mandoc_strdup(mlink->dsec); |
mpage->arch = mandoc_strdup(mlink->arch); |
mpage->arch = mandoc_strdup(mlink->arch); |
mpage->title = mandoc_strdup(mlink->name); |
mpage->title = mandoc_strdup(mlink->name); |
parse_cat(mpage, fd); |
if (meta == NULL) { |
|
mpage->form = FORM_CAT; |
|
parse_cat(mpage, fd); |
|
} else |
|
mpage->form = FORM_SRC; |
} else if (meta->macroset == MACROSET_MDOC) |
} else if (meta->macroset == MACROSET_MDOC) |
parse_mdoc(mpage, meta, meta->first); |
parse_mdoc(mpage, meta, meta->first); |
else |
else |