texi2mdoc/main.c - diff

Return to main.c CVS log

Up to [cvsweb.bsd.lv] / texi2mdoc

Diff for /texi2mdoc/main.c between version 1.28 and 1.39

version 1.28, 2015/02/21 21:49:18

version 1.39, 2015/02/23 20:54:53

Line 14

* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

#if defined(__linux__) || defined(__MINT__)

# define _GNU_SOURCE /* memmem */

#endif

#include <sys/mman.h>

#include <sys/stat.h>

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

Line 61 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 73 static void dotab(struct texi *, enum texicmd, const c

Line 77 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 93 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 98 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 102 static const struct texitok __texitoks[TEXICMD__MAX] =

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

Line 120 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 128 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 140 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 150 static const struct texitok __texitoks[TEXICMD__MAX] =

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

Line 150 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 161 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 172 static const struct texitok __texitoks[TEXICMD__MAX] =

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

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

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

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

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

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

Line 188 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 200 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 216 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 229 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 229 static const struct texitok __texitoks[TEXICMD__MAX] =

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

Line 244 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 260 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 257 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 274 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 311 dodefn(struct texi *p, enum texicmd cmd,

Line 330 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 336 dodefn(struct texi *p, enum texicmd cmd,

Line 357 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 384 dodefn(struct texi *p, enum texicmd cmd,

Line 409 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 426 dodefn(struct texi *p, enum texicmd cmd,

Line 453 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 449 doignblock(struct texi *p, enum texicmd cmd,

Line 535 doignblock(struct texi *p, enum texicmd cmd,

term = memmem(&buf[*pos], sz, end, endsz);

endpos = NULL == term ? sz :

*pos + term - &buf[*pos];

*pos + (size_t)(term - &buf[*pos]);

assert(endpos <= sz);

while (*pos < endpos)

advance(p, buf, pos);

Line 526 static void

Line 612 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 542 doverb(struct texi *p, enum texicmd cmd,

Line 667 doverb(struct texi *p, enum texicmd cmd,

term = memmem(&buf[*pos], sz, end, endsz);

endpos = NULL == term ? sz :

*pos + term - &buf[*pos];

*pos + (size_t)(term - &buf[*pos]);

teximacro(p, "Bd -literal -offset indent");

assert(endpos <= sz);

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

Line 709 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 643 doinclude(struct texi *p, enum texicmd cmd,

Line 768 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 767 doaccent(struct texi *p, enum texicmd cmd,

Line 892 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 795 doaccent(struct texi *p, enum texicmd cmd,

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

break;

default:

texiputchar(p, buf[*pos]);

break;

}

break;

case (TEXICMD_GRAVE):

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

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

break;

default:

texiputchar(p, buf[*pos]);

break;

}

break;

case (TEXICMD_UMLAUT):

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

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

break;

default:

texiputchar(p, buf[*pos]);

break;

}

break;

default:

abort();

}

advance(p, buf, pos);

}

static void

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

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

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

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

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

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

case (TEXICMD_TEXSYM):

texiputchars(p, "TeX");

break;

case (TEXICMD_TIE):

texiputchars(p, "\\ ");

break;

case (TEXICMD_COLON):

case (TEXICMD_HYPHEN):

break;

default:

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

abort();

}

Line 934 static void

Line 1095 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 950 domath(struct texi *p, enum texicmd cmd,

Line 1111 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 1014 dovalue(struct texi *p, enum texicmd cmd,

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

break;

if (i < p->valstackpos)

texierr(p, "recursive value");

if (64 == p->valstackpos)

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

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

parseeof(p, cp, strlen(cp));

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

p->valstackpos--;

} else

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

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

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

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 1044 dolink(struct texi *p, enum texicmd cmd,

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

break;

case (TEXICMD_XREF):

texiputchars(p, "See Section");

teximacroopen(p, "Qq");

teximacroopen(p, "Dq");

break;

case (TEXICMD_PXREF):

texiputchars(p, "see Section");

teximacroopen(p, "Qq");

teximacroopen(p, "Dq");

break;

case (TEXICMD_INFOREF):

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

teximacroopen(p, "Dq");

break;

default:

abort();

}

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

Line 1299 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 1184 dosp(struct texi *p, enum texicmd cmd,

Line 1358 dosp(struct texi *p, enum texicmd cmd,

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

{

texivspace(p);

if (p->literal)

texiputchar(p, '\n');

else

texivspace(p);

/* FIXME: ignore and parseeoln. */

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

}

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

Line 1461 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 1304 domultitable(struct texi *p, enum texicmd cmd,

Line 1487 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 1340 domultitable(struct texi *p, enum texicmd cmd,

Line 1523 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 1453 main(int argc, char *argv[])

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

{

struct texi texi;

int c;

char *path, *dir;

char *dirpath, *dir, *ccp;

const char *progname, *Idir, *cp;

progname = strrchr(argv[0], '/');

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

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

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

goto usage;

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

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

texiabort(&texi, NULL);

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

if (NULL == (dir = dirname(dirpath)))

texiabort(&texi, NULL);

free(path);

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

texi.title = strdup(cp + 1);

else

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

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

if (NULL == texi.title)

texiabort(&texi, NULL);

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

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

*path = '\0';

*ccp = '\0';

texi.ign = 1;

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

free(dirpath);

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

/* We shouldn't get here. */

texiexit(&texi);

CVSweb