=================================================================== RCS file: /cvs/texi2mdoc/main.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- texi2mdoc/main.c 2015/02/19 08:09:55 1.14 +++ texi2mdoc/main.c 2015/02/19 09:28:42 1.15 @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.14 2015/02/19 08:09:55 kristaps Exp $ */ +/* $Id: main.c,v 1.15 2015/02/19 09:28:42 kristaps Exp $ */ /* * Copyright (c) 2015 Kristaps Dzonsons * @@ -60,12 +60,26 @@ enum texicmd { TEXICMD_CONTENTS, TEXICMD_COPYING, TEXICMD_COPYRIGHT, + TEXICMD_DEFFN, + TEXICMD_DEFFNX, + TEXICMD_DEFMAC, + TEXICMD_DEFMACX, + TEXICMD_DEFTP, + TEXICMD_DEFTPX, TEXICMD_DEFTYPEFN, TEXICMD_DEFTYPEFNX, TEXICMD_DEFTYPEFUN, TEXICMD_DEFTYPEFUNX, TEXICMD_DEFTYPEVAR, + TEXICMD_DEFTYPEVARX, TEXICMD_DEFTYPEVR, + TEXICMD_DEFTYPEVRX, + TEXICMD_DEFUN, + TEXICMD_DEFUNX, + TEXICMD_DEFVAR, + TEXICMD_DEFVARX, + TEXICMD_DEFVR, + TEXICMD_DEFVRX, TEXICMD_DETAILMENU, TEXICMD_DFN, TEXICMD_DIRCATEGORY, @@ -77,6 +91,7 @@ enum texicmd { TEXICMD_END, TEXICMD_ENUMERATE, TEXICMD_ENV, + TEXICMD_ERROR, TEXICMD_EXAMPLE, TEXICMD_FILE, TEXICMD_GROUP, @@ -108,6 +123,7 @@ enum texicmd { TEXICMD_LATEX, TEXICMD_MATH, TEXICMD_MENU, + TEXICMD_NEED, TEXICMD_NEWLINE, TEXICMD_NODE, TEXICMD_NOINDENT, @@ -119,6 +135,7 @@ enum texicmd { TEXICMD_PRINTINDEX, TEXICMD_R, TEXICMD_REF, + TEXICMD_RESULT, TEXICMD_SAMP, TEXICMD_SANSSERIF, TEXICMD_SC, @@ -226,8 +243,7 @@ struct texi { static void doblock(struct texi *, enum texicmd, const char *, size_t, size_t *); static void dobracket(struct texi *, enum texicmd, const char *, size_t, size_t *); static void dobye(struct texi *, enum texicmd, const char *, size_t, size_t *); -static void dodeftypefun(struct texi *, enum texicmd, const char *, size_t, size_t *); -static void dodeftypevar(struct texi *, enum texicmd, const char *, size_t, size_t *); +static void dodefn(struct texi *, enum texicmd, const char *, size_t, size_t *); 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 *); @@ -276,12 +292,26 @@ static const struct texitok texitoks[TEXICMD__MAX] = { { doignline, "contents", 8 }, /* TEXICMD_CONTENTS */ { doignblock, "copying", 7 }, /* TEXICMD_COPYING */ { dosymbol, "copyright", 9 }, /* TEXICMD_COPYRIGHT */ - { dodeftypefun, "deftypefn", 9 }, /* TEXICMD_DEFTYPEFN */ - { dodeftypefun, "deftypefnx", 10 }, /* TEXICMD_DEFTYPEFNX */ - { dodeftypefun, "deftypefun", 10 }, /* TEXICMD_DEFTYPEFUN */ - { dodeftypefun, "deftypefunx", 11 }, /* TEXICMD_DEFTYPEFUNX */ - { dodeftypevar, "deftypevar", 10 }, /* TEXICMD_DEFTYPEVAR */ - { dodeftypevar, "deftypevr", 9 }, /* TEXICMD_DEFTYPEVR */ + { dodefn, "deffn", 5 }, /* TEXICMD_DEFFN */ + { dodefn, "deffnx", 6 }, /* TEXICMD_DEFFNX */ + { dodefn, "defmac", 6 }, /* TEXICMD_DEFMAC */ + { dodefn, "defmacx", 7 }, /* TEXICMD_DEFMACX */ + { dodefn, "deftp", 5 }, /* TEXICMD_DEFTP */ + { dodefn, "deftpx", 6 }, /* TEXICMD_DEFTPX */ + { dodefn, "deftypefn", 9 }, /* TEXICMD_DEFTYPEFN */ + { dodefn, "deftypefnx", 10 }, /* TEXICMD_DEFTYPEFNX */ + { dodefn, "deftypefun", 10 }, /* TEXICMD_DEFTYPEFUN */ + { dodefn, "deftypefunx", 11 }, /* TEXICMD_DEFTYPEFUNX */ + { dodefn, "deftypevar", 10 }, /* TEXICMD_DEFTYPEVAR */ + { dodefn, "deftypevarx", 11 }, /* TEXICMD_DEFTYPEVARX */ + { dodefn, "deftypevr", 9 }, /* TEXICMD_DEFTYPEVR */ + { dodefn, "deftypevrx", 10 }, /* TEXICMD_DEFTYPEVRX */ + { dodefn, "defun", 5 }, /* TEXICMD_DEFUN */ + { dodefn, "defunx", 6 }, /* TEXICMD_DEFUNX */ + { dodefn, "defvar", 6 }, /* TEXICMD_DEFVAR */ + { dodefn, "defvarx", 7 }, /* TEXICMD_DEFVARX */ + { dodefn, "defvr", 5 }, /* TEXICMD_DEFVR */ + { dodefn, "defvrx", 6 }, /* TEXICMD_DEFVRX */ { doignblock, "detailmenu", 10 }, /* TEXICMD_DETAILMENU */ { dofont, "dfn", 3 }, /* TEXICMD_DFN */ { doignline, "dircategory", 11 }, /* TEXICMD_DIRCATEGORY */ @@ -293,6 +323,7 @@ static const struct texitok texitoks[TEXICMD__MAX] = { { NULL, "end", 3 }, /* TEXICMD_END */ { doenumerate, "enumerate", 9 }, /* TEXICMD_ENUMERATE */ { doinline, "env", 3 }, /* TEXICMD_ENV */ + { dosymbol, "error", 5 }, /* TEXICMD_ERROR */ { doexample, "example", 7 }, /* TEXICMD_EXAMPLE */ { doinline, "file", 4 }, /* TEXICMD_FILE */ { doblock, "group", 5 }, /* TEXICMD_GROUP */ @@ -324,6 +355,7 @@ static const struct texitok texitoks[TEXICMD__MAX] = { { dosymbol, "LaTeX", 5 }, /* TEXICMD_LATEX */ { domath, "math", 4 }, /* TEXICMD_MATH */ { doignblock, "menu", 4 }, /* TEXICMD_MENU */ + { doignline, "need", 4 }, /* TEXICMD_NEED */ { dosymbol, "\n", 1 }, /* TEXICMD_NEWLINE */ { doignline, "node", 4 }, /* TEXICMD_NODE */ { doignline, "noindent", 8 }, /* TEXICMD_NOINDENT */ @@ -335,6 +367,7 @@ static const struct texitok texitoks[TEXICMD__MAX] = { { doignline, "printindex", 10 }, /* TEXICMD_PRINTINDEX */ { dofont, "r", 1 }, /* TEXICMD_R */ { dobracket, "ref", 3 }, /* TEXICMD_REF */ + { dosymbol, "result", 6 }, /* TEXICMD_RESULT */ { dofont, "samp", 4 }, /* TEXICMD_SAMP */ { dofont, "sansserif", 9 }, /* TEXICMD_SANSSERIF */ { dobracket, "sc", 2 }, /* TEXICMD_SC */ @@ -941,6 +974,25 @@ parsesingle(struct texi *p, const char *buf, size_t sz (*texitoks[cmd].fp)(p, cmd, buf, sz, pos); } +static int +parselinearg(struct texi *p, const char *buf, size_t sz, size_t *pos) +{ + + while (*pos < sz && isws(buf[*pos])) { + p->seenws = 1; + advance(p, buf, pos); + } + + if (*pos < sz && '{' == buf[*pos]) + parsebracket(p, buf, sz, pos); + else if ('\n' != buf[*pos]) + parsesingle(p, buf, sz, pos); + else + return(0); + + return(1); +} + /* * Parse til the end of the buffer. */ @@ -1049,41 +1101,22 @@ parsefile(struct texi *p, const char *fname) } static void -dodeftypevar(struct texi *p, enum texicmd cmd, +dodefn(struct texi *p, enum texicmd cmd, const char *buf, size_t sz, size_t *pos) { const char *blk; - blk = TEXICMD_DEFTYPEVR == cmd ? - "deftypevr" : "deftypevar"; - - if (p->ign) { - parseto(p, buf, sz, pos, blk); - return; - } - - texivspace(p); - if (TEXICMD_DEFTYPEVR == cmd) { - parsebracket(p, buf, sz, pos); - texiputchars(p, ":\n"); - } - teximacroopen(p, "Vt"); - parseeoln(p, buf, sz, pos); - teximacroclose(p); - texivspace(p); - parseto(p, buf, sz, pos, blk); -} - -static void -dodeftypefun(struct texi *p, enum texicmd cmd, - const char *buf, size_t sz, size_t *pos) -{ - const char *blk; - blk = NULL; switch (cmd) { + case (TEXICMD_DEFFN): + case (TEXICMD_DEFTP): case (TEXICMD_DEFTYPEFN): case (TEXICMD_DEFTYPEFUN): + case (TEXICMD_DEFTYPEVAR): + case (TEXICMD_DEFTYPEVR): + case (TEXICMD_DEFUN): + case (TEXICMD_DEFVAR): + case (TEXICMD_DEFVR): blk = texitoks[cmd].tok; break; default: @@ -1091,33 +1124,100 @@ dodeftypefun(struct texi *p, enum texicmd cmd, } if (p->ign) { - if (NULL != blk) - parseto(p, buf, sz, pos, blk); + NULL != blk ? + parseto(p, buf, sz, pos, blk) : + parseeoln(p, buf, sz, pos); return; } + if (NULL != blk) + texivspace(p); + switch (cmd) { - case (TEXICMD_DEFTYPEFN): + case (TEXICMD_DEFMAC): + case (TEXICMD_DEFMACX): + texiputchars(p, "Macro"); + break; + case (TEXICMD_DEFTYPEVAR): + case (TEXICMD_DEFTYPEVARX): + case (TEXICMD_DEFVAR): + case (TEXICMD_DEFVARX): + texiputchars(p, "Variable"); + break; case (TEXICMD_DEFTYPEFUN): - texivspace(p); + case (TEXICMD_DEFTYPEFUNX): + case (TEXICMD_DEFUN): + case (TEXICMD_DEFUNX): + texiputchars(p, "Function"); break; default: + parselinearg(p, buf, sz, pos); break; } - if (TEXICMD_DEFTYPEFN == cmd || - TEXICMD_DEFTYPEFNX == cmd) { - parsebracket(p, buf, sz, pos); - texiputchars(p, ":\n"); + + texiputchars(p, ":\n"); + + switch (cmd) { + case (TEXICMD_DEFMAC): + case (TEXICMD_DEFMACX): + teximacroopen(p, "Dv"); + while (parselinearg(p, buf, sz, pos)) + /* Spin. */ ; + teximacroclose(p); + break; + case (TEXICMD_DEFFN): + case (TEXICMD_DEFFNX): + case (TEXICMD_DEFUN): + case (TEXICMD_DEFUNX): + teximacroopen(p, "Fo"); + parselinearg(p, buf, sz, pos); + teximacroclose(p); + teximacroopen(p, "Fa"); + while (parselinearg(p, buf, sz, pos)) + /* Spin. */ ; + teximacroclose(p); + teximacro(p, "Fc"); + break; + case (TEXICMD_DEFTYPEFUN): + case (TEXICMD_DEFTYPEFUNX): + case (TEXICMD_DEFTYPEFN): + case (TEXICMD_DEFTYPEFNX): + teximacroopen(p, "Ft"); + parselinearg(p, buf, sz, pos); + teximacroclose(p); + teximacroopen(p, "Fo"); + parselinearg(p, buf, sz, pos); + teximacroclose(p); + teximacroopen(p, "Fa"); + while (parselinearg(p, buf, sz, pos)) + /* Spin. */ ; + teximacroclose(p); + teximacro(p, "Fc"); + break; + case (TEXICMD_DEFTP): + case (TEXICMD_DEFTPX): + case (TEXICMD_DEFTYPEVAR): + case (TEXICMD_DEFTYPEVARX): + case (TEXICMD_DEFTYPEVR): + case (TEXICMD_DEFTYPEVRX): + teximacroopen(p, "Vt"); + while (parselinearg(p, buf, sz, pos)) + /* Spin. */ ; + teximacroclose(p); + break; + case (TEXICMD_DEFVAR): + case (TEXICMD_DEFVARX): + case (TEXICMD_DEFVR): + case (TEXICMD_DEFVRX): + teximacroopen(p, "Va"); + while (parselinearg(p, buf, sz, pos)) + /* Spin. */ ; + teximacroclose(p); + break; + default: + abort(); } - teximacroopen(p, "Ft"); - parsesingle(p, buf, sz, pos); - teximacroclose(p); - teximacroopen(p, "Fn"); - parsesingle(p, buf, sz, pos); - teximacroclose(p); - teximacroopen(p, "Li"); - parseeoln(p, buf, sz, pos); - teximacroclose(p); + texivspace(p); if (NULL != blk) parseto(p, buf, sz, pos, blk); @@ -1351,11 +1451,17 @@ dosymbol(struct texi *p, enum texicmd cmd, case (TEXICMD_DOTS): texiputchars(p, "..."); break; + case (TEXICMD_ERROR): + texiputchars(p, "error\\(->"); + break; case (TEXICMD_LATEX): texiputchars(p, "LaTeX"); break; case (TEXICMD_QUESTIONMARK): texiputchar(p, '?'); + break; + case (TEXICMD_RESULT): + texiputchars(p, "\\(rA"); break; case (TEXICMD_SQUIGGLE_LEFT): texiputchars(p, "{");