texi2mdoc/main.c - diff

Return to main.c CVS log

Up to [cvsweb.bsd.lv] / texi2mdoc

Diff for /texi2mdoc/main.c between version 1.26 and 1.35

version 1.26, 2015/02/20 15:37:33

version 1.35, 2015/02/23 15:09:09

Line 44 static void doaccent(struct texi *, enum texicmd, cons

static void doblock(struct texi *, enum texicmd, const char *, size_t, size_t *);

static void dobracket(struct texi *, enum texicmd, const char *, size_t, size_t *);

static void dobye(struct texi *, enum texicmd, const char *, size_t, size_t *);

static void dodefindex(struct texi *, enum texicmd, const char *, size_t, size_t *);

static void dodefn(struct texi *, enum texicmd, const char *, size_t, size_t *);

static void dodisplay(struct texi *, enum texicmd, const char *, size_t, size_t *);

static void doenumerate(struct texi *, enum texicmd, const char *, size_t, size_t *);

Line 57 static void doinclude(struct texi *, enum texicmd, con

Line 58 static void doinclude(struct texi *, enum texicmd, con

static void doitem(struct texi *, enum texicmd, const char *, size_t, size_t *);

static void doitemize(struct texi *, enum texicmd, const char *, size_t, size_t *);

static void dolink(struct texi *, enum texicmd, const char *, size_t, size_t *);

static void domacro(struct texi *, enum texicmd, const char *, size_t, size_t *);

static void domath(struct texi *, enum texicmd, const char *, size_t, size_t *);

static void domultitable(struct texi *, enum texicmd, const char *, size_t, size_t *);

static void doquotation(struct texi *, enum texicmd, const char *, size_t, size_t *);

Line 72 static void dotab(struct texi *, enum texicmd, const c

Line 74 static void dotab(struct texi *, enum texicmd, const c

static void dotitle(struct texi *, enum texicmd, const char *, size_t, size_t *);

static void dovalue(struct texi *, enum texicmd, const char *, size_t, size_t *);

static void doverb(struct texi *, enum texicmd, const char *, size_t, size_t *);

static void doverbatim(struct texi *, enum texicmd, const char *, size_t, size_t *);

static void doverbinclude(struct texi *, enum texicmd, const char *, size_t, size_t *);

static const struct texitok __texitoks[TEXICMD__MAX] = {

Line 92 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 95 static const struct texitok __texitoks[TEXICMD__MAX] =

{ dosymbol, "!", 1 }, /* TEXICMD_BANG */

{ dosymbol, "bullet", 6 }, /* TEXICMD_BULLET */

{ dobye, "bye", 3 }, /* TEXICMD_BYE */

{ doblock, "cartouche", 9 }, /* TEXICMD_CARTOUCHE */

{ doaccent, ",", 1 }, /* TEXICMD_CEDILLA */

{ doignline, "center", 6 }, /* TEXICMD_CENTER */

{ dosection, "chapter", 7 }, /* TEXICMD_CHAPTER */

{ doignline, "cindex", 6 }, /* TEXICMD_CINDEX */

Line 101 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 106 static const struct texitok __texitoks[TEXICMD__MAX] =

{ doinline, "code", 4 }, /* TEXICMD_CODE */

{ dosymbol, ":", 1 }, /* TEXICMD_COLON */

{ NULL, "columnfractions", 15 }, /* TEXICMD_COLUMNFRACTIONS */

{ dosymbol, "comma", 5 }, /* TEXICMD_COMMA */

{ doinline, "command", 7 }, /* TEXICMD_COMMAND */

{ doignline, "c", 1 }, /* TEXICMD_COMMENT */

{ doignline, "comment", 7 }, /* TEXICMD_COMMENT_LONG */

{ doignline, "contents", 8 }, /* TEXICMD_CONTENTS */

{ doignblock, "copying", 7 }, /* TEXICMD_COPYING */

{ dosymbol, "copyright", 9 }, /* TEXICMD_COPYRIGHT */

{ dodefindex, "defcodeindex", 12 }, /* TEXICMD_DEFCODEINDEX */

{ dodefn, "deffn", 5 }, /* TEXICMD_DEFFN */

{ dodefn, "deffnx", 6 }, /* TEXICMD_DEFFNX */

{ dodefindex, "defindex", 8 }, /* TEXICMD_DEFINDEX */

{ dodefn, "defmac", 6 }, /* TEXICMD_DEFMAC */

{ dodefn, "defmacx", 7 }, /* TEXICMD_DEFMACX */

{ dodefn, "deftp", 5 }, /* TEXICMD_DEFTP */

Line 117 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 125 static const struct texitok __texitoks[TEXICMD__MAX] =

{ dodefn, "deftypefnx", 10 }, /* TEXICMD_DEFTYPEFNX */

{ dodefn, "deftypefun", 10 }, /* TEXICMD_DEFTYPEFUN */

{ dodefn, "deftypefunx", 11 }, /* TEXICMD_DEFTYPEFUNX */

{ dodefn, "deftypemethod", 13 }, /* TEXICMD_DEFTYPEMETHOD */

{ dodefn, "deftypemethodx", 14 }, /* TEXICMD_DEFTYPEMETHODX */

{ dodefn, "deftypevar", 10 }, /* TEXICMD_DEFTYPEVAR */

{ dodefn, "deftypevarx", 11 }, /* TEXICMD_DEFTYPEVARX */

{ dodefn, "deftypevr", 9 }, /* TEXICMD_DEFTYPEVR */

Line 132 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 142 static const struct texitok __texitoks[TEXICMD__MAX] =

{ doignline, "dircategory", 11 }, /* TEXICMD_DIRCATEGORY */

{ doignblock, "direntry", 8 }, /* TEXICMD_DIRENTRY */

{ dodisplay, "display", 7 }, /* TEXICMD_DISPLAY */

{ doignbracket, "dmn", 3 }, /* TEXICMD_DMN */

{ dosymbol, "dots", 4 }, /* TEXICMD_DOTS */

{ dolink, "email", 5 }, /* TEXICMD_EMAIL */

{ doinline, "emph", 4 }, /* TEXICMD_EMPH */

{ NULL, "end", 3 }, /* TEXICMD_END */

{ dosymbol, "enddots", 7 }, /* TEXICMD_ENDDOTS */

{ doenumerate, "enumerate", 9 }, /* TEXICMD_ENUMERATE */

{ doinline, "env", 3 }, /* TEXICMD_ENV */

{ dosymbol, "equiv", 5 }, /* TEXICMD_EQUIV */

{ dosymbol, "error", 5 }, /* TEXICMD_ERROR */

{ doexample, "example", 7 }, /* TEXICMD_EXAMPLE */

{ doignline, "exdent", 6 }, /* TEXICMD_EXDENT */

Line 145 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 158 static const struct texitok __texitoks[TEXICMD__MAX] =

{ doinline, "file", 4 }, /* TEXICMD_FILE */

{ doignline, "finalout", 8 }, /* TEXICMD_FINALOUT */

{ doignline, "findex", 6 }, /* TEXICMD_FINDEX */

{ doignbracket, "footnote", 8 }, /* TEXICMD_FOOTNOTE */

{ dotable, "ftable", 6 }, /* TEXICMD_FTABLE */

{ dodisplay, "format", 6 }, /* TEXICMD_FORMAT */

{ doaccent, "`", 1 }, /* TEXICMD_GRAVE */

Line 167 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 181 static const struct texitok __texitoks[TEXICMD__MAX] =

{ doblock, "ifnotxml", 8 }, /* TEXICMD_IFNOTXML */

{ doblock, "ifplaintext", 11 }, /* TEXICMD_IFPLAINTEXT */

{ doignblock, "iftex", 5 }, /* TEXICMD_IFTEX */

{ doignblock, "ifset", 5 }, /* TEXICMD_IFSET */

{ dovalue, "ifset", 5 }, /* TEXICMD_IFSET */

{ doignblock, "ifxml", 5 }, /* TEXICMD_IFXML */

{ doignblock, "ignore", 6 }, /* TEXICMD_IGNORE */

{ doignbracket, "image", 5 }, /* TEXICMD_IMAGE */

{ doinclude, "include", 7 }, /* TEXICMD_INCLUDE */

{ dodisplay, "indentblock", 11 }, /* TEXICMD_INDENTBLOCK */

{ dolink, "inforef", 7 }, /* TEXICMD_INDENTBLOCK */

{ doignline, "insertcopying", 13 }, /* TEXICMD_INSERTCOPYING */

{ doitem, "item", 4 }, /* TEXICMD_ITEM */

{ doitemize, "itemize", 7 }, /* TEXICMD_ITEMIZE */

Line 182 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 197 static const struct texitok __texitoks[TEXICMD__MAX] =

{ doignline, "kindex", 6 }, /* TEXICMD_KINDEX */

{ dosymbol, "LaTeX", 5 }, /* TEXICMD_LATEX */

{ dosecoffs, "lowersections", 13 }, /* TEXICMD_LOWERSECTIONS */

{ domacro, "macro", 5 }, /* TEXICMD_MACRO */

{ domath, "math", 4 }, /* TEXICMD_MATH */

{ doignblock, "menu", 4 }, /* TEXICMD_MENU */

{ dosymbol, "minus", 5 }, /* TEXICMD_MINUS */

Line 197 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 213 static const struct texitok __texitoks[TEXICMD__MAX] =

{ doignline, "page", 4 }, /* TEXICMD_PAGE */

{ doignline, "paragraphindent", 15 }, /* TEXICMD_PARINDENT */

{ dosymbol, ".", 1 }, /* TEXICMD_PERIOD */

{ doignline, "pindex", 6 }, /* TEXICMD_PINDEX */

{ doignline, "printindex", 10 }, /* TEXICMD_PRINTINDEX */

{ doinline, "r", 1 }, /* TEXICMD_R */

{ dosecoffs, "raisesections", 13 }, /* TEXICMD_RAISESECTIONS */

{ dobracket, "ref", 3 }, /* TEXICMD_REF */

{ doignline, "refill", 6 }, /* TEXICMD_REFILL */

{ dosymbol, "result", 6 }, /* TEXICMD_RESULT */

{ doinline, "samp", 4 }, /* TEXICMD_SAMP */

{ doinline, "sansserif", 9 }, /* TEXICMD_SANSSERIF */

Line 208 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 226 static const struct texitok __texitoks[TEXICMD__MAX] =

{ dosection, "section", 7 }, /* TEXICMD_SECTION */

{ dovalue, "set", 3 }, /* TEXICMD_SET */

{ doignline, "setchapternewpage", 17 }, /* TEXICMD_SETCHAPNEWPAGE */

{ doignline, "setcontentsaftertitlepage", 25 }, /* TEXICMD_SETCONTENTSAFTER */

{ doignline, "setfilename", 11 }, /* TEXICMD_SETFILENAME */

{ dotitle, "settitle", 8 }, /* TEXICMD_SETTITLE */

{ doignline, "shortcontents", 13 }, /* TEXICMD_SHORTCONTENTS */

{ doinline, "slanted", 7 }, /* TEXICMD_SLANTED */

{ dosymbol, "/", 1 }, /* TEXICMD_SLASH */

{ dosp, "sp", 2 }, /* TEXICMD_SP */

{ dosymbol, " ", 1 }, /* TEXICMD_SPACE */

{ doignline, "smallbook", 9 }, /* TEXICMD_SMALLBOOK */

Line 221 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 241 static const struct texitok __texitoks[TEXICMD__MAX] =

{ dodisplay, "smallindentblock", 16 }, /* TEXICMD_SMALLINDENTBLOCK */

{ dosymbol, "{", 1 }, /* TEXICMD_SQUIGGLE_LEFT */

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

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

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

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

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

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

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

Line 234 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 257 static const struct texitok __texitoks[TEXICMD__MAX] =

{ dotable, "table", 5 }, /* TEXICMD_TABLE */

{ doignblock, "tex", 3 }, /* TEXICMD_TEX */

{ dosymbol, "TeX", 3 }, /* TEXICMD_TEXSYM */

{ dosymbol, "tie", 3 }, /* TEXICMD_TIE */

{ doaccent, "~", 1 }, /* TEXICMD_TILDE */

{ doignline, "tindex", 6 }, /* TEXICMD_TINDEX */

{ doignline, "title", 5 }, /* TEXICMD_TITLE */

Line 247 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 271 static const struct texitok __texitoks[TEXICMD__MAX] =

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

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

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

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

{ dovalue, "value", 5 }, /* TEXICMD_VALUE */

{ doinline, "var", 3 }, /* TEXICMD_VAR */

{ doverb, "verbatim", 8 }, /* TEXICMD_VERBATIM */

{ doverb, "verb", 4 }, /* TEXICMD_VERB */

{ doverbatim, "verbatim", 8 }, /* TEXICMD_VERBATIM */

{ doverbinclude, "verbatiminclude", 15 }, /* TEXICMD_VERBATIMINCLUDE */

{ doignline, "vindex", 6 }, /* TEXICMD_VINDEX */

{ dosp, "vskip", 5 }, /* TEXICMD_VSKIP */

Line 262 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 288 static const struct texitok __texitoks[TEXICMD__MAX] =

const struct texitok *const texitoks = __texitoks;

static void

dodefindex(struct texi *p, enum texicmd cmd,

const char *buf, size_t sz, size_t *pos)

{

size_t start, end;

char *cp;

while (*pos < sz && isws(buf[*pos]))

advance(p, buf, pos);

start = end = *pos;

while (end < sz && ! ismspace(buf[end]))

end++;

if (start == end) {

advanceeoln(p, buf, sz, pos, 1);

return;

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

texiabort(p, NULL);

memcpy(cp, &buf[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;

}

static void

dodefn(struct texi *p, enum texicmd cmd,

const char *buf, size_t sz, size_t *pos)

{

Line 270 dodefn(struct texi *p, enum texicmd cmd,

Line 327 dodefn(struct texi *p, enum texicmd cmd,

blk = NULL;

switch (cmd) {

case (TEXICMD_DEFFN):

case (TEXICMD_DEFMAC):

case (TEXICMD_DEFTP):

case (TEXICMD_DEFTYPEFN):

case (TEXICMD_DEFTYPEFUN):

case (TEXICMD_DEFTYPEMETHOD):

case (TEXICMD_DEFTYPEVAR):

case (TEXICMD_DEFTYPEVR):

case (TEXICMD_DEFUN):

Line 295 dodefn(struct texi *p, enum texicmd cmd,

Line 354 dodefn(struct texi *p, enum texicmd cmd,

texivspace(p);

switch (cmd) {

case (TEXICMD_DEFTYPEMETHOD):

case (TEXICMD_DEFTYPEMETHODX):

texiputchars(p, "Method");

break;

case (TEXICMD_DEFMAC):

case (TEXICMD_DEFMACX):

texiputchars(p, "Macro");

Line 343 dodefn(struct texi *p, enum texicmd cmd,

Line 406 dodefn(struct texi *p, enum texicmd cmd,

case (TEXICMD_DEFTYPEFUNX):

case (TEXICMD_DEFTYPEFN):

case (TEXICMD_DEFTYPEFNX):

case (TEXICMD_DEFTYPEMETHOD):

case (TEXICMD_DEFTYPEMETHODX):

teximacroopen(p, "Ft");

parselinearg(p, buf, sz, pos);

teximacroclose(p);

Line 385 dodefn(struct texi *p, enum texicmd cmd,

Line 450 dodefn(struct texi *p, enum texicmd cmd,

}

static void

domacro(struct texi *p, enum texicmd cmd,

const char *buf, size_t sz, size_t *pos)

{

size_t start, end, endtoksz, len;

struct teximacro m;

const char *endtok, *blk;

memset(&m, 0, sizeof(struct teximacro));

while (*pos < sz && isws(buf[*pos]))

advance(p, buf, pos);

for (start = end = *pos; end < sz; end++)

if (ismspace(buf[end]) || '{' == buf[end])

break;

if (start == end)

texierr(p, "zero-length macro name");

advanceto(p, buf, pos, end);

m.key = malloc(end - start + 1);

if (NULL == m.key)

texiabort(p, NULL);

memcpy(m.key, &buf[start], end - start);

m.key[end - start] = '\0';

m.args = argparse(p, buf, sz, pos, &m.argsz, 0);

advanceeoln(p, buf, sz, pos, 0);

start = *pos;

endtok = "\n@end macro\n";

endtoksz = strlen(endtok);

blk = memmem(&buf[start], sz, endtok, endtoksz);

if (NULL == blk)

texierr(p, "unterminated macro body");

while (&buf[*pos] != blk)

advance(p, buf, pos);

assert('\n' == buf[*pos]);

advance(p, buf, pos);

len = blk - &buf[start];

m.value = malloc(len + 1);

if (NULL == m.value)

texiabort(p, NULL);

memcpy(m.value, &buf[start], len);

m.value[len] = '\0';

p->macros = realloc

(p->macros,

(p->macrosz + 1) *

sizeof(struct teximacro));

if (NULL == p->macros)

texiabort(p, NULL);

p->macros[p->macrosz++] = m;

advanceeoln(p, buf, sz, pos, 1);

}

static void

doignblock(struct texi *p, enum texicmd cmd,

const char *buf, size_t sz, size_t *pos)

{

Line 485 static void

Line 609 static void

doverb(struct texi *p, enum texicmd cmd,

const char *buf, size_t sz, size_t *pos)

{

char delim;

size_t start;

while (*pos < sz && isws(buf[*pos]))

advance(p, buf, pos);

if (*pos == sz || '{' != buf[*pos])

return;

advance(p, buf, pos);

if (*pos == sz)

return;

delim = buf[*pos];

advance(p, buf, pos);

/* Make sure we flush out our initial whitespace... */

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

texiputchar(p, ' ');

p->seenws = 0;

start = *pos;

/* Read until we see the delimiter then end-brace. */

while (*pos < sz - 1) {

if (buf[*pos] == delim && buf[*pos + 1] == '}')

break;

advance(p, buf, pos);

}

if (*pos == sz - 1)

return;

texiputbuf(p, buf, start, *pos);

/* Make sure we read after the end-brace. */

assert(delim == buf[*pos]);

advance(p, buf, pos);

assert('}' == buf[*pos]);

advance(p, buf, pos);

}

static void

doverbatim(struct texi *p, enum texicmd cmd,

const char *buf, size_t sz, size_t *pos)

{

const char *end, *term;

size_t endsz, endpos;

Line 543 doverbinclude(struct texi *p, enum texicmd cmd,

Line 706 doverbinclude(struct texi *p, enum texicmd cmd,

advance(p, buf, pos);

continue;

}

type = texicmd(p, buf, *pos, sz, &end);

type = texicmd(p, buf, *pos, sz, &end, NULL);

advanceto(p, buf, pos, end);

if (TEXICMD_VALUE != type)

texierr(p, "unknown verbatiminclude command");

Line 602 doinclude(struct texi *p, enum texicmd cmd,

Line 765 doinclude(struct texi *p, enum texicmd cmd,

advance(p, buf, pos);

continue;

}

type = texicmd(p, buf, *pos, sz, &end);

type = texicmd(p, buf, *pos, sz, &end, NULL);

advanceto(p, buf, pos, end);

if (TEXICMD_VALUE != type)

texierr(p, "unknown include command");

Line 713 dotitle(struct texi *p, enum texicmd cmd,

Line 876 dotitle(struct texi *p, enum texicmd cmd,

advanceeoln(p, buf, sz, pos, 1);

free(p->subtitle);

p->subtitle = malloc(end - start + 1);

if (NULL == p->subtitle)

texiabort(p, NULL);

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

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

}

Line 724 doaccent(struct texi *p, enum texicmd cmd,

Line 889 doaccent(struct texi *p, enum texicmd cmd,

if (*pos == sz)

return;

advance(p, buf, pos);

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

texiputchar(p, ' ');

p->seenws = 0;

switch (cmd) {

case (TEXICMD_CEDILLA):

/* Strange rules... */

while (*pos < sz && isws(buf[*pos]))

advance(p, buf, pos);

if (*pos == sz || '{' != buf[*pos])

return;

advance(p, buf, pos);

switch (buf[*pos]) {

case ('c'): case ('C'):

texiputchars(p, "\\(,");

texiputchar(p, buf[*pos]);

break;

default:

texiputchar(p, buf[*pos]);

break;

}

advance(p, buf, pos);

break;

case (TEXICMD_ACUTE):

switch (buf[*pos]) {

case ('a'): case ('A'):

Line 752 doaccent(struct texi *p, enum texicmd cmd,

Line 937 doaccent(struct texi *p, enum texicmd cmd,

break;

default:

texiputchar(p, buf[*pos]);

break;

}

break;

case (TEXICMD_GRAVE):

Line 778 doaccent(struct texi *p, enum texicmd cmd,

Line 964 doaccent(struct texi *p, enum texicmd cmd,

break;

default:

texiputchar(p, buf[*pos]);

break;

}

break;

case (TEXICMD_UMLAUT):

Line 793 doaccent(struct texi *p, enum texicmd cmd,

Line 980 doaccent(struct texi *p, enum texicmd cmd,

break;

default:

texiputchar(p, buf[*pos]);

break;

}

break;

default:

abort();

}

advance(p, buf, pos);

}

static void

Line 826 dosymbol(struct texi *p, enum texicmd cmd,

Line 1015 dosymbol(struct texi *p, enum texicmd cmd,

case (TEXICMD_BULLET):

texiputchars(p, "\\(bu");

break;

case (TEXICMD_COMMA):

texiputchar(p, ',');

break;

case (TEXICMD_COPYRIGHT):

texiputchars(p, "\\(co");

break;

case (TEXICMD_DOTS):

case (TEXICMD_ENDDOTS):

texiputchars(p, "...");

break;

case (TEXICMD_EQUIV):

texiputchars(p, "\\(==");

break;

case (TEXICMD_ERROR):

texiputchars(p, "error\\(->");

break;

Line 853 dosymbol(struct texi *p, enum texicmd cmd,

Line 1049 dosymbol(struct texi *p, enum texicmd cmd,

case (TEXICMD_RESULT):

texiputchars(p, "\\(rA");

break;

case (TEXICMD_SLASH):

texiputchar(p, '/');

break;

case (TEXICMD_SS):

texiputchars(p, "\\(ss");

break;

case (TEXICMD_SQUIGGLE_LEFT):

texiputchars(p, "{");

break;

case (TEXICMD_SQUIGGLE_RIGHT):

texiputchars(p, "}");

break;

case (TEXICMD_TEXSYM):

case (TEXICMD_TIE):

texiputchars(p, "TeX");

break;

case (TEXICMD_TEXSYM):

texiputchars(p, "\\ ");

break;

case (TEXICMD_COLON):

case (TEXICMD_HYPHEN):

break;

default:

texiwarn(p, "sym: %d", cmd);

abort();

}

Line 888 static void

Line 1092 static void

domath(struct texi *p, enum texicmd cmd,

const char *buf, size_t sz, size_t *pos)

{

size_t nest;

size_t nest, start;

* Math handling is different from everything else.

Line 904 domath(struct texi *p, enum texicmd cmd,

Line 1108 domath(struct texi *p, enum texicmd cmd,

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

texiputchar(p, ' ');

p->seenws = 0;

for (nest = 1; *pos < sz && nest > 0; ) {

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

if ('{' == buf[*pos])

nest++;

else if ('}' == buf[*pos])

if (0 == --nest)

continue;

texiputchar(p, buf[*pos]);

advance(p, buf, pos);

}

if (*pos == sz)

return;

assert('}' == buf[*pos]);

texiputbuf(p, buf, start, *pos);

advance(p, buf, pos);

}

Line 923 static void

Line 1127 static void

dovalue(struct texi *p, enum texicmd cmd,

const char *buf, size_t sz, size_t *pos)

{

size_t start, end;

size_t start, end, i;

char *key, *val;

const char *cp;

Line 939 dovalue(struct texi *p, enum texicmd cmd,

Line 1143 dovalue(struct texi *p, enum texicmd cmd,

advanceto(p, buf, pos, end);

key = malloc(end - start + 1);

if (NULL == key) {

if (NULL == key)

perror(NULL);

texiabort(p, NULL);

exit(EXIT_FAILURE);

}

memcpy(key, &buf[start], end - start);

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

Line 955 dovalue(struct texi *p, enum texicmd cmd,

Line 1157 dovalue(struct texi *p, enum texicmd cmd,

advanceeoln(p, buf, sz, pos, 1);

val = malloc(end - start + 1);

if (NULL == val) {

if (NULL == val)

perror(NULL);

texiabort(p, NULL);

exit(EXIT_FAILURE);

}

memcpy(val, &buf[start], end - start);

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

valueadd(p, key, val);

Line 966 dovalue(struct texi *p, enum texicmd cmd,

Line 1166 dovalue(struct texi *p, enum texicmd cmd,

if (p->seenws)

texiputchar(p, ' ');

p->seenws = 0;

if (NULL == (cp = valueblookup(p, buf, sz, pos)))

if (NULL != (cp = valueblookup(p, buf, sz, pos))) {

for (i = 0; i < p->valstackpos; i++)

if (cp == p->valstack[i])

break;

if (i < p->valstackpos)

texierr(p, "recursive value");

if (64 == p->valstackpos)

texierr(p, "too many nested values");

p->valstack[p->valstackpos++] = cp;

parsemembuf(p, cp, strlen(cp));

p->valstackpos--;

} else

texiputchars(p, "{No value}");

else

texiputchars(p, cp);

} else if (TEXICMD_IFCLEAR == cmd) {

if (NULL != valuellookup(p, buf, sz, pos))

doignblock(p, cmd, buf, sz, pos);

else

parseto(p, buf, sz, pos, texitoks[cmd].tok);

} else if (TEXICMD_IFSET == cmd) {

if (NULL == valuellookup(p, buf, sz, pos))

doignblock(p, cmd, buf, sz, pos);

else

parseto(p, buf, sz, pos, texitoks[cmd].tok);

} else if (TEXICMD_CLEAR == cmd)

valuelclear(p, buf, sz, pos);

}

Line 1001 dolink(struct texi *p, enum texicmd cmd,

Line 1215 dolink(struct texi *p, enum texicmd cmd,

texiputchars(p, "see Section");

teximacroopen(p, "Qq");

break;

case (TEXICMD_INFOREF):

texiputchars(p, "See Info file node");

teximacroopen(p, "Qq");

break;

default:

abort();

}

Line 1078 dosubsection(struct texi *p, enum texicmd cmd,

Line 1296 dosubsection(struct texi *p, enum texicmd cmd,

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

/* We don't have a subsubsection, so make one up. */

texivspace(p);

if (sec > 1)

texivspace(p);

teximacroopen(p, sects[sec]);

parseeoln(p, buf, sz, pos);

teximacroclose(p);

texivspace(p);

if (sec > 1)

texivspace(p);

}

static void

Line 1235 domultitable(struct texi *p, enum texicmd cmd,

Line 1455 domultitable(struct texi *p, enum texicmd cmd,

const char *buf, size_t sz, size_t *pos)

{

enum texilist sv = p->list;

int svliteral = p->literal;

enum texicmd type;

size_t i, end, columns;

p->list = TEXILIST_TABLE;

* TS/TE blocks aren't "in mdoc(7)", so we can disregard the

* fact that we're in literal mode right now.

p->literal = 0;

teximacro(p, "TS");

columns = 0;

Line 1255 domultitable(struct texi *p, enum texicmd cmd,

Line 1481 domultitable(struct texi *p, enum texicmd cmd,

* arguments to set the number of columns that we'll

* have.

type = texicmd(p, buf, *pos, sz, &end);

type = texicmd(p, buf, *pos, sz, &end, NULL);

advanceto(p, buf, pos, end);

if (TEXICMD_COLUMNFRACTIONS != type)

texierr(p, "unknown multitable command");

Line 1291 domultitable(struct texi *p, enum texicmd cmd,

Line 1517 domultitable(struct texi *p, enum texicmd cmd,

parseto(p, buf, sz, pos, texitoks[cmd].tok);

p->outmacro--;

teximacro(p, "TE");

p->literal = svliteral;

p->list = sv;

}

Line 1368 doignline(struct texi *p, enum texicmd cmd,

Line 1595 doignline(struct texi *p, enum texicmd cmd,

* This does NOT sanitise the directories!

static char **

parsedirs(const char *base, const char *cp, size_t *sz)

parsedirs(struct texi *p, const char *base, const char *cp, size_t *sz)

{

char *tok, *str, *tofree;

const char *cpp;

Line 1380 parsedirs(const char *base, const char *cp, size_t *sz

Line 1607 parsedirs(const char *base, const char *cp, size_t *sz

for ( ; NULL != (cpp = strchr(cpp, ':')); (*sz)++)

cpp++;

dirs = calloc(*sz, sizeof(char *));

if (NULL == (dirs = calloc(*sz, sizeof(char *))))

if (NULL == dirs) {

texiabort(p, NULL);

perror(NULL);

else if (NULL == (dirs[0] = strdup(base)))

exit(EXIT_FAILURE);

texiabort(p, NULL);

} else if (NULL == (dirs[0] = strdup(base))) {

perror(NULL);

exit(EXIT_FAILURE);

}

if (NULL == cp)

return(dirs);

if (NULL == (tofree = tok = str = strdup(cp))) {

if (NULL == (tofree = tok = str = strdup(cp)))

perror(NULL);

texiabort(p, NULL);

exit(EXIT_FAILURE);

}

for (i = 1; NULL != (tok = strsep(&str, ":")); i++)

if (NULL == (dirs[i] = strdup(tok))) {

if (NULL == (dirs[i] = strdup(tok)))

perror(NULL);

texiabort(p, NULL);

exit(EXIT_FAILURE);

}

free(tofree);

return(dirs);

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

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

if (0 == (argc -= optind))

goto usage;

if (NULL == (path = strdup(argv[0]))) {

if (NULL == (path = strdup(argv[0])))

perror(NULL);

texiabort(&texi, NULL);

exit(EXIT_FAILURE);

else if (NULL == (dir = dirname(path)))

} else if (NULL == (dir = dirname(path))) {

texiabort(&texi, NULL);

perror(argv[0]);

free(path);

exit(EXIT_FAILURE);

}

free(path);

if (NULL != (cp = strrchr(argv[0], '/')))

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

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

else

texi.title = strdup(argv[0]);

if (NULL == texi.title) {

if (NULL == texi.title)

perror(NULL);

texiabort(&texi, NULL);

exit(EXIT_FAILURE);

else if (NULL != (path = strchr(texi.title, '.')))

} else if (NULL != (path = strchr(texi.title, '.')))

*path = '\0';

texi.ign = 1;

texi.dirs = parsedirs(dir, Idir, &texi.dirsz);

texi.dirs = parsedirs(&texi, dir, Idir, &texi.dirsz);

parsefile(&texi, argv[0], 1);

/* We shouldn't get here. */

texiexit(&texi);

CVSweb