===================================================================
RCS file: /cvs/texi2mdoc/main.c,v
retrieving revision 1.61
retrieving revision 1.64
diff -u -p -r1.61 -r1.64
--- texi2mdoc/main.c	2015/03/05 08:35:35	1.61
+++ texi2mdoc/main.c	2015/03/07 11:49:32	1.64
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.61 2015/03/05 08:35:35 kristaps Exp $ */
+/*	$Id: main.c,v 1.64 2015/03/07 11:49:32 kristaps Exp $ */
 /*
  * Copyright (c) 2015 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -61,6 +61,9 @@ static	void doitemize(struct texi *, enum texicmd, siz
 static	void dolink(struct texi *, enum texicmd, size_t *);
 static	void domacro(struct texi *, enum texicmd, size_t *);
 static	void domath(struct texi *, enum texicmd, size_t *);
+#if 0
+static	void domenu(struct texi *, enum texicmd, size_t *);
+#endif
 static	void domultitable(struct texi *, enum texicmd, size_t *);
 static	void doquotation(struct texi *, enum texicmd, size_t *);
 static	void dotable(struct texi *, enum texicmd, size_t *);
@@ -544,9 +547,9 @@ dodefn(struct texi *p, enum texicmd cmd, size_t *pos)
 		break;
 	}
 	teximacro(p, "Bd -filled -offset indent");
-	p->seenvs = 1;
 	parseto(p, pos, blk);
 	teximacro(p, "Ed");
+	p->seenvs = 1;
 }
 
 static void
@@ -755,11 +758,15 @@ doinline(struct texi *p, enum texicmd cmd, size_t *pos
 
 	teximacroopen(p, macro);
 	p->seenws = 0;
+	if (TEXICMD_CODE == cmd)
+		p->literal++;
 	if (TEXICMD_SC == cmd)
 		p->uppercase++;
 	parsebracket(p, pos, 0);
 	if (TEXICMD_SC == cmd)
 		p->uppercase--;
+	if (TEXICMD_CODE == cmd)
+		p->literal--;
 	texipunctuate(p, pos);
 	teximacroclose(p);
 }
@@ -880,6 +887,7 @@ doverbatim(struct texi *p, enum texicmd cmd, size_t *p
 		advance(p, pos);
 	}
 	teximacro(p, "Ed");
+	p->seenvs = 1;
 	if (*pos < BUFSZ(p))
 		advanceto(p, pos, endpos + endsz);
 }
@@ -1029,9 +1037,9 @@ dodisplay(struct texi *p, enum texicmd cmd, size_t *po
 		break;
 	}
 
-	p->seenvs = 1;
 	parseto(p, pos, texitoks[cmd].tok);
 	teximacro(p, "Ed");
+	p->seenvs = 1;
 }
 
 static void
@@ -1045,6 +1053,7 @@ doexample(struct texi *p, enum texicmd cmd, size_t *po
 	parseto(p, pos, texitoks[cmd].tok);
 	p->literal--;
 	teximacro(p, "Ed");
+	p->seenvs = 1;
 }
 
 static void
@@ -1445,7 +1454,118 @@ doquotation(struct texi *p, enum texicmd cmd, size_t *
 	teximacro(p, "Qc");
 }
 
+#if 0
 static void
+domenu(struct texi *p, enum texicmd cmd, size_t *pos)
+{
+	size_t	 start;
+
+	if (NULL != p->chapters) {
+		doignblock(p, cmd, pos);
+		return;
+	}
+
+	advanceeoln(p, pos, 1);
+
+	teximacro(p, "Bl -tag -width Ds");
+	while (*pos < BUFSZ(p)) {
+		/* Read to next menu item. */
+		while (*pos < BUFSZ(p) && ismspace(BUF(p)[*pos]))
+			advance(p, pos);
+		if ('*' != BUF(p)[*pos])
+			break;
+
+		assert('*' == BUF(p)[*pos]);
+		advance(p, pos);
+		while (*pos < BUFSZ(p) && ismspace(BUF(p)[*pos]))
+			advance(p, pos);
+		start = *pos;
+		while (*pos < BUFSZ(p) && ':' != BUF(p)[*pos])
+			advance(p, pos);
+		if (*pos == BUFSZ(p) || *pos == start) {
+			texiwarn(p, "empty menu name");
+			break;
+		}
+		teximacroopen(p, "It");
+		teximacroopen(p, "Sx");
+		for ( ; start < *pos; start++)
+			texiputchar(p, BUF(p)[start]);
+		teximacroclose(p);
+		teximacroclose(p);
+
+		advance(p, pos);
+		if (*pos == BUFSZ(p)) {
+			texiwarn(p, "bad menu syntax");
+			break;
+		} else if (':' != BUF(p)[*pos]) {
+			while (*pos < BUFSZ(p) && isws(BUF(p)[*pos]))
+				advance(p, pos);
+			start = *pos;
+			while (*pos < BUFSZ(p)) {
+				switch (BUF(p)[*pos]) {
+				case ('\t'):
+				case ('\n'):
+				case (','):
+					break;
+				case ('.'):
+					if (*pos + 1 == BUFSZ(p)) {
+						advance(p, pos);
+						continue;
+					} 
+					if (' ' == BUF(p)[*pos + 1]) {
+						advance(p, pos);
+						break;
+					}
+					/* FALLTHROUGH */
+				default:
+					advance(p, pos);
+					continue;
+				}
+				advance(p, pos);
+				break;
+			}
+		} else
+			advance(p, pos);
+
+		while (*pos < BUFSZ(p) && isws(BUF(p)[*pos]))
+			advance(p, pos);
+
+		if (*pos == BUFSZ(p)) {
+			texiwarn(p, "bad menu syntax");
+			break;
+		}
+
+		while (*pos < BUFSZ(p)) {
+			if ('*' == BUF(p)[*pos])
+				break;
+			if ('\n' != BUF(p)[*pos]) {
+				texiputchar(p, BUF(p)[*pos]);
+				advance(p, pos);
+				continue;
+			}
+			advance(p, pos);
+			while (*pos == BUFSZ(p)) {
+				texiwarn(p, "bad menu syntax");
+				break;
+			} 
+			if ('\n' == BUF(p)[*pos]) {
+				advance(p, pos);
+				break;
+			} else if ('*' == BUF(p)[*pos]) {
+				continue;
+			} else if ('@' == BUF(p)[*pos]) 
+				break;
+			texiputchar(p, ' ');
+		}
+	}
+
+	teximacro(p, "El");
+
+	doignblock(p, cmd, pos);
+}
+#endif
+
+static void
 domath(struct texi *p, enum texicmd cmd, size_t *pos)
 {
 
@@ -1668,7 +1788,6 @@ dosection(struct texi *p, enum texicmd cmd, size_t *po
 	teximacroopen(p, sects[sec]);
 	parseeoln(p, pos);
 	teximacroclose(p);
-	p->seenvs = 1;
 }
 
 static void
@@ -1700,7 +1819,8 @@ doitem(struct texi *p, enum texicmd cmd, size_t *pos)
 
 	/* Multitable is using raw tbl(7). */
 	if (TEXILIST_TABLE == p->list) {
-		texiputchar(p, '\n');
+		if (p->outcol > 0)
+			texiputchar(p, '\n');
 		return;
 	} 
 	
@@ -1722,7 +1842,6 @@ doitem(struct texi *p, enum texicmd cmd, size_t *pos)
 	}
 
 	/* Trick so we don't start with Pp. */
-	p->seenvs = 1;
 	parseeoln(p, pos);
 
 	if (TEXILIST_ITEM == p->list)
@@ -1736,7 +1855,7 @@ dotab(struct texi *p, enum texicmd cmd, size_t *pos)
 {
 
 	/* This command is only useful in @multitable. */
-	if (TEXILIST_TABLE == p->list)
+	if (TEXILIST_TABLE == p->list && p->outcol)
 		texiputchar(p, '\t');
 }
 
@@ -1748,6 +1867,7 @@ domultitable(struct texi *p, enum texicmd cmd, size_t 
 	enum texicmd	type;
 	size_t		i, end, columns;
 
+	texivspace(p);
 	p->list = TEXILIST_TABLE;
 	/* 
 	 * TS/TE blocks aren't "in mdoc(7)", so we can disregard the
@@ -1801,7 +1921,9 @@ domultitable(struct texi *p, enum texicmd cmd, size_t 
 			texiputchar(p, ' ');
 		texiputchar(p, 'l');
 	}
-	texiputchars(p, ".\n");
+
+	texiputchar(p, '.');
+	texiputchar(p, '\n');
 	p->outmacro++;
 	parseto(p, pos, texitoks[cmd].tok);
 	p->outmacro--;
@@ -1819,9 +1941,9 @@ dotable(struct texi *p, enum texicmd cmd, size_t *pos)
 
 	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 +1972,9 @@ doenumerate(struct texi *p, enum texicmd cmd, size_t *
 
 	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 +1987,9 @@ doitemize(struct texi *p, enum texicmd cmd, size_t *po
 
 	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;
 }