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.33

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

version 1.33, 2015/02/23 12:39:59

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

Line 110 static const struct texitok __texitoks[TEXICMD__MAX] =

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

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

{ 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 152 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 175 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_USER_INDEX */

{ 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 191 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 207 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 224 static const struct texitok __texitoks[TEXICMD__MAX] =

Line 236 static const struct texitok __texitoks[TEXICMD__MAX] =

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

Line 263 static const struct texitok __texitoks[TEXICMD__MAX] =

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

{ 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 277 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 385 dodefn(struct texi *p, enum texicmd cmd,

Line 431 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 590 static void

doverb(struct texi *p, enum texicmd cmd,

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

{

char delim;

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;

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

while (*pos < sz - 1) {

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

break;

texiputchar(p, buf[*pos]);

advance(p, buf, pos);

}

if (*pos == sz - 1)

return;

/* 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 684 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 743 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 854 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 832 dosymbol(struct texi *p, enum texicmd cmd,

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

case (TEXICMD_DOTS):

texiputchars(p, "...");

break;

case (TEXICMD_EQUIV):

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

break;

case (TEXICMD_ERROR):

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

break;

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

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

case (TEXICMD_HYPHEN):

break;

default:

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

abort();

}

Line 923 static void

Line 1068 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 1084 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 1098 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 1107 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 1235 domultitable(struct texi *p, enum texicmd cmd,

Line 1390 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 1416 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 1452 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 1530 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 1542 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 1591 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 1603 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