===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.119
retrieving revision 1.121
diff -u -p -r1.119 -r1.121
--- mandoc/mdoc_term.c	2010/05/09 16:38:38	1.119
+++ mandoc/mdoc_term.c	2010/05/12 16:01:01	1.121
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.119 2010/05/09 16:38:38 kristaps Exp $ */
+/*	$Id: mdoc_term.c,v 1.121 2010/05/12 16:01:01 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -337,6 +337,9 @@ print_mdoc_node(DECL_ARGS)
 		if (termacts[n->tok].post)
 			(*termacts[n->tok].post)(p, &npair, m, n);
 
+	if (MDOC_EOS & n->flags)
+		p->flags |= TERMP_SENTENCE;
+
 	p->offset = offset;
 	p->rmargin = rmargin;
 }
@@ -1659,7 +1662,7 @@ termp_bd_pre(DECL_ARGS)
 
 	rm = p->rmargin;
 	rmax = p->maxrmargin;
-	p->rmargin = p->maxrmargin = 100000; /* FIXME */
+	p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
 
 	for (nn = n->child; nn; nn = nn->next) {
 		p->flags |= TERMP_NOSPACE;
@@ -1695,7 +1698,7 @@ termp_bd_post(DECL_ARGS)
 	rmax = p->maxrmargin;
 
 	if (MDOC_Literal == type || MDOC_Unfilled == type)
-		p->rmargin = p->maxrmargin = 100000; /* FIXME */
+		p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
 
 	p->flags |= TERMP_NOSPACE;
 	term_flushln(p);