=================================================================== RCS file: /cvs/texi2mdoc/main.c,v retrieving revision 1.55 retrieving revision 1.70 diff -u -p -r1.55 -r1.70 --- texi2mdoc/main.c 2015/03/01 00:25:07 1.55 +++ texi2mdoc/main.c 2015/03/13 08:13:21 1.70 @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.55 2015/03/01 00:25:07 kristaps Exp $ */ +/* $Id: main.c,v 1.70 2015/03/13 08:13:21 kristaps Exp $ */ /* * Copyright (c) 2015 Kristaps Dzonsons * @@ -30,18 +30,27 @@ #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 *); static void doblock(struct texi *, enum texicmd, size_t *); static void dobracket(struct texi *, enum texicmd, size_t *); static void dobye(struct texi *, enum texicmd, size_t *); +static void docopying(struct texi *, enum texicmd, size_t *); static void dodefindex(struct texi *, enum texicmd, size_t *); static void dodefn(struct texi *, enum texicmd, size_t *); static void dodisplay(struct texi *, enum texicmd, size_t *); @@ -52,22 +61,24 @@ 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 *); static void doitem(struct texi *, enum texicmd, size_t *); static void doitemize(struct texi *, enum texicmd, size_t *); 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 *); +static void domenu(struct texi *, enum texicmd, size_t *); static void domultitable(struct texi *, enum texicmd, size_t *); +static void donode(struct texi *, enum texicmd, size_t *); +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 *); @@ -88,13 +99,14 @@ 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 */ { doignline, "author", 6 }, /* TEXICMD_AUTHOR */ - { doinline, "b", 1 }, /* TEXICMD_BOLD */ + { doinline, "b", 1 }, /* TEXICMD_B */ + { dosymbol, "\\", 1 }, /* TEXICMD_BACKSLASH */ { dosymbol, "!", 1 }, /* TEXICMD_BANG */ { dosymbol, "bullet", 6 }, /* TEXICMD_BULLET */ { dobye, "bye", 3 }, /* TEXICMD_BYE */ @@ -102,7 +114,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 */ @@ -114,7 +126,7 @@ static const struct texitok __texitoks[TEXICMD__MAX] = { doignline, "c", 1 }, /* TEXICMD_COMMENT */ { doignline, "comment", 7 }, /* TEXICMD_COMMENT_LONG */ { doignline, "contents", 8 }, /* TEXICMD_CONTENTS */ - { doignblock, "copying", 7 }, /* TEXICMD_COPYING */ + { docopying, "copying", 7 }, /* TEXICMD_COPYING */ { dosymbol, "copyright", 9 }, /* TEXICMD_COPYRIGHT */ { dodefindex, "defcodeindex", 12 }, /* TEXICMD_DEFCODEINDEX */ { dodefn, "deffn", 5 }, /* TEXICMD_DEFFN */ @@ -122,6 +134,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 */ @@ -169,7 +185,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 */ @@ -213,7 +229,7 @@ static const struct texitok __texitoks[TEXICMD__MAX] = { dodisplay, "indentblock", 11 }, /* TEXICMD_INDENTBLOCK */ { dolink, "indicateurl", 11 }, /* TEXICMD_INDICATEURL */ { dolink, "inforef", 7 }, /* TEXICMD_INFOREF */ - { doignline, "insertcopying", 13 }, /* TEXICMD_INSERTCOPYING */ + { doinsertcopying, "insertcopying", 13 }, /* TEXICMD_INSERTCOPYING */ { doitem, "item", 4 }, /* TEXICMD_ITEM */ { doitemize, "itemize", 7 }, /* TEXICMD_ITEMIZE */ { doitem, "itemx", 5 }, /* TEXICMD_ITEMX */ @@ -228,12 +244,12 @@ static const struct texitok __texitoks[TEXICMD__MAX] = { domacro, "macro", 5 }, /* TEXICMD_MACRO */ { doaccent, "=", 1 }, /* TEXICMD_MACRON */ { domath, "math", 4 }, /* TEXICMD_MATH */ - { doignblock, "menu", 4 }, /* TEXICMD_MENU */ + { domenu, "menu", 4 }, /* TEXICMD_MENU */ { dosymbol, "minus", 5 }, /* TEXICMD_MINUS */ { domultitable, "multitable", 10 }, /* TEXICMD_MULTITABLE */ { doignline, "need", 4 }, /* TEXICMD_NEED */ { dosymbol, "\n", 1 }, /* TEXICMD_NEWLINE */ - { doignline, "node", 4 }, /* TEXICMD_NODE */ + { donode, "node", 4 }, /* TEXICMD_NODE */ { doignline, "noindent", 8 }, /* TEXICMD_NOINDENT */ { dosymbol, "O", 1 }, /* TEXICMD_O */ { dosymbol, "OE", 2 }, /* TEXICMD_OE */ @@ -248,7 +264,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 */ @@ -268,7 +284,7 @@ static const struct texitok __texitoks[TEXICMD__MAX] = { doaccent, "ringaccent", 10 }, /* TEXICMD_RINGACCENT */ { doinline, "samp", 4 }, /* TEXICMD_SAMP */ { doinline, "sansserif", 9 }, /* TEXICMD_SANSSERIF */ - { dobracket, "sc", 2 }, /* TEXICMD_SC */ + { doinline, "sc", 2 }, /* TEXICMD_SC */ { dosection, "section", 7 }, /* TEXICMD_SECTION */ { dovalue, "set", 3 }, /* TEXICMD_SET */ { doignline, "setchapternewpage", 17 }, /* TEXICMD_SETCHAPNEWPAGE */ @@ -289,10 +305,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 */ @@ -309,19 +325,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 */ @@ -331,7 +348,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 */ @@ -341,36 +359,35 @@ static const struct texitok __texitoks[TEXICMD__MAX] = const struct texitok *const texitoks = __texitoks; +/* + * 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; - } else if (NULL == (cp = malloc(end - start + 1))) - texiabort(p, NULL); - - memcpy(cp, &BUF(p)[start], end - start); - cp[end - start] = '\0'; - - p->indexs = realloc(p->indexs, - sizeof(char *) * (p->indexsz + 1)); - - if (NULL == p->indexs) - texiabort(p, NULL); - p->indexs[p->indexsz++] = cp; + } + 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) { @@ -380,6 +397,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): @@ -402,8 +421,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): @@ -414,6 +435,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): @@ -431,6 +456,7 @@ dodefn(struct texi *p, enum texicmd cmd, size_t *pos) break; } + p->seenvs = 0; texiputchar(p, ':'); texiputchar(p, '\n'); @@ -455,6 +481,8 @@ dodefn(struct texi *p, enum texicmd cmd, size_t *pos) teximacroclose(p); teximacro(p, "Fc"); break; + case (TEXICMD_DEFOP): + case (TEXICMD_DEFOPX): case (TEXICMD_DEFTYPEFUN): case (TEXICMD_DEFTYPEFUNX): case (TEXICMD_DEFTYPEFN): @@ -484,6 +512,8 @@ dodefn(struct texi *p, enum texicmd cmd, size_t *pos) /* Spin. */ ; teximacroclose(p); break; + case (TEXICMD_DEFOPT): + case (TEXICMD_DEFOPTX): case (TEXICMD_DEFVAR): case (TEXICMD_DEFVARX): case (TEXICMD_DEFVR): @@ -515,6 +545,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): @@ -532,10 +564,19 @@ dodefn(struct texi *p, enum texicmd cmd, size_t *pos) } break; } - teximacro(p, "Bd -filled -offset indent"); - p->seenvs = 1; + + if (TEXICMD_END == peekcmd(p, *pos)) { + parseto(p, pos, blk); + return; + } + + texivspace(p); + teximacro(p, "Bd -filled -offset indent -compact"); + p->seenvs = -1; parseto(p, pos, blk); + p->seenvs = 0; teximacro(p, "Ed"); + texivspace(p); } static void @@ -566,9 +607,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 @@ -581,7 +630,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); @@ -637,7 +685,7 @@ doignblock(struct texi *p, enum texicmd cmd, size_t *p "@%s", texitoks[cmd].tok); assert(ssz < sizeof(start)); esz = snprintf(end, sizeof(end), - "@end %s\n", texitoks[cmd].tok); + "@end %s", texitoks[cmd].tok); assert(esz < sizeof(end)); stack = 1; @@ -690,6 +738,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"; @@ -725,13 +774,34 @@ doinline(struct texi *p, enum texicmd cmd, size_t *pos } if (NULL == macro || p->literal || TEXILIST_TABLE == p->list) { + if (TEXICMD_SC == cmd) + p->uppercase++; parsebracket(p, pos, 0); + if (TEXICMD_SC == cmd) + p->uppercase--; return; } + /* + * If we haven't seen any whitespace, then we don't want the + * subsequent macro to insert any whitespace. + */ + if (p->outmacro && 0 == p->seenws) { + teximacroopen(p, "Ns"); + teximacroclose(p); + } + teximacroopen(p, macro); p->seenws = 0; + if (TEXICMD_CODE == cmd) + p->literal++; + if (TEXICMD_SC == cmd) + p->uppercase++; parsebracket(p, pos, 0); + if (TEXICMD_SC == cmd) + p->uppercase--; + if (TEXICMD_CODE == cmd) + p->literal--; texipunctuate(p, pos); teximacroclose(p); } @@ -775,6 +845,61 @@ doverb(struct texi *p, enum texicmd cmd, size_t *pos) } static void +doinsertcopying(struct texi *p, enum texicmd cmd, size_t *pos) +{ + + advanceeoln(p, pos, 0); + if (NULL != p->copying) + texisplice(p, p->copying, p->copyingsz, *pos); +} + +static void +docopying(struct texi *p, enum texicmd cmd, size_t *pos) +{ + const char *end, *term; + size_t endsz, endpos; + + /* We retain our starting (but not ending) newlines. */ + end = "\n@end copying\n"; + endsz = strlen(end); + advanceeoln(p, pos, 0); + if (*pos == BUFSZ(p)) { + texiwarn(p, "unterminated \"%s\"", texitoks[cmd].tok); + return; + } + + term = memmem(&BUF(p)[*pos], BUFSZ(p) - *pos, end, endsz); + if (NULL == term) + texierr(p, "unterminated \"%s\"", texitoks[cmd].tok); + else + endpos = *pos + (size_t)(term - &BUF(p)[*pos]); + + 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); + p->copying[endpos - *pos] = '\0'; + + while (*pos < endpos) + advance(p, pos); + if (*pos < BUFSZ(p)) + advanceto(p, pos, endpos + endsz); +} + +static void doverbatim(struct texi *p, enum texicmd cmd, size_t *pos) { const char *end, *term; @@ -785,13 +910,13 @@ doverbatim(struct texi *p, enum texicmd cmd, size_t *p endsz = strlen(end); advanceeoln(p, pos, 0); if (*pos == BUFSZ(p)) { - texiwarn(p, "unexpected end of file"); + texiwarn(p, "unterminated \"%s\"", texitoks[cmd].tok); return; } term = memmem(&BUF(p)[*pos], BUFSZ(p) - *pos, end, endsz); if (NULL == term) { - texiwarn(p, "unterminated verbatim block"); + texiwarn(p, "unterminated \"%s\"", texitoks[cmd].tok); endpos = BUFSZ(p); } else endpos = *pos + (size_t)(term - &BUF(p)[*pos]); @@ -799,12 +924,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"); + texivspace(p); if (*pos < BUFSZ(p)) advanceto(p, pos, endpos + endsz); } @@ -942,34 +1071,40 @@ static void dodisplay(struct texi *p, enum texicmd cmd, size_t *pos) { + 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; - /* FIXME: ignore and parseeoln. */ - advanceeoln(p, pos, 1); + p->seenvs = -1; parseto(p, pos, texitoks[cmd].tok); + p->seenvs = 0; teximacro(p, "Ed"); + texivspace(p); } static void doexample(struct texi *p, enum texicmd cmd, size_t *pos) { - teximacro(p, "Bd -literal -offset indent"); - /* FIXME: ignore and parseeoln. */ advanceeoln(p, pos, 1); + + 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"); + texivspace(p); } static void @@ -983,20 +1118,27 @@ dobye(struct texi *p, enum texicmd cmd, size_t *pos) static void dotitle(struct texi *p, enum texicmd cmd, size_t *pos) { - size_t start, end; + size_t start; while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) advance(p, pos); - start = end = *pos; - while (end < BUFSZ(p) && '\n' != BUF(p)[end]) - end++; - advanceeoln(p, pos, 1); + + /* We want to suck down the entire line, inclusive \n. */ + start = *pos; + 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); + + /* Copy this into a buffer. */ free(p->subtitle); - p->subtitle = malloc(end - start + 1); - if (NULL == p->subtitle) + if (NULL == (p->subtitle = malloc(*pos - start + 1))) texiabort(p, NULL); - memcpy(p->subtitle, &BUF(p)[start], end - start); - p->subtitle[end - start] = '\0'; + memcpy(p->subtitle, &BUF(p)[start], *pos - start); + p->subtitle[*pos - start] = '\0'; } static void @@ -1189,6 +1331,9 @@ dosymbol(struct texi *p, enum texicmd cmd, size_t *pos case (TEXICMD_AT): texiputchar(p, '@'); break; + case (TEXICMD_BACKSLASH): + texiputchar(p, '\\'); + break; case (TEXICMD_BANG): texiputchar(p, '!'); break; @@ -1360,7 +1505,329 @@ doquotation(struct texi *p, enum texicmd cmd, size_t * teximacro(p, "Qc"); } +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; + + 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; + advance(p, pos); + } + 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 nodename, entryname; + size_t nodenameend, entrynameend, i; + ssize_t ppos, lastppos; + char buf[PATH_MAX]; + enum texicmd tcmd; + + 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. + * 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 (*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; + } + + /* Now we're parsing a menu item. */ + advance(p, pos); + while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) + advance(p, pos); + entryname = *pos; + while (*pos < BUFSZ(p) && ':' != BUF(p)[*pos]) + advance(p, pos); + entrynameend = *pos; + if (*pos == BUFSZ(p)) { + texiwarn(p, "unexpected EOF"); + return; + } + 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); + nodename = *pos; + while (*pos < BUFSZ(p)) { + switch (BUF(p)[*pos]) { + case ('\t'): + case ('\n'): + case (','): + break; + case ('.'): + if (*pos + 1 == BUFSZ(p)) { + advance(p, pos); + continue; + } + if (' ' == BUF(p)[*pos + 1]) { + advance(p, pos); + break; + } + /* FALLTHROUGH */ + default: + advance(p, pos); + continue; + } + advance(p, pos); + break; + } + nodenameend = *pos; + } else { + advance(p, pos); + nodename = entryname; + nodenameend = entrynameend; + } + 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"); + texivspace(p); +} + +static void domath(struct texi *p, enum texicmd cmd, size_t *pos) { @@ -1410,7 +1877,7 @@ dovalue(struct texi *p, enum texicmd cmd, size_t *pos) texiputchar(p, ' '); p->seenws = 0; if (NULL != (cp = valueblookup(p, pos))) - texisplice(p, cp, strlen(cp), pos); + texisplice(p, cp, strlen(cp), *pos); else texiputchars(p, "{No value}"); } else if (TEXICMD_IFCLEAR == cmd) { @@ -1500,43 +1967,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) { @@ -1566,6 +1996,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(); } @@ -1575,39 +2017,30 @@ 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); - } + if (sec < 2) + p->seenvs = -1; + else + texivspace(p); teximacroopen(p, sects[sec]); parseeoln(p, pos); teximacroclose(p); - p->seenvs = 1; -} -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); - dosection(p, cmd, pos); + if (sec < 2) + p->seenvs = -1; + else + texivspace(p); } static void dosp(struct texi *p, enum texicmd cmd, size_t *pos) { + advanceeoln(p, pos, 1); if (p->literal) texiputchar(p, '\n'); else texivspace(p); - /* FIXME: ignore and parseeoln. */ - advanceeoln(p, pos, 1); } static void @@ -1616,7 +2049,8 @@ doitem(struct texi *p, enum texicmd cmd, size_t *pos) /* Multitable is using raw tbl(7). */ if (TEXILIST_TABLE == p->list) { - texiputchar(p, '\n'); + if (p->outcol > 0) + texiputchar(p, '\n'); return; } @@ -1627,9 +2061,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: @@ -1638,7 +2074,6 @@ doitem(struct texi *p, enum texicmd cmd, size_t *pos) } /* Trick so we don't start with Pp. */ - p->seenvs = 1; parseeoln(p, pos); if (TEXILIST_ITEM == p->list) @@ -1652,7 +2087,7 @@ dotab(struct texi *p, enum texicmd cmd, size_t *pos) { /* This command is only useful in @multitable. */ - if (TEXILIST_TABLE == p->list) + if (TEXILIST_TABLE == p->list && p->outcol) texiputchar(p, '\t'); } @@ -1664,6 +2099,7 @@ domultitable(struct texi *p, enum texicmd cmd, size_t enum texicmd type; size_t i, end, columns; + texivspace(p); p->list = TEXILIST_TABLE; /* * TS/TE blocks aren't "in mdoc(7)", so we can disregard the @@ -1679,7 +2115,7 @@ domultitable(struct texi *p, enum texicmd cmd, size_t /* Make sure we don't print anything when scanning. */ p->ign++; - if ('@' == BUF(p)[*pos]) { + if (*pos < BUFSZ(p) && '@' == BUF(p)[*pos]) { /* * Look for @columnfractions. * We ignore these, but we do use the number of @@ -1717,13 +2153,16 @@ domultitable(struct texi *p, enum texicmd cmd, size_t texiputchar(p, ' '); texiputchar(p, 'l'); } - texiputchars(p, ".\n"); + + texiputchar(p, '.'); + texiputchar(p, '\n'); p->outmacro++; parseto(p, pos, texitoks[cmd].tok); p->outmacro--; teximacro(p, "TE"); p->literal = svliteral; p->list = sv; + texivspace(p); } static void @@ -1731,13 +2170,15 @@ dotable(struct texi *p, enum texicmd cmd, size_t *pos) { enum texilist sv = p->list; - p->list = TEXILIST_ITEM; - teximacro(p, "Bl -tag -width Ds"); - /* FIXME: ignore and parseeoln. */ advanceeoln(p, pos, 1); - p->seenvs = 1; + + p->list = TEXILIST_ITEM; + texivspace(p); + teximacro(p, "Bl -tag -width Ds -compact"); parseto(p, pos, texitoks[cmd].tok); + p->seenvs = 0; teximacro(p, "El"); + texivspace(p); p->list = sv; } @@ -1752,7 +2193,8 @@ 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", (int)(*pos - start), &BUF(p)[start]); + texiwarn(p, "unexpected \"end\": %.*s", + (int)(*pos - start), &BUF(p)[start]); advanceeoln(p, pos, 1); } @@ -1761,13 +2203,15 @@ doenumerate(struct texi *p, enum texicmd cmd, size_t * { enum texilist sv = p->list; - p->list = TEXILIST_NOITEM; - teximacro(p, "Bl -enum"); - p->seenvs = 1; - /* FIXME: ignore and parseeoln. */ advanceeoln(p, pos, 1); - parseto(p, pos, "enumerate"); + + p->list = TEXILIST_NOITEM; + texivspace(p); + teximacro(p, "Bl -enum -compact"); + parseto(p, pos, texitoks[cmd].tok); + p->seenvs = 0; teximacro(p, "El"); + texivspace(p); p->list = sv; } @@ -1776,13 +2220,15 @@ doitemize(struct texi *p, enum texicmd cmd, size_t *po { enum texilist sv = p->list; - p->list = TEXILIST_NOITEM; - teximacro(p, "Bl -bullet"); - p->seenvs = 1; - /* FIXME: ignore and parseeoln. */ advanceeoln(p, pos, 1); - parseto(p, pos, "itemize"); + + p->list = TEXILIST_NOITEM; + texivspace(p); + teximacro(p, "Bl -bullet -compact"); + parseto(p, pos, texitoks[cmd].tok); + p->seenvs = 0; teximacro(p, "El"); + texivspace(p); p->list = sv; } @@ -1796,11 +2242,60 @@ 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) { - /* FIXME: ignore and parseeoln. */ - advanceeoln(p, pos, 1); + advanceeoln(p, pos, 1); } /* @@ -1859,6 +2354,7 @@ 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:"))) @@ -1876,6 +2372,12 @@ 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); @@ -1899,7 +2401,7 @@ main(int argc, char *argv[]) } texiexit(&texi); - return(EXIT_FAILURE); + exit(EXIT_SUCCESS); usage: fprintf(stderr, "usage: %s [-Cdir] [-Idirs] [file]\n", progname); return(EXIT_FAILURE);