version 1.51, 2015/02/27 19:28:55 |
version 1.53, 2015/02/28 08:41:59 |
Line 614 doignblock(struct texi *p, enum texicmd cmd, size_t *p |
|
Line 614 doignblock(struct texi *p, enum texicmd cmd, size_t *p |
|
* Thus, we keep track of scopes for matching "end" blocks. |
* Thus, we keep track of scopes for matching "end" blocks. |
*/ |
*/ |
while (stack > 0 && *pos < BUFSZ(p)) { |
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); |
endt = memmem(&BUF(p)[*pos], BUFSZ(p) - *pos, end, esz); |
startt = memmem(&BUF(p)[*pos], BUFSZ(p) - *pos, start, ssz); |
startt = memmem(&BUF(p)[*pos], BUFSZ(p) - *pos, start, ssz); |
if (NULL == endt) { |
if (NULL == endt) { |
Line 690 doinline(struct texi *p, enum texicmd cmd, size_t *pos |
|
Line 690 doinline(struct texi *p, enum texicmd cmd, size_t *pos |
|
} |
} |
|
|
if (NULL == macro || p->literal || TEXILIST_TABLE == p->list) { |
if (NULL == macro || p->literal || TEXILIST_TABLE == p->list) { |
parsebracket(p, pos); |
parsebracket(p, pos, 0); |
return; |
return; |
} |
} |
|
|
teximacroopen(p, macro); |
teximacroopen(p, macro); |
p->seenws = 0; |
p->seenws = 0; |
parsebracket(p, pos); |
parsebracket(p, pos, 0); |
texipunctuate(p, pos); |
texipunctuate(p, pos); |
teximacroclose(p); |
teximacroclose(p); |
} |
} |
|
|
dobracket(struct texi *p, enum texicmd cmd, size_t *pos) |
dobracket(struct texi *p, enum texicmd cmd, size_t *pos) |
{ |
{ |
|
|
parsebracket(p, pos); |
parsebracket(p, pos, 0); |
} |
} |
|
|
static void |
static void |
Line 1328 doquotation(struct texi *p, enum texicmd cmd, size_t * |
|
Line 1328 doquotation(struct texi *p, enum texicmd cmd, size_t * |
|
static void |
static void |
domath(struct texi *p, enum texicmd cmd, size_t *pos) |
domath(struct texi *p, enum texicmd cmd, size_t *pos) |
{ |
{ |
size_t nest, start; |
|
|
|
/* |
parsebracket(p, pos, 1); |
* 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]) |
|
return; |
|
advance(p, pos); |
|
if (p->seenws && p->outcol && 0 == p->literal) |
|
texiputchar(p, ' '); |
|
p->seenws = 0; |
|
for (nest = 1, start = *pos; *pos < BUFSZ(p) && nest > 0; ) { |
|
if ('{' == BUF(p)[*pos]) |
|
nest++; |
|
else if ('}' == BUF(p)[*pos]) |
|
if (0 == --nest) |
|
continue; |
|
advance(p, pos); |
|
} |
|
if (*pos == BUFSZ(p)) |
|
return; |
|
assert('}' == BUF(p)[*pos]); |
|
texiputbuf(p, start, *pos); |
|
advance(p, pos); |
|
} |
} |
|
|
static void |
static void |
Line 1809 doignbracket(struct texi *p, enum texicmd cmd, size_t |
|
Line 1782 doignbracket(struct texi *p, enum texicmd cmd, size_t |
|
{ |
{ |
|
|
p->ign++; |
p->ign++; |
parsebracket(p, pos); |
parsebracket(p, pos, 0); |
p->ign--; |
p->ign--; |
} |
} |
|
|