===================================================================
RCS file: /cvs/mandoc/man_term.c,v
retrieving revision 1.8
retrieving revision 1.11
diff -u -p -r1.8 -r1.11
--- mandoc/man_term.c	2009/04/12 19:45:26	1.8
+++ mandoc/man_term.c	2009/06/11 12:07:49	1.11
@@ -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.11 2009/06/11 12:07:49 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
@@ -292,7 +292,9 @@ 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");
 	return(0);
 }
 
@@ -495,7 +497,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);