=================================================================== RCS file: /cvs/texi2mdoc/main.c,v retrieving revision 1.13 retrieving revision 1.19 diff -u -p -r1.13 -r1.19 --- texi2mdoc/main.c 2015/02/19 07:50:51 1.13 +++ texi2mdoc/main.c 2015/02/19 15:40:44 1.19 @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.13 2015/02/19 07:50:51 kristaps Exp $ */ +/* $Id: main.c,v 1.19 2015/02/19 15:40:44 kristaps Exp $ */ /* * Copyright (c) 2015 Kristaps Dzonsons * @@ -37,6 +37,7 @@ */ enum texicmd { TEXICMD_ACRONYM, + TEXICMD_ACUTE, TEXICMD_A4PAPER, TEXICMD_ANCHOR, TEXICMD_APPENDIX, @@ -51,21 +52,37 @@ enum texicmd { TEXICMD_CENTER, TEXICMD_CHAPTER, TEXICMD_CINDEX, + TEXICMD_CIRCUMFLEX, TEXICMD_CITE, TEXICMD_CODE, TEXICMD_COLON, + TEXICMD_COLUMNFRACTIONS, TEXICMD_COMMAND, TEXICMD_COMMENT, TEXICMD_COMMENT_LONG, 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,32 +94,50 @@ enum texicmd { TEXICMD_END, TEXICMD_ENUMERATE, TEXICMD_ENV, + TEXICMD_ERROR, TEXICMD_EXAMPLE, + TEXICMD_EXPANSION, TEXICMD_FILE, + TEXICMD_FINALOUT, + TEXICMD_GRAVE, TEXICMD_GROUP, TEXICMD_HEADING, TEXICMD_HEADINGS, + TEXICMD_HEADITEM, TEXICMD_HYPHEN, TEXICMD_I, TEXICMD_IFCLEAR, + TEXICMD_IFDOCBOOK, TEXICMD_IFHTML, TEXICMD_IFINFO, + TEXICMD_IFNOTDOCBOOK, + TEXICMD_IFNOTHTML, + TEXICMD_IFNOTINFO, + TEXICMD_IFNOTPLAINTEXT, TEXICMD_IFNOTTEX, + TEXICMD_IFNOTXML, + TEXICMD_IFPLAINTEXT, TEXICMD_IFTEX, TEXICMD_IFSET, + TEXICMD_IFXML, + TEXICMD_IGNORE, TEXICMD_IMAGE, TEXICMD_INCLUDE, TEXICMD_INDENTBLOCK, TEXICMD_INSERTCOPYING, TEXICMD_ITEM, TEXICMD_ITEMIZE, + TEXICMD_KEY, TEXICMD_KBD, TEXICMD_LATEX, TEXICMD_MATH, TEXICMD_MENU, + TEXICMD_MULTITABLE, + TEXICMD_NEED, TEXICMD_NEWLINE, TEXICMD_NODE, TEXICMD_NOINDENT, + TEXICMD_OPTION, TEXICMD_PXREF, TEXICMD_QUESTIONMARK, TEXICMD_QUOTATION, @@ -111,6 +146,7 @@ enum texicmd { TEXICMD_PRINTINDEX, TEXICMD_R, TEXICMD_REF, + TEXICMD_RESULT, TEXICMD_SAMP, TEXICMD_SANSSERIF, TEXICMD_SC, @@ -122,6 +158,7 @@ enum texicmd { TEXICMD_SLANTED, TEXICMD_SP, TEXICMD_SPACE, + TEXICMD_SMALLBOOK, TEXICMD_SMALLDISPLAY, TEXICMD_SMALLEXAMPLE, TEXICMD_SMALLINDENTBLOCK, @@ -132,18 +169,23 @@ enum texicmd { TEXICMD_SUBTITLE, TEXICMD_T, TEXICMD_TAB, + TEXICMD_TABSYM, TEXICMD_TABLE, TEXICMD_TEX, TEXICMD_TEXSYM, + TEXICMD_TILDE, TEXICMD_TITLE, TEXICMD_TITLEFONT, TEXICMD_TITLEPAGE, TEXICMD_TOP, + TEXICMD_UMLAUT, TEXICMD_UNNUMBERED, TEXICMD_UNNUMBEREDSEC, TEXICMD_UREF, TEXICMD_URL, TEXICMD_VAR, + TEXICMD_VERBATIMINCLUDE, + TEXICMD_VINDEX, TEXICMD_VSKIP, TEXICMD_W, TEXICMD_XREF, @@ -183,6 +225,7 @@ enum texilist { TEXILIST_NONE = 0, TEXILIST_ITEM, TEXILIST_NOITEM, + TEXILIST_TABLE }; /* @@ -215,11 +258,11 @@ struct texi { #define ismspace(_x) \ (isws((_x)) || '\n' == (_x)) +static void doaccent(struct texi *, enum texicmd, const char *, size_t, size_t *); 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 *); @@ -234,6 +277,7 @@ static void doitem(struct texi *, enum texicmd, const static void doitemize(struct texi *, enum texicmd, const char *, size_t, size_t *); static void dolink(struct texi *, enum texicmd, const char *, size_t, size_t *); static void domath(struct texi *, enum texicmd, const char *, size_t, size_t *); +static void domultitable(struct texi *, enum texicmd, const char *, size_t, size_t *); static void doquotation(struct texi *, enum texicmd, const char *, size_t, size_t *); static void dotable(struct texi *, enum texicmd, const char *, size_t, size_t *); static void dotop(struct texi *, enum texicmd, const char *, size_t, size_t *); @@ -241,10 +285,13 @@ static void dosection(struct texi *, enum texicmd, con static void dosp(struct texi *, enum texicmd, const char *, size_t, size_t *); static void dosubsection(struct texi *, enum texicmd, const char *, size_t, size_t *); static void dosymbol(struct texi *, enum texicmd, const char *, size_t, size_t *); +static void dotab(struct texi *, enum texicmd, const char *, size_t, size_t *); static void dotitle(struct texi *, enum texicmd, const char *, size_t, size_t *); +static void doverbinclude(struct texi *, enum texicmd, const char *, size_t, size_t *); static const struct texitok texitoks[TEXICMD__MAX] = { { doignargn, "acronym", 7 }, /* TEXICMD_ACRONYM */ + { doaccent, "'", 1 }, /* TEXICMD_ACUTE */ { doignline, "afourpaper", 10 }, /* TEXICMD_A4PAPER */ { doignbracket, "anchor", 6 }, /* TEXICMD_ANCHOR */ { dosection, "appendix", 8 }, /* TEXICMD_APPENDIX */ @@ -259,21 +306,37 @@ static const struct texitok texitoks[TEXICMD__MAX] = { { doignline, "center", 6 }, /* TEXICMD_CENTER */ { dosection, "chapter", 7 }, /* TEXICMD_CHAPTER */ { doignline, "cindex", 6 }, /* TEXICMD_CINDEX */ + { doaccent, "^", 1 }, /* TEXICMD_CIRCUMFLEX */ { dofont, "code", 4 }, /* TEXICMD_CODE */ { dofont, "cite", 4 }, /* TEXICMD_CITE */ { dosymbol, ":", 1 }, /* TEXICMD_COLON */ + { NULL, "columnfractions", 15 }, /* TEXICMD_COLUMNFRACTIONS */ { doinline, "command", 7 }, /* TEXICMD_COMMAND */ { doignline, "c", 1 }, /* TEXICMD_COMMENT */ { doignline, "comment", 7 }, /* TEXICMD_COMMENT_LONG */ { 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 */ @@ -285,32 +348,50 @@ 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 */ + { dosymbol, "expansion", 9 }, /* TEXICMD_EXPANSION */ { doinline, "file", 4 }, /* TEXICMD_FILE */ + { doignline, "finalout", 8 }, /* TEXICMD_FINALOUT */ + { 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 */ { doignblock, "ifclear", 7 }, /* TEXICMD_IFCLEAR */ + { doignblock, "ifdocbook", 9 }, /* TEXICMD_IFDOCBOOK */ { doignblock, "ifhtml", 6 }, /* TEXICMD_IFHTML */ { doignblock, "ifinfo", 6 }, /* TEXICMD_IFINFO */ + { doblock, "ifnotdocbook", 12 }, /* TEXICMD_IFNOTDOCBOOK */ + { doblock, "ifnothtml", 9 }, /* TEXICMD_IFNOTHTML */ + { doblock, "ifnotinfo", 9 }, /* TEXICMD_IFNOTINFO */ + { doignblock, "ifnotplaintext", 14 }, /* TEXICMD_IFNOTPLAINTEXT */ { doblock, "ifnottex", 8 }, /* TEXICMD_IFNOTTEX */ + { doblock, "ifnotxml", 8 }, /* TEXICMD_IFNOTXML */ + { doblock, "ifplaintext", 11 }, /* TEXICMD_IFPLAINTEXT */ { doignblock, "iftex", 5 }, /* TEXICMD_IFTEX */ { doignblock, "ifset", 5 }, /* TEXICMD_IFSET */ + { doignblock, "ifxml", 5 }, /* TEXICMD_IFXML */ + { doignblock, "ignore", 6 }, /* TEXICMD_IGNORE */ { doignbracket, "image", 5 }, /* TEXICMD_IMAGE */ { doinclude, "include", 7 }, /* TEXICMD_INCLUDE */ { dodisplay, "indentblock", 11 }, /* TEXICMD_INDENTBLOCK */ { doignline, "insertcopying", 13 }, /* TEXICMD_INSERTCOPYING */ { doitem, "item", 4 }, /* TEXICMD_ITEM */ { doitemize, "itemize", 7 }, /* TEXICMD_ITEMIZE */ + { dobracket, "key", 3 }, /* TEXICMD_KEY */ { dofont, "kbd", 3 }, /* TEXICMD_KBD */ { dosymbol, "LaTeX", 5 }, /* TEXICMD_LATEX */ { domath, "math", 4 }, /* TEXICMD_MATH */ { doignblock, "menu", 4 }, /* TEXICMD_MENU */ + { domultitable, "multitable", 10 }, /* TEXICMD_MULTITABLE */ + { doignline, "need", 4 }, /* TEXICMD_NEED */ { dosymbol, "\n", 1 }, /* TEXICMD_NEWLINE */ { doignline, "node", 4 }, /* TEXICMD_NODE */ { doignline, "noindent", 8 }, /* TEXICMD_NOINDENT */ + { doinline, "option", 6 }, /* TEXICMD_OPTION */ { dolink, "pxref", 5 }, /* TEXICMD_PXREF */ { dosymbol, "?", 1 }, /* TEXICMD_QUESTIONMARK */ { doquotation, "quotation", 9 }, /* TEXICMD_QUOTATION */ @@ -319,6 +400,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 */ @@ -330,6 +412,7 @@ static const struct texitok texitoks[TEXICMD__MAX] = { { dofont, "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, "smallindentblock", 16 }, /* TEXICMD_SMALLINDENTBLOCK */ @@ -339,19 +422,24 @@ static const struct texitok texitoks[TEXICMD__MAX] = { { dosubsection, "subsection", 10 }, /* TEXICMD_SUBSECTION */ { doignline, "subtitle", 8 }, /* TEXICMD_SUBTITLE */ { dofont, "t", 1 }, /* TEXICMD_T */ - { dosymbol, "\t", 1 }, /* TEXICMD_TAB */ + { dotab, "tab", 3 }, /* TEXICMD_TAB */ + { dosymbol, "\t", 1 }, /* TEXICMD_TABSYM */ { dotable, "table", 5 }, /* TEXICMD_TABLE */ { doignblock, "tex", 3 }, /* TEXICMD_TEX */ { dosymbol, "TeX", 3 }, /* TEXICMD_TEXSYM */ + { doaccent, "~", 1 }, /* TEXICMD_TILDE */ { doignline, "title", 5 }, /* TEXICMD_TITLE */ { dobracket, "titlefont", 9 }, /* TEXICMD_TITLEFONT */ { doignblock, "titlepage", 9 }, /* TEXICMD_TITLEPAGE */ { dotop, "top", 3 }, /* TEXICMD_TOP */ + { doaccent, "\"", 1 }, /* TEXICMD_UMLAUT */ { dosection, "unnumbered", 10 }, /* TEXICMD_UNNUMBERED */ { dosection, "unnumberedsec", 13 }, /* TEXICMD_UNNUMBEREDSEC */ { 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 */ { dobracket, "w", 1 }, /* TEXICMD_W */ { dolink, "xref", 4 }, /* TEXICMD_XREF */ @@ -450,6 +538,7 @@ texierr(struct texi *p, const char *fmt, ...) /* * Put a single data character to the output if we're not ignoring. * Adjusts our output status. + * This shouldn't be called for macros: just for ordinary text. */ static void texiputchar(struct texi *p, char c) @@ -457,6 +546,10 @@ texiputchar(struct texi *p, char c) if (p->ign) return; + + if ('.' == c && 0 == p->outcol) + fputs("\\&", stdout); + putchar(c); p->seenvs = 0; if ('\n' == c) { @@ -468,6 +561,7 @@ texiputchar(struct texi *p, char c) /* * Put multiple characters (see texiputchar()). + * This shouldn't be called for macros: just for ordinary text. */ static void texiputchars(struct texi *p, const char *s) @@ -485,9 +579,13 @@ static void teximacroclose(struct texi *p) { - /* FIXME: punctuation. */ - if (0 == --p->outmacro) - texiputchar(p, '\n'); + if (p->ign) + return; + + if (0 == --p->outmacro) { + putchar('\n'); + p->outcol = p->seenws = 0; + } } /* @@ -498,15 +596,26 @@ teximacroclose(struct texi *p) static void teximacroopen(struct texi *p, const char *s) { + int rc; - if (p->outcol && 0 == p->outmacro) - texiputchar(p, '\n'); + if (p->ign) + return; + + if (p->outcol && 0 == p->outmacro) { + putchar('\n'); + p->outcol = 0; + } + if (0 == p->outmacro) - texiputchar(p, '.'); + putchar('.'); else - texiputchar(p, ' '); - texiputchars(p, s); - texiputchar(p, ' '); + putchar(' '); + + if (EOF != (rc = fputs(s, stdout))) + p->outcol += rc; + + putchar(' '); + p->outcol++; p->outmacro++; p->seenws = 0; } @@ -518,17 +627,20 @@ static void teximacro(struct texi *p, const char *s) { + if (p->ign) + return; + if (p->outmacro) texierr(p, "\"%s\" in open line scope!?", s); - else if (p->literal) + if (p->literal) texierr(p, "\"%s\" in a literal scope!?", s); if (p->outcol) - texiputchar(p, '\n'); + putchar('\n'); - texiputchar(p, '.'); - texiputchars(p, s); - texiputchar(p, '\n'); + putchar('.'); + puts(s); + p->outcol = p->seenws = 0; } static void @@ -664,7 +776,7 @@ texiword(struct texi *p, const char *buf, size_t sz, size_t *pos, char extra) { - if (0 == p->outmacro && p->outcol > 72 && 0 == p->literal) + if (p->seenws && 0 == p->outmacro && p->outcol > 72 && 0 == p->literal) texiputchar(p, '\n'); /* FIXME: abstract this: we use it elsewhere. */ if (p->seenws && p->outcol && 0 == p->literal) @@ -852,11 +964,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]) { @@ -925,6 +1037,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. */ @@ -1001,11 +1132,12 @@ parseto(struct texi *p, const char *buf, * This can be called in a nested context. */ static void -parsefile(struct texi *p, const char *fname) +parsefile(struct texi *p, const char *fname, int parse) { - struct texifile *f; - int fd; - struct stat st; + struct texifile *f; + int fd; + struct stat st; + size_t i; assert(p->filepos < 64); f = &p->files[p->filepos]; @@ -1028,46 +1160,43 @@ parsefile(struct texi *p, const char *fname) texiabort(p, fname); p->filepos++; - parseeof(p, f->map, f->mapsz); + if ( ! parse) { + /* + * We're printing verbatim output. + * Make sure it doesn't get interpreted as mdoc by + * escaping escapes and making sure leading dots don't + * trigger mdoc(7) expansion. + */ + for (i = 0; i < f->mapsz; i++) { + if (i > 0 && '.' == f->map[i]) + if ('\n' == f->map[i - 1]) + fputs("\\&", stdout); + putchar(f->map[i]); + if ('\\' == f->map[i]) + putchar('e'); + } + } else + parseeof(p, f->map, f->mapsz); texifilepop(p); } 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: @@ -1075,33 +1204,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); @@ -1141,6 +1337,9 @@ doinline(struct texi *p, enum texicmd cmd, case (TEXICMD_FILE): macro = "Pa"; break; + case (TEXICMD_OPTION): + macro = "Op"; + break; case (TEXICMD_VAR): macro = "Va"; break; @@ -1161,6 +1360,46 @@ doinline(struct texi *p, enum texicmd cmd, } static void +doverbinclude(struct texi *p, enum texicmd cmd, + const char *buf, size_t sz, size_t *pos) +{ + char fname[PATH_MAX], path[PATH_MAX]; + int rc; + size_t i; + + while (*pos < sz && ' ' == buf[*pos]) + advance(p, buf, pos); + + /* Read in the filename. */ + for (i = 0; *pos < sz && '\n' != buf[*pos]; i++) { + if (i == sizeof(fname) - 1) + break; + fname[i] = buf[*pos]; + advance(p, buf, pos); + } + + if (i == 0) + texierr(p, "path too short"); + else if ('\n' != buf[*pos]) + texierr(p, "path too long"); + else if ('/' == fname[0]) + texierr(p, "no absolute paths"); + fname[i] = '\0'; + + if (strstr(fname, "../") || strstr(fname, "/..")) + texierr(p, "insecure path"); + + rc = snprintf(path, sizeof(path), + "%s/%s", p->dirs[0], fname); + if (rc < 0) + texierr(p, "couldn't format path"); + else if ((size_t)rc >= sizeof(path)) + texierr(p, "path too long"); + + parsefile(p, path, 0); +} + +static void doinclude(struct texi *p, enum texicmd cmd, const char *buf, size_t sz, size_t *pos) { @@ -1200,7 +1439,7 @@ doinclude(struct texi *p, enum texicmd cmd, else if (-1 == access(path, R_OK)) continue; - parsefile(p, path); + parsefile(p, path, 1); return; } @@ -1237,6 +1476,10 @@ dofont(struct texi *p, enum texicmd cmd, abort(); } + if (p->seenws) { + texiputchar(p, ' '); + p->seenws = 0; + } texiputchars(p, font); parsebracket(p, buf, sz, pos); texiputchars(p, "\\fP"); @@ -1304,6 +1547,89 @@ dotitle(struct texi *p, enum texicmd cmd, } static void +doaccent(struct texi *p, enum texicmd cmd, + const char *buf, size_t sz, size_t *pos) +{ + + if (*pos == sz) + return; + advance(p, buf, pos); + switch (cmd) { + case (TEXICMD_ACUTE): + switch (buf[*pos]) { + case ('a'): case ('A'): + case ('e'): case ('E'): + case ('i'): case ('I'): + case ('o'): case ('O'): + case ('u'): case ('U'): + texiputchars(p, "\\(\'"); + texiputchar(p, buf[*pos]); + break; + default: + texiputchar(p, buf[*pos]); + } + break; + case (TEXICMD_CIRCUMFLEX): + switch (buf[*pos]) { + case ('a'): case ('A'): + case ('e'): case ('E'): + case ('i'): case ('I'): + case ('o'): case ('O'): + case ('u'): case ('U'): + texiputchars(p, "\\(^"); + texiputchar(p, buf[*pos]); + break; + default: + texiputchar(p, buf[*pos]); + } + break; + case (TEXICMD_GRAVE): + switch (buf[*pos]) { + case ('a'): case ('A'): + case ('e'): case ('E'): + case ('i'): case ('I'): + case ('o'): case ('O'): + case ('u'): case ('U'): + texiputchars(p, "\\(`"); + texiputchar(p, buf[*pos]); + break; + default: + texiputchar(p, buf[*pos]); + } + break; + case (TEXICMD_TILDE): + switch (buf[*pos]) { + case ('a'): case ('A'): + case ('n'): case ('N'): + case ('o'): case ('O'): + texiputchars(p, "\\(~"); + texiputchar(p, buf[*pos]); + break; + default: + texiputchar(p, buf[*pos]); + } + break; + case (TEXICMD_UMLAUT): + switch (buf[*pos]) { + case ('a'): case ('A'): + case ('e'): case ('E'): + case ('i'): case ('I'): + case ('o'): case ('O'): + case ('u'): case ('U'): + case ('y'): + texiputchars(p, "\\(:"); + texiputchar(p, buf[*pos]); + break; + default: + texiputchar(p, buf[*pos]); + } + break; + default: + abort(); + } +} + +static void dosymbol(struct texi *p, enum texicmd cmd, const char *buf, size_t sz, size_t *pos) { @@ -1317,7 +1643,7 @@ dosymbol(struct texi *p, enum texicmd cmd, case (TEXICMD_ASTERISK): case (TEXICMD_NEWLINE): case (TEXICMD_SPACE): - case (TEXICMD_TAB): + case (TEXICMD_TABSYM): texiputchar(p, ' '); break; case (TEXICMD_AT): @@ -1335,12 +1661,21 @@ dosymbol(struct texi *p, enum texicmd cmd, case (TEXICMD_DOTS): texiputchars(p, "..."); break; + case (TEXICMD_ERROR): + texiputchars(p, "error\\(->"); + break; + case (TEXICMD_EXPANSION): + texiputchars(p, "\\(->"); + 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, "{"); break; @@ -1525,6 +1860,13 @@ dotop(struct texi *p, enum texicmd cmd, time_t t; char date[32]; + /* + * Here we print our standard mdoc(7) prologue. + * We use the title set with @settitle for the `Nd' description + * and the source document filename (the first one as invoked on + * the command line) for the title. + * The date is set to the current date. + */ t = time(NULL); strftime(date, sizeof(date), "%F", localtime(&t)); @@ -1555,6 +1897,12 @@ doitem(struct texi *p, enum texicmd cmd, const char *buf, size_t sz, size_t *pos) { + /* Multitable is using raw tbl(7). */ + if (TEXILIST_TABLE == p->list) { + texiputchar(p, '\n'); + return; + } + if (p->outmacro) texierr(p, "item in open line scope!?"); else if (p->literal) @@ -1571,8 +1919,9 @@ doitem(struct texi *p, enum texicmd cmd, texivspace(p); break; } - p->seenvs = 1; + /* Trick so we don't start with Pp. */ + p->seenvs = 1; parseeoln(p, buf, sz, pos); if (TEXILIST_ITEM == p->list) @@ -1582,6 +1931,80 @@ doitem(struct texi *p, enum texicmd cmd, } static void +dotab(struct texi *p, enum texicmd cmd, + const char *buf, size_t sz, size_t *pos) +{ + + /* This command is only useful in @multitable. */ + if (TEXILIST_TABLE == p->list) + texiputchar(p, '\t'); +} + +static void +domultitable(struct texi *p, enum texicmd cmd, + const char *buf, size_t sz, size_t *pos) +{ + enum texilist sv = p->list; + enum texicmd type; + size_t i, end, columns; + + p->list = TEXILIST_TABLE; + teximacro(p, "TS"); + columns = 0; + + /* Advance to the first argument... */ + while (*pos < sz && isws(buf[*pos])) + advance(p, buf, pos); + + /* Make sure we don't print anything when scanning. */ + p->ign++; + if ('@' == buf[*pos]) { + /* + * Look for @columnfractions. + * We ignore these, but we do use the number of + * arguments to set the number of columns that we'll + * have. + */ + type = texicmd(p, buf, *pos, sz, &end); + advanceto(p, buf, pos, end); + if (TEXICMD_COLUMNFRACTIONS != type) + texierr(p, "unknown multitable type"); + while (*pos < sz && '\n' != buf[*pos]) { + while (*pos < sz && isws(buf[*pos])) + advance(p, buf, pos); + while (*pos < sz && ! isws(buf[*pos])) { + if ('\n' == buf[*pos]) + break; + advance(p, buf, pos); + } + columns++; + } + } else + /* + * We have arguments. + * We could parse these, but it's easier to just let + * tbl(7) figure it out. + * So use this only to count arguments. + */ + while (parselinearg(p, buf, sz, pos) > 0) + columns++; + p->ign--; + + /* Left-justify each table entry. */ + for (i = 0; i < columns; i++) { + if (i > 0) + texiputchar(p, ' '); + texiputchar(p, 'l'); + } + texiputchars(p, ".\n"); + p->outmacro++; + parseto(p, buf, sz, pos, texitoks[cmd].tok); + p->outmacro--; + teximacro(p, "TE"); + p->list = sv; +} + +static void dotable(struct texi *p, enum texicmd cmd, const char *buf, size_t sz, size_t *pos) { @@ -1747,7 +2170,7 @@ main(int argc, char *argv[]) texi.ign = 1; texi.dirs = parsedirs(dir, Idir, &texi.dirsz); - parsefile(&texi, argv[0]); + parsefile(&texi, argv[0], 1); /* We shouldn't get here. */ texiexit(&texi); return(EXIT_FAILURE);