=================================================================== RCS file: /cvs/texi2mdoc/main.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- texi2mdoc/main.c 2015/02/19 16:15:17 1.20 +++ texi2mdoc/main.c 2015/02/19 16:35:54 1.21 @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.20 2015/02/19 16:15:17 kristaps Exp $ */ +/* $Id: main.c,v 1.21 2015/02/19 16:35:54 kristaps Exp $ */ /* * Copyright (c) 2015 Kristaps Dzonsons * @@ -277,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 *); @@ -312,7 +311,7 @@ static const struct texitok texitoks[TEXICMD__MAX] = { { 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 */ @@ -320,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 */ @@ -351,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 */ @@ -375,7 +374,7 @@ static const struct texitok texitoks[TEXICMD__MAX] = { { 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 */ @@ -398,7 +397,7 @@ static const struct texitok texitoks[TEXICMD__MAX] = { { doitem, "item", 4 }, /* TEXICMD_ITEM */ { doitemize, "itemize", 7 }, /* TEXICMD_ITEMIZE */ { doitem, "itemx", 5 }, /* TEXICMD_ITEMX */ - { dofont, "kbd", 3 }, /* TEXICMD_KBD */ + { doinline, "kbd", 3 }, /* TEXICMD_KBD */ { dobracket, "key", 3 }, /* TEXICMD_KEY */ { doignline, "kindex", 6 }, /* TEXICMD_KINDEX */ { dosymbol, "LaTeX", 5 }, /* TEXICMD_LATEX */ @@ -416,18 +415,18 @@ 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 */ @@ -437,12 +436,12 @@ static const struct texitok texitoks[TEXICMD__MAX] = { { 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 */ { doignline, "syncodeindex", 12 }, /* TEXICMD_SYNCODEINDEX */ - { dofont, "t", 1 }, /* TEXICMD_T */ + { doinline, "t", 1 }, /* TEXICMD_T */ { dotab, "tab", 3 }, /* TEXICMD_TAB */ { dosymbol, "\t", 1 }, /* TEXICMD_TABSYM */ { dotable, "table", 5 }, /* TEXICMD_TABLE */ @@ -1349,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; @@ -1371,7 +1387,7 @@ doinline(struct texi *p, enum texicmd cmd, abort(); } - if (p->literal) { + if (NULL == macro || p->literal) { parsebracket(p, buf, sz, pos); return; } @@ -1471,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) { @@ -1834,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); @@ -2075,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. */