===================================================================
RCS file: /cvs/mandoc/term.c,v
retrieving revision 1.130
retrieving revision 1.134
diff -u -p -r1.130 -r1.134
--- mandoc/term.c	2010/04/03 12:46:35	1.130
+++ mandoc/term.c	2010/05/15 16:18:23	1.134
@@ -1,4 +1,4 @@
-/*	$Id: term.c,v 1.130 2010/04/03 12:46:35 kristaps Exp $ */
+/*	$Id: term.c,v 1.134 2010/05/15 16:18:23 joerg Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -34,7 +34,7 @@
 #include "mdoc.h"
 #include "main.h"
 
-static	struct termp	 *term_alloc(enum termenc);
+static	struct termp	 *term_alloc(enum termenc, size_t);
 static	void		  term_free(struct termp *);
 static	void		  spec(struct termp *, const char *, size_t);
 static	void		  res(struct termp *, const char *, size_t);
@@ -45,10 +45,10 @@ static	void		  encode(struct termp *, const char *, si
 
 
 void *
-ascii_alloc(void)
+ascii_alloc(size_t width)
 {
 
-	return(term_alloc(TERMENC_ASCII));
+	return(term_alloc(TERMENC_ASCII, width));
 }
 
 
@@ -74,7 +74,7 @@ term_free(struct termp *p)
 
 
 static struct termp *
-term_alloc(enum termenc enc)
+term_alloc(enum termenc enc, size_t width)
 {
 	struct termp *p;
 
@@ -84,6 +84,10 @@ term_alloc(enum termenc enc)
 		exit(EXIT_FAILURE);
 	}
 	p->enc = enc;
+	/* Enforce some lower boundary. */
+	if (width < 60)
+		width = 60;
+	p->defrmargin = width - 2;
 	return(p);
 }
 
@@ -131,7 +135,6 @@ term_flushln(struct termp *p)
 	size_t		 vbl;   /* number of blanks to prepend to output */
 	size_t		 vsz;   /* visual characters to write to output */
 	size_t		 bp;    /* visual right border position */
-	size_t		 hyph;	/* visible position of hyphen */
 	int		 j;     /* temporary loop index */
 	size_t		 maxvis, mmax;
 
@@ -177,23 +180,16 @@ term_flushln(struct termp *p)
 		 * (starting with the CSI) aren't counted.  A space
 		 * generates a non-printing word, which is valid (the
 		 * space is printed according to regular spacing rules).
-		 * Collect the number of printable characters until the
-		 * first hyphen, if found.  Hyphens aren't included if
-		 * they're the first character (so `Fl' doesn't break)
-		 * or second consecutive character (`Fl -').
 		 */
 
 		/* LINTED */
-		for (j = i, vsz = 0, hyph = 0; j < (int)p->col; j++) {
+		for (j = i, vsz = 0; j < (int)p->col; j++) {
 			if (j && ' ' == p->buf[j]) 
 				break;
 			if (8 == p->buf[j])
 				vsz--;
 			else
 				vsz++;
-			if (j > i && '-' == p->buf[j] && 0 == hyph)
-			       if ('-' != p->buf[j - 1])
-					hyph = vsz;
 		}
 
 		/*
@@ -206,38 +202,11 @@ term_flushln(struct termp *p)
 
 		/*
 		 * Find out whether we would exceed the right margin.
-		 * If so, break to the next line, possibly after
-		 * emittign character up to a hyphen.  Otherwise, write
-		 * the chosen number of blanks.
+		 * If so, break to the next line.  Otherwise, write the chosen
+		 * number of blanks.
 		 */
 
 		if (vis && vis + vbl + vsz > bp) {
-			/*
-			 * Has a hyphen been found before the breakpoint
-			 * that we can use?
-			 */
-			if (hyph && vis + vbl + hyph <= bp) {
-				/* First prepend blanks. */
-				for (j = 0; j < (int)vbl; j++)
-					putchar(' ');
-				
-				/* Emit up to the character. */
-				do {
-					if (31 == p->buf[i])
-						putchar(' ');
-					else
-						putchar(p->buf[i]);
-					if (8 != p->buf[i])
-						vsz--;
-				} while ('-' != p->buf[i++]);
-
-				/* Emit trailing decoration. */
-				if (8 == p->buf[i]) {
-					putchar(p->buf[i]);
-					putchar(p->buf[i + 1]);
-				}
-			} 
-
 			putchar('\n');
 			if (TERMP_NOBREAK & p->flags) {
 				for (j = 0; j < (int)p->rmargin; j++)
@@ -480,12 +449,17 @@ term_word(struct termp *p, const char *word)
 			break;
 		}
 
-	if ( ! (TERMP_NOSPACE & p->flags))
+	if ( ! (TERMP_NOSPACE & p->flags)) {
 		bufferc(p, ' ');
+		if (TERMP_SENTENCE & p->flags)
+			bufferc(p, ' ');
+	}
 
 	if ( ! (p->flags & TERMP_NONOSPACE))
 		p->flags &= ~TERMP_NOSPACE;
 
+	p->flags &= ~TERMP_SENTENCE;
+
 	/* FIXME: use strcspn. */
 
 	while (*word) {
@@ -526,10 +500,12 @@ term_word(struct termp *p, const char *word)
 			p->flags |= TERMP_NOSPACE;
 	}
 
+	/* 
+	 * Note that we don't process the pipe: the parser sees it as
+	 * punctuation, but we don't in terms of typography.
+	 */
 	if (sv[0] && 0 == sv[1])
 		switch (sv[0]) {
-		case('|'):
-			/* FALLTHROUGH */
 		case('('):
 			/* FALLTHROUGH */
 		case('['):