===================================================================
RCS file: /cvs/mandoc/mdoc_man.c,v
retrieving revision 1.27
retrieving revision 1.32
diff -u -p -r1.27 -r1.32
--- mandoc/mdoc_man.c	2012/07/09 18:56:12	1.27
+++ mandoc/mdoc_man.c	2012/07/10 20:37:02	1.32
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_man.c,v 1.27 2012/07/09 18:56:12 schwarze Exp $ */
+/*	$Id: mdoc_man.c,v 1.32 2012/07/10 20:37:02 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -46,14 +46,18 @@ static	void	  font_pop(void);
 static	void	  post_bd(DECL_ARGS);
 static	void	  post_bf(DECL_ARGS);
 static	void	  post_bk(DECL_ARGS);
+static	void	  post_bl(DECL_ARGS);
 static	void	  post_dl(DECL_ARGS);
 static	void	  post_enc(DECL_ARGS);
+static	void	  post_eo(DECL_ARGS);
 static	void	  post_fa(DECL_ARGS);
+static	void	  post_fd(DECL_ARGS);
 static	void	  post_fl(DECL_ARGS);
 static	void	  post_fn(DECL_ARGS);
 static	void	  post_fo(DECL_ARGS);
 static	void	  post_font(DECL_ARGS);
 static	void	  post_in(DECL_ARGS);
+static	void	  post_it(DECL_ARGS);
 static	void	  post_lb(DECL_ARGS);
 static	void	  post_nm(DECL_ARGS);
 static	void	  post_percent(DECL_ARGS);
@@ -66,12 +70,14 @@ static	int	  pre_ap(DECL_ARGS);
 static	int	  pre_bd(DECL_ARGS);
 static	int	  pre_bf(DECL_ARGS);
 static	int	  pre_bk(DECL_ARGS);
+static	int	  pre_bl(DECL_ARGS);
 static	int	  pre_br(DECL_ARGS);
 static	int	  pre_bx(DECL_ARGS);
 static	int	  pre_dl(DECL_ARGS);
 static	int	  pre_enc(DECL_ARGS);
 static	int	  pre_em(DECL_ARGS);
 static	int	  pre_fa(DECL_ARGS);
+static	int	  pre_fd(DECL_ARGS);
 static	int	  pre_fl(DECL_ARGS);
 static	int	  pre_fn(DECL_ARGS);
 static	int	  pre_fo(DECL_ARGS);
@@ -94,6 +100,8 @@ static	int	  pre_ux(DECL_ARGS);
 static	int	  pre_xr(DECL_ARGS);
 static	void	  print_word(const char *);
 static	void	  print_offs(const char *);
+static	void	  print_width(const char *, const struct mdoc_node *);
+static	void	  print_count(int *);
 static	void	  print_node(DECL_ARGS);
 
 static	const struct manact manacts[MDOC_MAX + 1] = {
@@ -108,9 +116,9 @@ static	const struct manact manacts[MDOC_MAX + 1] = {
 	{ cond_body, pre_dl, post_dl, NULL, NULL }, /* Dl */
 	{ cond_body, pre_bd, post_bd, NULL, NULL }, /* Bd */
 	{ NULL, NULL, NULL, NULL, NULL }, /* Ed */
-	{ NULL, NULL, NULL, NULL, NULL }, /* Bl */
+	{ cond_body, pre_bl, post_bl, NULL, NULL }, /* Bl */
 	{ NULL, NULL, NULL, NULL, NULL }, /* El */
-	{ NULL, pre_it, NULL, NULL, NULL }, /* _It */
+	{ NULL, pre_it, post_it, NULL, NULL }, /* It */
 	{ NULL, pre_em, post_font, NULL, NULL }, /* Ad */
 	{ NULL, pre_an, NULL, NULL, NULL }, /* An */
 	{ NULL, pre_em, post_font, NULL, NULL }, /* Ar */
@@ -123,7 +131,7 @@ static	const struct manact manacts[MDOC_MAX + 1] = {
 	    "\\fP\nutility exits 0 on success, and >0 if an error occurs."
 	    }, /* Ex */
 	{ NULL, pre_fa, post_fa, NULL, NULL }, /* Fa */
-	{ NULL, NULL, NULL, NULL, NULL }, /* _Fd */
+	{ NULL, pre_fd, post_fd, NULL, NULL }, /* Fd */
 	{ NULL, pre_fl, post_fl, NULL, NULL }, /* Fl */
 	{ NULL, pre_fn, post_fn, NULL, NULL }, /* Fn */
 	{ NULL, pre_ft, post_font, NULL, NULL }, /* Ft */
@@ -169,10 +177,10 @@ static	const struct manact manacts[MDOC_MAX + 1] = {
 	{ NULL, NULL, NULL, NULL, NULL }, /* Dc */
 	{ cond_body, pre_enc, post_enc, "``", "''" }, /* Do */
 	{ cond_body, pre_enc, post_enc, "``", "''" }, /* Dq */
-	{ NULL, NULL, NULL, NULL, NULL }, /* _Ec */
-	{ NULL, NULL, NULL, NULL, NULL }, /* _Ef */
+	{ NULL, NULL, NULL, NULL, NULL }, /* Ec */
+	{ NULL, NULL, NULL, NULL, NULL }, /* Ef */
 	{ NULL, pre_em, post_font, NULL, NULL }, /* Em */
-	{ NULL, NULL, NULL, NULL, NULL }, /* _Eo */
+	{ NULL, NULL, post_eo, NULL, NULL }, /* Eo */
 	{ NULL, pre_ux, NULL, "FreeBSD", NULL }, /* Fx */
 	{ NULL, pre_sy, post_font, NULL, NULL }, /* Ms */
 	{ NULL, pre_no, NULL, NULL, NULL }, /* No */
@@ -217,8 +225,8 @@ static	const struct manact manacts[MDOC_MAX + 1] = {
 	{ cond_body, pre_enc, post_enc, "{", "}" }, /* Bro */
 	{ NULL, NULL, NULL, NULL, NULL }, /* Brc */
 	{ NULL, NULL, NULL, NULL, NULL }, /* _%C */
-	{ NULL, NULL, NULL, NULL, NULL }, /* _Es */
-	{ NULL, NULL, NULL, NULL, NULL }, /* _En */
+	{ NULL, NULL, NULL, NULL, NULL }, /* Es */
+	{ NULL, NULL, NULL, NULL, NULL }, /* En */
 	{ NULL, pre_ux, NULL, "DragonFly", NULL }, /* Dx */
 	{ NULL, NULL, NULL, NULL, NULL }, /* _%Q */
 	{ NULL, pre_br, NULL, NULL, NULL }, /* br */
@@ -352,6 +360,48 @@ print_offs(const char *v)
 }
 
 void
+print_width(const char *v, const struct mdoc_node *child)
+{
+	char		  buf[24];
+	struct roffsu	  su;
+	size_t		  sz, chsz;
+
+	/* XXX Rough estimation, might have multiple parts. */
+	chsz = (NULL != child && MDOC_TEXT == child->type) ?
+			strlen(child->string) : 0;
+
+	if (a2roffsu(v, &su, SCALE_MAX)) {
+		if (SCALE_EN == su.unit)
+			sz = su.scale;
+		else {
+			if (chsz)
+				print_word(".HP");
+			else
+				print_word(".TP");
+			print_word(v);
+			return;
+		}
+	} else
+		sz = strlen(v);
+
+	if (chsz > sz)
+		print_word(".HP");
+	else
+		print_word(".TP");
+	snprintf(buf, sizeof(buf), "%ldn", sz + 2);
+	print_word(buf);
+}
+
+void
+print_count(int *count)
+{
+	char		  buf[12];
+
+	snprintf(buf, sizeof(buf), "%d.", ++*count);
+	print_word(buf);
+}
+
+void
 man_man(void *arg, const struct man *man)
 {
 
@@ -702,6 +752,24 @@ post_bk(DECL_ARGS)
 }
 
 static int
+pre_bl(DECL_ARGS)
+{
+
+	if (LIST_enum == n->norm->Bl.type)
+		n->norm->Bl.count = 0;
+	return(1);
+}
+
+static void
+post_bl(DECL_ARGS)
+{
+
+	outflags |= MMAN_br;
+	if (LIST_enum == n->norm->Bl.type)
+		n->norm->Bl.count = 0;
+}
+
+static int
 pre_br(DECL_ARGS)
 {
 
@@ -756,6 +824,14 @@ pre_em(DECL_ARGS)
 	return(1);
 }
 
+static void
+post_eo(DECL_ARGS)
+{
+
+	if (MDOC_HEAD == n->type || MDOC_BODY == n->type)
+		outflags &= ~MMAN_spc;
+}
+
 static int
 pre_fa(DECL_ARGS)
 {
@@ -782,6 +858,23 @@ post_fa(DECL_ARGS)
 }
 
 static int
+pre_fd(DECL_ARGS)
+{
+
+	pre_syn(n);
+	font_push('B');
+	return(1);
+}
+
+static void
+post_fd(DECL_ARGS)
+{
+
+	font_pop();
+	outflags |= MMAN_br;
+}
+
+static int
 pre_fl(DECL_ARGS)
 {
 
@@ -916,24 +1009,86 @@ pre_it(DECL_ARGS)
 {
 	const struct mdoc_node *bln;
 
-	if (MDOC_HEAD == n->type) {
+	switch (n->type) {
+	case (MDOC_HEAD):
 		outflags |= MMAN_nl;
-		print_word(".TP");
-		bln = n->parent->parent->prev;
+		bln = n->parent->parent;
 		switch (bln->norm->Bl.type) {
+		case (LIST_item):
+			if (bln->norm->Bl.comp)
+				outflags |= MMAN_br;
+			else
+				outflags |= MMAN_sp;
+			return(0);
+		case (LIST_inset):
+			/* FALLTHROUGH */
+		case (LIST_diag):
+			/* FALLTHROUGH */
+		case (LIST_ohang):
+			if (bln->norm->Bl.comp)
+				outflags |= MMAN_br;
+			else
+				outflags |= MMAN_sp;
+			if (bln->norm->Bl.type == LIST_diag)
+				print_word(".B \"");
+			else
+				print_word(".R \"");
+			outflags &= ~MMAN_spc;
+			return(1);
 		case (LIST_bullet):
-			print_word("4n");
+			/* FALLTHROUGH */
+		case (LIST_dash):
+			/* FALLTHROUGH */
+		case (LIST_hyphen):
+			print_width(bln->norm->Bl.width, NULL);
 			outflags |= MMAN_nl;
-			print_word("\\fBo\\fP");
+			font_push('B');
+			if (LIST_bullet == bln->norm->Bl.type)
+				print_word("o");
+			else
+				print_word("-");
+			font_pop();
 			break;
-		default:
-			if (bln->norm->Bl.width)
-				print_word(bln->norm->Bl.width);
+		case (LIST_enum):
+			print_width(bln->norm->Bl.width, NULL);
+			outflags |= MMAN_nl;
+			print_count(&bln->norm->Bl.count);
 			break;
+		case (LIST_hang):
+			print_width(bln->norm->Bl.width, n->child);
+			break;
+		case (LIST_tag):
+			print_width(bln->norm->Bl.width, NULL);
+			break;
+		default:
+			return(1);
 		}
 		outflags |= MMAN_nl;
+	default:
+		break;
 	}
 	return(1);
+}
+
+static void
+post_it(DECL_ARGS)
+{
+	const struct mdoc_node *bln;
+
+	if (MDOC_HEAD == n->type) {
+		bln = n->parent->parent;
+		switch (bln->norm->Bl.type) {
+		case (LIST_diag):
+			outflags &= ~MMAN_spc;
+			print_word("\\ ");
+			break;
+		case (LIST_ohang):
+			outflags |= MMAN_br;
+			break;
+		default:
+			break;
+		}
+	}
 }
 
 static void