===================================================================
RCS file: /cvs/texi2mdoc/util.c,v
retrieving revision 1.21
retrieving revision 1.27
diff -u -p -r1.21 -r1.27
--- texi2mdoc/util.c	2015/03/01 13:39:51	1.21
+++ texi2mdoc/util.c	2015/03/05 09:36:41	1.27
@@ -1,4 +1,4 @@
-/*	$Id: util.c,v 1.21 2015/03/01 13:39:51 kristaps Exp $ */
+/*	$Id: util.c,v 1.27 2015/03/05 09:36:41 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);
 }
 
 /*
@@ -184,10 +185,12 @@ texiputchar(struct texi *p, char c)
 	if ('\'' == c && 0 == p->outcol)
 		fputs("\\&", p->outfile);
 
-	fputc(c, p->outfile);
+	if (p->uppercase)
+		fputc(toupper((unsigned int)c), p->outfile);
+	else
+		fputc(c, p->outfile);
 	if ('\\' == c)
 		fputc('e', p->outfile);
-	p->seenvs = 0;
 	if ('\n' == c) {
 		p->outcol = 0;
 		p->seenws = 0;
@@ -210,8 +213,12 @@ texiputchars(struct texi *p, const char *s)
 		fputs("\\&", p->outfile);
 	if ('\'' == *s && 0 == p->outcol)
 		fputs("\\&", p->outfile);
-	p->outcol += fputs(s, p->outfile);
-	p->seenvs = 0;
+	if (p->uppercase) 
+		for ( ; '\0' != *s; s++)
+			p->outcol += fputc(toupper
+				((unsigned int)*s), p->outfile);
+	else
+		p->outcol += fputs(s, p->outfile);
 }
 
 /*
@@ -242,6 +249,7 @@ teximacroclose(struct texi *p)
 		fputc('\n', p->outfile);
 		p->outcol = p->seenws = 0;
 	}
+	p->seenvs = 0;
 }
 
 /*
@@ -275,6 +283,7 @@ teximacroopen(struct texi *p, const char *s)
 	p->outcol++;
 	p->outmacro++;
 	p->seenws = 0;
+	p->seenvs = 0;
 }
 
 /*
@@ -299,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;
 }
 
 /*
@@ -308,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");
 }
 
 /*
@@ -362,6 +370,7 @@ texipunctuate(struct texi *p, size_t *pos)
 		case ('.'):
 		case ('"'):
 		case (':'):
+		case (';'):
 		case ('!'):
 		case ('?'):
 			continue;
@@ -401,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);
@@ -415,15 +417,18 @@ advancenext(struct texi *p, size_t *pos)
 
 /*
  * Advance to the EOLN in the input stream.
- * NOTE: THIS SHOULD NOT BE CALLED ON BLANK TEXT, as it will read up to
- * the @\n.
+ * This will skip over '@' markers in an effort to ignore escaped
+ * newlines.
  */
 size_t
 advanceeoln(struct texi *p, size_t *pos, int consumenl)
 {
 
-	while (*pos < BUFSZ(p) && '\n' != BUF(p)[*pos])
+	while (*pos < BUFSZ(p) && '\n' != BUF(p)[*pos]) {
+		if ('@' == BUF(p)[*pos])
+			advance(p, pos);
 		advance(p, pos);
+	}
 	if (*pos < BUFSZ(p) && consumenl)
 		advance(p, pos);
 	return(*pos);
@@ -452,8 +457,13 @@ texiexecmacro(struct texi *p, struct teximacro *m, siz
 	const char	 *cp;
 
 	/* Disregard empty macros. */
-	if (0 == (valsz = realsz = strlen(m->value)))
+	if (0 == (valsz = realsz = strlen(m->value))) {
+		args = argparse(p, pos, &asz, m->argsz);
+		for (i = 0; i < asz; i++)
+			free(args[i]);
+		free(args);
 		return;
+	}
 
 	/*
 	 * This is important: it protect us from macros that invoke more
@@ -463,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);
@@ -552,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, ' ');
 
@@ -584,6 +611,20 @@ parseword(struct texi *p, size_t *pos, char extra)
 			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');
 }
 
 /*
@@ -607,7 +648,7 @@ texicmd(const struct texi *p, size_t pos, size_t *end,
 		return(TEXICMD__MAX);
 
 	/* Alphabetic commands are special. */
-	if ( ! isalpha((unsigned char)BUF(p)[pos])) {
+	if ( ! isalpha((unsigned int)BUF(p)[pos])) {
 		if ((*end = pos + 1) == BUFSZ(p))
 			return(TEXICMD__MAX);
 		for (i = 0; i < TEXICMD__MAX; i++) {
@@ -1369,26 +1410,32 @@ teximdocclose(struct texi *p, int last)
 
 	/* Print a reference to the "top" node. */
 	if (p->chapnum > 1) {
+		texiputchars(p, "Top node,");
 		snprintf(buf, sizeof(buf), "node1 7");
 		teximacroopen(p, "Xr ");
 		texiputchars(p, buf);
-		texiputchars(p, " ,");
+		texiputchars(p, " ;");
 		teximacroclose(p);
 	}
 
 	/* Print a reference to the previous node. */
 	if (p->chapnum > 2) {
+		texiputchars(p, "previous node,");
 		snprintf(buf, sizeof(buf),
 			"node%zu 7", p->chapnum - 1);
 		teximacroopen(p, "Xr ");
 		texiputchars(p, buf);
 		if ( ! last) 
-			texiputchars(p, " ,");
+			texiputchars(p, " ;");
 		teximacroclose(p);
 	} 
 
 	/* Print a reference to the next node. */
 	if ( ! last) {
+		if (1 == p->chapnum)
+			texiputchars(p, "Next node,");
+		else
+			texiputchars(p, "next node,");
 		snprintf(buf, sizeof(buf),
 			"node%zu 7", p->chapnum + 1);
 		teximacroopen(p, "Xr ");
@@ -1455,6 +1502,5 @@ teximdocopen(struct texi *p, size_t *pos)
 	} else
 		texiputchars(p, "Unknown description");
 	teximacroclose(p);
-	p->seenvs = 1;
 }