=================================================================== RCS file: /cvs/texi2mdoc/util.c,v retrieving revision 1.23 retrieving revision 1.36 diff -u -p -r1.23 -r1.36 --- texi2mdoc/util.c 2015/03/02 18:12:53 1.23 +++ texi2mdoc/util.c 2018/11/13 09:07:58 1.36 @@ -1,4 +1,4 @@ -/* $Id: util.c,v 1.23 2015/03/02 18:12:53 kristaps Exp $ */ +/* $Id: util.c,v 1.36 2018/11/13 09:07:58 schwarze Exp $ */ /* * Copyright (c) 2015 Kristaps Dzonsons * @@ -25,12 +25,49 @@ #include #include #include -#include #include #include "extern.h" /* + * Table of macros. + * These ABSOLUTELY MUST BE 2 or three characters long. + */ +static const char *const mdocs[] = { + "Ap", "Dd", "Dt", "Os", + "Sh", "Ss", "Pp", "D1", + "Dl", "Bd", "Ed", "Bl", + "El", "It", "Ad", "An", + "Ar", "Cd", "Cm", "Dv", + "Er", "Ev", "Ex", "Fa", + "Fd", "Fl", "Fn", "Ft", + "Ic", "In", "Li", "Nd", + "Nm", "Op", "Ot", "Pa", + "Rv", "St", "Va", "Vt", + "Xr", "%A", "%B", "%D", + "%I", "%J", "%N", "%O", + "%P", "%R", "%T", "%V", + "Ac", "Ao", "Aq", "At", + "Bc", "Bf", "Bo", "Bq", + "Bsx", "Bx", "Db", "Dc", + "Do", "Dq", "Ec", "Ef", + "Em", "Eo", "Fx", "Ms", + "No", "Ns", "Nx", "Ox", + "Pc", "Pf", "Po", "Pq", + "Qc", "Ql", "Qo", "Qq", + "Re", "Rs", "Sc", "So", + "Sq", "Sm", "Sx", "Sy", + "Tn", "Ux", "Xc", "Xo", + "Fo", "Fc", "Oo", "Oc", + "Bk", "Ek", "Bt", "Hf", + "Fr", "Ud", "Lb", "Lp", + "Lk", "Mt", "Brq", "Bro", + "Brc", "%C", "Es", "En", + "Dx", "%Q", "br", "sp", + "%U", "Ta", "ll", NULL, + }; + +/* * Unmap the top-most file in the stack of files currently opened (that * is, nested calls to parsefile()). */ @@ -65,7 +102,119 @@ texivaluefree(struct texivalue *p) free(p->value); } +static void +texidex_free(struct texidex *p) +{ + size_t i; + + for (i = 0; i < p->indexsz; i++) + free(p->index[i].term); + + free(p->index); + free(p->name); + p->index = NULL; + p->indexsz = 0; +} + /* + * Add the text beginning at "index" and of "sz" bytes to the index + * named "tok" with name size "toksz". + * This will also output the necessary mdoc(7) to construct the index. + */ +void +texindex(struct texi *p, const char *tok, + size_t toksz, const char *index, size_t sz) +{ + size_t i, isz; +#ifdef HAVE_INDEX + char *cp; +#endif + + if (0 == sz) { + texiwarn(p, "zero-length index entry"); + return; + } + + /* Look for the index. (Must be found.) */ + for (i = 0; i < p->indexsz; i++) { + if (strlen(p->indexs[i].name) != toksz) + continue; + if (strncmp(p->indexs[i].name, tok, toksz)) + continue; + break; + } + + assert(i < p->indexsz); + isz = p->indexs[i].indexsz; + /* Reallocate index's terms. */ + p->indexs[i].index = realloc + (p->indexs[i].index, + (isz + 1) * sizeof(struct texiterm)); + if (NULL == p->indexs[i].index) + texiabort(p, NULL); + + /* Add term to term array. */ + p->indexs[i].index[isz].chapter = p->nodecur; + p->indexs[i].index[isz].term = malloc(sz + 1); + if (NULL == p->indexs[i].index[isz].term) + texiabort(p, NULL); + memcpy(p->indexs[i].index[isz].term, index, sz); + p->indexs[i].index[isz].term[sz] = '\0'; + + /* Output mdoc(7) for index. */ +#ifdef HAVE_INDEX + p->seenvs = -1; + teximacroopen(p, "Ix"); + texiputchars(p, "idx"); + texiputchars(p, p->indexs[i].name); + cp = p->indexs[i].index[isz].term; + while ('\n' != *cp) + texiputchar(p, *cp++); + teximacroclose(p); +#endif + p->indexs[i].indexsz++; +} + +/* + * Add an index entry named "tok" of length "sz". + * This usually consists of two letters, e.g., "cp" or "vr". + * This does nothing if the index exists or is zero-sized. + */ +void +texindex_add(struct texi *p, const char *tok, size_t sz) +{ + size_t i; + char *cp; + + if (0 == sz) + return; + + /* Make sure we don't have a duplicate. */ + for (i = 0; i < p->indexsz; i++) { + if (strlen(p->indexs[i].name) != sz) + continue; + if (strncmp(p->indexs[i].name, tok, sz)) + continue; + return; + } + + /* Reallocate indices. */ + p->indexs = realloc(p->indexs, + sizeof(struct texidex) * + (p->indexsz + 1)); + if (NULL == p->indexs) + texiabort(p, NULL); + if (NULL == (cp = malloc(sz + 1))) + texiabort(p, NULL); + memcpy(cp, tok, sz); + cp[sz] = '\0'; + p->indexs[p->indexsz].name = cp; + p->indexs[p->indexsz].index = NULL; + p->indexs[p->indexsz].indexsz = 0; + p->indexsz++; +} + +/* * 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. @@ -90,16 +239,18 @@ texiexit(struct texi *p) for (i = 0; i < p->dirsz; i++) free(p->dirs[i]); for (i = 0; i < p->indexsz; i++) - free(p->indexs[i]); - for (i = 0; i < p->valsz; i++) + texidex_free(&p->indexs[i]); + for (i = 0; i < p->valsz; i++) texivaluefree(&p->vals[i]); + free(p->nodecache); free(p->macros); free(p->vals); free(p->indexs); free(p->dirs); free(p->subtitle); free(p->title); + free(p->copying); } /* @@ -122,14 +273,14 @@ texiabort(struct texi *p, const char *errstring) void texiwarn(const struct texi *p, const char *fmt, ...) { - va_list ap; + va_list ap; const struct texifile *f; f = &p->files[p->filepos - 1]; if (f->insplice) fprintf(stderr, "%s:%zu:%zu (%zuB left in splice): " - "warning: ", f->name, f->line + 1, + "warning: ", f->name, f->line + 1, f->col + 1, f->insplice); else fprintf(stderr, "%s:%zu:%zu: warning: ", @@ -148,14 +299,14 @@ texiwarn(const struct texi *p, const char *fmt, ...) void texierr(struct texi *p, const char *fmt, ...) { - va_list ap; + va_list ap; struct texifile *f; f = &p->files[p->filepos - 1]; - if (f->insplice) + if (f->insplice) fprintf(stderr, "%s:%zu:%zu: (%zuB left in splice): " - "error: ", f->name, f->line + 1, + "error: ", f->name, f->line + 1, f->col + 1, f->insplice); else fprintf(stderr, "%s:%zu:%zu: error: ", @@ -190,7 +341,6 @@ texiputchar(struct texi *p, char c) fputc(c, p->outfile); if ('\\' == c) fputc('e', p->outfile); - p->seenvs = 0; if ('\n' == c) { p->outcol = 0; p->seenws = 0; @@ -213,13 +363,12 @@ texiputchars(struct texi *p, const char *s) fputs("\\&", p->outfile); if ('\'' == *s && 0 == p->outcol) fputs("\\&", p->outfile); - if (p->uppercase) + if (p->uppercase) for ( ; '\0' != *s; s++) p->outcol += fputc(toupper ((unsigned int)*s), p->outfile); else p->outcol += fputs(s, p->outfile); - p->seenvs = 0; } /* @@ -243,7 +392,7 @@ void teximacroclose(struct texi *p) { - if (p->ign) + if (p->ign || p->literal|| TEXILIST_TABLE == p->list) return; if (0 == --p->outmacro) { @@ -263,7 +412,7 @@ teximacroopen(struct texi *p, const char *s) { int rc; - if (p->ign) + if (p->ign || p->literal|| TEXILIST_TABLE == p->list) return; if (p->outcol && 0 == p->outmacro) { @@ -271,6 +420,9 @@ teximacroopen(struct texi *p, const char *s) p->outcol = 0; } + if (p->seenvs > 0 && 0 == p->outmacro) + fputs(".Pp\n", p->outfile); + if (0 == p->outmacro) fputc('.', p->outfile); else @@ -282,7 +434,7 @@ teximacroopen(struct texi *p, const char *s) fputc(' ', p->outfile); p->outcol++; p->outmacro++; - p->seenws = 0; + p->seenws = p->seenvs = 0; } /* @@ -299,9 +451,10 @@ teximacro(struct texi *p, const char *s) texierr(p, "\"%s\" in open line scope!?", s); if (p->literal) texierr(p, "\"%s\" in a literal scope!?", s); - if (p->outcol) fputc('\n', p->outfile); + if (p->seenvs > 0) + fputs(".Pp\n", p->outfile); fputc('.', p->outfile); fputs(s, p->outfile); @@ -316,10 +469,8 @@ void texivspace(struct texi *p) { - if (p->seenvs || TEXILIST_TABLE == p->list) - return; - teximacro(p, "Pp"); - p->seenvs = 1; + if (TEXILIST_TABLE != p->list && p->seenvs >= 0) + p->seenvs = 1; } /* @@ -381,8 +532,8 @@ texipunctuate(struct texi *p, size_t *pos) } if (end == *pos) return; - if (end + 1 == BUFSZ(p) || ' ' == BUF(p)[end] || - '\n' == BUF(p)[end]) { + if (end + 1 == BUFSZ(p) || ' ' == BUF(p)[end] || + '@' == BUF(p)[end] || '\n' == BUF(p)[end]) { for ( ; start < end; start++) { texiputchar(p, ' '); texiputchar(p, BUF(p)[start]); @@ -399,24 +550,20 @@ texipunctuate(struct texi *p, size_t *pos) static size_t advancenext(struct texi *p, size_t *pos) { - + if (p->literal) { while (*pos < BUFSZ(p) && ismspace(BUF(p)[*pos])) { texiputchar(p, BUF(p)[*pos]); advance(p, pos); } return(*pos); - } + } while (*pos < BUFSZ(p) && ismspace(BUF(p)[*pos])) { p->seenws = 1; - /* - * If it looks like we've printed a double-line, then - * output a paragraph. - * FIXME: this is stupid. - */ - if (*pos && '\n' == BUF(p)[*pos] && '\n' == BUF(p)[*pos - 1]) - texivspace(p); + if (0 == p->seenvs && '\n' == BUF(p)[*pos]) + if (*pos + 1 < BUFSZ(p) && '\n' == BUF(p)[*pos + 1]) + p->seenvs = 1; advance(p, pos); } return(*pos); @@ -434,7 +581,8 @@ advanceeoln(struct texi *p, size_t *pos, int consumenl while (*pos < BUFSZ(p) && '\n' != BUF(p)[*pos]) { if ('@' == BUF(p)[*pos]) advance(p, pos); - advance(p, pos); + if (*pos < BUFSZ(p)) + advance(p, pos); } if (*pos < BUFSZ(p) && consumenl) advance(p, pos); @@ -450,14 +598,14 @@ advanceto(struct texi *p, size_t *pos, size_t end) { assert(*pos <= end); - while (*pos < end) + while (*pos < end) advance(p, pos); } static void texiexecmacro(struct texi *p, struct teximacro *m, size_t sv, size_t *pos) { - size_t valsz, realsz, aasz, asz, + size_t valsz, realsz, aasz, asz, ssz, i, j, k, start, end; char *val; char **args; @@ -480,7 +628,7 @@ texiexecmacro(struct texi *p, struct teximacro *m, siz * The "sv" value was initialised at the start of the macro. */ if (sv > 0) - if (++p->files[p->filepos].depth > 64) + if (++p->files[p->filepos - 1].depth > 64) texierr(p, "maximium recursive depth"); args = argparse(p, pos, &asz, m->argsz); @@ -515,7 +663,7 @@ texiexecmacro(struct texi *p, struct teximacro *m, siz /* Parse to terminating delimiter. */ /* FIXME: embedded, escaped delimiters? */ - for (start = end = i + 1; end < realsz; end++) + for (start = end = i + 1; end < realsz; end++) if ('\\' == m->value[end]) break; if (end == realsz) @@ -529,8 +677,8 @@ texiexecmacro(struct texi *p, struct teximacro *m, siz break; } - /* - * Argument didn't exist in argument table. + /* + * Argument didn't exist in argument table. * Just ignore it. */ if (k == aasz) { @@ -545,7 +693,7 @@ texiexecmacro(struct texi *p, struct teximacro *m, siz texiabort(p, NULL); } - for (cp = args[k]; '\0' != *cp; cp++) + for (cp = args[k]; '\0' != *cp; cp++) val[j++] = *cp; val[j] = '\0'; @@ -558,7 +706,7 @@ texiexecmacro(struct texi *p, struct teximacro *m, siz free(args[i]); free(args); free(val); -} +} /* * Output a free-form word in the input stream, progressing to the next @@ -568,16 +716,78 @@ texiexecmacro(struct texi *p, struct teximacro *m, siz static void parseword(struct texi *p, size_t *pos, char extra) { + size_t i, end, len; + int c; - if (p->seenws && 0 == p->outmacro && + /* + * If a prior word had a terminating double-newline, then begin + * this text block with a `Pp'. + * We don't do this if we're in a literal context (we'll print + * out the newlines themselves) nor in a `TS' table. + */ + if (p->seenvs > 0 && 0 == p->literal && TEXILIST_TABLE != p->list) { + if (p->outcol > 0) + fputc('\n', p->outfile); + if (p->ign == 0) + fputs(".Pp\n", p->outfile); + p->outcol = 0; + } + + /* + * Some line control: if we (non-macro, non-literal) already + * have more than 72 characters written to the screen, then + * output a newline before getting started. + */ + if (p->seenws && 0 == p->outmacro && p->outcol > 72 && 0 == p->literal) texiputchar(p, '\n'); - /* FIXME: abstract this: we use it elsewhere. */ + + /* Usual padding in the case of seen whitespace. */ if (p->seenws && p->outcol && 0 == p->literal) texiputchar(p, ' '); p->seenws = 0; + /* + * If we're in a macro line, we might want to print text that + * happens to be the same as an mdoc(7) macro. + * Obviously, we need to escape these words. + */ + if (p->outmacro) { + end = *pos; + /* Read ahead to get the word length. */ + while (end < BUFSZ(p) && ! ismspace(BUF(p)[end])) { + switch ((c = BUF(p)[end])) { + case ('@'): + case ('}'): + case ('{'): + break; + default: + if ('\0' != extra && extra == c) + break; + end++; + continue; + } + break; + } + len = end - *pos; + /* See if we have a match. */ + for (i = 0; NULL != mdocs[i]; i++) { + /* All macros are 2 or three letters. */ + if (len < 2 || len > 3) + continue; + /* Check the macro word length. */ + if ('\0' == mdocs[i][2] && 2 != len) + continue; + else if ('\0' == mdocs[i][3] && 3 != len) + continue; + if (strncmp(mdocs[i], &BUF(p)[*pos], len)) + continue; + texiputchars(p, "\\&"); + break; + } + } + while (*pos < BUFSZ(p) && ! ismspace(BUF(p)[*pos])) { switch (BUF(p)[*pos]) { case ('@'): @@ -587,20 +797,60 @@ parseword(struct texi *p, size_t *pos, char extra) } if ('\0' != extra && BUF(p)[*pos] == extra) return; - if (*pos < BUFSZ(p) - 1 && - '`' == BUF(p)[*pos] && + + if (p->literal) { + texiputchar(p, BUF(p)[*pos]); + advance(p, pos); + continue; + } + + if ('"' == BUF(p)[*pos]) { + texiputchars(p, "\\(dq"); + } else if (*pos < BUFSZ(p) - 2 && + '-' == BUF(p)[*pos] && + '-' == BUF(p)[*pos + 1] && + '-' == BUF(p)[*pos + 2]) { + texiputchars(p, "\\(em"); + advance(p, pos); + advance(p, pos); + } else if (*pos < BUFSZ(p) - 1 && + '-' == BUF(p)[*pos] && + '-' == BUF(p)[*pos + 1]) { + texiputchars(p, "\\(en"); + advance(p, pos); + } else if (*pos < BUFSZ(p) - 1 && + '`' == BUF(p)[*pos] && '`' == BUF(p)[*pos + 1]) { texiputchars(p, "\\(lq"); advance(p, pos); - } else if (*pos < BUFSZ(p) - 1 && - '\'' == BUF(p)[*pos] && + } else if (*pos < BUFSZ(p) - 1 && + '\'' == BUF(p)[*pos] && '\'' == BUF(p)[*pos + 1]) { texiputchars(p, "\\(rq"); advance(p, pos); } else texiputchar(p, BUF(p)[*pos]); + advance(p, pos); } + + /* + * New sentence, new line:if we (non-macro, non-literal) see a + * period at the end of the last printed word, then open a + * newline. + */ + if (0 == p->literal && 0 == p->outmacro && *pos < BUFSZ(p)) + switch (BUF(p)[*pos - 1]) { + case ('.'): + case ('!'): + case ('?'): + texiputchar(p, '\n'); + break; + default: + break; + } + + p->seenvs = 0; } /* @@ -639,7 +889,7 @@ texicmd(const struct texi *p, size_t pos, size_t *end, /* Scan to the end of the possible command name. */ for (*end = pos; *end < BUFSZ(p) && ! ismspace(BUF(p)[*end]); (*end)++) - if ((*end > pos && ('@' == BUF(p)[*end] || + if ((*end > pos && ('@' == BUF(p)[*end] || '{' == BUF(p)[*end] || '}' == BUF(p)[*end]))) break; @@ -654,10 +904,10 @@ texicmd(const struct texi *p, size_t pos, size_t *end, /* Look for it in our indices. */ for (i = 0; i < p->indexsz; i++) { - toksz = strlen(p->indexs[i]); + toksz = strlen(p->indexs[i].name); if (len != 5 + toksz) continue; - if (strncmp(&BUF(p)[pos], p->indexs[i], toksz)) + if (strncmp(&BUF(p)[pos], p->indexs[i].name, toksz)) continue; if (0 == strncmp(&BUF(p)[pos + toksz], "index", 5)) return(TEXICMD_USER_INDEX); @@ -724,7 +974,7 @@ parsearg(struct texi *p, size_t *pos, size_t num) advanceto(p, pos, end); if (NULL != macro) texiexecmacro(p, macro, sv, pos); - if (TEXICMD__MAX == cmd) + if (TEXICMD__MAX == cmd) continue; if (NULL != texitoks[cmd].fp) (*texitoks[cmd].fp)(p, cmd, pos); @@ -785,7 +1035,7 @@ parsebracket(struct texi *p, size_t *pos, int dostack) advanceto(p, pos, end); if (NULL != macro) texiexecmacro(p, macro, sv, pos); - if (TEXICMD__MAX == cmd) + if (TEXICMD__MAX == cmd) continue; if (NULL != texitoks[cmd].fp) (*texitoks[cmd].fp)(p, cmd, pos); @@ -811,6 +1061,10 @@ parseeoln(struct texi *p, size_t *pos) texiputchar(p, BUF(p)[*pos]); advance(p, pos); } + if (*pos == BUFSZ(p)) { + texiwarn(p, "unexpected EOF"); + return; + } switch (BUF(p)[*pos]) { case ('}'): if (0 == p->ign) @@ -822,6 +1076,8 @@ parseeoln(struct texi *p, size_t *pos) texiwarn(p, "unexpected \"{\""); advance(p, pos); continue; + case ('\n'): + continue; case ('@'): break; default: @@ -834,7 +1090,7 @@ parseeoln(struct texi *p, size_t *pos) advanceto(p, pos, end); if (NULL != macro) texiexecmacro(p, macro, sv, pos); - if (TEXICMD__MAX == cmd) + if (TEXICMD__MAX == cmd) continue; if (NULL != texitoks[cmd].fp) (*texitoks[cmd].fp)(p, cmd, pos); @@ -844,6 +1100,18 @@ parseeoln(struct texi *p, size_t *pos) advance(p, pos); } +enum texicmd +peeklinecmd(const struct texi *p, size_t pos) +{ + size_t end; + + while (pos < BUFSZ(p) && isws(BUF(p)[pos])) + pos++; + if (pos == BUFSZ(p) || '@' != BUF(p)[pos]) + return(TEXICMD__MAX); + return(texicmd(p, pos, &end, NULL)); +} + /* * Peek to see if there's a command after subsequent whitespace. * If so, return the macro identifier. @@ -865,7 +1133,7 @@ peekcmd(const struct texi *p, size_t pos) * Parse a single word or command. * This will return immediately at the EOF. */ -static void +void parsesingle(struct texi *p, size_t *pos) { size_t end, sv; @@ -898,7 +1166,7 @@ parsesingle(struct texi *p, size_t *pos) advanceto(p, pos, end); if (NULL != macro) texiexecmacro(p, macro, sv, pos); - if (TEXICMD__MAX == cmd) + if (TEXICMD__MAX == cmd) return; if (NULL != texitoks[cmd].fp) (*texitoks[cmd].fp)(p, cmd, pos); @@ -939,7 +1207,7 @@ parseeof(struct texi *p) { size_t pos; - for (pos = 0; pos < BUFSZ(p); ) + for (pos = 0; pos < BUFSZ(p); ) parsesingle(p, &pos); } @@ -981,7 +1249,7 @@ parseto(struct texi *p, size_t *pos, const char *endto endtoksz = strlen(endtoken); assert(endtoksz > 0); - + while ((*pos = advancenext(p, pos)) < BUFSZ(p)) { switch (BUF(p)[*pos]) { case ('}'): @@ -1007,7 +1275,7 @@ parseto(struct texi *p, size_t *pos, const char *endto if (TEXICMD_END == cmd) { while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) advance(p, pos); - /* + /* * FIXME: check the full word, not just its * initial substring! */ @@ -1020,14 +1288,17 @@ parseto(struct texi *p, size_t *pos, const char *endto texiwarn(p, "unexpected \"end\""); advanceeoln(p, pos, 0); continue; - } + } if (NULL != macro) texiexecmacro(p, macro, sv, pos); - if (TEXICMD__MAX == cmd) + if (TEXICMD__MAX == cmd) continue; - if (NULL != texitoks[cmd].fp) + if (NULL != texitoks[cmd].fp) (*texitoks[cmd].fp)(p, cmd, pos); } + + if (*pos == BUFSZ(p)) + texiwarn(p, "EOF expecting \"%s\" end\n", endtoken); } /* @@ -1051,17 +1322,17 @@ parsestdin(struct texi *p) if (f->mapsz == f->mapmaxsz) { if (f->mapmaxsz == (1U << 31)) texierr(p, "stdin buffer too long"); - f->mapmaxsz = f->mapmaxsz > 65536 / 2 ? + f->mapmaxsz = f->mapmaxsz > 65536 / 2 ? 2 * f->mapmaxsz : 65536; f->map = realloc(f->map, f->mapmaxsz); - if (NULL == f->map) + if (NULL == f->map) texiabort(p, NULL); } - ssz = read(STDIN_FILENO, f->map + + ssz = read(STDIN_FILENO, f->map + (int)f->mapsz, f->mapmaxsz - f->mapsz); if (0 == ssz) break; - else if (-1 == ssz) + else if (-1 == ssz) texiabort(p, NULL); } @@ -1085,7 +1356,7 @@ parsefile(struct texi *p, const char *fname, int parse size_t i; char *map; - if (64 == p->filepos) + if (64 == p->filepos) texierr(p, "too many open files"); f = &p->files[p->filepos]; memset(f, 0, sizeof(struct texifile)); @@ -1097,7 +1368,7 @@ parsefile(struct texi *p, const char *fname, int parse } else if (-1 == fstat(fd, &st)) { close(fd); texiabort(p, fname); - } + } f->mapsz = f->mapmaxsz = st.st_size; map = mmap(NULL, f->mapsz, @@ -1247,7 +1518,7 @@ valueadd(struct texi *p, char *key, char *val) p->vals[i].value = val; } else { /* FIXME: reallocarray() */ - p->vals = realloc(p->vals, + p->vals = realloc(p->vals, (p->valsz + 1) * sizeof(struct texivalue)); if (NULL == p->vals) @@ -1318,7 +1589,7 @@ argparse(struct texi *p, size_t *pos, size_t *argsz, s start = *pos; stack = 0; while (*pos < BUFSZ(p)) { - /* + /* * According to the manual, commas within * embedded commands are escaped. * We keep track of embedded-ness in the "stack" @@ -1360,7 +1631,7 @@ argparse(struct texi *p, size_t *pos, size_t *argsz, s advance(p, pos); } - if (*pos == BUFSZ(p)) + if (*pos == BUFSZ(p)) texierr(p, "unterminated arguments"); assert('}' == BUF(p)[*pos]); advance(p, pos); @@ -1379,82 +1650,97 @@ teximdocclose(struct texi *p, int last) { char buf[PATH_MAX]; - if (NULL == p->chapters || 0 == p->chapnum) + if (NULL == p->chapters || 1 == p->nodesz) return; teximacro(p, "Sh INFO NAVIGATION"); /* Print a reference to the "top" node. */ - if (p->chapnum > 1) { + if (-1 != p->nodecache[p->nodecur].up) { texiputchars(p, "Top node,"); - snprintf(buf, sizeof(buf), "node1 7"); + snprintf(buf, sizeof(buf), "%s-%zd 7", + p->chapters, p->nodecache[p->nodecur].up); + p->seenvs = 0; teximacroopen(p, "Xr "); texiputchars(p, buf); texiputchars(p, " ;"); teximacroclose(p); } - /* Print a reference to the previous node. */ - if (p->chapnum > 2) { + if (-1 != p->nodecache[p->nodecur].prev) { texiputchars(p, "previous node,"); - snprintf(buf, sizeof(buf), - "node%zu 7", p->chapnum - 1); + snprintf(buf, sizeof(buf), "%s-%zd 7", + p->chapters, p->nodecache[p->nodecur].prev); + p->seenvs = 0; teximacroopen(p, "Xr "); texiputchars(p, buf); - if ( ! last) + if ( ! last) texiputchars(p, " ;"); teximacroclose(p); - } + } - /* Print a reference to the next node. */ - if ( ! last) { - if (1 == p->chapnum) - texiputchars(p, "Next node,"); - else - texiputchars(p, "next node,"); - snprintf(buf, sizeof(buf), - "node%zu 7", p->chapnum + 1); + if (-1 != p->nodecache[p->nodecur].next) { + texiputchars(p, "next node,"); + snprintf(buf, sizeof(buf), "%s-%zd 7", + p->chapters, p->nodecache[p->nodecur].next); + p->seenvs = 0; teximacroopen(p, "Xr "); texiputchars(p, buf); teximacroclose(p); } fclose(p->outfile); + p->outfile = NULL; } +ssize_t +texicache(struct texi *p, const char *buf, size_t sz) +{ + size_t i; + + for (i = 0; i < p->nodecachesz; i++) { + if (sz != strlen(p->nodecache[i].name)) + continue; + if (strncmp(buf, p->nodecache[i].name, sz)) + continue; + break; + } + if (i < p->nodecachesz) + return(i); + if (NULL == buf) + return(-1); + p->nodecache = realloc + (p->nodecache, + (p->nodecachesz + 1) * sizeof(struct texinode)); + if (NULL == p->nodecache) + texiabort(p, NULL); + p->nodecache[p->nodecachesz].name = malloc(sz + 1); + if (NULL == p->nodecache[p->nodecachesz].name) + texiabort(p, NULL); + memcpy(p->nodecache[p->nodecachesz].name, buf, sz); + p->nodecache[p->nodecachesz].name[sz] = '\0'; + p->nodecache[p->nodecachesz].up = + p->nodecache[p->nodecachesz].next = + p->nodecache[p->nodecachesz].prev = -1; + p->nodecachesz++; + return(p->nodecachesz - 1); +} + /* - * Open a mdoc(7) context. - * If we're printing chapters, then open the outfile here, too. - * Otherwise just print the mdoc(7) prologue. + * Here we print our standard mdoc(7) prologue. + * We use the title set with @settitle for the `Nd' description + * and the source document filename (the first one as invoked on + * the command line) for the title. + * The date is set to the modification time of the input. */ void teximdocopen(struct texi *p, size_t *pos) { const char *cp; - time_t t; - char date[32]; - char fname[PATH_MAX]; - if (NULL != p->chapters) { - snprintf(fname, sizeof(fname), "%s/node%zu.7", - p->chapters, ++p->chapnum); - p->outfile = fopen(fname, "w"); - if (NULL == p->outfile) - texiabort(p, fname); - } - - /* - * Here we print our standard mdoc(7) prologue. - * We use the title set with @settitle for the `Nd' description - * and the source document filename (the first one as invoked on - * the command line) for the title. - * The date is set to the current date. - */ - t = time(NULL); - strftime(date, sizeof(date), "%F", localtime(&t)); - + p->seenvs = -1; teximacroopen(p, "Dd"); - texiputchars(p, date); + texiputchars(p, p->date); teximacroclose(p); teximacroopen(p, "Dt"); for (cp = p->title; '\0' != *cp; cp++) @@ -1478,6 +1764,5 @@ teximdocopen(struct texi *p, size_t *pos) } else texiputchars(p, "Unknown description"); teximacroclose(p); - p->seenvs = 1; }