===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.95
retrieving revision 1.98
diff -u -p -r1.95 -r1.98
--- docbook2mdoc/docbook2mdoc.c	2019/04/07 15:06:56	1.95
+++ docbook2mdoc/docbook2mdoc.c	2019/04/07 17:55:18	1.98
@@ -1,4 +1,4 @@
-/* $Id: docbook2mdoc.c,v 1.95 2019/04/07 15:06:56 schwarze Exp $ */
+/* $Id: docbook2mdoc.c,v 1.98 2019/04/07 17:55:18 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -103,10 +103,12 @@ 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_LISTITEM:
@@ -521,6 +523,41 @@ pnode_printauthor(struct format *f, struct pnode *n)
 }
 
 static void
+pnode_printlink(struct format *f, struct pnode *n)
+{
+	const char	*uri, *text;
+
+	uri = pnode_getattr_raw(n, ATTRKEY_LINKEND, NULL);
+	if (uri != NULL) {
+		if (TAILQ_FIRST(&n->childq) != NULL) {
+			print_textnode(f, n);
+			text = "";
+		} else {
+			text = pnode_getattr_raw(n, ATTRKEY_ENDTERM, NULL);
+			if (text != NULL)
+				print_text(f, text, ARG_SPACE);
+		}
+		if (text != NULL)
+			macro_open(f, "Pq");
+		macro_open(f, "Sx");
+		macro_addarg(f, uri, ARG_SPACE);
+		pnode_unlinksub(n);
+		return;
+	}
+	uri = pnode_getattr_raw(n, ATTRKEY_XLINK_HREF, NULL);
+	if (uri == NULL)
+		uri = pnode_getattr_raw(n, ATTRKEY_URL, NULL);
+	if (uri != NULL) {
+		macro_open(f, "Lk");
+		macro_addarg(f, uri, ARG_SPACE | ARG_SINGLE);
+		if (TAILQ_FIRST(&n->childq) != NULL)
+			macro_addnode(f, n, ARG_SPACE | ARG_SINGLE);
+		pnode_unlinksub(n);
+		return;
+	}
+}
+
+static void
 pnode_printprologue(struct format *p, struct ptree *tree)
 {
 	struct pnode	*refmeta;
@@ -706,7 +743,6 @@ static void
 pnode_print(struct format *p, struct pnode *pn)
 {
 	struct pnode	*pp;
-	const char	*ccp;
 	enum linestate	 sv;
 
 	if (pn == NULL)
@@ -728,6 +764,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;
@@ -794,11 +833,8 @@ pnode_print(struct format *p, struct pnode *pn)
 		macro_line(p, "Sh LEGAL NOTICE");
 		break;
 	case NODE_LINK:
-		ccp = pnode_getattr_raw(pn, ATTRKEY_LINKEND, NULL);
-		if (ccp == NULL)
-			break;
-		macro_argline(p, "Sx", ccp);
-		return;
+		pnode_printlink(p, pn);
+		break;
 	case NODE_LITERAL:
 		macro_open(p, "Ql");
 		break;
@@ -889,7 +925,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;
 		}
@@ -964,6 +1001,7 @@ pnode_print(struct format *p, struct pnode *pn)
 	case NODE_FUNCTION:
 	case NODE_FUNCSYNOPSISINFO:
 	case NODE_KEYSYM:
+	case NODE_LINK:
 	case NODE_LITERAL:
 	case NODE_OPTION:
 	case NODE_PARAMETER:
@@ -1006,6 +1044,7 @@ pnode_print(struct format *p, struct pnode *pn)
 	case NODE_WARNING:
 		p->level--;
 		break;
+	case NODE_BLOCKQUOTE:
 	case NODE_LITERALLAYOUT:
 	case NODE_PROGRAMLISTING:
 	case NODE_SCREEN:
@@ -1013,7 +1052,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: