===================================================================
RCS file: /cvs/texi2mdoc/main.c,v
retrieving revision 1.30
retrieving revision 1.33
diff -u -p -r1.30 -r1.33
--- texi2mdoc/main.c	2015/02/23 11:44:30	1.30
+++ texi2mdoc/main.c	2015/02/23 12:39:59	1.33
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.30 2015/02/23 11:44:30 kristaps Exp $ */
+/*	$Id: main.c,v 1.33 2015/02/23 12:39:59 kristaps Exp $ */
 /*
  * Copyright (c) 2015 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -74,6 +74,7 @@ static	void dotab(struct texi *, enum texicmd, const c
 static	void dotitle(struct texi *, enum texicmd, const char *, size_t, size_t *);
 static	void dovalue(struct texi *, enum texicmd, const char *, size_t, size_t *);
 static	void doverb(struct texi *, enum texicmd, const char *, size_t, size_t *);
+static	void doverbatim(struct texi *, enum texicmd, const char *, size_t, size_t *);
 static	void doverbinclude(struct texi *, enum texicmd, const char *, size_t, size_t *);
 
 static	const struct texitok __texitoks[TEXICMD__MAX] = {
@@ -151,6 +152,7 @@ static	const struct texitok __texitoks[TEXICMD__MAX] =
 	{ doinline, "file", 4 }, /* TEXICMD_FILE */
 	{ doignline, "finalout", 8 }, /* TEXICMD_FINALOUT */
 	{ doignline, "findex", 6 }, /* TEXICMD_FINDEX */
+	{ doignbracket, "footnote", 8 }, /* TEXICMD_FOOTNOTE */
 	{ dotable, "ftable", 6 }, /* TEXICMD_FTABLE */
 	{ dodisplay, "format", 6 }, /* TEXICMD_FORMAT */
 	{ doaccent, "`", 1 }, /* TEXICMD_GRAVE */
@@ -261,7 +263,8 @@ static	const struct texitok __texitoks[TEXICMD__MAX] =
 	{ dolink, "url", 3 }, /* TEXICMD_URL */
 	{ dovalue, "value", 5 }, /* TEXICMD_VALUE */
 	{ doinline, "var", 3 }, /* TEXICMD_VAR */
-	{ doverb, "verbatim", 8 }, /* TEXICMD_VERBATIM */
+	{ doverb, "verb", 4 }, /* TEXICMD_VERB */
+	{ doverbatim, "verbatim", 8 }, /* TEXICMD_VERBATIM */
 	{ doverbinclude, "verbatiminclude", 15 }, /* TEXICMD_VERBATIMINCLUDE */
 	{ doignline, "vindex", 6 }, /* TEXICMD_VINDEX */
 	{ dosp, "vskip", 5 }, /* TEXICMD_VSKIP */
@@ -455,7 +458,7 @@ domacro(struct texi *p, enum texicmd cmd, 
 	memcpy(m.key, &buf[start], end - start);
 	m.key[end - start] = '\0';
 
-	m.args = argparse(p, buf, sz, pos, &m.argsz);
+	m.args = argparse(p, buf, sz, pos, &m.argsz, 0);
 	advanceeoln(p, buf, sz, pos, 0);
 
 	start = *pos;
@@ -587,6 +590,42 @@ static void
 doverb(struct texi *p, enum texicmd cmd, 
 	const char *buf, size_t sz, size_t *pos)
 {
+	char	 delim;
+
+	while (*pos < sz && isws(buf[*pos]))
+		advance(p, buf, pos);
+	if (*pos == sz || '{' != buf[*pos])
+		return;
+	advance(p, buf, pos);
+	if (*pos == sz)
+		return;
+
+	delim = buf[*pos];
+	advance(p, buf, pos);
+	/* Make sure we flush out our initial whitespace... */
+	if (p->seenws && p->outcol && 0 == p->literal)
+		texiputchar(p, ' ');
+	p->seenws = 0;
+	/* Read until we see the delimiter then end-brace. */
+	while (*pos < sz - 1) {
+		if (buf[*pos] == delim && buf[*pos + 1] == '}') 
+			break;
+		texiputchar(p, buf[*pos]);
+		advance(p, buf, pos);
+	}
+	if (*pos == sz - 1)
+		return;
+	/* Make sure we read after the end-brace. */
+	assert(delim == buf[*pos]);
+	advance(p, buf, pos);
+	assert('}' == buf[*pos]);
+	advance(p, buf, pos);
+}
+
+static void
+doverbatim(struct texi *p, enum texicmd cmd, 
+	const char *buf, size_t sz, size_t *pos)
+{
 	const char	*end, *term;
 	size_t		 endsz, endpos;
 
@@ -1077,7 +1116,7 @@ dovalue(struct texi *p, enum texicmd cmd, 
 			if (64 == p->valstackpos) 
 				texierr(p, "too many nested values");
 			p->valstack[p->valstackpos++] = cp;
-			parseeof(p, cp, strlen(cp));
+			parsemembuf(p, cp, strlen(cp));
 			p->valstackpos--;
 		} else
 			texiputchars(p, "{No value}");
@@ -1351,10 +1390,16 @@ domultitable(struct texi *p, enum texicmd cmd, 
 	const char *buf, size_t sz, size_t *pos)
 {
 	enum texilist	sv = p->list;
+	int		svliteral = p->literal;
 	enum texicmd	type;
 	size_t		i, end, columns;
 
 	p->list = TEXILIST_TABLE;
+	/* 
+	 * TS/TE blocks aren't "in mdoc(7)", so we can disregard the
+	 * fact that we're in literal mode right now.
+	 */
+	p->literal = 0;
 	teximacro(p, "TS");
 	columns = 0;
 
@@ -1407,6 +1452,7 @@ domultitable(struct texi *p, enum texicmd cmd, 
 	parseto(p, buf, sz, pos, texitoks[cmd].tok);
 	p->outmacro--;
 	teximacro(p, "TE");
+	p->literal = svliteral;
 	p->list = sv;
 }