===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.39
retrieving revision 1.44
diff -u -p -r1.39 -r1.44
--- mandoc/mdoc_term.c	2009/07/14 15:17:25	1.39
+++ mandoc/mdoc_term.c	2009/07/17 10:56:57	1.44
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.39 2009/07/14 15:17:25 kristaps Exp $ */
+/*	$Id: mdoc_term.c,v 1.44 2009/07/17 10:56:57 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -130,6 +130,7 @@ static	int	  termp_ar_pre(DECL_ARGS);
 static	int	  termp_bd_pre(DECL_ARGS);
 static	int	  termp_bf_pre(DECL_ARGS);
 static	int	  termp_bq_pre(DECL_ARGS);
+static	int	  termp_br_pre(DECL_ARGS);
 static	int	  termp_brq_pre(DECL_ARGS);
 static	int	  termp_bt_pre(DECL_ARGS);
 static	int	  termp_cd_pre(DECL_ARGS);
@@ -292,6 +293,8 @@ static const struct termact termacts[MDOC_MAX] = {
 	{ NULL, NULL }, /* En */ 
 	{ termp_xx_pre, NULL }, /* Dx */ 
 	{ NULL, NULL }, /* %Q */ 
+	{ termp_br_pre, NULL }, /* br */
+	{ NULL, NULL }, /* sp */ 
 };
 
 #ifdef __linux__
@@ -407,7 +410,7 @@ print_foot(struct termp *p, const struct mdoc_meta *me
 
 	tm = localtime(&meta->date);
 
-	if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))
+	if (0 == strftime(buf, p->rmargin, "%B %e, %Y", tm))
 		err(1, "strftime");
 
 	(void)strlcpy(os, meta->os, p->rmargin);
@@ -517,28 +520,26 @@ print_head(struct termp *p, const struct mdoc_meta *me
 static size_t
 arg_width(const struct mdoc_argv *arg, int pos)
 {
-	size_t		 v;
 	int		 i, len;
+	const char	*p;
 
 	assert(pos < (int)arg->sz && pos >= 0);
 	assert(arg->value[pos]);
 
-	if (0 == (len = (int)strlen(arg->value[pos])))
+	p = arg->value[pos];
+
+	if (0 == (len = (int)strlen(p)))
 		return(0);
 
 	for (i = 0; i < len - 1; i++) 
-		if ( ! isdigit((u_char)arg->value[pos][i]))
+		if ( ! isdigit((u_char)p[i]))
 			break;
 
-	if (i == len - 1) {
-		if ('n' == arg->value[pos][len - 1] ||
-				'm' == arg->value[pos][len - 1]) {
-			v = (size_t)atoi(arg->value[pos]);
-			return(v + 2);
-		}
+	if (i == len - 1) 
+		if ('n' == p[len - 1] || 'm' == p[len - 1])
+			return((size_t)atoi(p) + 2);
 
-	}
-	return(strlen(arg->value[pos]) + 2);
+	return((size_t)len + 2);
 }
 
 
@@ -586,18 +587,31 @@ arg_listtype(const struct mdoc_node *n)
 static size_t
 arg_offset(const struct mdoc_argv *arg)
 {
+	int		 len, i;
+	const char	*p;
 
 	assert(*arg->value);
-	if (0 == strcmp(*arg->value, "left"))
+	p = *arg->value;
+
+	if (0 == strcmp(p, "left"))
 		return(0);
-	if (0 == strcmp(*arg->value, "indent"))
+	if (0 == strcmp(p, "indent"))
 		return(INDENT + 1);
-	if (0 == strcmp(*arg->value, "indent-two"))
+	if (0 == strcmp(p, "indent-two"))
 		return((INDENT + 1) * 2);
 
-	/* FIXME: needs to support field-widths (10n, etc.). */
+	if (0 == (len = (int)strlen(p)))
+		return(0);
 
-	return(strlen(*arg->value));
+	for (i = 0; i < len - 1; i++) 
+		if ( ! isdigit((u_char)p[i]))
+			break;
+
+	if (i == len - 1) 
+		if ('n' == p[len - 1] || 'm' == p[len - 1])
+			return((size_t)atoi(p));
+
+	return((size_t)len);
 }
 
 
@@ -786,9 +800,6 @@ termp_it_pre(DECL_ARGS)
 	 */
 
 	switch (type) {
-	case (MDOC_Diag):
-		term_word(p, "\\ ");
-		/* FALLTHROUGH */
 	case (MDOC_Inset):
 		if (MDOC_BODY == node->type) 
 			p->flags &= ~TERMP_NOSPACE;
@@ -977,6 +988,7 @@ termp_it_post(DECL_ARGS)
 
 	switch (type) {
 	case (MDOC_Diag):
+		term_word(p, "\\ ");
 		/* FALLTHROUGH */
 	case (MDOC_Item):
 		/* FALLTHROUGH */
@@ -1129,13 +1141,8 @@ termp_nd_pre(DECL_ARGS)
 	if (MDOC_BODY != node->type)
 		return(1);
 
-	/* 
-	 * XXX: signed off by jmc@openbsd.org.  This technically
-	 * produces a minus sign after the Nd, which is wrong, but is
-	 * consistent with the historic OpenBSD tmac file.
-	 */
 #if defined(__OpenBSD__) || defined(__linux__)
-	term_word(p, "\\-");
+	term_word(p, "\\(en");
 #else
 	term_word(p, "\\(em");
 #endif
@@ -1821,6 +1828,16 @@ termp_in_post(DECL_ARGS)
 	 */
 	if (node->next && MDOC_In != node->next->tok)
 		term_vspace(p);
+}
+
+
+/* ARGSUSED */
+static int
+termp_br_pre(DECL_ARGS)
+{
+
+	term_newln(p);
+	return(1);
 }