===================================================================
RCS file: /cvs/texi2mdoc/main.c,v
retrieving revision 1.61
retrieving revision 1.63
diff -u -p -r1.61 -r1.63
--- texi2mdoc/main.c	2015/03/05 08:35:35	1.61
+++ texi2mdoc/main.c	2015/03/05 15:18:13	1.63
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.61 2015/03/05 08:35:35 kristaps Exp $ */
+/*	$Id: main.c,v 1.63 2015/03/05 15:18:13 kristaps Exp $ */
 /*
  * Copyright (c) 2015 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -544,9 +544,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 +755,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 +884,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 +1034,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 +1050,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
@@ -1668,7 +1674,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
@@ -1722,7 +1727,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)
@@ -1819,9 +1823,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 +1854,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 +1869,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;
 }