===================================================================
RCS file: /cvs/texi2mdoc/main.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- texi2mdoc/main.c	2015/03/03 15:04:24	1.59
+++ texi2mdoc/main.c	2015/03/05 08:18:56	1.60
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.59 2015/03/03 15:04:24 kristaps Exp $ */
+/*	$Id: main.c,v 1.60 2015/03/05 08:18:56 kristaps Exp $ */
 /*
  * Copyright (c) 2015 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -342,6 +342,12 @@ static	const struct texitok __texitoks[TEXICMD__MAX] =
 
 const	struct texitok *const texitoks = __texitoks;
 
+/*
+ * Texinfo has lots of indexes.
+ * You can add new ones in a variety of ways.
+ * We maintain an array of all of these index names (usually a few
+ * letters) and pass unknown commands through the array list.
+ */
 static void
 dodefindex(struct texi *p, enum texicmd cmd, size_t *pos)
 {
@@ -350,7 +356,6 @@ dodefindex(struct texi *p, enum texicmd cmd, size_t *p
 
 	while (*pos < BUFSZ(p) && isws(BUF(p)[*pos]))
 		advance(p, pos);
-
 	start = end = *pos;
 	while (end < BUFSZ(p) && ! ismspace(BUF(p)[end]))
 		end++;
@@ -358,18 +363,21 @@ dodefindex(struct texi *p, enum texicmd cmd, size_t *p
 	if (start == end) {
 		advanceeoln(p, pos, 1);
 		return;
-	} else if (NULL == (cp = malloc(end - start + 1)))
+	} 
+	
+	if (NULL == (cp = malloc(end - start + 1)))
 		texiabort(p, NULL);
-
 	memcpy(cp, &BUF(p)[start], end - start);
 	cp[end - start] = '\0';
 
+	/* FIXME: use reallocarray(). */
 	p->indexs = realloc(p->indexs, 
 		sizeof(char *) * (p->indexsz + 1));
-
 	if (NULL == p->indexs)
 		texiabort(p, NULL);
 	p->indexs[p->indexsz++] = cp;
+
+	advanceeoln(p, pos, 1);
 }
 
 static void