texi2mdoc: First stab at properly handling the superfluous `Pp' problem:

texi2mdoc: First stab at properly handling the superfluous `Pp' problem:

[kristaps]

Log Message:
-----------
First stab at properly handling the superfluous `Pp' problem: when we 
encounter a double-newline while parsing words, remember that this has
happened.
Then, when we're parsing a subsequent word with that flag set, start with
a `Pp'.
Printing macros will automatically disable the newline status.

Modified Files:
--------------
    texi2mdoc:
        main.c
        util.c

Revision Data
-------------
Index: main.c
===================================================================
RCS file: /home/cvs/mdocml/texi2mdoc/main.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -Lmain.c -Lmain.c -u -p -r1.61 -r1.62
--- main.c
+++ main.c
@@ -544,9 +544,9 @@ dodefn(struct texi *p, enum texicmd cmd,
 		break;
 	}
 	teximacro(p, "Bd -filled -offset indent");
-	p->seenvs = 1;
 	parseto(p, pos, blk);
 	teximacro(p, "Ed");
+	p->seenvs = 1;
 }
 
 static void
@@ -880,6 +880,7 @@ doverbatim(struct texi *p, enum texicmd 
 		advance(p, pos);
 	}
 	teximacro(p, "Ed");
+	p->seenvs = 1;
 	if (*pos < BUFSZ(p))
 		advanceto(p, pos, endpos + endsz);
 }
@@ -1029,9 +1030,9 @@ dodisplay(struct texi *p, enum texicmd c
 		break;
 	}
 
-	p->seenvs = 1;
 	parseto(p, pos, texitoks[cmd].tok);
 	teximacro(p, "Ed");
+	p->seenvs = 1;
 }
 
 static void
@@ -1045,6 +1046,7 @@ doexample(struct texi *p, enum texicmd c
 	parseto(p, pos, texitoks[cmd].tok);
 	p->literal--;
 	teximacro(p, "Ed");
+	p->seenvs = 1;
 }
 
 static void
@@ -1668,7 +1670,6 @@ dosection(struct texi *p, enum texicmd c
 	teximacroopen(p, sects[sec]);
 	parseeoln(p, pos);
 	teximacroclose(p);
-	p->seenvs = 1;
 }
 
 static void
@@ -1722,7 +1723,6 @@ doitem(struct texi *p, enum texicmd cmd,
 	}
 
 	/* Trick so we don't start with Pp. */
-	p->seenvs = 1;
 	parseeoln(p, pos);
 
 	if (TEXILIST_ITEM == p->list)
@@ -1819,9 +1819,9 @@ dotable(struct texi *p, enum texicmd cmd
 
 	p->list = TEXILIST_ITEM;
 	teximacro(p, "Bl -tag -width Ds");
-	p->seenvs = 1;
 	parseto(p, pos, texitoks[cmd].tok);
 	teximacro(p, "El");
+	p->seenvs = 1;
 	p->list = sv;
 }
 
@@ -1850,9 +1850,9 @@ doenumerate(struct texi *p, enum texicmd
 
 	p->list = TEXILIST_NOITEM;
 	teximacro(p, "Bl -enum");
-	p->seenvs = 1;
 	parseto(p, pos, texitoks[cmd].tok);
 	teximacro(p, "El");
+	p->seenvs = 1;
 	p->list = sv;
 }
 
@@ -1865,9 +1865,9 @@ doitemize(struct texi *p, enum texicmd c
 
 	p->list = TEXILIST_NOITEM;
 	teximacro(p, "Bl -bullet");
-	p->seenvs = 1;
 	parseto(p, pos, texitoks[cmd].tok);
 	teximacro(p, "El");
+	p->seenvs = 1;
 	p->list = sv;
 }
 
Index: util.c
===================================================================
RCS file: /home/cvs/mdocml/texi2mdoc/util.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -Lutil.c -Lutil.c -u -p -r1.26 -r1.27
--- util.c
+++ util.c
@@ -191,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;
@@ -220,7 +219,6 @@ texiputchars(struct texi *p, const char 
 				((unsigned int)*s), p->outfile);
 	else
 		p->outcol += fputs(s, p->outfile);
-	p->seenvs = 0;
 }
 
 /*
@@ -251,6 +249,7 @@ teximacroclose(struct texi *p)
 		fputc('\n', p->outfile);
 		p->outcol = p->seenws = 0;
 	}
+	p->seenvs = 0;
 }
 
 /*
@@ -284,6 +283,7 @@ teximacroopen(struct texi *p, const char
 	p->outcol++;
 	p->outmacro++;
 	p->seenws = 0;
+	p->seenvs = 0;
 }
 
 /*
@@ -308,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;
 }
 
 /*
@@ -317,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");
 }
 
 /*
@@ -411,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);
@@ -571,6 +563,17 @@ parseword(struct texi *p, size_t *pos, c
 {
 
 	/*
+	 * 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.
@@ -609,6 +612,11 @@ parseword(struct texi *p, size_t *pos, c
 		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
@@ -1494,6 +1502,5 @@ teximdocopen(struct texi *p, size_t *pos
 	} else
 		texiputchars(p, "Unknown description");
 	teximacroclose(p);
-	p->seenvs = 1;
 }
 
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv