texi2mdoc/main.c - diff

Return to main.c CVS log

Up to [cvsweb.bsd.lv] / texi2mdoc

Diff for /texi2mdoc/main.c between version 1.47 and 1.69

version 1.47, 2015/02/25 15:04:13

version 1.69, 2015/03/13 08:07:33

Line 26

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <time.h>

#include <unistd.h>

#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",

"Sh", /* Chapters (sections) */

"Ss",

"Ss", /* Sections (subsections) */

"Em",

"Em", /* Subsections (subsubsection) */

"No",

"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 *);

Line 53 static void doignargn(struct texi *, enum texicmd, siz

Line 61 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 *);

Line 89 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 99 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 */

{ dosection, "appendixsubsec", 14 }, /* TEXICMD_APPENDIXSUBSEC */

{ dosubsubsection, "appendixsubsubsec", 17 }, /* TEXICMD_APPENDIXSUBSUBSEC */

{ 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 */

Line 103 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 114 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 */

Line 115 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 126 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 */

Line 123 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 134 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 */

Line 170 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 185 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 */

Line 214 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 229 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 */

Line 229 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 244 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 */

Line 249 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 264 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 */

Line 269 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 284 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 */

Line 290 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 305 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 */

{ dosection, "subheading", 10 }, /* TEXICMD_SUBHEADING */

{ dosubsection, "subsection", 10 }, /* TEXICMD_SUBSECTION */

{ dosection, "subsection", 10 }, /* TEXICMD_SUBSECTION */

{ dosubsubsection, "subsubheading", 13 }, /* TEXICMD_SUBSUBHEADING */

{ dosection, "subsubheading", 13 }, /* TEXICMD_SUBSUBHEADING */

{ dosubsubsection, "subsubsection", 13 }, /* TEXICMD_SUBSUBSECTION */

{ dosection, "subsubsection", 13 }, /* TEXICMD_SUBSUBSECTION */

{ doignline, "subtitle", 8 }, /* TEXICMD_SUBTITLE */

{ doignline, "summarycontents", 15 }, /* TEXICMD_SUMMARYCONTENTS */

{ doignline, "synindex", 8 }, /* TEXICMD_SYNINDEX */

{ dodefindex, "synindex", 8 }, /* TEXICMD_SYNINDEX */

{ doignline, "syncodeindex", 12 }, /* TEXICMD_SYNCODEINDEX */

{ dodefindex, "syncodeindex", 12 }, /* TEXICMD_SYNCODEINDEX */

{ doinline, "t", 1 }, /* TEXICMD_T */

{ dotab, "tab", 3 }, /* TEXICMD_TAB */

{ dosymbol, "\t", 1 }, /* TEXICMD_TABSYM */

Line 310 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 325 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 */

{ dosection, "unnumberedsubsec", 16 }, /* TEXICMD_UNNUMBEREDSUBSEC */

{ dosubsubsection, "unnumberedsubsubsec", 19 }, /* TEXICMD_UNNUMBEREDSUBSUBSEC */

{ dosection, "unnumberedsubsubsec", 19 }, /* TEXICMD_UNNUMBEREDSUBSUBSEC */

{ dolink, "uref", 4 }, /* TEXICMD_UREF */

{ dolink, "url", 3 }, /* TEXICMD_URL */

{ doignline, "", 0 }, /* TEXICMD_USER_INDEX */

Line 332 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 348 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 */

Line 342 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 359 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;

size_t start;

char *cp;

while (*pos < BUFSZ(p) && isws(BUF(p)[*pos]))

advance(p, pos);

start = *pos;

start = end = *pos;

while (*pos < BUFSZ(p) && '\n' != BUF(p)[*pos])

while (end < BUFSZ(p) && ! ismspace(BUF(p)[end]))

advance(p, pos);

end++;

if (*pos == BUFSZ(p)) {

texiwarn(p, "unexpected EOF");

if (start == end) {

advanceeoln(p, pos, 1);

return;

} else if (NULL == (cp = malloc(end - start + 1)))

}

texiabort(p, NULL);

if (0 == *pos - start)

texiwarn(p, "zero-length index definition");

memcpy(cp, &BUF(p)[start], end - start);

else

cp[end - start] = '\0';

texindex_add(p, &BUF(p)[start], *pos - start);

advance(p, pos);

p->indexs = realloc(p->indexs,

sizeof(char *) * (p->indexsz + 1));

if (NULL == p->indexs)

texiabort(p, NULL);

p->indexs[p->indexsz++] = cp;

}

* 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)

{

Line 381 dodefn(struct texi *p, enum texicmd cmd, size_t *pos)

Line 397 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):

Line 403 dodefn(struct texi *p, enum texicmd cmd, size_t *pos)

Line 421 dodefn(struct texi *p, enum texicmd cmd, size_t *pos)

return;

}

if (NULL != blk)

if (p->seenvs >= 0) {

texivspace(p);

teximacro(p, "Pp");

p->seenvs = -1;

}

switch (cmd) {

case (TEXICMD_DEFTYPEMETHOD):

Line 415 dodefn(struct texi *p, enum texicmd cmd, size_t *pos)

Line 435 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):

Line 432 dodefn(struct texi *p, enum texicmd cmd, size_t *pos)

Line 456 dodefn(struct texi *p, enum texicmd cmd, size_t *pos)

break;

}

texiputchars(p, ":\n");

p->seenvs = 0;

texiputchar(p, ':');

texiputchar(p, '\n');

switch (cmd) {

case (TEXICMD_DEFMAC):

Line 455 dodefn(struct texi *p, enum texicmd cmd, size_t *pos)

Line 481 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):

Line 484 dodefn(struct texi *p, enum texicmd cmd, size_t *pos)

Line 512 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):

Line 497 dodefn(struct texi *p, enum texicmd cmd, size_t *pos)

Line 527 dodefn(struct texi *p, enum texicmd cmd, size_t *pos)

abort();

}

texivspace(p);

if (NULL == blk)

if (NULL != blk)

return;

* All "block" definitions have their block bodies indented

* unless they have the "x" form of the command following.

* E.g.,

* @deffn some function

* @deffnx another

* An explanation.

* @end deffn

* With this loop, we delay opening the indented block until we

* skipped past conformant macros.

for (;;) {

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):

case (TEXICMD_DEFTYPEMETHODX):

case (TEXICMD_DEFTYPEVARX):

case (TEXICMD_DEFTYPEVRX):

case (TEXICMD_DEFUNX):

case (TEXICMD_DEFVARX):

case (TEXICMD_DEFVRX):

texivspace(p);

parseeoln(p, pos);

continue;

default:

break;

}

break;

}

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

Line 530 domacro(struct texi *p, enum texicmd cmd, size_t *pos)

Line 607 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

Line 545 domacro(struct texi *p, enum texicmd cmd, size_t *pos)

Line 630 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);

Line 601 doignblock(struct texi *p, enum texicmd cmd, size_t *p

Line 685 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;

Line 613 doignblock(struct texi *p, enum texicmd cmd, size_t *p

Line 697 doignblock(struct texi *p, enum texicmd cmd, size_t *p

* Thus, we keep track of scopes for matching "end" blocks.

while (stack > 0 && *pos < BUFSZ(p)) {

if (stack > 10)

if (stack > 64)

abort();

texierr(p, "run-away nested stack?");

endt = memmem(&BUF(p)[*pos], BUFSZ(p) - *pos, end, esz);

startt = memmem(&BUF(p)[*pos], BUFSZ(p) - *pos, start, ssz);

if (NULL == endt) {

Line 654 doinline(struct texi *p, enum texicmd cmd, size_t *pos

Line 738 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";

Line 689 doinline(struct texi *p, enum texicmd cmd, size_t *pos

Line 774 doinline(struct texi *p, enum texicmd cmd, size_t *pos

}

if (NULL == macro || p->literal || TEXILIST_TABLE == p->list) {

parsebracket(p, pos);

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;

parsebracket(p, pos);

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);

}

Line 727 doverb(struct texi *p, enum texicmd cmd, size_t *pos)

Line 833 doverb(struct texi *p, enum texicmd cmd, size_t *pos)

break;

advance(p, pos);

}

if (*pos == BUFSZ(p) - 1)

if (*pos >= BUFSZ(p) - 1)

return;

texiputbuf(p, start, *pos);

Line 739 doverb(struct texi *p, enum texicmd cmd, size_t *pos)

Line 845 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;

Line 749 doverbatim(struct texi *p, enum texicmd cmd, size_t *p

Line 910 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]);

Line 763 doverbatim(struct texi *p, enum texicmd cmd, size_t *p

Line 924 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);

}

Line 899 static void

Line 1064 static void

dobracket(struct texi *p, enum texicmd cmd, size_t *pos)

{

parsebracket(p, pos);

parsebracket(p, pos, 0);

}

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;

p->seenvs = -1;

/* FIXME: ignore and parseeoln. */

advanceeoln(p, pos, 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

Line 947 dobye(struct texi *p, enum texicmd cmd, size_t *pos)

Line 1118 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])

/* We want to suck down the entire line, inclusive \n. */

end++;

start = *pos;

advanceeoln(p, pos, 1);

while (*pos < BUFSZ(p) && '\n' != BUF(p)[*pos]) {

if ('@' == BUF(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 = malloc(*pos - start + 1)))

if (NULL == p->subtitle)

texiabort(p, NULL);

memcpy(p->subtitle, &BUF(p)[start], end - start);

memcpy(p->subtitle, &BUF(p)[start], *pos - start);

p->subtitle[end - start] = '\0';

p->subtitle[*pos - start] = '\0';

}

static void

Line 989 doaccent(struct texi *p, enum texicmd cmd, size_t *pos

Line 1167 doaccent(struct texi *p, enum texicmd cmd, size_t *pos

if ('{' == BUF(p)[*pos]) {

brace = 1;

advance(p, pos);

} else if (isalpha(texitoks[cmd].tok[0]))

} else if (isalpha((unsigned char)texitoks[cmd].tok[0]))

while (*pos < BUFSZ(p) && isws(BUF(p)[*pos]))

advance(p, pos);

Line 1153 dosymbol(struct texi *p, enum texicmd cmd, size_t *pos

Line 1331 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;

Line 1311 dosymbol(struct texi *p, enum texicmd cmd, size_t *pos

Line 1492 dosymbol(struct texi *p, enum texicmd cmd, size_t *pos

}

/* Alphabetic commands have braces we ignore. */

if (isalpha(texitoks[cmd].tok[0]))

if (isalpha((unsigned char)texitoks[cmd].tok[0]))

doignbracket(p, cmd, pos);

}

Line 1324 doquotation(struct texi *p, enum texicmd cmd, size_t *

Line 1505 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

domath(struct texi *p, enum texicmd cmd, size_t *pos)

doprintindex(struct texi *p, enum texicmd cmd, size_t *pos)

{

size_t nest, start;

size_t i, j, start, end, len;

#if HAVE_INDEX

char *cp;

char buf[PATH_MAX];

#endif

* Math handling is different from everything else.

* We don't allow any subcomponents, and we ignore the rules in

* terms of @-commands.

* This departs from GNU's rules, but whatever.

while (*pos < BUFSZ(p) && isws(BUF(p)[*pos]))

advance(p, pos);

if (*pos == BUFSZ(p) || '{' != BUF(p)[*pos])

start = *pos;

while (*pos < BUFSZ(p) && '\n' != BUF(p)[*pos])

advance(p, pos);

if ((end = *pos) == BUFSZ(p)) {

texiwarn(p, "unexpected EOF");

return;

}

advance(p, pos);

if (p->seenws && p->outcol && 0 == p->literal)

if (*pos == BUFSZ(p)) {

texiputchar(p, ' ');

texiwarn(p, "unexpected EOF");

p->seenws = 0;

return;

for (nest = 1, start = *pos; *pos < BUFSZ(p) && nest > 0; ) {

} else if (0 == (len = end - start)) {

if ('{' == BUF(p)[*pos])

texiwarn(p, "zero-length index");

nest++;

return;

else if ('}' == BUF(p)[*pos])

}

if (0 == --nest)

continue;

/* 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");

return;

} else if (0 == p->indexs[i].indexsz)

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);

}

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))

if (*pos == BUFSZ(p)) {

texiwarn(p, "unexpected EOF");

return;

assert('}' == BUF(p)[*pos]);

}

texiputbuf(p, start, *pos);

end = *pos;

advance(p, 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)

{

parsebracket(p, pos, 1);

}

static void

dovalue(struct texi *p, enum texicmd cmd, size_t *pos)

{

size_t start, end;

Line 1401 dovalue(struct texi *p, enum texicmd cmd, size_t *pos)

Line 1866 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) {

Line 1491 sectioner(struct texi *p, int sec)

Line 1956 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)

{

Line 1543 dosection(struct texi *p, enum texicmd cmd, size_t *po

Line 1971 dosection(struct texi *p, enum texicmd cmd, size_t *po

int sec;

switch (cmd) {

case (TEXICMD_TOP):

sec = 0;

break;

case (TEXICMD_APPENDIX):

case (TEXICMD_CHAPTER):

case (TEXICMD_TOP):

case (TEXICMD_UNNUMBERED):

sec = sectioner(p, 0);

break;

Line 1555 dosection(struct texi *p, enum texicmd cmd, size_t *po

Line 1985 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();

}

Line 1564 dosection(struct texi *p, enum texicmd cmd, size_t *po

Line 2006 dosection(struct texi *p, enum texicmd cmd, size_t *po

else if (p->literal)

texierr(p, "\"%s\" in a literal scope!?", sects[sec]);

if (sec < 2)

p->seenvs = -1;

else

texivspace(p);

teximacroopen(p, sects[sec]);

parseeoln(p, pos);

teximacroclose(p);

p->seenvs = 1;

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

dotop(struct texi *p, enum texicmd cmd, size_t *pos)

{

const char *cp;

time_t t;

char date[32];

if (--p->ign)

texierr(p, "@top command while ignoring");

* 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));

teximacroopen(p, "Dd");

texiputchars(p, date);

teximacroclose(p);

teximacroopen(p, "Dt");

for (cp = p->title; '\0' != *cp; cp++)

texiputchar(p, toupper(*cp));

texiputchars(p, " 7");

teximacroclose(p);

teximacro(p, "Os");

teximacro(p, "Sh NAME");

teximacroopen(p, "Nm");

for (cp = p->title; '\0' != *cp; cp++)

texiputchar(p, *cp);

teximacroclose(p);

teximacroopen(p, "Nd");

if (NULL != p->subtitle)

for (cp = p->subtitle; '\0' != *cp; cp++)

texiputchar(p, *cp);

else

texiputchars(p, "Unknown description");

teximacroclose(p);

p->seenvs = 1;

dosection(p, cmd, pos);

}

static void

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;

}

Line 1644 doitem(struct texi *p, enum texicmd cmd, size_t *pos)

Line 2050 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:

Line 1655 doitem(struct texi *p, enum texicmd cmd, size_t *pos)

Line 2063 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)

Line 1669 dotab(struct texi *p, enum texicmd cmd, size_t *pos)

Line 2076 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');

}

Line 1681 domultitable(struct texi *p, enum texicmd cmd, size_t

Line 2088 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

Line 1696 domultitable(struct texi *p, enum texicmd cmd, size_t

Line 2104 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

Line 1734 domultitable(struct texi *p, enum texicmd cmd, size_t

Line 2142 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

Line 1748 dotable(struct texi *p, enum texicmd cmd, size_t *pos)

Line 2159 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;

}

Line 1769 doend(struct texi *p, enum texicmd cmd, size_t *pos)

Line 2182 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);

}

Line 1778 doenumerate(struct texi *p, enum texicmd cmd, size_t *

Line 2192 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;

}

Line 1793 doitemize(struct texi *p, enum texicmd cmd, size_t *po

Line 2209 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;

}

Line 1808 doignbracket(struct texi *p, enum texicmd cmd, size_t

Line 2226 doignbracket(struct texi *p, enum texicmd cmd, size_t

{

p->ign++;

parsebracket(p, pos);

parsebracket(p, pos, 0);

p->ign--;

}

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);

}

Line 1875 main(int argc, char *argv[])

Line 2342 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, "I:")))

while (-1 != (c = getopt(argc, argv, "C:I:")))

switch (c) {

case ('C'):

texi.chapters = optarg;

break;

case ('I'):

Idir = optarg;

break;

Line 1889 main(int argc, char *argv[])

Line 2361 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);

Line 1912 main(int argc, char *argv[])

Line 2390 main(int argc, char *argv[])

}

texiexit(&texi);

return(EXIT_FAILURE);

exit(EXIT_SUCCESS);

usage:

fprintf(stderr, "usage: %s [-Idirs] [file]\n", progname);

fprintf(stderr, "usage: %s [-Cdir] [-Idirs] [file]\n", progname);

return(EXIT_FAILURE);

}

CVSweb