=================================================================== RCS file: /cvs/texi2mdoc/main.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -p -r1.34 -r1.35 --- texi2mdoc/main.c 2015/02/23 14:36:03 1.34 +++ texi2mdoc/main.c 2015/02/23 15:09:09 1.35 @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.34 2015/02/23 14:36:03 kristaps Exp $ */ +/* $Id: main.c,v 1.35 2015/02/23 15:09:09 kristaps Exp $ */ /* * Copyright (c) 2015 Kristaps Dzonsons * @@ -106,6 +106,7 @@ static const struct texitok __texitoks[TEXICMD__MAX] = { doinline, "code", 4 }, /* TEXICMD_CODE */ { dosymbol, ":", 1 }, /* TEXICMD_COLON */ { NULL, "columnfractions", 15 }, /* TEXICMD_COLUMNFRACTIONS */ + { dosymbol, "comma", 5 }, /* TEXICMD_COMMA */ { doinline, "command", 7 }, /* TEXICMD_COMMAND */ { doignline, "c", 1 }, /* TEXICMD_COMMENT */ { doignline, "comment", 7 }, /* TEXICMD_COMMENT_LONG */ @@ -225,6 +226,7 @@ static const struct texitok __texitoks[TEXICMD__MAX] = { dosection, "section", 7 }, /* TEXICMD_SECTION */ { dovalue, "set", 3 }, /* TEXICMD_SET */ { doignline, "setchapternewpage", 17 }, /* TEXICMD_SETCHAPNEWPAGE */ + { doignline, "setcontentsaftertitlepage", 25 }, /* TEXICMD_SETCONTENTSAFTER */ { doignline, "setfilename", 11 }, /* TEXICMD_SETFILENAME */ { dotitle, "settitle", 8 }, /* TEXICMD_SETTITLE */ { doignline, "shortcontents", 13 }, /* TEXICMD_SHORTCONTENTS */ @@ -239,6 +241,7 @@ static const struct texitok __texitoks[TEXICMD__MAX] = { dodisplay, "smallindentblock", 16 }, /* TEXICMD_SMALLINDENTBLOCK */ { dosymbol, "{", 1 }, /* TEXICMD_SQUIGGLE_LEFT */ { dosymbol, "}", 1 }, /* TEXICMD_SQUIGGLE_RIGHT */ + { dosymbol, "ss", 2 }, /* TEXICMD_SS */ { doinline, "strong", 6 }, /* TEXICMD_STRONG */ { dosubsection, "subheading", 10 }, /* TEXICMD_SUBHEADING */ { dosubsection, "subsection", 10 }, /* TEXICMD_SUBSECTION */ @@ -254,6 +257,7 @@ static const struct texitok __texitoks[TEXICMD__MAX] = { dotable, "table", 5 }, /* TEXICMD_TABLE */ { doignblock, "tex", 3 }, /* TEXICMD_TEX */ { dosymbol, "TeX", 3 }, /* TEXICMD_TEXSYM */ + { dosymbol, "tie", 3 }, /* TEXICMD_TIE */ { doaccent, "~", 1 }, /* TEXICMD_TILDE */ { doignline, "tindex", 6 }, /* TEXICMD_TINDEX */ { doignline, "title", 5 }, /* TEXICMD_TITLE */ @@ -323,6 +327,7 @@ dodefn(struct texi *p, enum texicmd cmd, blk = NULL; switch (cmd) { case (TEXICMD_DEFFN): + case (TEXICMD_DEFMAC): case (TEXICMD_DEFTP): case (TEXICMD_DEFTYPEFN): case (TEXICMD_DEFTYPEFUN): @@ -1010,6 +1015,9 @@ dosymbol(struct texi *p, enum texicmd cmd, case (TEXICMD_BULLET): texiputchars(p, "\\(bu"); break; + case (TEXICMD_COMMA): + texiputchar(p, ','); + break; case (TEXICMD_COPYRIGHT): texiputchars(p, "\\(co"); break; @@ -1044,14 +1052,20 @@ dosymbol(struct texi *p, enum texicmd cmd, case (TEXICMD_SLASH): texiputchar(p, '/'); break; + case (TEXICMD_SS): + texiputchars(p, "\\(ss"); + break; case (TEXICMD_SQUIGGLE_LEFT): texiputchars(p, "{"); break; case (TEXICMD_SQUIGGLE_RIGHT): texiputchars(p, "}"); break; - case (TEXICMD_TEXSYM): + case (TEXICMD_TIE): texiputchars(p, "TeX"); + break; + case (TEXICMD_TEXSYM): + texiputchars(p, "\\ "); break; case (TEXICMD_COLON): case (TEXICMD_HYPHEN):