version 1.42, 2015/02/24 20:06:32 |
version 1.44, 2015/02/24 21:06:52 |
Line 45 static void dobye(struct texi *, enum texicmd, const c |
|
Line 45 static void dobye(struct texi *, enum texicmd, const c |
|
static void dodefindex(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 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 dodisplay(struct texi *, enum texicmd, const char *, size_t, size_t *); |
|
static void doend(struct texi *, enum texicmd, const char *, size_t, size_t *); |
static void doenumerate(struct texi *, enum texicmd, const char *, size_t, size_t *); |
static void doenumerate(struct texi *, enum texicmd, const char *, size_t, size_t *); |
static void doexample(struct texi *, enum texicmd, const char *, size_t, size_t *); |
static void doexample(struct texi *, enum texicmd, const char *, size_t, size_t *); |
static void doignargn(struct texi *, enum texicmd, const char *, size_t, size_t *); |
static void doignargn(struct texi *, enum texicmd, const char *, size_t, size_t *); |
Line 149 static const struct texitok __texitoks[TEXICMD__MAX] = |
|
Line 150 static const struct texitok __texitoks[TEXICMD__MAX] = |
|
{ doignbracket, "dmn", 3 }, /* TEXICMD_DMN */ |
{ doignbracket, "dmn", 3 }, /* TEXICMD_DMN */ |
{ doignblock, "documentdescription", 19 }, /* TEXICMD_DOCUMENTDESCRIPTION */ |
{ doignblock, "documentdescription", 19 }, /* TEXICMD_DOCUMENTDESCRIPTION */ |
{ doignline, "documentencoding", 16 }, /* TEXICMD_DOCUMENTENCODING */ |
{ doignline, "documentencoding", 16 }, /* TEXICMD_DOCUMENTENCODING */ |
|
{ doignline, "documentlanguage", 16 }, /* TEXICMD_DOCUMENTLANGUAGE */ |
{ doaccent, "dotaccent", 9 }, /* TEXICMD_DOTACCENT */ |
{ doaccent, "dotaccent", 9 }, /* TEXICMD_DOTACCENT */ |
{ doaccent, "dotless", 7 }, /* TEXICMD_DOTLESS */ |
{ doaccent, "dotless", 7 }, /* TEXICMD_DOTLESS */ |
{ dosymbol, "dots", 4 }, /* TEXICMD_DOTS */ |
{ dosymbol, "dots", 4 }, /* TEXICMD_DOTS */ |
{ dolink, "email", 5 }, /* TEXICMD_EMAIL */ |
{ dolink, "email", 5 }, /* TEXICMD_EMAIL */ |
{ doinline, "emph", 4 }, /* TEXICMD_EMPH */ |
{ doinline, "emph", 4 }, /* TEXICMD_EMPH */ |
{ NULL, "end", 3 }, /* TEXICMD_END */ |
{ doend, "end", 3 }, /* TEXICMD_END */ |
{ dosymbol, "enddots", 7 }, /* TEXICMD_ENDDOTS */ |
{ dosymbol, "enddots", 7 }, /* TEXICMD_ENDDOTS */ |
{ doenumerate, "enumerate", 9 }, /* TEXICMD_ENUMERATE */ |
{ doenumerate, "enumerate", 9 }, /* TEXICMD_ENUMERATE */ |
{ doinline, "env", 3 }, /* TEXICMD_ENV */ |
{ doinline, "env", 3 }, /* TEXICMD_ENV */ |
{ dosymbol, "equiv", 5 }, /* TEXICMD_EQUIV */ |
{ dosymbol, "equiv", 5 }, /* TEXICMD_EQUIV */ |
{ dosymbol, "error", 5 }, /* TEXICMD_ERROR */ |
{ dosymbol, "error", 5 }, /* TEXICMD_ERROR */ |
|
{ dosymbol, "euro", 4 }, /* TEXICMD_EURO */ |
{ doexample, "example", 7 }, /* TEXICMD_EXAMPLE */ |
{ doexample, "example", 7 }, /* TEXICMD_EXAMPLE */ |
{ dosymbol, "exclamdown", 10 }, /* TEXICMD_EXCLAMDOWN */ |
{ dosymbol, "exclamdown", 10 }, /* TEXICMD_EXCLAMDOWN */ |
{ doignline, "exdent", 6 }, /* TEXICMD_EXDENT */ |
{ doignline, "exdent", 6 }, /* TEXICMD_EXDENT */ |
Line 167 static const struct texitok __texitoks[TEXICMD__MAX] = |
|
Line 170 static const struct texitok __texitoks[TEXICMD__MAX] = |
|
{ doinline, "file", 4 }, /* TEXICMD_FILE */ |
{ doinline, "file", 4 }, /* TEXICMD_FILE */ |
{ doignline, "finalout", 8 }, /* TEXICMD_FINALOUT */ |
{ doignline, "finalout", 8 }, /* TEXICMD_FINALOUT */ |
{ doignline, "findex", 6 }, /* TEXICMD_FINDEX */ |
{ doignline, "findex", 6 }, /* TEXICMD_FINDEX */ |
|
{ doblock, "flushleft", 9 }, /* TEXICMD_FLUSHLEFT */ |
|
{ doblock, "flushright", 10 }, /* TEXICMD_FLUSHRIGHT */ |
|
{ doignline, "firstparagraphindent", 20 }, /* TEXICMD_FIRSTPARAGRAPHINDENT */ |
{ doignbracket, "footnote", 8 }, /* TEXICMD_FOOTNOTE */ |
{ doignbracket, "footnote", 8 }, /* TEXICMD_FOOTNOTE */ |
|
{ doignline, "footnotestyle", 13 }, /* TEXICMD_FOOTNOTESTYLE */ |
{ dotable, "ftable", 6 }, /* TEXICMD_FTABLE */ |
{ dotable, "ftable", 6 }, /* TEXICMD_FTABLE */ |
{ dodisplay, "format", 6 }, /* TEXICMD_FORMAT */ |
{ dodisplay, "format", 6 }, /* TEXICMD_FORMAT */ |
|
{ dosymbol, "geq", 3 }, /* TEXICMD_GEQ */ |
{ doaccent, "`", 1 }, /* TEXICMD_GRAVE */ |
{ doaccent, "`", 1 }, /* TEXICMD_GRAVE */ |
{ doblock, "group", 5 }, /* TEXICMD_GROUP */ |
{ doblock, "group", 5 }, /* TEXICMD_GROUP */ |
|
{ dosymbol, "guillemetleft", 13 }, /* TEXICMD_GUILLEMETLEFT */ |
|
{ dosymbol, "guillemetright", 14 }, /* TEXICMD_GUILLEMETRIGHT */ |
|
{ dosymbol, "guillemotleft", 13 }, /* TEXICMD_GUILLEMOTLEFT */ |
|
{ dosymbol, "guillemotright", 14 }, /* TEXICMD_GUILLEMOTRIGHT */ |
|
{ dosymbol, "guilsinglleft", 13 }, /* TEXICMD_GUILSINGLLEFT */ |
|
{ dosymbol, "guilsinglright", 14 }, /* TEXICMD_GUILSINGLRIGHT */ |
{ doaccent, "H", 1 }, /* TEXICMD_H */ |
{ doaccent, "H", 1 }, /* TEXICMD_H */ |
{ dosection, "heading", 7 }, /* TEXICMD_HEADING */ |
{ dosection, "heading", 7 }, /* TEXICMD_HEADING */ |
{ doignline, "headings", 8 }, /* TEXICMD_HEADINGS */ |
{ doignline, "headings", 8 }, /* TEXICMD_HEADINGS */ |
Line 197 static const struct texitok __texitoks[TEXICMD__MAX] = |
|
Line 211 static const struct texitok __texitoks[TEXICMD__MAX] = |
|
{ doignbracket, "image", 5 }, /* TEXICMD_IMAGE */ |
{ doignbracket, "image", 5 }, /* TEXICMD_IMAGE */ |
{ doinclude, "include", 7 }, /* TEXICMD_INCLUDE */ |
{ doinclude, "include", 7 }, /* TEXICMD_INCLUDE */ |
{ dodisplay, "indentblock", 11 }, /* TEXICMD_INDENTBLOCK */ |
{ dodisplay, "indentblock", 11 }, /* TEXICMD_INDENTBLOCK */ |
{ dolink, "inforef", 7 }, /* TEXICMD_INDENTBLOCK */ |
{ dolink, "indicateurl", 11 }, /* TEXICMD_INDICATEURL */ |
|
{ dolink, "inforef", 7 }, /* TEXICMD_INFOREF */ |
{ doignline, "insertcopying", 13 }, /* TEXICMD_INSERTCOPYING */ |
{ doignline, "insertcopying", 13 }, /* TEXICMD_INSERTCOPYING */ |
{ doitem, "item", 4 }, /* TEXICMD_ITEM */ |
{ doitem, "item", 4 }, /* TEXICMD_ITEM */ |
{ doitemize, "itemize", 7 }, /* TEXICMD_ITEMIZE */ |
{ doitemize, "itemize", 7 }, /* TEXICMD_ITEMIZE */ |
Line 207 static const struct texitok __texitoks[TEXICMD__MAX] = |
|
Line 222 static const struct texitok __texitoks[TEXICMD__MAX] = |
|
{ doignline, "kindex", 6 }, /* TEXICMD_KINDEX */ |
{ doignline, "kindex", 6 }, /* TEXICMD_KINDEX */ |
{ dosymbol, "L", 1 }, /* TEXICMD_L */ |
{ dosymbol, "L", 1 }, /* TEXICMD_L */ |
{ dosymbol, "LaTeX", 5 }, /* TEXICMD_LATEX */ |
{ dosymbol, "LaTeX", 5 }, /* TEXICMD_LATEX */ |
|
{ dosymbol, "leq", 3 }, /* TEXICMD_LEQ */ |
{ dosecoffs, "lowersections", 13 }, /* TEXICMD_LOWERSECTIONS */ |
{ dosecoffs, "lowersections", 13 }, /* TEXICMD_LOWERSECTIONS */ |
{ dosymbol, "l", 1 }, /* TEXICMD_LSMALL */ |
{ dosymbol, "l", 1 }, /* TEXICMD_LSMALL */ |
{ domacro, "macro", 5 }, /* TEXICMD_MACRO */ |
{ domacro, "macro", 5 }, /* TEXICMD_MACRO */ |
Line 231 static const struct texitok __texitoks[TEXICMD__MAX] = |
|
Line 247 static const struct texitok __texitoks[TEXICMD__MAX] = |
|
{ doignline, "paragraphindent", 15 }, /* TEXICMD_PARINDENT */ |
{ doignline, "paragraphindent", 15 }, /* TEXICMD_PARINDENT */ |
{ dosymbol, ".", 1 }, /* TEXICMD_PERIOD */ |
{ dosymbol, ".", 1 }, /* TEXICMD_PERIOD */ |
{ doignline, "pindex", 6 }, /* TEXICMD_PINDEX */ |
{ doignline, "pindex", 6 }, /* TEXICMD_PINDEX */ |
|
{ dosymbol, "pounds", 6 }, /* TEXICMD_POUNDS */ |
{ doignline, "printindex", 10 }, /* TEXICMD_PRINTINDEX */ |
{ doignline, "printindex", 10 }, /* TEXICMD_PRINTINDEX */ |
{ dolink, "pxref", 5 }, /* TEXICMD_PXREF */ |
{ dolink, "pxref", 5 }, /* TEXICMD_PXREF */ |
{ dosymbol, "questiondown", 12 }, /* TEXICMD_QUESTIONDOWN */ |
{ dosymbol, "questiondown", 12 }, /* TEXICMD_QUESTIONDOWN */ |
{ dosymbol, "?", 1 }, /* TEXICMD_QUESTIONMARK */ |
{ dosymbol, "?", 1 }, /* TEXICMD_QUESTIONMARK */ |
{ doquotation, "quotation", 9 }, /* TEXICMD_QUOTATION */ |
{ doquotation, "quotation", 9 }, /* TEXICMD_QUOTATION */ |
|
{ dosymbol, "quotedblbase", 12 }, /* TEXICMD_QUOTEDBLBASE */ |
|
{ dosymbol, "quotedblleft", 12 }, /* TEXICMD_QUOTEDBLLEFT */ |
|
{ dosymbol, "quotedblright", 13 }, /* TEXICMD_QUOTEDBLRIGHT */ |
|
{ dosymbol, "quotesinglbase", 14 }, /* TEXICMD_QUOTESINGLBASE */ |
|
{ dosymbol, "quoteleft", 9 }, /* TEXICMD_QUOTELEFT */ |
|
{ dosymbol, "quoteright", 10 }, /* TEXICMD_QUOTERIGHT */ |
{ doinline, "r", 1 }, /* TEXICMD_R */ |
{ doinline, "r", 1 }, /* TEXICMD_R */ |
{ dosecoffs, "raisesections", 13 }, /* TEXICMD_RAISESECTIONS */ |
{ dosecoffs, "raisesections", 13 }, /* TEXICMD_RAISESECTIONS */ |
{ dobracket, "ref", 3 }, /* TEXICMD_REF */ |
{ dobracket, "ref", 3 }, /* TEXICMD_REF */ |
{ doignline, "refill", 6 }, /* TEXICMD_REFILL */ |
{ doignline, "refill", 6 }, /* TEXICMD_REFILL */ |
|
{ dosymbol, "registeredsymbol", 16 }, /* TEXICMD_REGISTEREDSYMBOL */ |
{ dosymbol, "result", 6 }, /* TEXICMD_RESULT */ |
{ dosymbol, "result", 6 }, /* TEXICMD_RESULT */ |
{ doaccent, "ringaccent", 10 }, /* TEXICMD_RINGACCENT */ |
{ doaccent, "ringaccent", 10 }, /* TEXICMD_RINGACCENT */ |
{ doinline, "samp", 4 }, /* TEXICMD_SAMP */ |
{ doinline, "samp", 4 }, /* TEXICMD_SAMP */ |
Line 279 static const struct texitok __texitoks[TEXICMD__MAX] = |
|
Line 303 static const struct texitok __texitoks[TEXICMD__MAX] = |
|
{ dotable, "table", 5 }, /* TEXICMD_TABLE */ |
{ dotable, "table", 5 }, /* TEXICMD_TABLE */ |
{ doignblock, "tex", 3 }, /* TEXICMD_TEX */ |
{ doignblock, "tex", 3 }, /* TEXICMD_TEX */ |
{ dosymbol, "TeX", 3 }, /* TEXICMD_TEXSYM */ |
{ dosymbol, "TeX", 3 }, /* TEXICMD_TEXSYM */ |
|
{ dosymbol, "textdegree", 10 }, /* TEXICMD_TEXTDEGREE */ |
{ dosymbol, "TH", 2 }, /* TEXICMD_TH */ |
{ dosymbol, "TH", 2 }, /* TEXICMD_TH */ |
{ dosymbol, "th", 2 }, /* TEXICMD_THSMALL */ |
{ dosymbol, "th", 2 }, /* TEXICMD_THSMALL */ |
{ dosymbol, "tie", 3 }, /* TEXICMD_TIE */ |
{ dosymbol, "tie", 3 }, /* TEXICMD_TIE */ |
Line 1067 dosymbol(struct texi *p, enum texicmd cmd, |
|
Line 1092 dosymbol(struct texi *p, enum texicmd cmd, |
|
{ |
{ |
|
|
/* Remember to pad us. */ |
/* Remember to pad us. */ |
if (p->seenws && p->outcol && 0 == p->literal) { |
if (p->seenws && p->outcol && 0 == p->literal) |
texiputchar(p, ' '); |
texiputchar(p, ' '); |
p->seenws = 0; |
|
} |
|
|
|
|
p->seenws = 0; |
|
|
switch (cmd) { |
switch (cmd) { |
case (TEXICMD_AA): |
case (TEXICMD_AA): |
texiputchars(p, "\\(oA"); |
texiputchars(p, "\\(oA"); |
Line 1122 dosymbol(struct texi *p, enum texicmd cmd, |
|
Line 1147 dosymbol(struct texi *p, enum texicmd cmd, |
|
case (TEXICMD_ERROR): |
case (TEXICMD_ERROR): |
texiputchars(p, "error\\(->"); |
texiputchars(p, "error\\(->"); |
break; |
break; |
|
case (TEXICMD_EURO): |
|
texiputchars(p, "\\(Eu"); |
|
break; |
case (TEXICMD_EXCLAMDOWN): |
case (TEXICMD_EXCLAMDOWN): |
texiputchars(p, "\\(r!"); |
texiputchars(p, "\\(r!"); |
break; |
break; |
case (TEXICMD_EXPANSION): |
case (TEXICMD_EXPANSION): |
texiputchars(p, "\\(->"); |
texiputchars(p, "\\(->"); |
break; |
break; |
|
case (TEXICMD_GEQ): |
|
texiputchars(p, "\\(>="); |
|
break; |
|
case (TEXICMD_GUILLEMETLEFT): |
|
case (TEXICMD_GUILLEMOTLEFT): |
|
texiputchars(p, "\\(Fo"); |
|
break; |
|
case (TEXICMD_GUILLEMETRIGHT): |
|
case (TEXICMD_GUILLEMOTRIGHT): |
|
texiputchars(p, "\\(Fc"); |
|
break; |
|
case (TEXICMD_GUILSINGLLEFT): |
|
texiputchars(p, "\\(fo"); |
|
break; |
|
case (TEXICMD_GUILSINGLRIGHT): |
|
texiputchars(p, "\\(fc"); |
|
break; |
case (TEXICMD_L): |
case (TEXICMD_L): |
texiputchars(p, "\\(/L"); |
texiputchars(p, "\\(/L"); |
break; |
break; |
case (TEXICMD_LATEX): |
case (TEXICMD_LATEX): |
texiputchars(p, "LaTeX"); |
texiputchars(p, "LaTeX"); |
break; |
break; |
|
case (TEXICMD_LEQ): |
|
texiputchars(p, "\\(<="); |
|
break; |
case (TEXICMD_LSMALL): |
case (TEXICMD_LSMALL): |
texiputchars(p, "\\(/l"); |
texiputchars(p, "\\(/l"); |
break; |
break; |
Line 1161 dosymbol(struct texi *p, enum texicmd cmd, |
|
Line 1209 dosymbol(struct texi *p, enum texicmd cmd, |
|
case (TEXICMD_PERIOD): |
case (TEXICMD_PERIOD): |
texiputchar(p, '.'); |
texiputchar(p, '.'); |
break; |
break; |
|
case (TEXICMD_POUNDS): |
|
texiputchars(p, "\\(Po"); |
|
break; |
case (TEXICMD_QUESTIONDOWN): |
case (TEXICMD_QUESTIONDOWN): |
texiputchars(p, "\\(r?"); |
texiputchars(p, "\\(r?"); |
break; |
break; |
case (TEXICMD_QUESTIONMARK): |
case (TEXICMD_QUESTIONMARK): |
texiputchar(p, '?'); |
texiputchar(p, '?'); |
break; |
break; |
|
case (TEXICMD_QUOTEDBLBASE): |
|
texiputchars(p, "\\(Bq"); |
|
break; |
|
case (TEXICMD_QUOTEDBLLEFT): |
|
texiputchars(p, "\\(lq"); |
|
break; |
|
case (TEXICMD_QUOTEDBLRIGHT): |
|
texiputchars(p, "\\(rq"); |
|
break; |
|
case (TEXICMD_QUOTESINGLBASE): |
|
texiputchars(p, "\\(bq"); |
|
break; |
|
case (TEXICMD_QUOTELEFT): |
|
texiputchars(p, "\\(oq"); |
|
break; |
|
case (TEXICMD_QUOTERIGHT): |
|
texiputchars(p, "\\(cq"); |
|
break; |
|
case (TEXICMD_REGISTEREDSYMBOL): |
|
texiputchars(p, "\\(rg"); |
|
break; |
case (TEXICMD_RESULT): |
case (TEXICMD_RESULT): |
texiputchars(p, "\\(rA"); |
texiputchars(p, "\\(rA"); |
break; |
break; |
Line 1185 dosymbol(struct texi *p, enum texicmd cmd, |
|
Line 1257 dosymbol(struct texi *p, enum texicmd cmd, |
|
case (TEXICMD_TEXSYM): |
case (TEXICMD_TEXSYM): |
texiputchars(p, "TeX"); |
texiputchars(p, "TeX"); |
break; |
break; |
|
case (TEXICMD_TEXTDEGREE): |
|
texiputchars(p, "\\(de"); |
|
break; |
case (TEXICMD_TH): |
case (TEXICMD_TH): |
texiputchars(p, "\\(TP"); |
texiputchars(p, "\\(TP"); |
break; |
break; |
Line 1333 dolink(struct texi *p, enum texicmd cmd, |
|
Line 1408 dolink(struct texi *p, enum texicmd cmd, |
|
break; |
break; |
case (TEXICMD_UREF): |
case (TEXICMD_UREF): |
case (TEXICMD_URL): |
case (TEXICMD_URL): |
|
case (TEXICMD_INDICATEURL): |
teximacroopen(p, "Lk"); |
teximacroopen(p, "Lk"); |
break; |
break; |
case (TEXICMD_XREF): |
case (TEXICMD_XREF): |
Line 1670 dotable(struct texi *p, enum texicmd cmd, |
|
Line 1746 dotable(struct texi *p, enum texicmd cmd, |
|
parseto(p, buf, sz, pos, texitoks[cmd].tok); |
parseto(p, buf, sz, pos, texitoks[cmd].tok); |
teximacro(p, "El"); |
teximacro(p, "El"); |
p->list = sv; |
p->list = sv; |
|
} |
|
|
|
static void |
|
doend(struct texi *p, enum texicmd cmd, |
|
const char *buf, size_t sz, size_t *pos) |
|
{ |
|
size_t start; |
|
|
|
while (*pos < sz && isws(buf[*pos])) |
|
advance(p, buf, pos); |
|
start = *pos; |
|
while (*pos < sz && '\n' != buf[*pos]) |
|
advance(p, buf, pos); |
|
|
|
texiwarn(p, "unexpected \"end\": %.*s", (int)(*pos - start), &buf[start]); |
|
advanceeoln(p, buf, sz, pos, 1); |
} |
} |
|
|
static void |
static void |