===================================================================
RCS file: /cvs/texi2mdoc/util.c,v
retrieving revision 1.23
retrieving revision 1.28
diff -u -p -r1.23 -r1.28
--- texi2mdoc/util.c	2015/03/02 18:12:53	1.23
+++ texi2mdoc/util.c	2015/03/05 15:18:13	1.28
@@ -1,4 +1,4 @@
-/*	$Id: util.c,v 1.23 2015/03/02 18:12:53 kristaps Exp $ */
+/*	$Id: util.c,v 1.28 2015/03/05 15:18:13 kristaps Exp $ */
 /*
  * Copyright (c) 2015 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -100,6 +100,7 @@ texiexit(struct texi *p)
 	free(p->dirs);
 	free(p->subtitle);
 	free(p->title);
+	free(p->copying);
 }
 
 /*
@@ -190,7 +191,6 @@ texiputchar(struct texi *p, char c)
 		fputc(c, p->outfile);
 	if ('\\' == c)
 		fputc('e', p->outfile);
-	p->seenvs = 0;
 	if ('\n' == c) {
 		p->outcol = 0;
 		p->seenws = 0;
@@ -219,7 +219,6 @@ texiputchars(struct texi *p, const char *s)
 				((unsigned int)*s), p->outfile);
 	else
 		p->outcol += fputs(s, p->outfile);
-	p->seenvs = 0;
 }
 
 /*
@@ -250,6 +249,7 @@ teximacroclose(struct texi *p)
 		fputc('\n', p->outfile);
 		p->outcol = p->seenws = 0;
 	}
+	p->seenvs = 0;
 }
 
 /*
@@ -283,6 +283,7 @@ teximacroopen(struct texi *p, const char *s)
 	p->outcol++;
 	p->outmacro++;
 	p->seenws = 0;
+	p->seenvs = 0;
 }
 
 /*
@@ -307,6 +308,7 @@ teximacro(struct texi *p, const char *s)
 	fputs(s, p->outfile);
 	fputc('\n', p->outfile);
 	p->outcol = p->seenws = 0;
+	p->seenvs = 0;
 }
 
 /*
@@ -316,10 +318,8 @@ void
 texivspace(struct texi *p)
 {
 
-	if (p->seenvs || TEXILIST_TABLE == p->list)
-		return;
-	teximacro(p, "Pp");
-	p->seenvs = 1;
+	if (TEXILIST_TABLE != p->list)
+		teximacro(p, "Pp");
 }
 
 /*
@@ -410,13 +410,6 @@ advancenext(struct texi *p, size_t *pos)
 
 	while (*pos < BUFSZ(p) && ismspace(BUF(p)[*pos])) {
 		p->seenws = 1;
-		/* 
-		 * If it looks like we've printed a double-line, then
-		 * output a paragraph.
-		 * FIXME: this is stupid.
-		 */
-		if (*pos && '\n' == BUF(p)[*pos] && '\n' == BUF(p)[*pos - 1])
-			texivspace(p);
 		advance(p, pos);
 	}
 	return(*pos);
@@ -480,7 +473,7 @@ texiexecmacro(struct texi *p, struct teximacro *m, siz
 	 * The "sv" value was initialised at the start of the macro.
 	 */
 	if (sv > 0)
-		if (++p->files[p->filepos].depth > 64)
+		if (++p->files[p->filepos - 1].depth > 64)
 			texierr(p, "maximium recursive depth");
 
 	args = argparse(p, pos, &asz, m->argsz);
@@ -569,10 +562,27 @@ static void
 parseword(struct texi *p, size_t *pos, char extra)
 {
 
+	/*
+	 * If a prior word had a terminating double-newline, then begin
+	 * this text block with a `Pp'.
+	 * We don't do this if we're in a literal context (we'll print
+	 * out the newlines themselves) nor in a `TS' table.
+	 */
+	if (p->seenvs && 0 == p->literal && TEXILIST_TABLE != p->list)
+		teximacro(p, "Pp");
+
+	p->seenvs = 0;
+
+	/*
+	 * Some line control: if we (non-macro, non-literal) already
+	 * have more than 72 characters written to the screen, then
+	 * output a newline before getting started.
+	 */
 	if (p->seenws && 0 == p->outmacro && 
 		 p->outcol > 72 && 0 == p->literal)
 		texiputchar(p, '\n');
-	/* FIXME: abstract this: we use it elsewhere. */
+
+	/* Usual padding in the case of seen whitespace. */
 	if (p->seenws && p->outcol && 0 == p->literal)
 		texiputchar(p, ' ');
 
@@ -587,7 +597,26 @@ parseword(struct texi *p, size_t *pos, char extra)
 		}
 		if ('\0' != extra && BUF(p)[*pos] == extra)
 			return;
-		if (*pos < BUFSZ(p) - 1 && 
+
+		if (p->literal) {
+			texiputchar(p, BUF(p)[*pos]);
+			advance(p, pos);
+			continue;
+		}
+
+		if (*pos < BUFSZ(p) - 2 && 
+			 '-' == BUF(p)[*pos] && 
+			 '-' == BUF(p)[*pos + 1] && 
+			 '-' == BUF(p)[*pos + 2]) {
+			texiputchars(p, "\\(em");
+			advance(p, pos);
+			advance(p, pos);
+		} else if (*pos < BUFSZ(p) - 1 && 
+			 '-' == BUF(p)[*pos] && 
+			 '-' == BUF(p)[*pos + 1]) {
+			texiputchars(p, "\\(en");
+			advance(p, pos);
+		} else if (*pos < BUFSZ(p) - 1 && 
 			 '`' == BUF(p)[*pos] && 
 			 '`' == BUF(p)[*pos + 1]) {
 			texiputchars(p, "\\(lq");
@@ -599,8 +628,23 @@ parseword(struct texi *p, size_t *pos, char extra)
 			advance(p, pos);
 		} else
 			texiputchar(p, BUF(p)[*pos]);
+
 		advance(p, pos);
 	}
+
+	if (*pos + 1 < BUFSZ(p) && 
+		'\n' == BUF(p)[*pos] &&
+		'\n' == BUF(p)[*pos + 1])
+		p->seenvs = 1;
+
+	/* 
+	 * New sentence, new line:if we (non-macro, non-literal) see a
+	 * period at the end of the last printed word, then open a
+	 * newline.
+	 */
+	if (0 == p->literal && 0 == p->outmacro && 
+		*pos < BUFSZ(p) && '.' == BUF(p)[*pos - 1])
+		texiputchar(p, '\n');
 }
 
 /*
@@ -1478,6 +1522,5 @@ teximdocopen(struct texi *p, size_t *pos)
 	} else
 		texiputchars(p, "Unknown description");
 	teximacroclose(p);
-	p->seenvs = 1;
 }