===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.96
retrieving revision 1.100
diff -u -p -r1.96 -r1.100
--- docbook2mdoc/docbook2mdoc.c	2019/04/07 17:00:56	1.96
+++ docbook2mdoc/docbook2mdoc.c	2019/04/07 19:33:27	1.100
@@ -1,4 +1,4 @@
-/* $Id: docbook2mdoc.c,v 1.96 2019/04/07 17:00:56 schwarze Exp $ */
+/* $Id: docbook2mdoc.c,v 1.100 2019/04/07 19:33:27 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -103,14 +103,20 @@ pnode_printpara(struct format *p, struct pnode *pn)
 {
 	struct pnode	*pp;
 
-	if ((pp = TAILQ_PREV(pn, pnodeq, child)) == NULL &&
-	    (pp = pn->parent) == NULL)
+	if (pn->parent == NULL)
 		return;
 
+	if ((pp = TAILQ_PREV(pn, pnodeq, child)) == NULL)
+	    pp = pn->parent;
+
 	switch (pp->node) {
 	case NODE_ENTRY:
+	case NODE_GLOSSTERM:
 	case NODE_LISTITEM:
+	case NODE_TERM:
 		return;
+	case NODE_APPENDIX:
+	case NODE_LEGALNOTICE:
 	case NODE_PREFACE:
 	case NODE_SECTION:
 		if (p->level < 3)
@@ -176,6 +182,12 @@ pnode_printrefsect(struct format *p, struct pnode *pn)
 		case NODE_PREFACE:
 			title = "Preface";
 			break;
+		case NODE_APPENDIX:
+			title = "Appendix";
+			break;
+		case NODE_LEGALNOTICE:
+			title = "Legal Notice";
+			break;
 		case NODE_CAUTION:
 			title = "Caution";
 			break;
@@ -213,7 +225,7 @@ pnode_printrefsect(struct format *p, struct pnode *pn)
 		macro_addnode(p, pp, flags);
 		pnode_unlink(pp);
 	} else
-		macro_addarg(p, title, ARG_SPACE | ARG_QUOTED);
+		macro_addarg(p, title, flags | ARG_QUOTED);
 	macro_close(p);
 }
 
@@ -595,7 +607,7 @@ pnode_printvarlistentry(struct format *p, struct pnode
 	macro_close(p);
 	macro_open(p, "It");
 	TAILQ_FOREACH(pp, &pn->childq, child) {
-		if (pp->node != NODE_TERM)
+		if (pp->node != NODE_TERM && pp->node != NODE_GLOSSTERM)
 			continue;
 		if ( ! first)
 			macro_addarg(p, ",", 0);
@@ -604,7 +616,7 @@ pnode_printvarlistentry(struct format *p, struct pnode
 	}
 	macro_close(p);
 	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (pp->node != NODE_TERM)
+		if (pp->node != NODE_TERM && pp->node != NODE_GLOSSTERM)
 			pnode_print(p, pp);
 	pnode_unlinksub(pn);
 }
@@ -762,6 +774,9 @@ pnode_print(struct format *p, struct pnode *pn)
 	case NODE_AUTHORGROUP:
 		macro_line(p, "An -split");
 		break;
+	case NODE_BLOCKQUOTE:
+		macro_line(p, "Bd -ragged -offset indent");
+		break;
 	case NODE_BOOKINFO:
 		macro_line(p, "Sh NAME");
 		break;
@@ -787,6 +802,7 @@ pnode_print(struct format *p, struct pnode *pn)
 		break;
 	case NODE_EMPHASIS:
 	case NODE_FIRSTTERM:
+	case NODE_GLOSSTERM:
 		macro_open(p, "Em");
 		break;
 	case NODE_ENVAR:
@@ -824,9 +840,6 @@ pnode_print(struct format *p, struct pnode *pn)
 	case NODE_KEYSYM:
 		macro_open(p, "Sy");
 		break;
-	case NODE_LEGALNOTICE:
-		macro_line(p, "Sh LEGAL NOTICE");
-		break;
 	case NODE_LINK:
 		pnode_printlink(p, pn);
 		break;
@@ -897,6 +910,8 @@ pnode_print(struct format *p, struct pnode *pn)
 		break;
 	case NODE_PREFACE:
 	case NODE_SECTION:
+	case NODE_APPENDIX:
+	case NODE_LEGALNOTICE:
 	case NODE_NOTE:
 	case NODE_TIP:
 	case NODE_CAUTION:
@@ -920,7 +935,8 @@ pnode_print(struct format *p, struct pnode *pn)
 		pnode_printtgroup(p, pn);
 		break;
 	case NODE_TITLE:
-		if (pn->parent->node == NODE_BOOKINFO) {
+		if (pn->parent != NULL &&
+		    pn->parent->node == NODE_BOOKINFO) {
 			macro_open(p, "Nd");
 			break;
 		}
@@ -1032,12 +1048,15 @@ pnode_print(struct format *p, struct pnode *pn)
 		break;
 	case NODE_PREFACE:
 	case NODE_SECTION:
+	case NODE_APPENDIX:
+	case NODE_LEGALNOTICE:
 	case NODE_NOTE:
 	case NODE_TIP:
 	case NODE_CAUTION:
 	case NODE_WARNING:
 		p->level--;
 		break;
+	case NODE_BLOCKQUOTE:
 	case NODE_LITERALLAYOUT:
 	case NODE_PROGRAMLISTING:
 	case NODE_SCREEN:
@@ -1045,7 +1064,8 @@ pnode_print(struct format *p, struct pnode *pn)
 		macro_line(p, "Ed");
 		break;
 	case NODE_TITLE:
-		if (pn->parent->node == NODE_BOOKINFO)
+		if (pn->parent != NULL &&
+		    pn->parent->node == NODE_BOOKINFO)
 			macro_line(p, "Sh AUTHORS");
 		break;
 	default: