===================================================================
RCS file: /cvs/texi2mdoc/main.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- texi2mdoc/main.c	2015/02/19 15:40:44	1.19
+++ texi2mdoc/main.c	2015/02/19 16:15:17	1.20
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.19 2015/02/19 15:40:44 kristaps Exp $ */
+/*	$Id: main.c,v 1.20 2015/02/19 16:15:17 kristaps Exp $ */
 /*
  * Copyright (c) 2015 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -42,6 +42,7 @@ enum	texicmd {
 	TEXICMD_ANCHOR,
 	TEXICMD_APPENDIX,
 	TEXICMD_APPENDIXSEC,
+	TEXICMD_APPENDIXSUBSEC,
 	TEXICMD_ASTERISK,
 	TEXICMD_AT,
 	TEXICMD_AUTHOR,
@@ -99,6 +100,9 @@ enum	texicmd {
 	TEXICMD_EXPANSION,
 	TEXICMD_FILE,
 	TEXICMD_FINALOUT,
+	TEXICMD_FINDEX,
+	TEXICMD_FTABLE,
+	TEXICMD_FORMAT,
 	TEXICMD_GRAVE,
 	TEXICMD_GROUP,
 	TEXICMD_HEADING,
@@ -127,8 +131,10 @@ enum	texicmd {
 	TEXICMD_INSERTCOPYING,
 	TEXICMD_ITEM,
 	TEXICMD_ITEMIZE,
-	TEXICMD_KEY,
+	TEXICMD_ITEMX,
 	TEXICMD_KBD,
+	TEXICMD_KEY,
+	TEXICMD_KINDEX,
 	TEXICMD_LATEX,
 	TEXICMD_MATH,
 	TEXICMD_MENU,
@@ -161,12 +167,15 @@ enum	texicmd {
 	TEXICMD_SMALLBOOK,
 	TEXICMD_SMALLDISPLAY,
 	TEXICMD_SMALLEXAMPLE,
+	TEXICMD_SMALLFORMAT,
 	TEXICMD_SMALLINDENTBLOCK,
 	TEXICMD_SQUIGGLE_LEFT,
 	TEXICMD_SQUIGGLE_RIGHT,
 	TEXICMD_STRONG,
+	TEXICMD_SUBHEADING,
 	TEXICMD_SUBSECTION,
 	TEXICMD_SUBTITLE,
+	TEXICMD_SYNCODEINDEX,
 	TEXICMD_T,
 	TEXICMD_TAB,
 	TEXICMD_TABSYM,
@@ -181,12 +190,14 @@ enum	texicmd {
 	TEXICMD_UMLAUT,
 	TEXICMD_UNNUMBERED,
 	TEXICMD_UNNUMBEREDSEC,
+	TEXICMD_UNNUMBEREDSUBSEC,
 	TEXICMD_UREF,
 	TEXICMD_URL,
 	TEXICMD_VAR,
 	TEXICMD_VERBATIMINCLUDE,
 	TEXICMD_VINDEX,
 	TEXICMD_VSKIP,
+	TEXICMD_VTABLE,
 	TEXICMD_W,
 	TEXICMD_XREF,
 	TEXICMD__MAX
@@ -290,12 +301,14 @@ static	void dotitle(struct texi *, enum texicmd, const
 static	void doverbinclude(struct texi *, enum texicmd, const char *, size_t, size_t *);
 
 static	const struct texitok texitoks[TEXICMD__MAX] = {
+	/* TEXICMD__BEGIN */
 	{ doignargn, "acronym", 7 }, /* TEXICMD_ACRONYM */
 	{ doaccent, "'", 1 }, /* TEXICMD_ACUTE */
 	{ doignline, "afourpaper", 10 }, /* TEXICMD_A4PAPER */
 	{ doignbracket, "anchor", 6 }, /* TEXICMD_ANCHOR */
 	{ dosection, "appendix", 8 }, /* TEXICMD_APPENDIX */
 	{ dosection, "appendixsec", 11 }, /* TEXICMD_APPENDIXSEC */
+	{ dosubsection, "appendixsubsec", 14 }, /* TEXICMD_APPENDIXSUBSEC */
 	{ dosymbol, "*", 1 }, /* TEXICMD_ASTERISK */
 	{ dosymbol, "@", 1 }, /* TEXICMD_AT */
 	{ doignline, "author", 6 }, /* TEXICMD_AUTHOR */
@@ -353,6 +366,9 @@ static	const struct texitok texitoks[TEXICMD__MAX] = {
 	{ dosymbol, "expansion", 9 }, /* TEXICMD_EXPANSION */
 	{ doinline, "file", 4 }, /* TEXICMD_FILE */
 	{ doignline, "finalout", 8 }, /* TEXICMD_FINALOUT */
+	{ doignline, "findex", 6 }, /* TEXICMD_FINDEX */
+	{ dotable, "ftable", 6 }, /* TEXICMD_FTABLE */
+	{ dodisplay, "format", 6 }, /* TEXICMD_FORMAT */
 	{ doaccent, "`", 1 }, /* TEXICMD_GRAVE */
 	{ doblock, "group", 5 }, /* TEXICMD_GROUP */
 	{ dosection, "heading", 7 }, /* TEXICMD_HEADING */
@@ -381,8 +397,10 @@ static	const struct texitok texitoks[TEXICMD__MAX] = {
 	{ doignline, "insertcopying", 13 }, /* TEXICMD_INSERTCOPYING */
 	{ doitem, "item", 4 }, /* TEXICMD_ITEM */
 	{ doitemize, "itemize", 7 }, /* TEXICMD_ITEMIZE */
-	{ dobracket, "key", 3 }, /* TEXICMD_KEY */
+	{ doitem, "itemx", 5 }, /* TEXICMD_ITEMX */
 	{ dofont, "kbd", 3 }, /* TEXICMD_KBD */
+	{ dobracket, "key", 3 }, /* TEXICMD_KEY */
+	{ doignline, "kindex", 6 }, /* TEXICMD_KINDEX */
 	{ dosymbol, "LaTeX", 5 }, /* TEXICMD_LATEX */
 	{ domath, "math", 4 }, /* TEXICMD_MATH */
 	{ doignblock, "menu", 4 }, /* TEXICMD_MENU */
@@ -415,12 +433,15 @@ static	const struct texitok texitoks[TEXICMD__MAX] = {
 	{ doignline, "smallbook", 9 }, /* TEXICMD_SMALLBOOK */
 	{ dodisplay, "smalldisplay", 12 }, /* TEXICMD_SMALLDISPLAY */
 	{ doexample, "smallexample", 12 }, /* TEXICMD_SMALLEXAMPLE */
+	{ dodisplay, "smallformat", 11 }, /* TEXICMD_SMALLFORMAT */
 	{ dodisplay, "smallindentblock", 16 }, /* TEXICMD_SMALLINDENTBLOCK */
 	{ dosymbol, "{", 1 }, /* TEXICMD_SQUIGGLE_LEFT */
 	{ dosymbol, "}", 1 }, /* TEXICMD_SQUIGGLE_RIGHT */
 	{ dofont, "strong", 6 }, /* TEXICMD_STRONG */
+	{ dosubsection, "subheading", 10 }, /* TEXICMD_SUBHEADING */
 	{ dosubsection, "subsection", 10 }, /* TEXICMD_SUBSECTION */
 	{ doignline, "subtitle", 8 }, /* TEXICMD_SUBTITLE */
+	{ doignline, "syncodeindex", 12 }, /* TEXICMD_SYNCODEINDEX */
 	{ dofont, "t", 1 }, /* TEXICMD_T */
 	{ dotab, "tab", 3 }, /* TEXICMD_TAB */
 	{ dosymbol, "\t", 1 }, /* TEXICMD_TABSYM */
@@ -435,14 +456,17 @@ static	const struct texitok texitoks[TEXICMD__MAX] = {
 	{ doaccent, "\"", 1 }, /* TEXICMD_UMLAUT */
 	{ dosection, "unnumbered", 10 }, /* TEXICMD_UNNUMBERED */
 	{ dosection, "unnumberedsec", 13 }, /* TEXICMD_UNNUMBEREDSEC */
+	{ dosubsection, "unnumberedsubsec", 16 }, /* TEXICMD_UNNUMBEREDSUBSEC */
 	{ dolink, "uref", 4 }, /* TEXICMD_UREF */
 	{ dolink, "url", 3 }, /* TEXICMD_URL */
 	{ doinline, "var", 3 }, /* TEXICMD_VAR */
 	{ doverbinclude, "verbatiminclude", 15 }, /* TEXICMD_VERBATIMINCLUDE */
 	{ doignline, "vindex", 6 }, /* TEXICMD_VINDEX */
 	{ dosp, "vskip", 5 }, /* TEXICMD_VSKIP */
+	{ dotable, "vtable", 6 }, /* TEXICMD_VTABLE */
 	{ dobracket, "w", 1 }, /* TEXICMD_W */
 	{ dolink, "xref", 4 }, /* TEXICMD_XREF */
+	/* TEXICMD__END */
 };
 
 /*
@@ -1498,7 +1522,16 @@ dodisplay(struct texi *p, enum texicmd cmd, 
 	const char *buf, size_t sz, size_t *pos)
 {
 
-	teximacro(p, "Bd -filled -offset indent");
+	switch (cmd) {
+	case (TEXICMD_FORMAT):
+	case (TEXICMD_SMALLFORMAT):
+		teximacro(p, "Bd -filled");
+		break;
+	default:
+		teximacro(p, "Bd -filled -offset indent");
+		break;
+	}
+
 	p->seenvs = 1;
 	/* FIXME: ignore and parseeoln. */
 	advanceeoln(p, buf, sz, pos, 1);
@@ -2015,7 +2048,7 @@ dotable(struct texi *p, enum texicmd cmd, 
 	/* FIXME: ignore and parseeoln. */
 	advanceeoln(p, buf, sz, pos, 1);
 	p->seenvs = 1;
-	parseto(p, buf, sz, pos, "table");
+	parseto(p, buf, sz, pos, texitoks[cmd].tok);
 	teximacro(p, "El");
 	p->list = sv;
 }