===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.63
retrieving revision 1.71
diff -u -p -r1.63 -r1.71
--- mandoc/man.c	2010/05/08 08:36:44	1.63
+++ mandoc/man.c	2010/05/16 00:04:46	1.71
@@ -1,4 +1,4 @@
-/*	$Id: man.c,v 1.63 2010/05/08 08:36:44 kristaps Exp $ */
+/*	$Id: man.c,v 1.71 2010/05/16 00:04:46 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -32,7 +32,6 @@
 
 const	char *const __man_merrnames[WERRMAX] = {		 
 	"invalid character", /* WNPRINT */
-	"invalid manual section", /* WMSEC */
 	"invalid date format", /* WDATE */
 	"scope of prior line violated", /* WLNSCOPE */
 	"over-zealous prior line scope violation", /* WLNSCOPE2 */
@@ -50,8 +49,6 @@ const	char *const __man_merrnames[WERRMAX] = {		 
 	"no scope context", /* WNOSCOPE */
 	"literal context already open", /* WOLITERAL */
 	"no literal context open", /* WNLITERAL */
-	"invalid nesting of roff declarations", /* WROFFNEST */
-	"scope in roff instructions broken", /* WROFFSCOPE */
 	"document title should be uppercase", /* WTITLECASE */
 	"deprecated comment style", /* WBADCOMMENT */
 };
@@ -65,9 +62,7 @@ const	char *const __man_macronames[MAN_MAX] = {		 
 	"RI",		"na",		"i",		"sp",
 	"nf",		"fi",		"r",		"RE",
 	"RS",		"DT",		"UC",		"PD",
-	"Sp",		"Vb",		"Ve",		"de",
-	"dei",		"am",		"ami",		"ig",
-	".",
+	"Sp",		"Vb",		"Ve",
 	};
 
 const	char * const *man_macronames = __man_macronames;
@@ -156,7 +151,7 @@ int
 man_parseln(struct man *m, int ln, char *buf)
 {
 
-	return('.' == *buf || '\'' == *buf ? 
+	return(('.' == *buf || '\'' == *buf) ? 
 			man_pmacro(m, ln, buf) : 
 			man_ptext(m, ln, buf));
 }
@@ -174,6 +169,8 @@ man_free1(struct man *man)
 		free(man->meta.source);
 	if (man->meta.vol)
 		free(man->meta.vol);
+	if (man->meta.msec)
+		free(man->meta.msec);
 }
 
 
@@ -404,8 +401,7 @@ man_ptext(struct man *m, int line, char *buf)
 	assert(i);
 
 	if (' ' == buf[i - 1] || '\t' == buf[i - 1]) {
-		assert(i > 1);
-		if ('\\' != buf[i - 2])
+		if (i > 1 && '\\' != buf[i - 2])
 			if ( ! man_pwarn(m, line, i - 1, WTSPACE))
 				return(0);
 
@@ -413,7 +409,6 @@ man_ptext(struct man *m, int line, char *buf)
 			/* Spin back to non-space. */ ;
 
 		/* Jump ahead of escaped whitespace. */
-		assert(i);
 		i += '\\' == buf[i] ? 2 : 1;
 
 		buf[i] = '\0';
@@ -422,6 +417,19 @@ man_ptext(struct man *m, int line, char *buf)
 	if ( ! man_word_alloc(m, line, 0, buf))
 		return(0);
 
+	/*
+	 * End-of-sentence check.  If the last character is an unescaped
+	 * EOS character, then flag the node as being the end of a
+	 * sentence.  The front-end will know how to interpret this.
+	 */
+
+	/* FIXME: chain of close delims. */
+
+	assert(i);
+
+	if (mandoc_eos(buf, (size_t)i))
+		m->last->flags |= MAN_EOS;
+
 descope:
 	/*
 	 * Co-ordinate what happens with having a next-line scope open:
@@ -537,9 +545,6 @@ man_pmacro(struct man *m, int ln, char *buf)
 	 * Remove prior ELINE macro, as it's being clobbering by a new
 	 * macro.  Note that NSCOPED macros do not close out ELINE
 	 * macros---they don't print text---so we let those slip by.
-	 * NOTE: we don't allow roff blocks (NOCLOSE) to be embedded
-	 * here because that would stipulate blocks as children of
-	 * elements!
 	 */
 
 	if ( ! (MAN_NSCOPED & man_macros[tok].flags) &&