=================================================================== RCS file: /cvs/texi2mdoc/main.c,v retrieving revision 1.30 retrieving revision 1.32 diff -u -p -r1.30 -r1.32 --- texi2mdoc/main.c 2015/02/23 11:44:30 1.30 +++ texi2mdoc/main.c 2015/02/23 12:28:20 1.32 @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.30 2015/02/23 11:44:30 kristaps Exp $ */ +/* $Id: main.c,v 1.32 2015/02/23 12:28:20 kristaps Exp $ */ /* * Copyright (c) 2015 Kristaps Dzonsons * @@ -151,6 +151,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 */ @@ -455,7 +456,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; @@ -1077,7 +1078,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 +1352,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 +1414,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; }