===================================================================
RCS file: /cvs/texi2mdoc/main.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- texi2mdoc/main.c	2015/02/18 15:30:31	1.10
+++ texi2mdoc/main.c	2015/02/18 16:35:49	1.11
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.10 2015/02/18 15:30:31 kristaps Exp $ */
+/*	$Id: main.c,v 1.11 2015/02/18 16:35:49 kristaps Exp $ */
 /*
  * Copyright (c) 2015 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -187,20 +187,20 @@ struct	texi {
 	size_t		  outcol; /* column in output line */
 	char		**dirs; /* texi directories */
 	size_t		  dirsz; /* number of texi directories */
+	char		 *title; /* title of document */
+	char		 *subtitle; /* subtitle of document */
+	/*
+	 * The following control what we output to the screen.
+	 * The complexity is required to accomodate for mdoc(7).
+	 */
 	enum texilist	  list; /* current list (set recursively) */
 	int		  outmacro; /* if >0, output is in line macro */
 	int		  seenws; /* ws has been seen (and ignored) */
+	int		  seenvs; /* newline has been Pp'd */
 	int		  ign; /* if >0, don't print anything */
 	int		  literal; /* if >0, literal context */
-	char		 *title; /* title of document */
-	char		 *subtitle; /* subtitle of document */
 };
 
-/* FIXME: FIND A BETTER WAY. */
-#define	ismpunct(_x) \
-	('.' == (_x) || \
-	 ',' == (_x) || \
-	 ';' == (_x))
 /* Texi disregards spaces and tabs. */
 #define	isws(_x) \
 	(' ' == (_x) || '\t' == (_x))
@@ -447,6 +447,7 @@ texiputchar(struct texi *p, char c)
 	if (p->ign)
 		return;
 	putchar(c);
+	p->seenvs = 0;
 	if ('\n' == c) {
 		p->outcol = 0;
 		p->seenws = 0;
@@ -519,6 +520,16 @@ teximacro(struct texi *p, const char *s)
 	texiputchar(p, '\n');
 }
 
+static void
+texivspace(struct texi *p)
+{
+
+	if (p->seenvs)
+		return;
+	teximacro(p, "Pp");
+	p->seenvs = 1;
+}
+
 /*
  * Advance by a single byte in the input stream.
  */
@@ -535,6 +546,40 @@ advance(struct texi *p, const char *buf, size_t *pos)
 	(*pos)++;
 }
 
+static void
+texipunctuate(struct texi *p, const char *buf, size_t sz, size_t *pos)
+{
+	size_t	 start, end;
+
+	if (1 != p->outmacro)
+		return;
+
+	for (start = end = *pos; end < sz; end++) {
+		switch (buf[end]) {
+		case (','):
+		case (')'):
+		case ('.'):
+		case ('"'):
+		case (':'):
+		case ('!'):
+		case ('?'):
+			continue;
+		default:
+			break;
+		}
+		break;
+	}
+	if (end == *pos)
+		return;
+	if (end + 1 == sz || ' ' == buf[end] || '\n' == buf[end]) {
+		for ( ; start < end; start++) {
+			texiputchar(p, ' ');
+			texiputchar(p, buf[start]);
+			advance(p, buf, pos);
+		}
+	}
+}
+
 /*
  * Advance to the next non-whitespace word in the input stream.
  * If we're in literal mode, then print all of the whitespace as we're
@@ -562,9 +607,8 @@ advancenext(struct texi *p, const char *buf, size_t sz
 		 * output a paragraph.
 		 * FIXME: this is stupid.
 		 */
-		if (*pos && '\n' == buf[*pos] && 
-			'\n' == buf[*pos - 1])
-			teximacro(p, "Pp");
+		if (*pos && '\n' == buf[*pos] && '\n' == buf[*pos - 1])
+			texivspace(p);
 		advance(p, buf, pos);
 	}
 	return(*pos);
@@ -991,7 +1035,7 @@ dodeftypevar(struct texi *p, enum texicmd cmd, 
 		return;
 	}
 
-	teximacro(p, "Pp");
+	texivspace(p);
 	if (TEXICMD_DEFTYPEVR == cmd) {
 		parsebracket(p, buf, sz, pos);
 		texiputchars(p, ":\n");
@@ -999,7 +1043,7 @@ dodeftypevar(struct texi *p, enum texicmd cmd, 
 	teximacroopen(p, "Vt");
 	parseeoln(p, buf, sz, pos);
 	teximacroclose(p);
-	teximacro(p, "Pp");
+	texivspace(p);
 	parseto(p, buf, sz, pos, blk);
 }
 
@@ -1028,7 +1072,7 @@ dodeftypefun(struct texi *p, enum texicmd cmd, 
 	switch (cmd) {
 	case (TEXICMD_DEFTYPEFN):
 	case (TEXICMD_DEFTYPEFUN):
-		teximacro(p, "Pp");
+		texivspace(p);
 		break;
 	default:
 		break;
@@ -1047,7 +1091,7 @@ dodeftypefun(struct texi *p, enum texicmd cmd, 
 	teximacroopen(p, "Li");
 	parseeoln(p, buf, sz, pos);
 	teximacroclose(p);
-	teximacro(p, "Pp");
+	texivspace(p);
 	if (NULL != blk)
 		parseto(p, buf, sz, pos, blk);
 }
@@ -1078,13 +1122,7 @@ doinline(struct texi *p, const char *buf, 
 	teximacroopen(p, macro);
 	p->seenws = 0;
 	parsebracket(p, buf, sz, pos);
-	if (*pos < sz - 1 && 
-		 ismpunct(buf[*pos]) && 
-		 ismspace(buf[*pos + 1])) {
-		texiputchar(p, ' ');
-		texiputchar(p, buf[*pos]);
-		advance(p, buf, pos);
-	}
+	texipunctuate(p, buf, sz, pos);
 	teximacroclose(p);
 }
 
@@ -1211,6 +1249,7 @@ dodisplay(struct texi *p, enum texicmd cmd, 
 {
 
 	teximacro(p, "Bd -display -offset indent");
+	p->seenvs = 1;
 	advanceeoln(p, buf, sz, pos, 1);
 	parseto(p, buf, sz, pos, "display");
 	teximacro(p, "Ed");
@@ -1394,14 +1433,7 @@ dolink(struct texi *p, enum texicmd cmd, 
 		c = parsearg(p, buf, sz, pos, 1);
 	p->ign--;
 
-	if (*pos < sz - 1 && 
-		 ismpunct(buf[*pos]) && 
-		 ismspace(buf[*pos + 1])) {
-		texiputchar(p, ' ');
-		texiputchar(p, buf[*pos]);
-		advance(p, buf, pos);
-	}
-
+	texipunctuate(p, buf, sz, pos);
 	teximacroclose(p);
 }
 
@@ -1423,11 +1455,11 @@ dosubsection(struct texi *p, enum texicmd cmd, 
 		const char *buf, size_t sz, size_t *pos)
 {
 
-	teximacro(p, "Pp");
+	texivspace(p);
 	teximacroopen(p, "Em");
 	parseeoln(p, buf, sz, pos);
 	teximacroclose(p);
-	teximacro(p, "Pp");
+	texivspace(p);
 }
 
 static void
@@ -1443,6 +1475,7 @@ dosection(struct texi *p, enum texicmd cmd, 
 	teximacroopen(p, "Ss");
 	parseeoln(p, buf, sz, pos);
 	teximacroclose(p);
+	p->seenvs = 1;
 }
 
 static void
@@ -1450,7 +1483,7 @@ dosp(struct texi *p, enum texicmd cmd, 
 	const char *buf, size_t sz, size_t *pos)
 {
 
-	teximacro(p, "Pp");
+	texivspace(p);
 	advanceeoln(p, buf, sz, pos, 1);
 }
 
@@ -1467,6 +1500,7 @@ dochapter(struct texi *p, enum texicmd cmd, 
 	teximacroopen(p, "Sh");
 	parseeoln(p, buf, sz, pos);
 	teximacroclose(p);
+	p->seenvs = 1;
 }
 
 static void
@@ -1481,13 +1515,13 @@ dotop(struct texi *p, enum texicmd cmd, 
 	strftime(date, sizeof(date), "%F", localtime(&t));
 
 	p->ign--;
-	advanceeoln(p, buf, sz, pos, 1);
 	teximacroopen(p, "Dd");
 	texiputchars(p, date);
 	teximacroclose(p);
 	teximacroopen(p, "Dt");
 	for (cp = p->title; '\0' != *cp; cp++)
 		texiputchar(p, toupper(*cp));
+	texiputchars(p, " 7");
 	teximacroclose(p);
 	teximacro(p, "Os");
 	teximacro(p, "Sh NAME");
@@ -1498,6 +1532,8 @@ dotop(struct texi *p, enum texicmd cmd, 
 	texiputchars(p, NULL != p->subtitle ?
 		p->subtitle : "Unknown description");
 	teximacroclose(p);
+	p->seenvs = 1;
+	dochapter(p, cmd, buf, sz, pos);
 }
 
 static void
@@ -1518,9 +1554,10 @@ doitem(struct texi *p, enum texicmd cmd, 
 		teximacro(p, "It");
 		break;
 	default:
-		teximacro(p, "Pp");
+		texivspace(p);
 		break;
 	}
+	p->seenvs = 1;
 
 	parseeoln(p, buf, sz, pos);
 
@@ -1538,6 +1575,7 @@ dotable(struct texi *p, enum texicmd cmd, 
 
 	p->list = TEXILIST_ITEM;
 	teximacro(p, "Bl -tag -width Ds");
+	p->seenvs = 1;
 	parseto(p, buf, sz, pos, "table");
 	teximacro(p, "El");
 	p->list = sv;
@@ -1551,6 +1589,7 @@ doenumerate(struct texi *p, enum texicmd cmd, 
 
 	p->list = TEXILIST_NOITEM;
 	teximacro(p, "Bl -enum");
+	p->seenvs = 1;
 	parseto(p, buf, sz, pos, "enumerate");
 	teximacro(p, "El");
 	p->list = sv;
@@ -1564,6 +1603,7 @@ doitemize(struct texi *p, enum texicmd cmd, 
 
 	p->list = TEXILIST_ITEM;
 	teximacro(p, "Bl -bullet");
+	p->seenvs = 1;
 	parseto(p, buf, sz, pos, "itemize");
 	teximacro(p, "El");
 	p->list = sv;