===================================================================
RCS file: /cvs/mandoc/man_term.c,v
retrieving revision 1.8
retrieving revision 1.17
diff -u -p -r1.8 -r1.17
--- mandoc/man_term.c	2009/04/12 19:45:26	1.8
+++ mandoc/man_term.c	2009/07/24 20:22:24	1.17
@@ -1,6 +1,6 @@
-/*	$Id: man_term.c,v 1.8 2009/04/12 19:45:26 kristaps Exp $ */
+/*	$Id: man_term.c,v 1.17 2009/07/24 20:22:24 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -40,6 +40,7 @@ struct	termact {
 static	int		  pre_B(DECL_ARGS);
 static	int		  pre_BI(DECL_ARGS);
 static	int		  pre_BR(DECL_ARGS);
+static	int		  pre_br(DECL_ARGS);
 static	int		  pre_I(DECL_ARGS);
 static	int		  pre_IB(DECL_ARGS);
 static	int		  pre_IP(DECL_ARGS);
@@ -57,7 +58,7 @@ static	void		  post_SH(DECL_ARGS);
 static	void		  post_SS(DECL_ARGS);
 
 static const struct termact termacts[MAN_MAX] = {
-	{ NULL, NULL }, /* __ */
+	{ pre_br, NULL }, /* br */
 	{ NULL, NULL }, /* TH */
 	{ pre_SH, post_SH }, /* SH */
 	{ pre_SS, post_SS }, /* SS */
@@ -78,9 +79,9 @@ static const struct termact termacts[MAN_MAX] = {
 	{ pre_I, post_I }, /* I */
 	{ pre_IR, NULL }, /* IR */
 	{ pre_RI, NULL }, /* RI */
-	{ pre_PP, NULL }, /* br */
 	{ NULL, NULL }, /* na */
 	{ pre_I, post_I }, /* i */
+	{ NULL, NULL }, /* sp */
 };
 
 static	void		  print_head(struct termp *, 
@@ -97,7 +98,10 @@ man_run(struct termp *p, const struct man *m)
 
 	print_head(p, man_meta(m));
 	p->flags |= TERMP_NOSPACE;
-	print_body(p, man_node(m), man_meta(m));
+	assert(man_node(m));
+	assert(MAN_ROOT == man_node(m)->type);
+	if (man_node(m)->child)
+		print_body(p, man_node(m)->child, man_meta(m));
 	print_foot(p, man_meta(m));
 
 	return(1);
@@ -260,6 +264,16 @@ post_B(DECL_ARGS)
 
 /* ARGSUSED */
 static int
+pre_br(DECL_ARGS)
+{
+
+	term_newln(p);
+	return(0);
+}
+
+
+/* ARGSUSED */
+static int
 pre_PP(DECL_ARGS)
 {
 
@@ -273,12 +287,15 @@ pre_PP(DECL_ARGS)
 static int
 pre_IP(DECL_ARGS)
 {
+#if 0
 	const struct man_node *nn;
 	size_t		 offs;
+#endif
 
 	term_vspace(p);
 	p->offset = INDENT;
 
+#if 0
 	if (NULL == (nn = n->child))
 		return(1);
 	if (MAN_TEXT != nn->type)
@@ -292,7 +309,11 @@ pre_IP(DECL_ARGS)
 		offs = strlen(nn->string);
 
 	p->flags |= TERMP_NOSPACE;
-	p->offset += offs;
+	/* FIXME */
+	if ((p->offset += offs) > p->rmargin)
+		errx(1, "line too long");
+#endif
+
 	return(0);
 }
 
@@ -305,6 +326,7 @@ pre_TP(DECL_ARGS)
 	size_t		 offs;
 
 	term_vspace(p);
+
 	p->offset = INDENT;
 
 	if (NULL == (nn = n->child))
@@ -442,11 +464,7 @@ print_foot(struct termp *p, const struct man_meta *met
 
 	tm = localtime(&meta->date);
 
-#ifdef __OpenBSD__
-	if (NULL == strftime(buf, p->rmargin, "%B %d, %Y", tm))
-#else
 	if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))
-#endif
 		err(1, "strftime");
 
 	term_vspace(p);
@@ -495,7 +513,7 @@ print_head(struct termp *p, const struct man_meta *met
 			meta->title, meta->msec);
 
 	p->offset = 0;
-	p->rmargin = (p->maxrmargin - strlen(buf)) / 2;
+	p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2;
 	p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
 
 	term_word(p, title);