=================================================================== RCS file: /cvs/texi2mdoc/main.c,v retrieving revision 1.9 retrieving revision 1.15 diff -u -p -r1.9 -r1.15 --- texi2mdoc/main.c 2015/02/18 14:52:45 1.9 +++ texi2mdoc/main.c 2015/02/19 09:28:42 1.15 @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.9 2015/02/18 14:52:45 kristaps Exp $ */ +/* $Id: main.c,v 1.15 2015/02/19 09:28:42 kristaps Exp $ */ /* * Copyright (c) 2015 Kristaps Dzonsons * @@ -27,6 +27,7 @@ #include #include #include +#include #include /* @@ -43,6 +44,7 @@ enum texicmd { TEXICMD_ASTERISK, TEXICMD_AT, TEXICMD_AUTHOR, + TEXICMD_B, TEXICMD_BANG, TEXICMD_BULLET, TEXICMD_BYE, @@ -58,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, @@ -75,6 +91,7 @@ enum texicmd { TEXICMD_END, TEXICMD_ENUMERATE, TEXICMD_ENV, + TEXICMD_ERROR, TEXICMD_EXAMPLE, TEXICMD_FILE, TEXICMD_GROUP, @@ -83,13 +100,22 @@ enum texicmd { 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_IMAGE, TEXICMD_INCLUDE, + TEXICMD_INDENTBLOCK, TEXICMD_INSERTCOPYING, TEXICMD_ITEM, TEXICMD_ITEMIZE, @@ -97,6 +123,7 @@ enum texicmd { TEXICMD_LATEX, TEXICMD_MATH, TEXICMD_MENU, + TEXICMD_NEED, TEXICMD_NEWLINE, TEXICMD_NODE, TEXICMD_NOINDENT, @@ -106,22 +133,29 @@ enum texicmd { TEXICMD_PAGE, TEXICMD_PARINDENT, TEXICMD_PRINTINDEX, + TEXICMD_R, TEXICMD_REF, + TEXICMD_RESULT, TEXICMD_SAMP, + TEXICMD_SANSSERIF, TEXICMD_SC, TEXICMD_SECTION, TEXICMD_SET, TEXICMD_SETCHAPNEWPAGE, TEXICMD_SETFILENAME, TEXICMD_SETTITLE, + TEXICMD_SLANTED, TEXICMD_SP, TEXICMD_SPACE, + TEXICMD_SMALLDISPLAY, TEXICMD_SMALLEXAMPLE, + TEXICMD_SMALLINDENTBLOCK, TEXICMD_SQUIGGLE_LEFT, TEXICMD_SQUIGGLE_RIGHT, TEXICMD_STRONG, TEXICMD_SUBSECTION, TEXICMD_SUBTITLE, + TEXICMD_T, TEXICMD_TAB, TEXICMD_TABLE, TEXICMD_TEX, @@ -186,47 +220,43 @@ struct texi { size_t outcol; /* column in output line */ char **dirs; /* texi directories */ size_t dirsz; /* number of texi directories */ + char *title; /* title of document */ + char *subtitle; /* subtitle of document */ + /* + * The following control what we output to the screen. + * The complexity is required to accomodate for mdoc(7). + */ enum texilist list; /* current list (set recursively) */ int outmacro; /* if >0, output is in line macro */ int seenws; /* ws has been seen (and ignored) */ + int seenvs; /* newline has been Pp'd */ int ign; /* if >0, don't print anything */ int literal; /* if >0, literal context */ }; -/* FIXME: FIND A BETTER WAY. */ -#define ismpunct(_x) \ - ('.' == (_x) || \ - ',' == (_x) || \ - ';' == (_x)) /* Texi disregards spaces and tabs. */ #define isws(_x) \ (' ' == (_x) || '\t' == (_x)) #define ismspace(_x) \ - (isws((_x) || '\n' == (_x))) + (isws((_x)) || '\n' == (_x)) 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 dochapter(struct texi *, enum texicmd, const char *, size_t, size_t *); -static void docommand(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 doemph(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 doenv(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 dofile(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 *); static void doignline(struct texi *, enum texicmd, const char *, size_t, size_t *); +static void doinline(struct texi *, enum texicmd, const char *, size_t, size_t *); static void doinclude(struct texi *, enum texicmd, const char *, size_t, size_t *); -static void doitalic(struct texi *, enum texicmd, const char *, size_t, size_t *); static void doitem(struct texi *, enum texicmd, const char *, size_t, size_t *); 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 doliteral(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 doquotation(struct texi *, enum texicmd, const char *, size_t, size_t *); static void dotable(struct texi *, enum texicmd, const char *, size_t, size_t *); @@ -235,70 +265,97 @@ 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 dotitle(struct texi *, enum texicmd, const char *, size_t, size_t *); static const struct texitok texitoks[TEXICMD__MAX] = { { doignargn, "acronym", 7 }, /* TEXICMD_ACRONYM */ { doignline, "afourpaper", 10 }, /* TEXICMD_A4PAPER */ { doignbracket, "anchor", 6 }, /* TEXICMD_ANCHOR */ - { dochapter, "appendix", 8 }, /* TEXICMD_APPENDIX */ - { dochapter, "appendixsec", 11 }, /* TEXICMD_APPENDIXSEC */ + { dosection, "appendix", 8 }, /* TEXICMD_APPENDIX */ + { dosection, "appendixsec", 11 }, /* TEXICMD_APPENDIXSEC */ { dosymbol, "*", 1 }, /* TEXICMD_ASTERISK */ { dosymbol, "@", 1 }, /* TEXICMD_AT */ { doignline, "author", 6 }, /* TEXICMD_AUTHOR */ + { dofont, "b", 1 }, /* TEXICMD_BOLD */ { dosymbol, "!", 1 }, /* TEXICMD_BANG */ { dosymbol, "bullet", 6 }, /* TEXICMD_BULLET */ { dobye, "bye", 3 }, /* TEXICMD_BYE */ - { doignline, "center", 5 }, /* TEXICMD_CENTER */ - { dochapter, "chapter", 7 }, /* TEXICMD_CHAPTER */ + { doignline, "center", 6 }, /* TEXICMD_CENTER */ + { dosection, "chapter", 7 }, /* TEXICMD_CHAPTER */ { doignline, "cindex", 6 }, /* TEXICMD_CINDEX */ - { doliteral, "code", 4 }, /* TEXICMD_CODE */ - { doitalic, "cite", 4 }, /* TEXICMD_CITE */ + { dofont, "code", 4 }, /* TEXICMD_CODE */ + { dofont, "cite", 4 }, /* TEXICMD_CITE */ { dosymbol, ":", 1 }, /* TEXICMD_COLON */ - { docommand, "command", 7 }, /* TEXICMD_COMMAND */ + { 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 */ - { doitalic, "dfn", 3 }, /* TEXICMD_DFN */ + { dofont, "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 */ - { doemph, "emph", 4 }, /* TEXICMD_EMPH */ + { dofont, "emph", 4 }, /* TEXICMD_EMPH */ { NULL, "end", 3 }, /* TEXICMD_END */ { doenumerate, "enumerate", 9 }, /* TEXICMD_ENUMERATE */ - { doenv, "env", 3 }, /* TEXICMD_ENV */ + { doinline, "env", 3 }, /* TEXICMD_ENV */ + { dosymbol, "error", 5 }, /* TEXICMD_ERROR */ { doexample, "example", 7 }, /* TEXICMD_EXAMPLE */ - { dofile, "file", 4 }, /* TEXICMD_FILE */ + { doinline, "file", 4 }, /* TEXICMD_FILE */ { doblock, "group", 5 }, /* TEXICMD_GROUP */ { dosection, "heading", 7 }, /* TEXICMD_HEADING */ { doignline, "headings", 8 }, /* TEXICMD_HEADINGS */ { dosymbol, "-", 1 }, /* TEXICMD_HYPHEN */ - { doitalic, "i", 1 }, /* TEXICMD_I */ + { 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 */ { 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 */ - { doliteral, "kbd", 3 }, /* TEXICMD_KBD */ + { dofont, "kbd", 3 }, /* TEXICMD_KBD */ { 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 */ @@ -308,22 +365,29 @@ 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 */ { dobracket, "ref", 3 }, /* TEXICMD_REF */ - { doliteral, "samp", 4 }, /* TEXICMD_SAMP */ + { dosymbol, "result", 6 }, /* TEXICMD_RESULT */ + { dofont, "samp", 4 }, /* TEXICMD_SAMP */ + { dofont, "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 */ - { doignline, "settitle", 8 }, /* TEXICMD_SETTITLE */ + { dotitle, "settitle", 8 }, /* TEXICMD_SETTITLE */ + { dofont, "slanted", 7 }, /* TEXICMD_SLANTED */ { dosp, "sp", 2 }, /* TEXICMD_SP */ { dosymbol, " ", 1 }, /* TEXICMD_SPACE */ + { dodisplay, "smalldisplay", 12 }, /* TEXICMD_SMALLDISPLAY */ { doexample, "smallexample", 12 }, /* TEXICMD_SMALLEXAMPLE */ + { dodisplay, "smallindentblock", 16 }, /* TEXICMD_SMALLINDENTBLOCK */ { dosymbol, "{", 1 }, /* TEXICMD_SQUIGGLE_LEFT */ { dosymbol, "}", 1 }, /* TEXICMD_SQUIGGLE_RIGHT */ - { doemph, "strong", 6 }, /* TEXICMD_STRONG */ + { dofont, "strong", 6 }, /* TEXICMD_STRONG */ { dosubsection, "subsection", 10 }, /* TEXICMD_SUBSECTION */ { doignline, "subtitle", 8 }, /* TEXICMD_SUBTITLE */ + { dofont, "t", 1 }, /* TEXICMD_T */ { dosymbol, "\t", 1 }, /* TEXICMD_TAB */ { dotable, "table", 5 }, /* TEXICMD_TABLE */ { doignblock, "tex", 3 }, /* TEXICMD_TEX */ @@ -332,11 +396,11 @@ static const struct texitok texitoks[TEXICMD__MAX] = { { dobracket, "titlefont", 9 }, /* TEXICMD_TITLEFONT */ { doignblock, "titlepage", 9 }, /* TEXICMD_TITLEPAGE */ { dotop, "top", 3 }, /* TEXICMD_TOP */ - { dochapter, "unnumbered", 10 }, /* TEXICMD_UNNUMBERED */ + { dosection, "unnumbered", 10 }, /* TEXICMD_UNNUMBERED */ { dosection, "unnumberedsec", 13 }, /* TEXICMD_UNNUMBEREDSEC */ { dolink, "uref", 4 }, /* TEXICMD_UREF */ { dolink, "url", 3 }, /* TEXICMD_URL */ - { doliteral, "var", 3 }, /* TEXICMD_VAR */ + { doinline, "var", 3 }, /* TEXICMD_VAR */ { dosp, "vskip", 5 }, /* TEXICMD_VSKIP */ { dobracket, "w", 1 }, /* TEXICMD_W */ { dolink, "xref", 4 }, /* TEXICMD_XREF */ @@ -373,7 +437,10 @@ texiexit(struct texi *p) for (i = 0; i < p->dirsz; i++) free(p->dirs[i]); + free(p->dirs); + free(p->subtitle); + free(p->title); } /* @@ -440,6 +507,7 @@ texiputchar(struct texi *p, char c) if (p->ign) return; putchar(c); + p->seenvs = 0; if ('\n' == c) { p->outcol = 0; p->seenws = 0; @@ -512,6 +580,16 @@ teximacro(struct texi *p, const char *s) texiputchar(p, '\n'); } +static void +texivspace(struct texi *p) +{ + + if (p->seenvs) + return; + teximacro(p, "Pp"); + p->seenvs = 1; +} + /* * Advance by a single byte in the input stream. */ @@ -528,6 +606,40 @@ advance(struct texi *p, const char *buf, size_t *pos) (*pos)++; } +static void +texipunctuate(struct texi *p, const char *buf, size_t sz, size_t *pos) +{ + size_t start, end; + + if (1 != p->outmacro) + return; + + for (start = end = *pos; end < sz; end++) { + switch (buf[end]) { + case (','): + case (')'): + case ('.'): + case ('"'): + case (':'): + case ('!'): + case ('?'): + continue; + default: + break; + } + break; + } + if (end == *pos) + return; + if (end + 1 == sz || ' ' == buf[end] || '\n' == buf[end]) { + for ( ; start < end; start++) { + texiputchar(p, ' '); + texiputchar(p, buf[start]); + advance(p, buf, pos); + } + } +} + /* * Advance to the next non-whitespace word in the input stream. * If we're in literal mode, then print all of the whitespace as we're @@ -555,9 +667,8 @@ advancenext(struct texi *p, const char *buf, size_t sz * output a paragraph. * FIXME: this is stupid. */ - if (*pos && '\n' == buf[*pos] && - '\n' == buf[*pos - 1]) - teximacro(p, "Pp"); + if (*pos && '\n' == buf[*pos] && '\n' == buf[*pos - 1]) + texivspace(p); advance(p, buf, pos); } return(*pos); @@ -863,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. */ @@ -971,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; - } - - teximacro(p, "Pp"); - if (TEXICMD_DEFTYPEVR == cmd) { - parsebracket(p, buf, sz, pos); - texiputchars(p, ":\n"); - } - teximacroopen(p, "Vt"); - parseeoln(p, buf, sz, pos); - teximacroclose(p); - teximacro(p, "Pp"); - 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: @@ -1013,34 +1124,101 @@ 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): - teximacro(p, "Pp"); + 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); - teximacro(p, "Pp"); + + texivspace(p); if (NULL != blk) parseto(p, buf, sz, pos, blk); } @@ -1064,20 +1242,37 @@ doblock(struct texi *p, enum texicmd cmd, } static void -doinline(struct texi *p, const char *buf, - size_t sz, size_t *pos, const char *macro) +doinline(struct texi *p, enum texicmd cmd, + const char *buf, size_t sz, size_t *pos) { + const char *macro; + switch (cmd) { + case (TEXICMD_COMMAND): + macro = "Xr"; + break; + case (TEXICMD_ENV): + macro = "Ev"; + break; + case (TEXICMD_FILE): + macro = "Pa"; + break; + case (TEXICMD_VAR): + macro = "Va"; + break; + default: + abort(); + } + + if (p->literal) { + parsebracket(p, buf, sz, pos); + return; + } + teximacroopen(p, macro); p->seenws = 0; parsebracket(p, buf, sz, pos); - if (*pos < sz - 1 && - ismpunct(buf[*pos]) && - ismspace(buf[*pos + 1])) { - texiputchar(p, ' '); - texiputchar(p, buf[*pos]); - advance(p, buf, pos); - } + texipunctuate(p, buf, sz, pos); teximacroclose(p); } @@ -1129,57 +1324,41 @@ doinclude(struct texi *p, enum texicmd cmd, } static void -doitalic(struct texi *p, enum texicmd cmd, +dofont(struct texi *p, enum texicmd cmd, const char *buf, size_t sz, size_t *pos) { + const char *font; - texiputchars(p, "\\fI"); + 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(); + } + + texiputchars(p, font); parsebracket(p, buf, sz, pos); texiputchars(p, "\\fP"); } static void -doenv(struct texi *p, enum texicmd cmd, - const char *buf, size_t sz, size_t *pos) -{ - - if (p->literal) - parsebracket(p, buf, sz, pos); - else - doinline(p, buf, sz, pos, "Ev"); -} - -static void -doliteral(struct texi *p, enum texicmd cmd, - const char *buf, size_t sz, size_t *pos) -{ - - if (p->literal) - parsebracket(p, buf, sz, pos); - else - doinline(p, buf, sz, pos, "Li"); -} - -static void -doemph(struct texi *p, enum texicmd cmd, - const char *buf, size_t sz, size_t *pos) -{ - - if (p->literal) - doitalic(p, cmd, buf, sz, pos); - else - doinline(p, buf, sz, pos, "Em"); -} - -static void -docommand(struct texi *p, enum texicmd cmd, - const char *buf, size_t sz, size_t *pos) -{ - - doinline(p, buf, sz, pos, "Xr"); -} - -static void dobracket(struct texi *p, enum texicmd cmd, const char *buf, size_t sz, size_t *pos) { @@ -1188,24 +1367,15 @@ dobracket(struct texi *p, enum texicmd cmd, } static void -dofile(struct texi *p, enum texicmd cmd, - const char *buf, size_t sz, size_t *pos) -{ - - if (p->literal) - parsebracket(p, buf, sz, pos); - else - doinline(p, buf, sz, pos, "Pa"); -} - -static void dodisplay(struct texi *p, enum texicmd cmd, const char *buf, size_t sz, size_t *pos) { - teximacro(p, "Bd -display -offset indent"); + teximacro(p, "Bd -filled -offset indent"); + p->seenvs = 1; + /* FIXME: ignore and parseeoln. */ advanceeoln(p, buf, sz, pos, 1); - parseto(p, buf, sz, pos, "display"); + parseto(p, buf, sz, pos, texitoks[cmd].tok); teximacro(p, "Ed"); } @@ -1213,14 +1383,12 @@ static void doexample(struct texi *p, enum texicmd cmd, const char *buf, size_t sz, size_t *pos) { - const char *blk; - blk = TEXICMD_EXAMPLE == cmd ? "example" : "smallexample"; - teximacro(p, "Bd -literal -offset indent"); + /* FIXME: ignore and parseeoln. */ advanceeoln(p, buf, sz, pos, 1); p->literal++; - parseto(p, buf, sz, pos, blk); + parseto(p, buf, sz, pos, texitoks[cmd].tok); p->literal--; teximacro(p, "Ed"); } @@ -1235,6 +1403,23 @@ dobye(struct texi *p, enum texicmd cmd, } static void +dotitle(struct texi *p, enum texicmd cmd, + const char *buf, size_t sz, size_t *pos) +{ + size_t start, end; + + while (*pos < sz && isws(buf[*pos])) + advance(p, buf, pos); + start = end = *pos; + while (end < sz && '\n' != buf[end]) + end++; + free(p->subtitle); + p->subtitle = malloc(end - start + 1); + memcpy(p->subtitle, &buf[start], end - start); + p->subtitle[end - start] = '\0'; +} + +static void dosymbol(struct texi *p, enum texicmd cmd, const char *buf, size_t sz, size_t *pos) { @@ -1266,12 +1451,18 @@ 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, "{"); break; @@ -1370,14 +1561,7 @@ dolink(struct texi *p, enum texicmd cmd, c = parsearg(p, buf, sz, pos, 1); p->ign--; - if (*pos < sz - 1 && - ismpunct(buf[*pos]) && - ismspace(buf[*pos + 1])) { - texiputchar(p, ' '); - texiputchar(p, buf[*pos]); - advance(p, buf, pos); - } - + texipunctuate(p, buf, sz, pos); teximacroclose(p); } @@ -1399,26 +1583,50 @@ dosubsection(struct texi *p, enum texicmd cmd, const char *buf, size_t sz, size_t *pos) { - teximacro(p, "Pp"); + if (p->outmacro) + texierr(p, "\"Em\" in open line scope!?"); + else if (p->literal) + texierr(p, "\"Em\" in a literal scope!?"); + + texivspace(p); teximacroopen(p, "Em"); parseeoln(p, buf, sz, pos); teximacroclose(p); - teximacro(p, "Pp"); + texivspace(p); } static void dosection(struct texi *p, enum texicmd cmd, const char *buf, size_t sz, size_t *pos) { + const char *blk; + switch (cmd) { + case (TEXICMD_APPENDIX): + case (TEXICMD_CHAPTER): + case (TEXICMD_TOP): + case (TEXICMD_UNNUMBERED): + blk = "Sh"; + break; + case (TEXICMD_APPENDIXSEC): + case (TEXICMD_HEADING): + case (TEXICMD_SECTION): + case (TEXICMD_UNNUMBEREDSEC): + blk = "Ss"; + break; + default: + abort(); + } + if (p->outmacro) - texierr(p, "subsection in open line scope!?"); + texierr(p, "%s in open line scope!?", blk); else if (p->literal) - texierr(p, "subsection in a literal scope!?"); + texierr(p, "%s in a literal scope!?", blk); - teximacroopen(p, "Ss"); + teximacroopen(p, blk); parseeoln(p, buf, sz, pos); teximacroclose(p); + p->seenvs = 1; } static void @@ -1426,38 +1634,42 @@ dosp(struct texi *p, enum texicmd cmd, const char *buf, size_t sz, size_t *pos) { - teximacro(p, "Pp"); + texivspace(p); + /* FIXME: ignore and parseeoln. */ advanceeoln(p, buf, sz, pos, 1); } static void -dochapter(struct texi *p, enum texicmd cmd, - const char *buf, size_t sz, size_t *pos) -{ - - if (p->outmacro) - texierr(p, "section in open line scope!?"); - else if (p->literal) - texierr(p, "section in a literal scope!?"); - - teximacroopen(p, "Sh"); - parseeoln(p, buf, sz, pos); - teximacroclose(p); -} - -static void dotop(struct texi *p, enum texicmd cmd, const char *buf, size_t sz, size_t *pos) { + const char *cp; + time_t t; + char date[32]; + t = time(NULL); + strftime(date, sizeof(date), "%F", localtime(&t)); + p->ign--; - advanceeoln(p, buf, sz, pos, 1); - teximacro(p, "Dd $Mdocdate: February 18 2015 $"); - teximacro(p, "Dt SOMETHING 7"); + teximacroopen(p, "Dd"); + texiputchars(p, date); + teximacroclose(p); + teximacroopen(p, "Dt"); + for (cp = p->title; '\0' != *cp; cp++) + texiputchar(p, toupper(*cp)); + texiputchars(p, " 7"); + teximacroclose(p); teximacro(p, "Os"); teximacro(p, "Sh NAME"); - teximacro(p, "Nm Something"); - teximacro(p, "Nd Something"); + teximacroopen(p, "Nm"); + texiputchars(p, p->title); + teximacroclose(p); + teximacroopen(p, "Nd"); + texiputchars(p, NULL != p->subtitle ? + p->subtitle : "Unknown description"); + teximacroclose(p); + p->seenvs = 1; + dosection(p, cmd, buf, sz, pos); } static void @@ -1478,9 +1690,10 @@ doitem(struct texi *p, enum texicmd cmd, teximacro(p, "It"); break; default: - teximacro(p, "Pp"); + texivspace(p); break; } + p->seenvs = 1; parseeoln(p, buf, sz, pos); @@ -1498,6 +1711,9 @@ dotable(struct texi *p, enum texicmd cmd, p->list = TEXILIST_ITEM; teximacro(p, "Bl -tag -width Ds"); + /* FIXME: ignore and parseeoln. */ + advanceeoln(p, buf, sz, pos, 1); + p->seenvs = 1; parseto(p, buf, sz, pos, "table"); teximacro(p, "El"); p->list = sv; @@ -1511,6 +1727,9 @@ doenumerate(struct texi *p, enum texicmd cmd, p->list = TEXILIST_NOITEM; teximacro(p, "Bl -enum"); + p->seenvs = 1; + /* FIXME: ignore and parseeoln. */ + advanceeoln(p, buf, sz, pos, 1); parseto(p, buf, sz, pos, "enumerate"); teximacro(p, "El"); p->list = sv; @@ -1524,6 +1743,9 @@ doitemize(struct texi *p, enum texicmd cmd, p->list = TEXILIST_ITEM; teximacro(p, "Bl -bullet"); + p->seenvs = 1; + /* FIXME: ignore and parseeoln. */ + advanceeoln(p, buf, sz, pos, 1); parseto(p, buf, sz, pos, "itemize"); teximacro(p, "El"); p->list = sv; @@ -1544,6 +1766,7 @@ doignline(struct texi *p, enum texicmd cmd, const char *buf, size_t sz, size_t *pos) { + /* FIXME: ignore and parseeoln. */ advanceeoln(p, buf, sz, pos, 1); } @@ -1599,7 +1822,7 @@ main(int argc, char *argv[]) struct texi texi; int c; char *path, *dir; - const char *progname, *Idir; + const char *progname, *Idir, *cp; progname = strrchr(argv[0], '/'); if (progname == NULL) @@ -1607,7 +1830,9 @@ main(int argc, char *argv[]) else ++progname; + memset(&texi, 0, sizeof(struct texi)); Idir = NULL; + while (-1 != (c = getopt(argc, argv, "I:"))) switch (c) { case ('I'): @@ -1631,7 +1856,17 @@ main(int argc, char *argv[]) } free(path); - memset(&texi, 0, sizeof(struct texi)); + if (NULL != (cp = strrchr(argv[0], '/'))) + texi.title = strdup(cp + 1); + else + texi.title = strdup(argv[0]); + + if (NULL == texi.title) { + perror(NULL); + exit(EXIT_FAILURE); + } else if (NULL != (path = strchr(texi.title, '.'))) + *path = '\0'; + texi.ign = 1; texi.dirs = parsedirs(dir, Idir, &texi.dirsz); parsefile(&texi, argv[0]);