===================================================================
RCS file: /cvs/docbook2mdoc/parse.c,v
retrieving revision 1.17
retrieving revision 1.21
diff -u -p -r1.17 -r1.21
--- docbook2mdoc/parse.c	2019/04/07 14:49:26	1.17
+++ docbook2mdoc/parse.c	2019/04/07 18:51:53	1.21
@@ -1,4 +1,4 @@
-/* $Id: parse.c,v 1.17 2019/04/07 14:49:26 schwarze Exp $ */
+/* $Id: parse.c,v 1.21 2019/04/07 18:51:53 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -101,6 +101,11 @@ static	const struct element elements[] = {
 	{ "funcsynopsis",	NODE_FUNCSYNOPSIS },
 	{ "funcsynopsisinfo",	NODE_FUNCSYNOPSISINFO },
 	{ "function",		NODE_FUNCTION },
+	{ "glossary",		NODE_VARIABLELIST },
+	{ "glossdef",		NODE_IGNORE },
+	{ "glossdiv",		NODE_IGNORE },
+	{ "glossentry",		NODE_VARLISTENTRY },
+	{ "glosslist",		NODE_VARIABLELIST },
 	{ "glossterm",		NODE_GLOSSTERM },
 	{ "group",		NODE_GROUP },
 	{ "holder",		NODE_HOLDER },
@@ -190,7 +195,7 @@ static	const struct element elements[] = {
 	{ "title",		NODE_TITLE },
 	{ "trademark",		NODE_IGNORE },
 	{ "type",		NODE_TYPE },
-	{ "ulink",		NODE_ULINK },
+	{ "ulink",		NODE_LINK },
 	{ "userinput",		NODE_LITERAL },
 	{ "variablelist",	NODE_VARIABLELIST },
 	{ "varlistentry",	NODE_VARLISTENTRY },
@@ -464,6 +469,7 @@ xml_elem_start(struct parse *ps, const char *name)
 
 	switch (dat->node = elem->node) {
 	case NODE_AUTHORGROUP:
+	case NODE_BLOCKQUOTE:
 	case NODE_BOOKINFO:
 	case NODE_CAUTION:
 	case NODE_EDITOR:
@@ -518,7 +524,7 @@ xml_attrkey(struct parse *ps, const char *name)
 	struct pattr	*attr;
 	enum attrkey	 key;
 
-	if (ps->del > 0 || *name == '\0')
+	if (ps->del > 0 || ps->ncur == NODE_IGNORE || *name == '\0')
 		return;
 	if ((key = attrkey_parse(name)) == ATTRKEY__MAX) {
 		ps->attr = 0;
@@ -540,7 +546,7 @@ xml_attrval(struct parse *ps, const char *name)
 {
 	struct pattr	*attr;
 
-	if (ps->del > 0 || ps->attr == 0)
+	if (ps->del > 0 || ps->ncur == NODE_IGNORE || ps->attr == 0)
 		return;
 	if ((attr = TAILQ_LAST(&ps->cur->attrq, pattrq)) == NULL)
 		return;