=================================================================== RCS file: /cvs/docbook2mdoc/reorg.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- docbook2mdoc/reorg.c 2019/04/28 19:59:01 1.3 +++ docbook2mdoc/reorg.c 2019/04/28 20:26:49 1.4 @@ -1,4 +1,4 @@ -/* $Id: reorg.c,v 1.3 2019/04/28 19:59:01 schwarze Exp $ */ +/* $Id: reorg.c,v 1.4 2019/04/28 20:26:49 schwarze Exp $ */ /* * Copyright (c) 2019 Ingo Schwarze * @@ -26,7 +26,7 @@ static void reorg_root(struct pnode *root) { - struct pnode *date, *descr, *name, *vol, *nc; + struct pnode *date, *info, *name, *vol, *nc; if (root == NULL) return; @@ -63,10 +63,13 @@ reorg_root(struct pnode *root) /* Insert prologue information at the beginning. */ if (pnode_findfirst(root, NODE_REFNAMEDIV) == NULL && - ((nc = pnode_findfirst(root, NODE_BOOKINFO)) != NULL || - (nc = pnode_findfirst(root, NODE_REFENTRYINFO)) != NULL) && - (descr = pnode_takefirst(nc, NODE_TITLE)) != NULL) - TAILQ_INSERT_HEAD(&root->childq, descr, child); + ((info = pnode_findfirst(root, NODE_BOOKINFO)) != NULL || + (info = pnode_findfirst(root, NODE_REFENTRYINFO)) != NULL)) { + if ((nc = pnode_takefirst(info, NODE_ABSTRACT)) != NULL) + TAILQ_INSERT_HEAD(&root->childq, nc, child); + if ((nc = pnode_takefirst(info, NODE_TITLE)) != NULL) + TAILQ_INSERT_HEAD(&root->childq, nc, child); + } TAILQ_INSERT_HEAD(&root->childq, vol, child); TAILQ_INSERT_HEAD(&root->childq, name, child); TAILQ_INSERT_HEAD(&root->childq, date, child); @@ -215,6 +218,10 @@ reorg_recurse(struct pnode *n) return; switch (n->node) { + case NODE_ABSTRACT: + default_title(n, "Abstract"); + n->node = NODE_SECTION; + break; case NODE_APPENDIX: if (n->parent == NULL) reorg_refentry(n);