=================================================================== RCS file: /cvs/texi2mdoc/main.c,v retrieving revision 1.4 retrieving revision 1.14 diff -u -p -r1.4 -r1.14 --- texi2mdoc/main.c 2015/02/17 20:27:44 1.4 +++ texi2mdoc/main.c 2015/02/19 08:09:55 1.14 @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.4 2015/02/17 20:27:44 kristaps Exp $ */ +/* $Id: main.c,v 1.14 2015/02/19 08:09:55 kristaps Exp $ */ /* * Copyright (c) 2015 Kristaps Dzonsons * @@ -27,6 +27,8 @@ #include #include #include +#include +#include /* * This defines each one of the Texinfo commands that we understand. @@ -42,8 +44,11 @@ enum texicmd { TEXICMD_ASTERISK, TEXICMD_AT, TEXICMD_AUTHOR, + TEXICMD_B, TEXICMD_BANG, + TEXICMD_BULLET, TEXICMD_BYE, + TEXICMD_CENTER, TEXICMD_CHAPTER, TEXICMD_CINDEX, TEXICMD_CITE, @@ -80,13 +85,23 @@ 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, TEXICMD_KBD, @@ -96,25 +111,34 @@ enum texicmd { TEXICMD_NEWLINE, TEXICMD_NODE, TEXICMD_NOINDENT, + TEXICMD_PXREF, TEXICMD_QUESTIONMARK, TEXICMD_QUOTATION, TEXICMD_PAGE, TEXICMD_PARINDENT, TEXICMD_PRINTINDEX, + TEXICMD_R, TEXICMD_REF, 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, @@ -128,7 +152,9 @@ enum texicmd { TEXICMD_UREF, TEXICMD_URL, TEXICMD_VAR, + TEXICMD_VSKIP, TEXICMD_W, + TEXICMD_XREF, TEXICMD__MAX }; @@ -172,47 +198,49 @@ enum texilist { * This keeps any necessary information handy. */ struct texi { - struct texifile files[64]; - size_t filepos; - size_t outcol; /* column of output */ - int outmacro; /* whether output is in line macro */ - int seenws; /* whitespace has been ignored */ - int ign; /* don't print anything */ - int literal; - char *dir; /* texi directory */ - enum texilist list; + struct texifile files[64]; /* stack of open files */ + size_t filepos; /* number of open files */ + 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: don't use this crap. */ -#define ismpunct(_x) \ - ('.' == (_x) || \ - ',' == (_x) || \ - ';' == (_x)) +/* Texi disregards spaces and tabs. */ #define isws(_x) \ (' ' == (_x) || '\t' == (_x)) +#define ismspace(_x) \ + (isws((_x)) || '\n' == (_x)) -static void doarg1(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 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 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 doliteral(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 doquotation(struct texi *, enum texicmd, const char *, size_t, size_t *); static void dotable(struct texi *, enum texicmd, const char *, size_t, size_t *); @@ -221,24 +249,28 @@ 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] = { - { doarg1, "acronym", 7 }, /* TEXICMD_ACRONYM */ + { 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 */ - { 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 */ @@ -251,59 +283,78 @@ static const struct texitok texitoks[TEXICMD__MAX] = { { dodeftypevar, "deftypevar", 10 }, /* TEXICMD_DEFTYPEVAR */ { dodeftypevar, "deftypevr", 9 }, /* TEXICMD_DEFTYPEVR */ { 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 */ - { doarg1, "email", 5 }, /* TEXICMD_EMAIL */ - { doemph, "emph", 4 }, /* TEXICMD_EMPH */ + { dolink, "email", 5 }, /* TEXICMD_EMAIL */ + { 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 */ { 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 */ { dosymbol, "\n", 1 }, /* TEXICMD_NEWLINE */ { doignline, "node", 4 }, /* TEXICMD_NODE */ { doignline, "noindent", 8 }, /* TEXICMD_NOINDENT */ + { dolink, "pxref", 5 }, /* TEXICMD_PXREF */ { dosymbol, "?", 1 }, /* TEXICMD_QUESTIONMARK */ { doquotation, "quotation", 9 }, /* TEXICMD_QUOTATION */ { 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 */ + { 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 */ + { 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 */ - { doignline, "settitle", 8 }, /* TEXICMD_SETTITLE */ + { dodisplay, "smallindentblock", 16 }, /* TEXICMD_SMALLINDENTBLOCK */ { dosymbol, "{", 1 }, /* TEXICMD_SQUIGGLE_LEFT */ { dosymbol, "}", 1 }, /* TEXICMD_SQUIGGLE_RIGHT */ + { 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 */ @@ -312,12 +363,14 @@ 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 */ - { doarg1, "uref", 4 }, /* TEXICMD_UREF */ - { doarg1, "url", 3 }, /* TEXICMD_URL */ - { doliteral, "var", 3 }, /* TEXICMD_VAR */ + { dolink, "uref", 4 }, /* TEXICMD_UREF */ + { dolink, "url", 3 }, /* TEXICMD_URL */ + { doinline, "var", 3 }, /* TEXICMD_VAR */ + { dosp, "vskip", 5 }, /* TEXICMD_VSKIP */ { dobracket, "w", 1 }, /* TEXICMD_W */ + { dolink, "xref", 4 }, /* TEXICMD_XREF */ }; /* @@ -334,18 +387,27 @@ texifilepop(struct texi *p) } /* - * Unmap all files that we're currently using. + * Unmap all files that we're currently using and free all resources + * that we've allocated during the parse. * The utility should exit(...) after this is called. */ static void texiexit(struct texi *p) { + size_t i; - while (p->filepos > 0) - texifilepop(p); - free(p->dir); if (p->outcol) putchar('\n'); + + while (p->filepos > 0) + texifilepop(p); + + for (i = 0; i < p->dirsz; i++) + free(p->dirs[i]); + + free(p->dirs); + free(p->subtitle); + free(p->title); } /* @@ -380,6 +442,10 @@ texiwarn(const struct texi *p, const char *fmt, ...) fputc('\n', stderr); } +/* + * Print an error message (to stderr) tied to our current location in + * the parse sequence, invoke texiexit(), then die. + */ static void texierr(struct texi *p, const char *fmt, ...) { @@ -398,9 +464,8 @@ texierr(struct texi *p, const char *fmt, ...) } /* - * Put a single data character. - * This MUST NOT be a mdoc(7) command: it should be free text that's - * outputted to the screen. + * Put a single data character to the output if we're not ignoring. + * Adjusts our output status. */ static void texiputchar(struct texi *p, char c) @@ -409,6 +474,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; @@ -428,40 +494,41 @@ texiputchars(struct texi *p, const char *s) } /* - * Put an mdoc(7) command without the trailing newline. - * This should ONLY be used for mdoc(7) commands! + * Close an mdoc(7) macro opened with teximacroopen(). + * If there are no more macros on the line, prints a newline. */ static void teximacroclose(struct texi *p) { - p->outmacro--; - if (p->ign) - return; - texiputchar(p, '\n'); + /* FIXME: punctuation. */ + if (0 == --p->outmacro) + texiputchar(p, '\n'); } /* - * Put an mdoc(7) command without the trailing newline. - * This should ONLY be used for mdoc(7) commands! + * Open a mdoc(7) macro. + * This is used for line macros, e.g., Qq [foo bar baz]. + * It can be invoked for nested macros, e.g., Qq Li foo . */ static void teximacroopen(struct texi *p, const char *s) { - int rc; - p->outmacro++; - if (p->ign) - return; - if (p->outcol) + if (p->outcol && 0 == p->outmacro) texiputchar(p, '\n'); - if (EOF != (rc = fputs(s, stdout))) - p->outcol += rc; + if (0 == p->outmacro) + texiputchar(p, '.'); + else + texiputchar(p, ' '); + texiputchars(p, s); + texiputchar(p, ' '); + p->outmacro++; + p->seenws = 0; } /* - * Put an mdoc(7) command with the trailing newline. - * This should ONLY be used for mdoc(7) commands! + * Put a stadnalone mdoc(7) command with the trailing newline. */ static void teximacro(struct texi *p, const char *s) @@ -472,15 +539,24 @@ teximacro(struct texi *p, const char *s) else if (p->literal) texierr(p, "\"%s\" in a literal scope!?", s); - if (p->ign) - return; if (p->outcol) texiputchar(p, '\n'); - puts(s); - p->outcol = 0; - p->seenws = 0; + + texiputchar(p, '.'); + texiputchars(p, 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. */ @@ -497,6 +573,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 @@ -507,14 +617,17 @@ advancenext(struct texi *p, const char *buf, size_t sz { if (p->literal) { - while (*pos < sz && isspace(buf[*pos])) { + while (*pos < sz && ismspace(buf[*pos])) { + if (*pos && '\n' == buf[*pos] && + '\\' == buf[*pos - 1]) + texiputchar(p, 'e'); texiputchar(p, buf[*pos]); advance(p, buf, pos); } return(*pos); } - while (*pos < sz && isspace(buf[*pos])) { + while (*pos < sz && ismspace(buf[*pos])) { p->seenws = 1; /* * If it looks like we've printed a double-line, then @@ -522,7 +635,7 @@ advancenext(struct texi *p, const char *buf, size_t sz * FIXME: this is stupid. */ if (*pos && '\n' == buf[*pos] && '\n' == buf[*pos - 1]) - teximacro(p, ".Pp"); + texivspace(p); advance(p, buf, pos); } return(*pos); @@ -536,6 +649,7 @@ advanceeoln(struct texi *p, const char *buf, size_t sz, size_t *pos, int consumenl) { + /* FIXME: disregards @NEWLINE. */ while (*pos < sz && '\n' != buf[*pos]) advance(p, buf, pos); if (*pos < sz && consumenl) @@ -562,28 +676,27 @@ advanceto(struct texi *p, const char *buf, size_t *pos * This also will advance the input stream. */ static void -texiword(struct texi *p, const char *buf, size_t sz, size_t *pos) +texiword(struct texi *p, const char *buf, + size_t sz, size_t *pos, char extra) { - /* - * XXX: if we're in literal mode, then we shouldn't do any - * reflowing of text here. - */ if (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) texiputchar(p, ' '); p->seenws = 0; - while (*pos < sz && ! isspace(buf[*pos])) { + while (*pos < sz && ! ismspace(buf[*pos])) { switch (buf[*pos]) { case ('@'): case ('}'): case ('{'): return; } + if ('\0' != extra && buf[*pos] == extra) + return; if (*pos < sz - 1 && '`' == buf[*pos] && '`' == buf[*pos + 1]) { @@ -600,6 +713,11 @@ texiword(struct texi *p, const char *buf, size_t sz, s } } +/* + * Look up the command at position "pos" in the buffer, returning it (or + * TEXICMD__MAX if none found) and setting "end" to be the absolute + * index after the command name. + */ static enum texicmd texicmd(struct texi *p, const char *buf, size_t pos, size_t sz, size_t *end) @@ -608,12 +726,15 @@ texicmd(struct texi *p, const char *buf, assert('@' == buf[pos]); - if (++pos >= sz) + if ((*end = pos) == sz) return(TEXICMD__MAX); + else if ((*end = ++pos) == sz) + return(TEXICMD__MAX); /* Alphabetic commands are special. */ if ( ! isalpha(buf[pos])) { - *end = pos + 1; + if ((*end = pos + 1) == sz) + return(TEXICMD__MAX); for (i = 0; i < TEXICMD__MAX; i++) { if (1 != texitoks[i].len) continue; @@ -624,7 +745,7 @@ texicmd(struct texi *p, const char *buf, return(TEXICMD__MAX); } - for (*end = pos; *end < sz && ! isspace(buf[*end]); (*end)++) + for (*end = pos; *end < sz && ! ismspace(buf[*end]); (*end)++) if ((*end > pos && ('@' == buf[*end] || '{' == buf[*end] || '}' == buf[*end]))) break; @@ -641,48 +762,69 @@ texicmd(struct texi *p, const char *buf, return(TEXICMD__MAX); } -static void -parseeof(struct texi *p, const char *buf, size_t sz) +/* + * Parse an argument from a bracketed command, e.g., @url{foo, baz}. + * Num should be set to the argument we're currently parsing, although + * it suffixes for it to be zero or non-zero. + * This will return 1 if there are more arguments, 0 otherwise. + * This will stop (returning 0) in the event of EOF or if we're not at a + * bracket for the zeroth parse. + */ +static int +parsearg(struct texi *p, const char *buf, + size_t sz, size_t *pos, size_t num) { - size_t pos = 0; + size_t end; enum texicmd cmd; - size_t end; - while ((pos = advancenext(p, buf, sz, &pos)) < sz) { - switch (buf[pos]) { + while (*pos < sz && ismspace(buf[*pos])) + advance(p, buf, pos); + if (*pos == sz || (0 == num && '{' != buf[*pos])) + return(0); + if (0 == num) + advance(p, buf, pos); + + while ((*pos = advancenext(p, buf, sz, pos)) < sz) { + switch (buf[*pos]) { + case (','): + advance(p, buf, pos); + return(1); case ('}'): - if (0 == p->ign) - texiwarn(p, "unexpected \"}\""); - advance(p, buf, &pos); - continue; + advance(p, buf, pos); + return(0); case ('{'): if (0 == p->ign) texiwarn(p, "unexpected \"{\""); - advance(p, buf, &pos); + advance(p, buf, pos); continue; case ('@'): break; default: - texiword(p, buf, sz, &pos); + texiword(p, buf, sz, pos, ','); continue; } - cmd = texicmd(p, buf, pos, sz, &end); - advanceto(p, buf, &pos, end); + cmd = texicmd(p, buf, *pos, sz, &end); + advanceto(p, buf, pos, end); if (TEXICMD__MAX == cmd) continue; if (NULL != texitoks[cmd].fp) - (*texitoks[cmd].fp)(p, cmd, buf, sz, &pos); - } + (*texitoks[cmd].fp)(p, cmd, buf, sz, pos); + } + return(0); } +/* + * Parse until the end of a bracketed statement, e.g., @foo{bar baz}. + * This will stop in the event of EOF or if we're not at a bracket. + */ static void parsebracket(struct texi *p, const char *buf, size_t sz, size_t *pos) { size_t end; enum texicmd cmd; - while (*pos < sz && isspace(buf[*pos])) + while (*pos < sz && ismspace(buf[*pos])) advance(p, buf, pos); if (*pos == sz || '{' != buf[*pos]) @@ -702,7 +844,7 @@ parsebracket(struct texi *p, const char *buf, size_t s case ('@'): break; default: - texiword(p, buf, sz, pos); + texiword(p, buf, sz, pos, '\0'); continue; } @@ -747,7 +889,7 @@ parseeoln(struct texi *p, const char *buf, size_t sz, case ('@'): break; default: - texiword(p, buf, sz, pos); + texiword(p, buf, sz, pos, '\0'); continue; } @@ -760,6 +902,10 @@ parseeoln(struct texi *p, const char *buf, size_t sz, } } +/* + * Parse a single word or command. + * This will return immediately at the EOF. + */ static void parsesingle(struct texi *p, const char *buf, size_t sz, size_t *pos) { @@ -783,7 +929,7 @@ parsesingle(struct texi *p, const char *buf, size_t sz case ('@'): break; default: - texiword(p, buf, sz, pos); + texiword(p, buf, sz, pos, '\0'); return; } @@ -795,7 +941,24 @@ parsesingle(struct texi *p, const char *buf, size_t sz (*texitoks[cmd].fp)(p, cmd, buf, sz, pos); } +/* + * Parse til the end of the buffer. + */ static void +parseeof(struct texi *p, const char *buf, size_t sz) +{ + size_t pos; + + for (pos = 0; pos < sz; ) + parsesingle(p, buf, sz, &pos); +} + +/* + * Parse a block sequence until we have the "@end endtoken" command + * invocation. + * This will return immediately at EOF. + */ +static void parseto(struct texi *p, const char *buf, size_t sz, size_t *pos, const char *endtoken) { @@ -821,7 +984,7 @@ parseto(struct texi *p, const char *buf, case ('@'): break; default: - texiword(p, buf, sz, pos); + texiword(p, buf, sz, pos, '\0'); continue; } @@ -831,8 +994,8 @@ parseto(struct texi *p, const char *buf, while (*pos < sz && isws(buf[*pos])) advance(p, buf, pos); /* - * FIXME: skip tabs and also check the full - * word, not just its initial substring! + * FIXME: check the full word, not just its + * initial substring! */ if (sz - *pos >= endtoksz && 0 == strncmp (&buf[*pos], endtoken, endtoksz)) { @@ -849,6 +1012,10 @@ parseto(struct texi *p, const char *buf, } } +/* + * Memory-map the file "fname" and begin parsing it. + * This can be called in a nested context. + */ static void parsefile(struct texi *p, const char *fname) { @@ -895,15 +1062,15 @@ dodeftypevar(struct texi *p, enum texicmd cmd, return; } - teximacro(p, ".Pp"); + texivspace(p); if (TEXICMD_DEFTYPEVR == cmd) { parsebracket(p, buf, sz, pos); texiputchars(p, ":\n"); } - teximacroopen(p, ".Vt "); + teximacroopen(p, "Vt"); parseeoln(p, buf, sz, pos); teximacroclose(p); - teximacro(p, ".Pp"); + texivspace(p); parseto(p, buf, sz, pos, blk); } @@ -913,19 +1080,14 @@ dodeftypefun(struct texi *p, enum texicmd cmd, { const char *blk; + blk = NULL; switch (cmd) { case (TEXICMD_DEFTYPEFN): - blk = "deftypefn"; - break; case (TEXICMD_DEFTYPEFUN): - blk = "deftypefun"; + blk = texitoks[cmd].tok; break; - case (TEXICMD_DEFTYPEFNX): - case (TEXICMD_DEFTYPEFUNX): - blk = NULL; - break; default: - abort(); + break; } if (p->ign) { @@ -937,7 +1099,7 @@ dodeftypefun(struct texi *p, enum texicmd cmd, switch (cmd) { case (TEXICMD_DEFTYPEFN): case (TEXICMD_DEFTYPEFUN): - teximacro(p, ".Pp"); + texivspace(p); break; default: break; @@ -947,16 +1109,16 @@ dodeftypefun(struct texi *p, enum texicmd cmd, parsebracket(p, buf, sz, pos); texiputchars(p, ":\n"); } - teximacroopen(p, ".Ft "); + teximacroopen(p, "Ft"); parsesingle(p, buf, sz, pos); teximacroclose(p); - teximacroopen(p, ".Fn "); + teximacroopen(p, "Fn"); parsesingle(p, buf, sz, pos); teximacroclose(p); - teximacroopen(p, ".Li "); + teximacroopen(p, "Li"); parseeoln(p, buf, sz, pos); teximacroclose(p); - teximacro(p, ".Pp"); + texivspace(p); if (NULL != blk) parseto(p, buf, sz, pos, blk); } @@ -965,47 +1127,9 @@ static void doignblock(struct texi *p, enum texicmd cmd, const char *buf, size_t sz, size_t *pos) { - const char *blk; - switch (cmd) { - case (TEXICMD_COPYING): - blk = "copying"; - break; - case (TEXICMD_DETAILMENU): - blk = "detailmenu"; - break; - case (TEXICMD_DIRENTRY): - blk = "direntry"; - break; - case (TEXICMD_IFCLEAR): - blk = "ifclear"; - break; - case (TEXICMD_IFHTML): - blk = "ifhtml"; - break; - case (TEXICMD_IFINFO): - blk = "ifinfo"; - break; - case (TEXICMD_IFSET): - blk = "ifset"; - break; - case (TEXICMD_IFTEX): - blk = "iftex"; - break; - case (TEXICMD_MENU): - blk = "menu"; - break; - case (TEXICMD_TEX): - blk = "tex"; - break; - case (TEXICMD_TITLEPAGE): - blk = "titlepage"; - break; - default: - abort(); - } p->ign++; - parseto(p, buf, sz, pos, blk); + parseto(p, buf, sz, pos, texitoks[cmd].tok); p->ign--; } @@ -1013,47 +1137,43 @@ static void doblock(struct texi *p, enum texicmd cmd, const char *buf, size_t sz, size_t *pos) { - const char *blk; + + parseto(p, buf, sz, pos, texitoks[cmd].tok); +} +static void +doinline(struct texi *p, enum texicmd cmd, + const char *buf, size_t sz, size_t *pos) +{ + const char *macro; + switch (cmd) { - case (TEXICMD_GROUP): - blk = "group"; + case (TEXICMD_COMMAND): + macro = "Xr"; break; - case (TEXICMD_IFNOTTEX): - blk = "ifnottex"; + case (TEXICMD_ENV): + macro = "Ev"; break; + case (TEXICMD_FILE): + macro = "Pa"; + break; + case (TEXICMD_VAR): + macro = "Va"; + break; default: abort(); } - - parseto(p, buf, sz, pos, blk); -} -static void -doinline(struct texi *p, const char *buf, - size_t sz, size_t *pos, const char *macro) -{ - int open = 0; + if (p->literal) { + parsebracket(p, buf, sz, pos); + return; + } - if (0 == p->outmacro) { - open = 1; - teximacroopen(p, "."); - } else - texiputchar(p, ' '); - - texiputchars(p, macro); - texiputchar(p, ' '); + teximacroopen(p, macro); p->seenws = 0; parsebracket(p, buf, sz, pos); - if (*pos < sz - 1 && - ismpunct(buf[*pos]) && - isspace(buf[*pos + 1])) { - texiputchar(p, ' '); - texiputchar(p, buf[*pos]); - advance(p, buf, pos); - } - if (open) - teximacroclose(p); + texipunctuate(p, buf, sz, pos); + teximacroclose(p); } static void @@ -1086,69 +1206,59 @@ doinclude(struct texi *p, enum texicmd cmd, if (strstr(fname, "../") || strstr(fname, "/..")) texierr(p, "insecure path"); - /* Append filename to original name's directory. */ - rc = snprintf(path, sizeof(path), "%s/%s", p->dir, fname); - if (rc < 0) - texierr(p, "couldn't format filename"); - else if ((size_t)rc >= sizeof(path)) - texierr(p, "path too long"); + for (i = 0; i < p->dirsz; i++) { + rc = snprintf(path, sizeof(path), + "%s/%s", p->dirs[i], fname); + if (rc < 0) + texierr(p, "couldn't format path"); + else if ((size_t)rc >= sizeof(path)) + texierr(p, "path too long"); + else if (-1 == access(path, R_OK)) + continue; - /* Pump through to parser. */ - parsefile(p, path); + parsefile(p, path); + return; + } + + texierr(p, "couldn't find %s in includes", fname); } 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) { @@ -1157,41 +1267,30 @@ 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"); + 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"); - teximacro(p, ".Ed"); + parseto(p, buf, sz, pos, texitoks[cmd].tok); + teximacro(p, "Ed"); } 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"); + 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"); + teximacro(p, "Ed"); } static void @@ -1204,6 +1303,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) { @@ -1226,6 +1342,9 @@ dosymbol(struct texi *p, enum texicmd cmd, case (TEXICMD_BANG): texiputchar(p, '!'); break; + case (TEXICMD_BULLET): + texiputchars(p, "\\(bu"); + break; case (TEXICMD_COPYRIGHT): texiputchars(p, "\\(co"); break; @@ -1251,10 +1370,12 @@ dosymbol(struct texi *p, enum texicmd cmd, case (TEXICMD_HYPHEN): break; default: + texiwarn(p, "sym: %d", cmd); abort(); } - doignbracket(p, cmd, buf, sz, pos); + if (texitoks[cmd].len > 1) + doignbracket(p, cmd, buf, sz, pos); } static void @@ -1262,12 +1383,11 @@ doquotation(struct texi *p, enum texicmd cmd, const char *buf, size_t sz, size_t *pos) { - teximacro(p, ".Qo"); + teximacro(p, "Qo"); parseto(p, buf, sz, pos, "quotation"); - teximacro(p, ".Qc"); + teximacro(p, "Qc"); } -/* FIXME */ static void domath(struct texi *p, enum texicmd cmd, const char *buf, size_t sz, size_t *pos) @@ -1303,78 +1423,104 @@ domath(struct texi *p, enum texicmd cmd, advance(p, buf, pos); } -/* FIXME */ static void -doarg1(struct texi *p, enum texicmd cmd, +dolink(struct texi *p, enum texicmd cmd, const char *buf, size_t sz, size_t *pos) { - int open = 0; + int c; - if (*pos == sz || '{' != buf[*pos]) - return; - advance(p, buf, pos); switch (cmd) { case (TEXICMD_EMAIL): - if ( ! p->outmacro) { - open = 1; - teximacroopen(p, "."); - } - texiputchars(p, "Lk "); + teximacroopen(p, "Mt"); break; case (TEXICMD_UREF): case (TEXICMD_URL): - if ( ! p->outmacro) { - open = 1; - teximacroopen(p, "."); - } - texiputchars(p, "Mt "); + teximacroopen(p, "Lk"); break; - default: + case (TEXICMD_XREF): + texiputchars(p, "See Section"); + teximacroopen(p, "Qq"); break; + case (TEXICMD_PXREF): + texiputchars(p, "see Section"); + teximacroopen(p, "Qq"); + break; + default: + abort(); } - /* FIXME: this is ugly */ - while (*pos < sz && '}' != buf[*pos] && ',' != buf[*pos]) { - texiputchar(p, buf[*pos]); - advance(p, buf, pos); - } - while (*pos < sz && '}' != buf[*pos]) - advance(p, buf, pos); - if (*pos < sz) - advance(p, buf, pos); - if (*pos < sz - 1 && - ismpunct(buf[*pos]) && - isspace(buf[*pos + 1])) { - texiputchar(p, ' '); - texiputchar(p, buf[*pos]); - advance(p, buf, pos); - } - if (open) - teximacroclose(p); + + c = parsearg(p, buf, sz, pos, 0); + p->ign++; + while (c > 0) + c = parsearg(p, buf, sz, pos, 1); + p->ign--; + + texipunctuate(p, buf, sz, pos); + teximacroclose(p); } static void +doignargn(struct texi *p, enum texicmd cmd, + const char *buf, size_t sz, size_t *pos) +{ + int c; + + c = parsearg(p, buf, sz, pos, 0); + p->ign++; + while (c > 0) + c = parsearg(p, buf, sz, pos, 1); + p->ign--; +} + +static void 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); - teximacro(p, ".Pp"); + teximacroclose(p); + 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 @@ -1382,41 +1528,45 @@ 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, +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]; - if (p->outmacro) - texierr(p, "section in open line scope!?"); - else if (p->literal) - texierr(p, "section in a literal scope!?"); + t = time(NULL); + strftime(date, sizeof(date), "%F", localtime(&t)); - teximacroopen(p, ".Sh "); - parseeoln(p, buf, sz, pos); + p->ign--; + 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"); + 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 -dotop(struct texi *p, enum texicmd cmd, - const char *buf, size_t sz, size_t *pos) -{ - - p->ign--; - advanceeoln(p, buf, sz, pos, 1); - teximacro(p, ".Dd $Mdocdate: February 17 2015 $"); - teximacro(p, ".Dt SOMETHING 7"); - teximacro(p, ".Os"); - teximacro(p, ".Sh NAME"); - teximacro(p, ".Nm Something"); - teximacro(p, ".Nd Something"); -} - -static void doitem(struct texi *p, enum texicmd cmd, const char *buf, size_t sz, size_t *pos) { @@ -1428,21 +1578,22 @@ doitem(struct texi *p, enum texicmd cmd, switch (p->list) { case (TEXILIST_ITEM): - teximacroopen(p, ".It"); + teximacroopen(p, "It"); break; case (TEXILIST_NOITEM): - teximacro(p, ".It"); + teximacro(p, "It"); break; default: - teximacro(p, ".Pp"); + texivspace(p); break; } + p->seenvs = 1; parseeoln(p, buf, sz, pos); if (TEXILIST_ITEM == p->list) teximacroclose(p); - else + else if (p->outcol > 0) texiputchar(p, '\n'); } @@ -1453,9 +1604,12 @@ dotable(struct texi *p, enum texicmd cmd, enum texilist sv = p->list; p->list = TEXILIST_ITEM; - teximacro(p, ".Bl -tag -width Ds"); + 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"); + teximacro(p, "El"); p->list = sv; } @@ -1466,9 +1620,12 @@ doenumerate(struct texi *p, enum texicmd cmd, enum texilist sv = p->list; p->list = TEXILIST_NOITEM; - teximacro(p, ".Bl -enum"); + 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"); + teximacro(p, "El"); p->list = sv; } @@ -1479,9 +1636,12 @@ doitemize(struct texi *p, enum texicmd cmd, enum texilist sv = p->list; p->list = TEXILIST_ITEM; - teximacro(p, ".Bl -bullet"); + 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"); + teximacro(p, "El"); p->list = sv; } @@ -1500,16 +1660,63 @@ 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); } +/* + * Parse colon-separated directories from "cp" (if not NULL) and returns + * the array of pointers. + * Prepends "base" to the array. + * This does NOT sanitise the directories! + */ +static char ** +parsedirs(const char *base, const char *cp, size_t *sz) +{ + char *tok, *str, *tofree; + const char *cpp; + size_t i; + char **dirs; + + *sz = NULL != (cpp = cp) ? 2 : 1; + if (*sz > 1) + for ( ; NULL != (cpp = strchr(cpp, ':')); (*sz)++) + cpp++; + + dirs = calloc(*sz, sizeof(char *)); + if (NULL == dirs) { + perror(NULL); + exit(EXIT_FAILURE); + } else if (NULL == (dirs[0] = strdup(base))) { + perror(NULL); + exit(EXIT_FAILURE); + } + + if (NULL == cp) + return(dirs); + + if (NULL == (tofree = tok = str = strdup(cp))) { + perror(NULL); + exit(EXIT_FAILURE); + } + + for (i = 1; NULL != (tok = strsep(&str, ":")); i++) + if (NULL == (dirs[i] = strdup(tok))) { + perror(NULL); + exit(EXIT_FAILURE); + } + + free(tofree); + return(dirs); +} + int main(int argc, char *argv[]) { struct texi texi; int c; char *path, *dir; - const char *progname; + const char *progname, *Idir, *cp; progname = strrchr(argv[0], '/'); if (progname == NULL) @@ -1517,8 +1724,14 @@ main(int argc, char *argv[]) else ++progname; - while (-1 != (c = getopt(argc, argv, ""))) + memset(&texi, 0, sizeof(struct texi)); + Idir = NULL; + + while (-1 != (c = getopt(argc, argv, "I:"))) switch (c) { + case ('I'): + Idir = optarg; + break; default: goto usage; } @@ -1537,13 +1750,24 @@ 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.dir = strdup(dir); + texi.dirs = parsedirs(dir, Idir, &texi.dirsz); parsefile(&texi, argv[0]); + /* We shouldn't get here. */ texiexit(&texi); return(EXIT_FAILURE); usage: - fprintf(stderr, "usage: %s file\n", progname); + fprintf(stderr, "usage: %s [-Idirs] file\n", progname); return(EXIT_FAILURE); }