===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.98
retrieving revision 1.100
diff -u -p -r1.98 -r1.100
--- docbook2mdoc/docbook2mdoc.c	2019/04/07 17:55:18	1.98
+++ docbook2mdoc/docbook2mdoc.c	2019/04/07 19:33:27	1.100
@@ -1,4 +1,4 @@
-/* $Id: docbook2mdoc.c,v 1.98 2019/04/07 17:55:18 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>
@@ -111,8 +111,12 @@ pnode_printpara(struct format *p, struct pnode *pn)
 
 	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)
@@ -178,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;
@@ -215,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);
 }
 
@@ -597,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);
@@ -606,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);
 }
@@ -792,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:
@@ -829,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;
@@ -902,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:
@@ -1038,6 +1048,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: