===================================================================
RCS file: /cvs/mandoc/man_html.c,v
retrieving revision 1.9
retrieving revision 1.12
diff -u -p -r1.9 -r1.12
--- mandoc/man_html.c	2009/10/09 07:10:37	1.9
+++ mandoc/man_html.c	2009/10/22 18:55:32	1.12
@@ -1,4 +1,4 @@
-/*	$Id: man_html.c,v 1.9 2009/10/09 07:10:37 kristaps Exp $ */
+/*	$Id: man_html.c,v 1.12 2009/10/22 18:55:32 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -27,6 +27,7 @@
 #include "out.h"
 #include "html.h"
 #include "man.h"
+#include "main.h"
 
 /* TODO: preserve ident widths. */
 
@@ -221,7 +222,7 @@ a2width(const struct man_node *n, struct roffsu *su)
 
 	if (MAN_TEXT != n->type)
 		return(0);
-	if (a2roffsu(n->string, su))
+	if (a2roffsu(n->string, su, SCALE_BU))
 		return(1);
 
 	return(0);
@@ -280,16 +281,12 @@ man_root_pre(MAN_ARGS)
 static void
 man_root_post(MAN_ARGS)
 {
-	struct tm	 tm;
 	struct htmlpair	 tag[2];
 	struct tag	*t, *tt;
-	char		 b[BUFSIZ];
+	char		 b[DATESIZ];
 
-	(void)localtime_r(&m->date, &tm);
+	time2a(m->date, b, DATESIZ);
 
-	if (0 == strftime(b, BUFSIZ - 1, "%B %e, %Y", &tm))
-		err(EXIT_FAILURE, "strftime");
-
 	PAIR_CLASS_INIT(&tag[0], "footer");
 	bufcat_style(h, "width", "100%");
 	PAIR_STYLE_INIT(&tag[1], h);
@@ -324,11 +321,9 @@ man_br_pre(MAN_ARGS)
 
 	SCALE_VS_INIT(&su, 1);
 
-	if (MAN_sp == n->tok) {
-		su.scale = 1;
-		if (n->child)
-			a2roffsu(n->child->string, &su);
-	} else if (MAN_br == n->tok)
+	if (MAN_sp == n->tok && n->child)
+		a2roffsu(n->child->string, &su, SCALE_VS);
+	else if (MAN_br == n->tok)
 		su.scale = 0;
 
 	bufcat_su(h, "height", &su);