===================================================================
RCS file: /cvs/mandoc/mdoc.c,v
retrieving revision 1.128
retrieving revision 1.130
diff -u -p -r1.128 -r1.130
--- mandoc/mdoc.c	2010/05/12 16:01:01	1.128
+++ mandoc/mdoc.c	2010/05/13 06:22:11	1.130
@@ -1,4 +1,4 @@
-/*	$Id: mdoc.c,v 1.128 2010/05/12 16:01:01 kristaps Exp $ */
+/*	$Id: mdoc.c,v 1.130 2010/05/13 06:22:11 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -289,7 +289,9 @@ mdoc_parseln(struct mdoc *m, int ln, char *buf)
 	if (MDOC_HALT & m->flags)
 		return(0);
 
-	return('.' == *buf ? mdoc_pmacro(m, ln, buf) :
+	m->flags |= MDOC_NEWLINE;
+	return('.' == *buf ? 
+			mdoc_pmacro(m, ln, buf) :
 			mdoc_ptext(m, ln, buf));
 }
 
@@ -453,7 +455,9 @@ node_alloc(struct mdoc *m, int line, int pos, 
 	p->pos = pos;
 	p->tok = tok;
 	p->type = type;
-
+	if (MDOC_NEWLINE & m->flags)
+		p->flags |= MDOC_LINE;
+	m->flags &= ~MDOC_NEWLINE;
 	return(p);
 }
 
@@ -700,21 +704,9 @@ mdoc_ptext(struct mdoc *m, int line, char *buf)
 
 	assert(i);
 
-	switch (buf[i - 1]) {
-	case ('.'):
-		if (i > 1 && '\\' == buf[i - 2])
-			break;
-		/* FALLTHROUGH */
-	case ('!'):
-		/* FALLTHROUGH */
-	case ('?'):
+	if (mandoc_eos(buf, (size_t)i))
 		m->last->flags |= MDOC_EOS;
-		break;
-	default:
-		break;
 
-	}
-
 	return(1);
 }
 
@@ -738,7 +730,7 @@ int
 mdoc_pmacro(struct mdoc *m, int ln, char *buf)
 {
 	enum mdoct	tok;
-	int		i, j;
+	int		i, j, sv;
 	char		mac[5];
 
 	/* Empty lines are ignored. */
@@ -758,6 +750,8 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf)
 			return(1);
 	}
 
+	sv = i;
+
 	/* Copy the first word into a nil-terminated buffer. */
 
 	for (j = 0; j < 4; j++, i++) {
@@ -805,7 +799,7 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf)
 	 * Begin recursive parse sequence.  Since we're at the start of
 	 * the line, we don't need to do callable/parseable checks.
 	 */
-	if ( ! mdoc_macro(m, tok, ln, 1, &i, buf)) 
+	if ( ! mdoc_macro(m, tok, ln, sv, &i, buf)) 
 		goto err;
 
 	return(1);