=================================================================== RCS file: /cvs/texi2mdoc/main.c,v retrieving revision 1.65 retrieving revision 1.73 diff -u -p -r1.65 -r1.73 --- texi2mdoc/main.c 2015/03/09 18:54:38 1.65 +++ texi2mdoc/main.c 2018/11/13 10:19:16 1.73 @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.65 2015/03/09 18:54:38 kristaps Exp $ */ +/* $Id: main.c,v 1.73 2018/11/13 10:19:16 schwarze Exp $ */ /* * Copyright (c) 2015 Kristaps Dzonsons * @@ -17,6 +17,9 @@ #if defined(__linux__) || defined(__MINT__) # define _GNU_SOURCE /* memmem */ #endif + +#include + #include #include #include @@ -26,16 +29,25 @@ #include #include #include +#include #include #include "extern.h" +#define HAVE_INDEX 1 + +/* + * Texinfo can change the "meaning" of its section headings: chapter, + * section, subsection, etc., can be promoted and/or demoted to other + * levels of heading. + * Thus, we use an offset and just jump into this array. + */ #define SECTSZ 4 static const char *const sects[SECTSZ] = { - "Sh", - "Ss", - "Em", - "No", + "Sh", /* Chapters (sections) */ + "Ss", /* Sections (subsections) */ + "Em", /* Subsections (subsubsection) */ + "Sy", /* Subsubsections (...). */ }; static void doaccent(struct texi *, enum texicmd, size_t *); @@ -53,6 +65,7 @@ static void doignargn(struct texi *, enum texicmd, siz static void doignblock(struct texi *, enum texicmd, size_t *); static void doignbracket(struct texi *, enum texicmd, size_t *); static void doignline(struct texi *, enum texicmd, size_t *); +static void doindex(struct texi *, enum texicmd, size_t *); static void doinline(struct texi *, enum texicmd, size_t *); static void doinclude(struct texi *, enum texicmd, size_t *); static void doinsertcopying(struct texi *, enum texicmd, size_t *); @@ -61,21 +74,15 @@ static void doitemize(struct texi *, enum texicmd, siz static void dolink(struct texi *, enum texicmd, size_t *); static void domacro(struct texi *, enum texicmd, size_t *); static void domath(struct texi *, enum texicmd, size_t *); -#if 0 static void domenu(struct texi *, enum texicmd, size_t *); -#endif static void domultitable(struct texi *, enum texicmd, size_t *); -#if 0 static void donode(struct texi *, enum texicmd, size_t *); -#endif +static void doprintindex(struct texi *, enum texicmd, size_t *); static void doquotation(struct texi *, enum texicmd, size_t *); static void dotable(struct texi *, enum texicmd, size_t *); -static void dotop(struct texi *, enum texicmd, size_t *); static void dosecoffs(struct texi *, enum texicmd, size_t *); static void dosection(struct texi *, enum texicmd, size_t *); static void dosp(struct texi *, enum texicmd, size_t *); -static void dosubsection(struct texi *, enum texicmd, size_t *); -static void dosubsubsection(struct texi *, enum texicmd, size_t *); static void dosymbol(struct texi *, enum texicmd, size_t *); static void dotab(struct texi *, enum texicmd, size_t *); static void dotitle(struct texi *, enum texicmd, size_t *); @@ -96,8 +103,8 @@ static const struct texitok __texitoks[TEXICMD__MAX] = { doignbracket, "anchor", 6 }, /* TEXICMD_ANCHOR */ { dosection, "appendix", 8 }, /* TEXICMD_APPENDIX */ { dosection, "appendixsec", 11 }, /* TEXICMD_APPENDIXSEC */ - { dosubsection, "appendixsubsec", 14 }, /* TEXICMD_APPENDIXSUBSEC */ - { dosubsubsection, "appendixsubsubsec", 17 }, /* TEXICMD_APPENDIXSUBSUBSEC */ + { dosection, "appendixsubsec", 14 }, /* TEXICMD_APPENDIXSUBSEC */ + { dosection, "appendixsubsubsec", 17 }, /* TEXICMD_APPENDIXSUBSUBSEC */ { doinline, "asis", 4 }, /* TEXICMD_ASIS */ { dosymbol, "*", 1 }, /* TEXICMD_ASTERISK */ { dosymbol, "@", 1 }, /* TEXICMD_AT */ @@ -111,7 +118,7 @@ static const struct texitok __texitoks[TEXICMD__MAX] = { doaccent, ",", 1 }, /* TEXICMD_CEDILLA */ { doignline, "center", 6 }, /* TEXICMD_CENTER */ { dosection, "chapter", 7 }, /* TEXICMD_CHAPTER */ - { doignline, "cindex", 6 }, /* TEXICMD_CINDEX */ + { doindex, "cindex", 6 }, /* TEXICMD_CINDEX */ { doaccent, "^", 1 }, /* TEXICMD_CIRCUMFLEX */ { doinline, "cite", 4 }, /* TEXICMD_CITE */ { dovalue, "clear", 5 }, /* TEXICMD_CLEAR */ @@ -131,6 +138,10 @@ static const struct texitok __texitoks[TEXICMD__MAX] = { dodefindex, "defindex", 8 }, /* TEXICMD_DEFINDEX */ { dodefn, "defmac", 6 }, /* TEXICMD_DEFMAC */ { dodefn, "defmacx", 7 }, /* TEXICMD_DEFMACX */ + { dodefn, "defop", 5 }, /* TEXICMD_DEFOP */ + { dodefn, "defopx", 6 }, /* TEXICMD_DEFOPX */ + { dodefn, "defopt", 6 }, /* TEXICMD_DEFOPT */ + { dodefn, "defoptx", 7 }, /* TEXICMD_DEFOPTX */ { dodefn, "deftp", 5 }, /* TEXICMD_DEFTP */ { dodefn, "deftpx", 6 }, /* TEXICMD_DEFTPX */ { dodefn, "deftypefn", 9 }, /* TEXICMD_DEFTYPEFN */ @@ -178,7 +189,7 @@ static const struct texitok __texitoks[TEXICMD__MAX] = { dosymbol, "expansion", 9 }, /* TEXICMD_EXPANSION */ { doinline, "file", 4 }, /* TEXICMD_FILE */ { doignline, "finalout", 8 }, /* TEXICMD_FINALOUT */ - { doignline, "findex", 6 }, /* TEXICMD_FINDEX */ + { doindex, "findex", 6 }, /* TEXICMD_FINDEX */ { doblock, "flushleft", 9 }, /* TEXICMD_FLUSHLEFT */ { doblock, "flushright", 10 }, /* TEXICMD_FLUSHRIGHT */ { doignline, "firstparagraphindent", 20 }, /* TEXICMD_FIRSTPARAGRAPHINDENT */ @@ -237,20 +248,12 @@ static const struct texitok __texitoks[TEXICMD__MAX] = { domacro, "macro", 5 }, /* TEXICMD_MACRO */ { doaccent, "=", 1 }, /* TEXICMD_MACRON */ { domath, "math", 4 }, /* TEXICMD_MATH */ -#if 0 { domenu, "menu", 4 }, /* TEXICMD_MENU */ -#else - { doignblock, "menu", 4 }, /* TEXICMD_MENU */ -#endif { dosymbol, "minus", 5 }, /* TEXICMD_MINUS */ { domultitable, "multitable", 10 }, /* TEXICMD_MULTITABLE */ { doignline, "need", 4 }, /* TEXICMD_NEED */ { dosymbol, "\n", 1 }, /* TEXICMD_NEWLINE */ -#if 0 { donode, "node", 4 }, /* TEXICMD_NODE */ -#else - { doignline, "node", 4 }, /* TEXICMD_NODE */ -#endif { doignline, "noindent", 8 }, /* TEXICMD_NOINDENT */ { dosymbol, "O", 1 }, /* TEXICMD_O */ { dosymbol, "OE", 2 }, /* TEXICMD_OE */ @@ -265,7 +268,7 @@ static const struct texitok __texitoks[TEXICMD__MAX] = { dosymbol, ".", 1 }, /* TEXICMD_PERIOD */ { doignline, "pindex", 6 }, /* TEXICMD_PINDEX */ { dosymbol, "pounds", 6 }, /* TEXICMD_POUNDS */ - { doignline, "printindex", 10 }, /* TEXICMD_PRINTINDEX */ + { doprintindex, "printindex", 10 }, /* TEXICMD_PRINTINDEX */ { dolink, "pxref", 5 }, /* TEXICMD_PXREF */ { dosymbol, "questiondown", 12 }, /* TEXICMD_QUESTIONDOWN */ { dosymbol, "?", 1 }, /* TEXICMD_QUESTIONMARK */ @@ -306,10 +309,10 @@ static const struct texitok __texitoks[TEXICMD__MAX] = { dosymbol, "}", 1 }, /* TEXICMD_SQUIGGLE_RIGHT */ { dosymbol, "ss", 2 }, /* TEXICMD_SS */ { doinline, "strong", 6 }, /* TEXICMD_STRONG */ - { dosubsection, "subheading", 10 }, /* TEXICMD_SUBHEADING */ - { dosubsection, "subsection", 10 }, /* TEXICMD_SUBSECTION */ - { dosubsubsection, "subsubheading", 13 }, /* TEXICMD_SUBSUBHEADING */ - { dosubsubsection, "subsubsection", 13 }, /* TEXICMD_SUBSUBSECTION */ + { dosection, "subheading", 10 }, /* TEXICMD_SUBHEADING */ + { dosection, "subsection", 10 }, /* TEXICMD_SUBSECTION */ + { dosection, "subsubheading", 13 }, /* TEXICMD_SUBSUBHEADING */ + { dosection, "subsubsection", 13 }, /* TEXICMD_SUBSUBSECTION */ { doignline, "subtitle", 8 }, /* TEXICMD_SUBTITLE */ { doignline, "summarycontents", 15 }, /* TEXICMD_SUMMARYCONTENTS */ { dodefindex, "synindex", 8 }, /* TEXICMD_SYNINDEX */ @@ -326,19 +329,20 @@ static const struct texitok __texitoks[TEXICMD__MAX] = { dosymbol, "tie", 3 }, /* TEXICMD_TIE */ { doaccent, "tieaccent", 9 }, /* TEXICMD_TIEACCENT */ { doaccent, "~", 1 }, /* TEXICMD_TILDE */ - { doignline, "tindex", 6 }, /* TEXICMD_TINDEX */ + { doindex, "tindex", 6 }, /* TEXICMD_TINDEX */ { doignline, "title", 5 }, /* TEXICMD_TITLE */ { dobracket, "titlefont", 9 }, /* TEXICMD_TITLEFONT */ { doignblock, "titlepage", 9 }, /* TEXICMD_TITLEPAGE */ - { dotop, "top", 3 }, /* TEXICMD_TOP */ + { dosection, "top", 3 }, /* TEXICMD_TOP */ + { doindex, "tpindex", 7 }, /* TEXICMD_TPINDEX */ { doaccent, "u", 1 }, /* TEXICMD_U */ { doaccent, "ubaraccent", 10 }, /* TEXICMD_UBARACCENT */ { doaccent, "udotaccent", 10 }, /* TEXICMD_UDOTACCENT */ { doaccent, "\"", 1 }, /* TEXICMD_UMLAUT */ { dosection, "unnumbered", 10 }, /* TEXICMD_UNNUMBERED */ { dosection, "unnumberedsec", 13 }, /* TEXICMD_UNNUMBEREDSEC */ - { dosubsection, "unnumberedsubsec", 16 }, /* TEXICMD_UNNUMBEREDSUBSEC */ - { dosubsubsection, "unnumberedsubsubsec", 19 }, /* TEXICMD_UNNUMBEREDSUBSUBSEC */ + { dosection, "unnumberedsubsec", 16 }, /* TEXICMD_UNNUMBEREDSUBSEC */ + { dosection, "unnumberedsubsubsec", 19 }, /* TEXICMD_UNNUMBEREDSUBSUBSEC */ { dolink, "uref", 4 }, /* TEXICMD_UREF */ { dolink, "url", 3 }, /* TEXICMD_URL */ { doignline, "", 0 }, /* TEXICMD_USER_INDEX */ @@ -348,7 +352,8 @@ static const struct texitok __texitoks[TEXICMD__MAX] = { doverb, "verb", 4 }, /* TEXICMD_VERB */ { doverbatim, "verbatim", 8 }, /* TEXICMD_VERBATIM */ { doverbinclude, "verbatiminclude", 15 }, /* TEXICMD_VERBATIMINCLUDE */ - { doignline, "vindex", 6 }, /* TEXICMD_VINDEX */ + { doindex, "vindex", 6 }, /* TEXICMD_VINDEX */ + { doindex, "vrindex", 7 }, /* TEXICMD_VRINDEX */ { dosp, "vskip", 5 }, /* TEXICMD_VSKIP */ { dotable, "vtable", 6 }, /* TEXICMD_VTABLE */ { dobracket, "w", 1 }, /* TEXICMD_W */ @@ -359,43 +364,34 @@ static const struct texitok __texitoks[TEXICMD__MAX] = const struct texitok *const texitoks = __texitoks; /* - * Texinfo has lots of indexes. - * You can add new ones in a variety of ways. - * We maintain an array of all of these index names (usually a few - * letters) and pass unknown commands through the array list. + * Define new indexes either by assignment or aliasing (both of these + * accept the first argument as the new index). */ static void dodefindex(struct texi *p, enum texicmd cmd, size_t *pos) { - size_t start, end; - char *cp; + size_t start; while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) advance(p, pos); - start = end = *pos; - while (end < BUFSZ(p) && ! ismspace(BUF(p)[end])) - end++; - - if (start == end) { - advanceeoln(p, pos, 1); + start = *pos; + while (*pos < BUFSZ(p) && '\n' != BUF(p)[*pos]) + advance(p, pos); + if (*pos == BUFSZ(p)) { + texiwarn(p, "unexpected EOF"); return; - } - - if (NULL == (cp = malloc(end - start + 1))) - texiabort(p, NULL); - memcpy(cp, &BUF(p)[start], end - start); - cp[end - start] = '\0'; - - /* FIXME: use reallocarray(). */ - p->indexs = realloc(p->indexs, - sizeof(char *) * (p->indexsz + 1)); - if (NULL == p->indexs) - texiabort(p, NULL); - p->indexs[p->indexsz++] = cp; - - advanceeoln(p, pos, 1); + } + if (0 == *pos - start) + texiwarn(p, "zero-length index definition"); + else + texindex_add(p, &BUF(p)[start], *pos - start); + advance(p, pos); } +/* + * Handle both possible "define function" (type, etc.) classes: where + * we'll have a body and without one (suffixed with "x"). + */ static void dodefn(struct texi *p, enum texicmd cmd, size_t *pos) { @@ -405,6 +401,8 @@ dodefn(struct texi *p, enum texicmd cmd, size_t *pos) switch (cmd) { case (TEXICMD_DEFFN): case (TEXICMD_DEFMAC): + case (TEXICMD_DEFOP): + case (TEXICMD_DEFOPT): case (TEXICMD_DEFTP): case (TEXICMD_DEFTYPEFN): case (TEXICMD_DEFTYPEFUN): @@ -427,8 +425,10 @@ dodefn(struct texi *p, enum texicmd cmd, size_t *pos) return; } - if (NULL != blk) - texivspace(p); + if (p->seenvs >= 0) { + teximacro(p, "Pp"); + p->seenvs = -1; + } switch (cmd) { case (TEXICMD_DEFTYPEMETHOD): @@ -439,6 +439,10 @@ dodefn(struct texi *p, enum texicmd cmd, size_t *pos) case (TEXICMD_DEFMACX): texiputchars(p, "Macro"); break; + case (TEXICMD_DEFOPT): + case (TEXICMD_DEFOPTX): + texiputchars(p, "User Option"); + break; case (TEXICMD_DEFTYPEVAR): case (TEXICMD_DEFTYPEVARX): case (TEXICMD_DEFVAR): @@ -456,6 +460,7 @@ dodefn(struct texi *p, enum texicmd cmd, size_t *pos) break; } + p->seenvs = 0; texiputchar(p, ':'); texiputchar(p, '\n'); @@ -463,7 +468,7 @@ dodefn(struct texi *p, enum texicmd cmd, size_t *pos) case (TEXICMD_DEFMAC): case (TEXICMD_DEFMACX): teximacroopen(p, "Dv"); - while (parselinearg(p, pos)) + while (parselinearg(p, pos)) /* Spin. */ ; teximacroclose(p); break; @@ -475,11 +480,13 @@ dodefn(struct texi *p, enum texicmd cmd, size_t *pos) parselinearg(p, pos); teximacroclose(p); teximacroopen(p, "Fa"); - while (parselinearg(p, pos)) + while (parselinearg(p, pos)) /* Spin. */ ; teximacroclose(p); teximacro(p, "Fc"); break; + case (TEXICMD_DEFOP): + case (TEXICMD_DEFOPX): case (TEXICMD_DEFTYPEFUN): case (TEXICMD_DEFTYPEFUNX): case (TEXICMD_DEFTYPEFN): @@ -493,7 +500,7 @@ dodefn(struct texi *p, enum texicmd cmd, size_t *pos) parselinearg(p, pos); teximacroclose(p); teximacroopen(p, "Fa"); - while (parselinearg(p, pos)) + while (parselinearg(p, pos)) /* Spin. */ ; teximacroclose(p); teximacro(p, "Fc"); @@ -505,16 +512,18 @@ dodefn(struct texi *p, enum texicmd cmd, size_t *pos) case (TEXICMD_DEFTYPEVR): case (TEXICMD_DEFTYPEVRX): teximacroopen(p, "Vt"); - while (parselinearg(p, pos)) + while (parselinearg(p, pos)) /* Spin. */ ; teximacroclose(p); break; + case (TEXICMD_DEFOPT): + case (TEXICMD_DEFOPTX): case (TEXICMD_DEFVAR): case (TEXICMD_DEFVARX): case (TEXICMD_DEFVR): case (TEXICMD_DEFVRX): teximacroopen(p, "Va"); - while (parselinearg(p, pos)) + while (parselinearg(p, pos)) /* Spin. */ ; teximacroclose(p); break; @@ -540,6 +549,8 @@ dodefn(struct texi *p, enum texicmd cmd, size_t *pos) switch (peekcmd(p, *pos)) { case (TEXICMD_DEFFNX): case (TEXICMD_DEFMACX): + case (TEXICMD_DEFOPX): + case (TEXICMD_DEFOPTX): case (TEXICMD_DEFTPX): case (TEXICMD_DEFTYPEFNX): case (TEXICMD_DEFTYPEFUNX): @@ -563,10 +574,13 @@ dodefn(struct texi *p, enum texicmd cmd, size_t *pos) return; } - teximacro(p, "Bd -filled -offset indent"); + texivspace(p); + teximacro(p, "Bd -filled -offset indent -compact"); + p->seenvs = -1; parseto(p, pos, blk); + p->seenvs = 0; teximacro(p, "Ed"); - p->seenvs = 1; + texivspace(p); } static void @@ -597,9 +611,17 @@ domacro(struct texi *p, enum texicmd cmd, size_t *pos) m.key[end - start] = '\0'; m.args = argparse(p, pos, &m.argsz, 0); + if (*pos == BUFSZ(p)) { + texiwarn(p, "unexpected EOF"); + return; + } /* Note: we advance to the beginning of the macro. */ advanceeoln(p, pos, 1); + if ((start = *pos) == BUFSZ(p)) { + texiwarn(p, "unexpected EOF"); + return; + } /* * According to the Texinfo manual, the macro ends on the @@ -612,7 +634,6 @@ domacro(struct texi *p, enum texicmd cmd, size_t *pos) * @end macro without the leading newline else we might look * past empty macros. */ - start = *pos; endtok = "@end macro\n"; endtoksz = strlen(endtok); blk = memmem(&BUF(p)[start], BUFSZ(p) - start, endtok, endtoksz); @@ -622,7 +643,7 @@ domacro(struct texi *p, enum texicmd cmd, size_t *pos) while (&BUF(p)[*pos] != blk) advance(p, pos); assert('@' == BUF(p)[*pos]); - if ('\n' != BUF(p)[*pos - 1]) + if ('\n' != BUF(p)[*pos - 1]) texierr(p, "cannot handle @end macro in-line"); len = blk - &BUF(p)[start]; @@ -634,7 +655,7 @@ domacro(struct texi *p, enum texicmd cmd, size_t *pos) p->macros = realloc (p->macros, - (p->macrosz + 1) * + (p->macrosz + 1) * sizeof(struct teximacro)); if (NULL == p->macros) texiabort(p, NULL); @@ -650,25 +671,25 @@ doignblock(struct texi *p, enum texicmd cmd, size_t *p const char *endt, *startt; size_t esz, ssz, newpos, stack; - /* + /* * FIXME: this is cheating. * These tokens are supposed to begin on a newline. * However, if we do that, then we would need to check within * the loop for trailer (or leading, as the case may be) * newline, and that's just a bit too complicated right now. * This is becasue - * @ifset BAR - * @ifset FOO - * @end ifset - * @end ifset + * @ifset BAR + * @ifset FOO + * @end ifset + * @end ifset * won't work right now: we'd read after the first "@end ifset" * to the next line, then look for the next line after that. */ - ssz = snprintf(start, sizeof(start), + ssz = snprintf(start, sizeof(start), "@%s", texitoks[cmd].tok); assert(ssz < sizeof(start)); - esz = snprintf(end, sizeof(end), - "@end %s\n", texitoks[cmd].tok); + esz = snprintf(end, sizeof(end), + "@end %s", texitoks[cmd].tok); assert(esz < sizeof(end)); stack = 1; @@ -689,7 +710,7 @@ doignblock(struct texi *p, enum texicmd cmd, size_t *p "block", texitoks[cmd].tok); *pos = BUFSZ(p); break; - } + } newpos = *pos; if (NULL == startt || startt > endt) { @@ -709,7 +730,7 @@ doignblock(struct texi *p, enum texicmd cmd, size_t *p static void doblock(struct texi *p, enum texicmd cmd, size_t *pos) { - + parseto(p, pos, texitoks[cmd].tok); } @@ -721,6 +742,7 @@ doinline(struct texi *p, enum texicmd cmd, size_t *pos switch (cmd) { case (TEXICMD_CODE): case (TEXICMD_KBD): + /* FIXME: quote around @samp{} */ case (TEXICMD_SAMP): case (TEXICMD_T): macro = "Li"; @@ -764,9 +786,9 @@ doinline(struct texi *p, enum texicmd cmd, size_t *pos return; } - /* + /* * If we haven't seen any whitespace, then we don't want the - * subsequent macro to insert any whitespace. + * subsequent macro to insert any whitespace. */ if (p->outmacro && 0 == p->seenws) { teximacroopen(p, "Ns"); @@ -811,7 +833,7 @@ doverb(struct texi *p, enum texicmd cmd, size_t *pos) start = *pos; /* Read until we see the delimiter then end-brace. */ while (*pos < BUFSZ(p) - 1) { - if (BUF(p)[*pos] == delim && BUF(p)[*pos + 1] == '}') + if (BUF(p)[*pos] == delim && BUF(p)[*pos + 1] == '}') break; advance(p, pos); } @@ -831,9 +853,8 @@ doinsertcopying(struct texi *p, enum texicmd cmd, size { advanceeoln(p, pos, 0); - if (NULL == p->copying) - return; - texisplice(p, p->copying, p->copyingsz, *pos); + if (NULL != p->copying) + texisplice(p, p->copying, p->copyingsz, *pos); } static void @@ -852,16 +873,25 @@ docopying(struct texi *p, enum texicmd cmd, size_t *po } term = memmem(&BUF(p)[*pos], BUFSZ(p) - *pos, end, endsz); - if (NULL == term) { - texiwarn(p, "unterminated \"%s\"", texitoks[cmd].tok); - endpos = BUFSZ(p); - } else + if (NULL == term) + texierr(p, "unterminated \"%s\"", texitoks[cmd].tok); + else endpos = *pos + (size_t)(term - &BUF(p)[*pos]); - assert(endpos <= BUFSZ(p)); + if (endpos == *pos) { + advanceeoln(p, pos, 1); + return; + } + + assert(endpos < BUFSZ(p) && endpos > *pos); assert('\n' == BUF(p)[*pos]); advance(p, pos); + if (*pos == BUFSZ(p)) { + texiwarn(p, "unterminated \"%s\"", texitoks[cmd].tok); + return; + } + p->copying = malloc(endpos - *pos + 1); p->copyingsz = endpos - *pos; memcpy(p->copying, &BUF(p)[*pos], p->copyingsz); @@ -898,13 +928,16 @@ doverbatim(struct texi *p, enum texicmd cmd, size_t *p assert(endpos <= BUFSZ(p)); assert('\n' == BUF(p)[*pos]); advance(p, pos); - teximacro(p, "Bd -literal -offset indent"); + texivspace(p); + teximacro(p, "Bd -literal -offset indent -compact"); + p->seenvs = -1; while (*pos < endpos) { texiputchar(p, BUF(p)[*pos]); advance(p, pos); } + p->seenvs = 0; teximacro(p, "Ed"); - p->seenvs = 1; + texivspace(p); if (*pos < BUFSZ(p)) advanceto(p, pos, endpos + endsz); } @@ -912,9 +945,9 @@ doverbatim(struct texi *p, enum texicmd cmd, size_t *p static void doverbinclude(struct texi *p, enum texicmd cmd, size_t *pos) { - char fname[PATH_MAX], path[PATH_MAX]; - int rc; - size_t i, end; + char fname[PATH_MAX], path[PATH_MAX]; + int rc; + size_t i, end; const char *v; enum texicmd type; @@ -931,7 +964,7 @@ doverbinclude(struct texi *p, enum texicmd cmd, size_t } type = texicmd(p, *pos, &end, NULL); advanceto(p, pos, end); - if (TEXICMD_VALUE != type) + if (TEXICMD_VALUE != type) texierr(p, "unknown verbatiminclude command"); v = valueblookup(p, pos); if (NULL == v) @@ -956,9 +989,9 @@ doverbinclude(struct texi *p, enum texicmd cmd, size_t if (strstr(fname, "../") || strstr(fname, "/..")) texierr(p, "insecure path"); - rc = snprintf(path, sizeof(path), + rc = snprintf(path, sizeof(path), "%s/%s", p->dirs[0], fname); - if (rc < 0) + if (rc < 0) texierr(p, "couldn't format path"); else if ((size_t)rc >= sizeof(path)) texierr(p, "path too long"); @@ -969,9 +1002,9 @@ doverbinclude(struct texi *p, enum texicmd cmd, size_t static void doinclude(struct texi *p, enum texicmd cmd, size_t *pos) { - char fname[PATH_MAX], path[PATH_MAX]; - size_t i, end; - int rc; + char fname[PATH_MAX], path[PATH_MAX]; + size_t i, end; + int rc; const char *v; enum texicmd type; @@ -989,7 +1022,7 @@ doinclude(struct texi *p, enum texicmd cmd, size_t *po } type = texicmd(p, *pos, &end, NULL); advanceto(p, pos, end); - if (TEXICMD_VALUE != type) + if (TEXICMD_VALUE != type) texierr(p, "unknown include command"); v = valueblookup(p, pos); if (NULL == v) @@ -1015,9 +1048,9 @@ doinclude(struct texi *p, enum texicmd cmd, size_t *po texierr(p, "insecure path"); for (i = 0; i < p->dirsz; i++) { - rc = snprintf(path, sizeof(path), + rc = snprintf(path, sizeof(path), "%s/%s", p->dirs[i], fname); - if (rc < 0) + if (rc < 0) texierr(p, "couldn't format path"); else if ((size_t)rc >= sizeof(path)) texierr(p, "path too long"); @@ -1043,20 +1076,23 @@ dodisplay(struct texi *p, enum texicmd cmd, size_t *po { advanceeoln(p, pos, 1); + texivspace(p); switch (cmd) { case (TEXICMD_FORMAT): case (TEXICMD_SMALLFORMAT): - teximacro(p, "Bd -filled"); + teximacro(p, "Bd -filled -compact"); break; default: - teximacro(p, "Bd -filled -offset indent"); + teximacro(p, "Bd -filled -offset indent -compact"); break; } + p->seenvs = -1; parseto(p, pos, texitoks[cmd].tok); + p->seenvs = 0; teximacro(p, "Ed"); - p->seenvs = 1; + texivspace(p); } static void @@ -1065,12 +1101,14 @@ doexample(struct texi *p, enum texicmd cmd, size_t *po advanceeoln(p, pos, 1); - teximacro(p, "Bd -literal -offset indent"); + texivspace(p); + teximacro(p, "Bd -literal -offset indent -compact"); p->literal++; parseto(p, pos, texitoks[cmd].tok); p->literal--; + p->seenvs = 0; teximacro(p, "Ed"); - p->seenvs = 1; + texivspace(p); } static void @@ -1133,7 +1171,7 @@ doaccent(struct texi *p, enum texicmd cmd, size_t *pos if ('{' == BUF(p)[*pos]) { brace = 1; advance(p, pos); - } else if (isalpha((unsigned char)texitoks[cmd].tok[0])) + } else if (isalpha((unsigned char)texitoks[cmd].tok[0])) while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) advance(p, pos); @@ -1251,7 +1289,7 @@ doaccent(struct texi *p, enum texicmd cmd, size_t *pos } if (*pos < BUFSZ(p)) advance(p, pos); - } + } switch (cmd) { case (TEXICMD_TIEACCENT): @@ -1465,87 +1503,260 @@ dosymbol(struct texi *p, enum texicmd cmd, size_t *pos static void doquotation(struct texi *p, enum texicmd cmd, size_t *pos) { - + teximacro(p, "Qo"); parseto(p, pos, "quotation"); teximacro(p, "Qc"); } -#if 0 +static int +indexcmp(const void *p1, const void *p2) +{ + const struct texiterm *t1 = p1, *t2 = p2; + + return(strcasecmp(t1->term, t2->term)); +} + static void +doprintindex(struct texi *p, enum texicmd cmd, size_t *pos) +{ + static size_t guard = 0; + size_t i, j, start, end, len; +#if HAVE_INDEX + char *cp; + char buf[PATH_MAX]; +#endif + + if (guard++ > 8) + texierr(p, "recursive @printindex"); + + while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) + advance(p, pos); + start = *pos; + while (*pos < BUFSZ(p) && '\n' != BUF(p)[*pos]) + advance(p, pos); + if ((end = *pos) == BUFSZ(p)) { + texiwarn(p, "unexpected EOF"); + guard--; + return; + } + + advance(p, pos); + if (*pos == BUFSZ(p)) { + texiwarn(p, "unexpected EOF"); + guard--; + return; + } else if (0 == (len = end - start)) { + texiwarn(p, "zero-length index"); + guard--; + return; + } + + /* Look for the index in our table. */ + for (i = 0; i < p->indexsz; i++) { + if (strlen(p->indexs[i].name) != len) + continue; + if (strncmp(p->indexs[i].name, &BUF(p)[start], len)) + continue; + break; + } + + if (i == p->indexsz) { + texiwarn(p, "cannot find index"); + guard--; + return; + } else if (0 == p->indexs[i].indexsz) { + guard--; + return; + } + + /* Alphabetically sort our indices. */ + qsort(p->indexs[i].index, + p->indexs[i].indexsz, + sizeof(struct texiterm), indexcmp); + + texivspace(p); + teximacro(p, "Bl -tag -width Ds -compact"); + for (j = 0; j < p->indexs[i].indexsz; j++) { + teximacroopen(p, "It"); +#if HAVE_INDEX + if (NULL == p->chapters) { + teximacroopen(p, "Lkx"); + texiputchars(p, "\"idx"); + texiputchars(p, p->indexs[i].name); + cp = p->indexs[i].index[j].term; + while ('\n' != *cp) + texiputchar(p, *cp++); + texiputchars(p, "\" \""); + p->literal++; + } else { + teximacroopen(p, "Xr"); + snprintf(buf, sizeof(buf), "%s-%zd 7 \"idx", + p->chapters, p->indexs[i].index[j].chapter); + texiputchars(p, buf); + texiputchars(p, p->indexs[i].name); + cp = p->indexs[i].index[j].term; + while ('\n' != *cp) + texiputchar(p, *cp++); + texiputchars(p, "\" \""); + p->literal++; + } +#endif + texisplice(p, p->indexs[i].index[j].term, + strlen(p->indexs[i].index[j].term), *pos); + parseeoln(p, pos); +#if HAVE_INDEX + p->literal--; + texiputchars(p, "\""); + teximacroclose(p); +#endif + teximacroclose(p); + } + p->seenvs = 0; + teximacro(p, "El"); + texivspace(p); + guard--; +} + +static void donode(struct texi *p, enum texicmd cmd, size_t *pos) { + int sv = p->seenvs; + char fname[PATH_MAX]; + size_t end, start; - teximacroopen(p, "Ix"); - texiputchars(p, "Node"); - while (*pos < BUFSZ(p) && isspace(BUF(p)[*pos])) + if (0 == p->nodesz++) + p->ign--; + + /* Grab our node name. */ + while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) advance(p, pos); + start = *pos; while (*pos < BUFSZ(p)) { if (BUF(p)[*pos] == ',') break; else if (BUF(p)[*pos] == '\n') break; - texiputchar(p, BUF(p)[*pos]); advance(p, pos); } - - teximacroclose(p); + if (*pos == BUFSZ(p)) { + texiwarn(p, "unexpected EOF"); + return; + } + end = *pos; advanceeoln(p, pos, 1); + + if (NULL != p->chapters) + teximdocclose(p, 0); + + /* Cache our node name. */ + p->nodecur = texicache(p, &BUF(p)[start], end - start); + + if (NULL != p->chapters) { + snprintf(fname, sizeof(fname), + "%s-%zd.7", p->chapters, p->nodecur); + p->outfile = fopen(fname, "w"); + if (NULL == p->outfile) + texiabort(p, fname); + teximdocopen(p, pos); + } else if (p->nodesz > 1) { + /* Otherwise, mark our index. */ + p->seenvs = -1; +#if HAVE_INDEX + teximacroopen(p, "Ix"); + texiputchars(p, "node"); + texiputchars(p, p->nodecache[p->nodecur].name); + teximacroclose(p); +#endif + p->seenvs = sv; + } else + teximdocopen(p, pos); } +/* + * This handles both menu and detailedmenu. + * The syntax of these is fairly... unspecific, but what we do here + * seems to work with most manuals. + */ static void domenu(struct texi *p, enum texicmd cmd, size_t *pos) { - size_t start, sv; + size_t nodename, entryname; + size_t nodenameend, entrynameend, i; + ssize_t ppos, lastppos; + char buf[PATH_MAX]; + enum texicmd tcmd; - if (NULL != p->chapters) { - doignblock(p, cmd, pos); - return; - } - advanceeoln(p, pos, 1); + /* + * Parse past initial stuff. + * TODO: the manual says we're supposed to make this in bold or + * something. + */ + while (*pos < BUFSZ(p)) { + while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) + advance(p, pos); + if (*pos < BUFSZ(p) && '*' != BUF(p)[*pos]) { + if (TEXICMD_END == peeklinecmd(p, *pos)) + break; + parseeoln(p, pos); + } else + break; + } + + lastppos = -1; texivspace(p); teximacro(p, "Bl -tag -width Ds -compact"); while (*pos < BUFSZ(p)) { - /* Read to next menu item. */ - while (*pos < BUFSZ(p) && ismspace(BUF(p)[*pos])) + /* + * Read to next menu item. + * We simply parse every line until we get a magic '*'. + * These lines might occur interspersed OR as the + * description of an entry. + * Either way it's in the `It' block. + */ + if (0 == p->seenws) + p->seenws = *pos < BUFSZ(p) && isws(BUF(p)[*pos]); + while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) advance(p, pos); - if ('*' != BUF(p)[*pos]) - break; + if (*pos == BUFSZ(p)) { + texiwarn(p, "unexpected EOF"); + return; + } else if ('*' != BUF(p)[*pos]) { + tcmd = peeklinecmd(p, *pos); + if (TEXICMD_END == tcmd) + break; + else if (TEXICMD_COMMENT == tcmd) + advanceeoln(p, pos, 1); + else + parseeoln(p, pos); + continue; + } - assert('*' == BUF(p)[*pos]); + /* Now we're parsing a menu item. */ advance(p, pos); - while (*pos < BUFSZ(p) && ismspace(BUF(p)[*pos])) + while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) advance(p, pos); - sv = start = *pos; + entryname = *pos; while (*pos < BUFSZ(p) && ':' != BUF(p)[*pos]) advance(p, pos); - if (*pos == BUFSZ(p) || *pos == start) { - texiwarn(p, "empty menu name"); - break; + entrynameend = *pos; + if (*pos == BUFSZ(p)) { + texiwarn(p, "unexpected EOF"); + return; } - teximacroopen(p, "It"); - teximacroopen(p, "Lkx"); - texiputchar(p, '"'); - texiputchars(p, "Node"); - for (start = sv; start < *pos; start++) - texiputchar(p, BUF(p)[start]); - texiputchars(p, "\" \""); - for (start = sv; start < *pos; start++) - texiputchar(p, BUF(p)[start]); - texiputchar(p, '"'); - teximacroclose(p); - teximacroclose(p); - advance(p, pos); + + p->seenvs = 0; + teximacroopen(p, "It"); if (*pos == BUFSZ(p)) { texiwarn(p, "bad menu syntax"); break; } else if (':' != BUF(p)[*pos]) { while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) advance(p, pos); - start = *pos; + nodename = *pos; while (*pos < BUFSZ(p)) { switch (BUF(p)[*pos]) { case ('\t'): @@ -1556,7 +1767,7 @@ domenu(struct texi *p, enum texicmd cmd, size_t *pos) if (*pos + 1 == BUFSZ(p)) { advance(p, pos); continue; - } + } if (' ' == BUF(p)[*pos + 1]) { advance(p, pos); break; @@ -1569,46 +1780,56 @@ domenu(struct texi *p, enum texicmd cmd, size_t *pos) advance(p, pos); break; } - } else + nodenameend = *pos; + } else { advance(p, pos); - - while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) - advance(p, pos); - - if (*pos == BUFSZ(p)) { - texiwarn(p, "bad menu syntax"); - break; + nodename = entryname; + nodenameend = entrynameend; } - - while (*pos < BUFSZ(p)) { - if ('*' == BUF(p)[*pos]) - break; - if ('\n' != BUF(p)[*pos]) { - texiputchar(p, BUF(p)[*pos]); - advance(p, pos); - continue; - } - advance(p, pos); - while (*pos == BUFSZ(p)) { - texiwarn(p, "bad menu syntax"); - break; - } - if ('\n' == BUF(p)[*pos]) { - advance(p, pos); - break; - } else if ('*' == BUF(p)[*pos]) { - continue; - } else if ('@' == BUF(p)[*pos]) - break; - texiputchar(p, ' '); + ppos = texicache(p, &BUF(p)[nodename], + nodenameend - nodename); + if (-1 != lastppos) + p->nodecache[lastppos].next = ppos; + p->nodecache[ppos].prev = lastppos; + p->nodecache[ppos].up = p->nodecur; + lastppos = ppos; +#ifdef HAVE_INDEX + if (NULL == p->chapters) { + teximacroopen(p, "Lkx"); + texiputchars(p, "\"node"); + for (i = nodename; i < nodenameend; i++) + texiputchar(p, BUF(p)[i]); + texiputchars(p, "\" \""); + for (i = entryname; i < entrynameend; i++) + texiputchar(p, BUF(p)[i]); + texiputchars(p, "\""); + teximacroclose(p); + } else { + snprintf(buf, sizeof(buf), + "%s-%zd 7 ", p->chapters, ppos); + teximacroopen(p, "Xr"); + texiputchars(p, buf); + texiputchars(p, "\"node"); + for (i = nodename; i < nodenameend; i++) + texiputchar(p, BUF(p)[i]); + texiputchars(p, "\" \""); + for (i = entryname; i < entrynameend; i++) + texiputchar(p, BUF(p)[i]); + texiputchars(p, "\""); + teximacroclose(p); } +#else + for (i = entryname; i < entrynameend; i++) + texiputchar(p, BUF(p)[i]); +#endif + teximacroclose(p); } + advanceeoln(p, pos, 0); + p->seenvs = 0; teximacro(p, "El"); - - doignblock(p, cmd, pos); + texivspace(p); } -#endif static void domath(struct texi *p, enum texicmd cmd, size_t *pos) @@ -1750,43 +1971,6 @@ sectioner(struct texi *p, int sec) } static void -dosubsubsection(struct texi *p, enum texicmd cmd, size_t *pos) -{ - int sec; - - sec = sectioner(p, 3); - - /* We don't have a subsubsubsection, so make one up. */ - texivspace(p); - teximacroopen(p, sects[sec]); - parseeoln(p, pos); - teximacroclose(p); - texivspace(p); -} - -static void -dosubsection(struct texi *p, enum texicmd cmd, size_t *pos) -{ - int sec; - - sec = sectioner(p, 2); - - if (p->outmacro) - texierr(p, "\"%s\" in open line scope!?", sects[sec]); - else if (p->literal) - texierr(p, "\"%s\" in a literal scope!?", sects[sec]); - - /* We don't have a subsubsection, so make one up. */ - if (sec > 1) - texivspace(p); - teximacroopen(p, sects[sec]); - parseeoln(p, pos); - teximacroclose(p); - if (sec > 1) - texivspace(p); -} - -static void dosecoffs(struct texi *p, enum texicmd cmd, size_t *pos) { @@ -1804,6 +1988,13 @@ dosection(struct texi *p, enum texicmd cmd, size_t *po switch (cmd) { case (TEXICMD_TOP): sec = 0; + if (p->nodesz) + break; + texiwarn(p, "@node Top is missing, assuming it implicitly"); + p->nodesz++; + p->ign--; + p->nodecur = texicache(p, "Top", 3); + teximdocopen(p, pos); break; case (TEXICMD_APPENDIX): case (TEXICMD_CHAPTER): @@ -1816,6 +2007,18 @@ dosection(struct texi *p, enum texicmd cmd, size_t *po case (TEXICMD_UNNUMBEREDSEC): sec = sectioner(p, 1); break; + case (TEXICMD_APPENDIXSUBSEC): + case (TEXICMD_SUBHEADING): + case (TEXICMD_SUBSECTION): + case (TEXICMD_UNNUMBEREDSUBSEC): + sec = sectioner(p, 2); + break; + case (TEXICMD_APPENDIXSUBSUBSEC): + case (TEXICMD_SUBSUBHEADING): + case (TEXICMD_SUBSUBSECTION): + case (TEXICMD_UNNUMBEREDSUBSUBSEC): + sec = sectioner(p, 3); + break; default: abort(); } @@ -1825,26 +2028,19 @@ dosection(struct texi *p, enum texicmd cmd, size_t *po else if (p->literal) texierr(p, "\"%s\" in a literal scope!?", sects[sec]); - if (0 == sec && NULL != p->chapters) { - teximdocclose(p, 0); - teximdocopen(p, pos); - } + if (sec < 2) + p->seenvs = -1; + else + texivspace(p); teximacroopen(p, sects[sec]); parseeoln(p, pos); teximacroclose(p); -} -static void -dotop(struct texi *p, enum texicmd cmd, size_t *pos) -{ - - if (--p->ign) - texierr(p, "@top command while ignoring"); - - if (NULL == p->chapters) - teximdocopen(p, pos); - dosection(p, cmd, pos); + if (sec < 2) + p->seenvs = -1; + else + texivspace(p); } static void @@ -1867,8 +2063,8 @@ doitem(struct texi *p, enum texicmd cmd, size_t *pos) if (p->outcol > 0) texiputchar(p, '\n'); return; - } - + } + if (p->outmacro) texierr(p, "item in open line scope!?"); else if (p->literal) @@ -1876,9 +2072,11 @@ doitem(struct texi *p, enum texicmd cmd, size_t *pos) switch (p->list) { case (TEXILIST_ITEM): + p->seenvs = -1; teximacroopen(p, "It"); break; case (TEXILIST_NOITEM): + p->seenvs = -1; teximacro(p, "It"); break; default: @@ -1914,7 +2112,7 @@ domultitable(struct texi *p, enum texicmd cmd, size_t texivspace(p); p->list = TEXILIST_TABLE; - /* + /* * TS/TE blocks aren't "in mdoc(7)", so we can disregard the * fact that we're in literal mode right now. */ @@ -1929,7 +2127,7 @@ domultitable(struct texi *p, enum texicmd cmd, size_t /* Make sure we don't print anything when scanning. */ p->ign++; if (*pos < BUFSZ(p) && '@' == BUF(p)[*pos]) { - /* + /* * Look for @columnfractions. * We ignore these, but we do use the number of * arguments to set the number of columns that we'll @@ -1937,7 +2135,7 @@ domultitable(struct texi *p, enum texicmd cmd, size_t */ type = texicmd(p, *pos, &end, NULL); advanceto(p, pos, end); - if (TEXICMD_COLUMNFRACTIONS != type) + if (TEXICMD_COLUMNFRACTIONS != type) texierr(p, "unknown multitable command"); while (*pos < BUFSZ(p) && '\n' != BUF(p)[*pos]) { while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) @@ -1949,7 +2147,7 @@ domultitable(struct texi *p, enum texicmd cmd, size_t } columns++; } - } else + } else /* * We have arguments. * We could parse these, but it's easier to just let @@ -1975,6 +2173,7 @@ domultitable(struct texi *p, enum texicmd cmd, size_t teximacro(p, "TE"); p->literal = svliteral; p->list = sv; + texivspace(p); } static void @@ -1985,10 +2184,12 @@ dotable(struct texi *p, enum texicmd cmd, size_t *pos) advanceeoln(p, pos, 1); p->list = TEXILIST_ITEM; - teximacro(p, "Bl -tag -width Ds"); + texivspace(p); + teximacro(p, "Bl -tag -width Ds -compact"); parseto(p, pos, texitoks[cmd].tok); + p->seenvs = 0; teximacro(p, "El"); - p->seenvs = 1; + texivspace(p); p->list = sv; } @@ -2003,7 +2204,7 @@ doend(struct texi *p, enum texicmd cmd, size_t *pos) while (*pos < BUFSZ(p) && '\n' != BUF(p)[*pos]) advance(p, pos); - texiwarn(p, "unexpected \"end\": %.*s", + texiwarn(p, "unexpected \"end\": %.*s", (int)(*pos - start), &BUF(p)[start]); advanceeoln(p, pos, 1); } @@ -2016,10 +2217,12 @@ doenumerate(struct texi *p, enum texicmd cmd, size_t * advanceeoln(p, pos, 1); p->list = TEXILIST_NOITEM; - teximacro(p, "Bl -enum"); + texivspace(p); + teximacro(p, "Bl -enum -compact"); parseto(p, pos, texitoks[cmd].tok); + p->seenvs = 0; teximacro(p, "El"); - p->seenvs = 1; + texivspace(p); p->list = sv; } @@ -2031,10 +2234,12 @@ doitemize(struct texi *p, enum texicmd cmd, size_t *po advanceeoln(p, pos, 1); p->list = TEXILIST_NOITEM; - teximacro(p, "Bl -bullet"); + texivspace(p); + teximacro(p, "Bl -bullet -compact"); parseto(p, pos, texitoks[cmd].tok); + p->seenvs = 0; teximacro(p, "El"); - p->seenvs = 1; + texivspace(p); p->list = sv; } @@ -2048,6 +2253,56 @@ doignbracket(struct texi *p, enum texicmd cmd, size_t } static void +doindex(struct texi *p, enum texicmd cmd, size_t *pos) +{ + size_t start, end, len; + + while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) + advance(p, pos); + + start = *pos; + while (*pos < BUFSZ(p) && '\n' != BUF(p)[*pos]) + advance(p, pos); + + if (*pos == BUFSZ(p)) { + texiwarn(p, "unexpected EOF"); + return; + } + + advance(p, pos); + end = *pos; + if (0 == (len = end - start)) { + texiwarn(p, "zero-length index"); + return; + } + + /* Two-letter combos we can look up verbatim. */ + if (7 == texitoks[cmd].len) { + texindex(p, texitoks[cmd].tok, 2, &BUF(p)[start], len); + return; + } + + assert(6 == texitoks[cmd].len); + /* Newer one-letter combos need to be mapped. */ + switch (texitoks[cmd].tok[0]) { + case ('c'): + texindex(p, "cp", 2, &BUF(p)[start], len); + break; + case ('v'): + texindex(p, "vr", 2, &BUF(p)[start], len); + break; + case ('f'): + texindex(p, "fn", 2, &BUF(p)[start], len); + break; + case ('t'): + texindex(p, "tp", 2, &BUF(p)[start], len); + break; + default: + abort(); + } +} + +static void doignline(struct texi *p, enum texicmd cmd, size_t *pos) { @@ -2063,9 +2318,9 @@ doignline(struct texi *p, enum texicmd cmd, size_t *po static char ** parsedirs(struct texi *p, const char *base, const char *cp, size_t *sz) { - char *tok, *str, *tofree; - const char *cpp; - size_t i = 0; + char *tok, *str, *tofree; + const char *cpp; + size_t i = 0; char **dirs; /* Count up our expected arguments. */ @@ -2078,15 +2333,15 @@ parsedirs(struct texi *p, const char *base, const char return(NULL); if (NULL == (dirs = calloc(*sz, sizeof(char *)))) texiabort(p, NULL); - if (NULL != base && NULL == (dirs[i++] = strdup(base))) + if (NULL != base && NULL == (dirs[i++] = strdup(base))) texiabort(p, NULL); if (NULL == cp) return(dirs); if (NULL == (tofree = tok = str = strdup(cp))) texiabort(p, NULL); - for ( ; NULL != (tok = strsep(&str, ":")); i++) - if (NULL == (dirs[i] = strdup(tok))) + for ( ; NULL != (tok = strsep(&str, ":")); i++) + if (NULL == (dirs[i] = strdup(tok))) texiabort(p, NULL); free(tofree); @@ -2097,9 +2352,12 @@ int main(int argc, char *argv[]) { struct texi texi; - int c; + char date[32]; + struct stat st; char *dirpath, *dir, *ccp; const char *progname, *Idir, *cp; + time_t t; + int c; progname = strrchr(argv[0], '/'); if (progname == NULL) @@ -2110,13 +2368,17 @@ main(int argc, char *argv[]) memset(&texi, 0, sizeof(struct texi)); texi.ign = 1; texi.outfile = stdout; + texi.seenvs = -1; Idir = NULL; - while (-1 != (c = getopt(argc, argv, "C:I:"))) + while (-1 != (c = getopt(argc, argv, "C:d:I:"))) switch (c) { case ('C'): texi.chapters = optarg; break; + case ('d'): + texi.date = optarg; + break; case ('I'): Idir = optarg; break; @@ -2127,12 +2389,18 @@ main(int argc, char *argv[]) argv += optind; argc -= optind; + /* Add the default Texinfo indices. */ + texindex_add(&texi, "cp", 2); + texindex_add(&texi, "vr", 2); + texindex_add(&texi, "tp", 2); + texindex_add(&texi, "fn", 2); + if (argc > 0) { if (NULL == (dirpath = strdup(argv[0]))) texiabort(&texi, NULL); if (NULL == (dir = dirname(dirpath))) texiabort(&texi, NULL); - if (NULL != (cp = strrchr(argv[0], '/'))) + if (NULL != (cp = strrchr(argv[0], '/'))) texi.title = strdup(cp + 1); else texi.title = strdup(argv[0]); @@ -2142,16 +2410,29 @@ main(int argc, char *argv[]) *ccp = '\0'; texi.dirs = parsedirs(&texi, dir, Idir, &texi.dirsz); free(dirpath); + if (NULL == texi.date) { + t = stat(argv[0], &st) == 0 ? st.st_mtime : time(NULL); + strftime(date, sizeof(date), + "%B %e, %Y", localtime(&t)); + texi.date = date; + } parsefile(&texi, argv[0], 1); } else { texi.title = strdup("Unknown Manual"); texi.dirs = parsedirs(&texi, NULL, Idir, &texi.dirsz); + if (NULL == texi.date) { + t = time(NULL); + strftime(date, sizeof(date), + "%B %e, %Y", localtime(&t)); + texi.date = date; + } parsestdin(&texi); } texiexit(&texi); exit(EXIT_SUCCESS); usage: - fprintf(stderr, "usage: %s [-Cdir] [-Idirs] [file]\n", progname); + fprintf(stderr, "usage: %s [-C dir] [-d date] [-I dirs] [file]\n", + progname); return(EXIT_FAILURE); }