===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_html.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- src/usr.bin/mandoc/mdoc_html.c	2010/08/20 00:53:35	1.29
+++ src/usr.bin/mandoc/mdoc_html.c	2010/09/20 20:02:27	1.30
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_html.c,v 1.29 2010/08/20 00:53:35 schwarze Exp $ */
+/*	$Id: mdoc_html.c,v 1.30 2010/09/20 20:02:27 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -2190,6 +2190,9 @@
 	switch (n->tok) {
 	case(MDOC__A):
 		PAIR_CLASS_INIT(&tag[0], "ref-auth");
+		if (n->prev && MDOC__A == n->prev->tok)
+			if (NULL == n->next || MDOC__A != n->next->tok)
+				print_text(h, "and");
 		break;
 	case(MDOC__B):
 		PAIR_CLASS_INIT(&tag[0], "ref-book");
@@ -2242,6 +2245,7 @@
 
 	PAIR_HREF_INIT(&tag[1], n->child->string);
 	print_otag(h, TAG_A, 2, tag);
+
 	return(1);
 }
 
@@ -2250,6 +2254,11 @@
 static void
 mdoc__x_post(MDOC_ARGS)
 {
+
+	if (MDOC__A == n->tok && n->next && MDOC__A == n->next->tok)
+		if (NULL == n->next->next || MDOC__A != n->next->next->tok)
+			if (NULL == n->prev || MDOC__A != n->prev->tok)
+				return;
 
 	/* TODO: %U */