=================================================================== RCS file: /cvs/texi2mdoc/main.c,v retrieving revision 1.18 retrieving revision 1.22 diff -u -p -r1.18 -r1.22 --- texi2mdoc/main.c 2015/02/19 15:34:20 1.18 +++ texi2mdoc/main.c 2015/02/19 16:44:26 1.22 @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.18 2015/02/19 15:34:20 kristaps Exp $ */ +/* $Id: main.c,v 1.22 2015/02/19 16:44:26 kristaps Exp $ */ /* * Copyright (c) 2015 Kristaps Dzonsons * @@ -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 @@ -266,7 +277,6 @@ static void dodefn(struct texi *, enum texicmd, const static void dodisplay(struct texi *, enum texicmd, const char *, size_t, size_t *); static void doenumerate(struct texi *, enum texicmd, const char *, size_t, size_t *); static void doexample(struct texi *, enum texicmd, const char *, size_t, size_t *); -static void dofont(struct texi *, enum texicmd, const char *, size_t, size_t *); static void doignargn(struct texi *, enum texicmd, const char *, size_t, size_t *); static void doignblock(struct texi *, enum texicmd, const char *, size_t, size_t *); static void doignbracket(struct texi *, enum texicmd, const char *, size_t, size_t *); @@ -290,16 +300,18 @@ 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 */ - { dofont, "b", 1 }, /* TEXICMD_BOLD */ + { doinline, "b", 1 }, /* TEXICMD_BOLD */ { dosymbol, "!", 1 }, /* TEXICMD_BANG */ { dosymbol, "bullet", 6 }, /* TEXICMD_BULLET */ { dobye, "bye", 3 }, /* TEXICMD_BYE */ @@ -307,8 +319,8 @@ static const struct texitok texitoks[TEXICMD__MAX] = { { dosection, "chapter", 7 }, /* TEXICMD_CHAPTER */ { doignline, "cindex", 6 }, /* TEXICMD_CINDEX */ { doaccent, "^", 1 }, /* TEXICMD_CIRCUMFLEX */ - { dofont, "code", 4 }, /* TEXICMD_CODE */ - { dofont, "cite", 4 }, /* TEXICMD_CITE */ + { doinline, "code", 4 }, /* TEXICMD_CODE */ + { doinline, "cite", 4 }, /* TEXICMD_CITE */ { dosymbol, ":", 1 }, /* TEXICMD_COLON */ { NULL, "columnfractions", 15 }, /* TEXICMD_COLUMNFRACTIONS */ { doinline, "command", 7 }, /* TEXICMD_COMMAND */ @@ -338,13 +350,13 @@ static const struct texitok texitoks[TEXICMD__MAX] = { { dodefn, "defvr", 5 }, /* TEXICMD_DEFVR */ { dodefn, "defvrx", 6 }, /* TEXICMD_DEFVRX */ { doignblock, "detailmenu", 10 }, /* TEXICMD_DETAILMENU */ - { dofont, "dfn", 3 }, /* TEXICMD_DFN */ + { doinline, "dfn", 3 }, /* TEXICMD_DFN */ { doignline, "dircategory", 11 }, /* TEXICMD_DIRCATEGORY */ { doignblock, "direntry", 8 }, /* TEXICMD_DIRENTRY */ { dodisplay, "display", 7 }, /* TEXICMD_DISPLAY */ { dosymbol, "dots", 4 }, /* TEXICMD_DOTS */ { dolink, "email", 5 }, /* TEXICMD_EMAIL */ - { dofont, "emph", 4 }, /* TEXICMD_EMPH */ + { doinline, "emph", 4 }, /* TEXICMD_EMPH */ { NULL, "end", 3 }, /* TEXICMD_END */ { doenumerate, "enumerate", 9 }, /* TEXICMD_ENUMERATE */ { doinline, "env", 3 }, /* TEXICMD_ENV */ @@ -353,13 +365,16 @@ 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 */ { doignline, "headings", 8 }, /* TEXICMD_HEADINGS */ { doitem, "headitem", 8 }, /* TEXICMD_HEADITEM */ { dosymbol, "-", 1 }, /* TEXICMD_HYPHEN */ - { dofont, "i", 1 }, /* TEXICMD_I */ + { doinline, "i", 1 }, /* TEXICMD_I */ { doignblock, "ifclear", 7 }, /* TEXICMD_IFCLEAR */ { doignblock, "ifdocbook", 9 }, /* TEXICMD_IFDOCBOOK */ { doignblock, "ifhtml", 6 }, /* TEXICMD_IFHTML */ @@ -381,8 +396,10 @@ static const struct texitok texitoks[TEXICMD__MAX] = { { doignline, "insertcopying", 13 }, /* TEXICMD_INSERTCOPYING */ { doitem, "item", 4 }, /* TEXICMD_ITEM */ { doitemize, "itemize", 7 }, /* TEXICMD_ITEMIZE */ + { doitem, "itemx", 5 }, /* TEXICMD_ITEMX */ + { doinline, "kbd", 3 }, /* TEXICMD_KBD */ { dobracket, "key", 3 }, /* TEXICMD_KEY */ - { dofont, "kbd", 3 }, /* TEXICMD_KBD */ + { doignline, "kindex", 6 }, /* TEXICMD_KINDEX */ { dosymbol, "LaTeX", 5 }, /* TEXICMD_LATEX */ { domath, "math", 4 }, /* TEXICMD_MATH */ { doignblock, "menu", 4 }, /* TEXICMD_MENU */ @@ -398,30 +415,33 @@ static const struct texitok texitoks[TEXICMD__MAX] = { { doignline, "page", 4 }, /* TEXICMD_PAGE */ { doignline, "paragraphindent", 14 }, /* TEXICMD_PARINDENT */ { doignline, "printindex", 10 }, /* TEXICMD_PRINTINDEX */ - { dofont, "r", 1 }, /* TEXICMD_R */ + { doinline, "r", 1 }, /* TEXICMD_R */ { dobracket, "ref", 3 }, /* TEXICMD_REF */ { dosymbol, "result", 6 }, /* TEXICMD_RESULT */ - { dofont, "samp", 4 }, /* TEXICMD_SAMP */ - { dofont, "sansserif", 9 }, /* TEXICMD_SANSSERIF */ + { doinline, "samp", 4 }, /* TEXICMD_SAMP */ + { doinline, "sansserif", 9 }, /* TEXICMD_SANSSERIF */ { dobracket, "sc", 2 }, /* TEXICMD_SC */ { dosection, "section", 7 }, /* TEXICMD_SECTION */ { doignline, "set", 3 }, /* TEXICMD_SET */ { doignline, "setchapternewpage", 17 }, /* TEXICMD_SETCHAPNEWPAGE */ { doignline, "setfilename", 11 }, /* TEXICMD_SETFILENAME */ { dotitle, "settitle", 8 }, /* TEXICMD_SETTITLE */ - { dofont, "slanted", 7 }, /* TEXICMD_SLANTED */ + { doinline, "slanted", 7 }, /* TEXICMD_SLANTED */ { dosp, "sp", 2 }, /* TEXICMD_SP */ { dosymbol, " ", 1 }, /* TEXICMD_SPACE */ { 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 */ + { doinline, "strong", 6 }, /* TEXICMD_STRONG */ + { dosubsection, "subheading", 10 }, /* TEXICMD_SUBHEADING */ { dosubsection, "subsection", 10 }, /* TEXICMD_SUBSECTION */ { doignline, "subtitle", 8 }, /* TEXICMD_SUBTITLE */ - { dofont, "t", 1 }, /* TEXICMD_T */ + { doignline, "syncodeindex", 12 }, /* TEXICMD_SYNCODEINDEX */ + { doinline, "t", 1 }, /* TEXICMD_T */ { dotab, "tab", 3 }, /* TEXICMD_TAB */ { dosymbol, "\t", 1 }, /* TEXICMD_TABSYM */ { dotable, "table", 5 }, /* TEXICMD_TABLE */ @@ -435,14 +455,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 */ }; /* @@ -964,11 +987,11 @@ parseeoln(struct texi *p, const char *buf, size_t sz, size_t end; enum texicmd cmd; - assert(0 == p->literal); - while (*pos < sz && '\n' != buf[*pos]) { while (*pos < sz && isws(buf[*pos])) { p->seenws = 1; + if (p->literal) + texiputchar(p, buf[*pos]); advance(p, buf, pos); } switch (buf[*pos]) { @@ -1325,9 +1348,26 @@ static void doinline(struct texi *p, enum texicmd cmd, const char *buf, size_t sz, size_t *pos) { - const char *macro; + const char *macro = NULL; switch (cmd) { + case (TEXICMD_CODE): + case (TEXICMD_KBD): + case (TEXICMD_SAMP): + case (TEXICMD_T): + macro = "Li"; + break; + case (TEXICMD_CITE): + case (TEXICMD_DFN): + case (TEXICMD_EMPH): + case (TEXICMD_I): + case (TEXICMD_SLANTED): + macro = "Em"; + break; + case (TEXICMD_B): + case (TEXICMD_STRONG): + macro = "Sy"; + break; case (TEXICMD_COMMAND): macro = "Xr"; break; @@ -1344,10 +1384,10 @@ doinline(struct texi *p, enum texicmd cmd, macro = "Va"; break; default: - abort(); + break; } - if (p->literal) { + if (NULL == macro || p->literal) { parsebracket(p, buf, sz, pos); return; } @@ -1447,45 +1487,6 @@ doinclude(struct texi *p, enum texicmd cmd, } static void -dofont(struct texi *p, enum texicmd cmd, - const char *buf, size_t sz, size_t *pos) -{ - const char *font; - - switch (cmd) { - case (TEXICMD_B): - case (TEXICMD_STRONG): - font = "\\fB"; - break; - case (TEXICMD_CITE): - case (TEXICMD_DFN): - case (TEXICMD_EMPH): - case (TEXICMD_I): - case (TEXICMD_SLANTED): - font = "\\fI"; - break; - case (TEXICMD_CODE): - case (TEXICMD_KBD): - case (TEXICMD_R): - case (TEXICMD_SAMP): - case (TEXICMD_SANSSERIF): - case (TEXICMD_T): - font = "\\fR"; - break; - default: - abort(); - } - - if (p->seenws) { - texiputchar(p, ' '); - p->seenws = 0; - } - texiputchars(p, font); - parsebracket(p, buf, sz, pos); - texiputchars(p, "\\fP"); -} - -static void dobracket(struct texi *p, enum texicmd cmd, const char *buf, size_t sz, size_t *pos) { @@ -1498,7 +1499,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); @@ -1801,6 +1811,7 @@ dosubsection(struct texi *p, enum texicmd cmd, else if (p->literal) texierr(p, "\"Em\" in a literal scope!?"); + /* We don't have a subsubsection, so make one up. */ texivspace(p); teximacroopen(p, "Em"); parseeoln(p, buf, sz, pos); @@ -2015,7 +2026,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; } @@ -2042,7 +2053,7 @@ doitemize(struct texi *p, enum texicmd cmd, { enum texilist sv = p->list; - p->list = TEXILIST_ITEM; + p->list = TEXILIST_NOITEM; teximacro(p, "Bl -bullet"); p->seenvs = 1; /* FIXME: ignore and parseeoln. */