version 1.32, 2014/07/18 05:09:32 |
version 1.34, 2014/07/19 00:42:22 |
Line 169 outbuf_addstr(struct state *st, const char *str) |
|
Line 169 outbuf_addstr(struct state *st, const char *str) |
|
if (st->outbuflen + slen >= st->outbufsz) |
if (st->outbuflen + slen >= st->outbufsz) |
outbuf_grow(st, slen); |
outbuf_grow(st, slen); |
memcpy(st->outbuf + st->outbuflen, str, slen+1); |
memcpy(st->outbuf + st->outbuflen, str, slen+1); |
|
st->outbuflen += slen; |
last = str[slen - 1]; |
last = str[slen - 1]; |
st->wantws = 0; |
st->wantws = 0; |
} |
} |
Line 242 formatescape(struct state *st, const char *buf, size_t |
|
Line 243 formatescape(struct state *st, const char *buf, size_t |
|
outbuf_addstr(st, "\\(la"); |
outbuf_addstr(st, "\\(la"); |
else if (0 == strcmp(esc, "gt")) |
else if (0 == strcmp(esc, "gt")) |
outbuf_addstr(st, "\\(ra"); |
outbuf_addstr(st, "\\(ra"); |
else if (0 == strcmp(esc, "vb")) |
else if (0 == strcmp(esc, "verbar")) |
outbuf_addstr(st, "\\(ba"); |
outbuf_addstr(st, "\\(ba"); |
else if (0 == strcmp(esc, "sol")) |
else if (0 == strcmp(esc, "sol")) |
outbuf_addstr(st, "\\(sl"); |
outbuf_addstr(st, "\\(sl"); |
|
|
* We usually exit in OUST_MAC mode, except when |
* We usually exit in OUST_MAC mode, except when |
* entering without OUST_MAC and the code is invalid. |
* entering without OUST_MAC and the code is invalid. |
*/ |
*/ |
static void |
static int |
formatcode(struct state *st, const char *buf, size_t *start, |
formatcode(struct state *st, const char *buf, size_t *start, |
size_t end, int nomacro, int pos) |
size_t end, int nomacro, int pos) |
{ |
{ |
Line 512 formatcode(struct state *st, const char *buf, size_t * |
|
Line 513 formatcode(struct state *st, const char *buf, size_t * |
|
*/ |
*/ |
if (FMT_ESCAPE == fmt) { |
if (FMT_ESCAPE == fmt) { |
formatescape(st, buf, start, end); |
formatescape(st, buf, start, end); |
return; |
return(0); |
} else if (FMT_NULL == fmt || FMT_INDEX == fmt) { |
} else if (FMT_NULL == fmt || FMT_INDEX == fmt) { |
/* |
/* |
* Just consume til the end delimiter, accounting for |
* Just consume til the end delimiter, accounting for |
Line 542 formatcode(struct state *st, const char *buf, size_t * |
|
Line 543 formatcode(struct state *st, const char *buf, size_t * |
|
if (isspace(last)) |
if (isspace(last)) |
while (*start < end && isspace((int)buf[*start])) |
while (*start < end && isspace((int)buf[*start])) |
(*start)++; |
(*start)++; |
return; |
return(0); |
} |
} |
|
|
/* |
/* |
Line 665 formatcode(struct state *st, const char *buf, size_t * |
|
Line 666 formatcode(struct state *st, const char *buf, size_t * |
|
break; |
break; |
} |
} |
} |
} |
if (*start + 1 < end && '<' == buf[*start + 1]) { |
if (*start + 1 < end && '<' == buf[*start + 1] && |
|
'A' <= buf[*start] && 'Z' >= buf[*start]) { |
formatcode(st, buf, start, end, nomacro, 1); |
formatcode(st, buf, start, end, nomacro, 1); |
continue; |
continue; |
} |
} |
Line 680 formatcode(struct state *st, const char *buf, size_t * |
|
Line 682 formatcode(struct state *st, const char *buf, size_t * |
|
continue; |
continue; |
} |
} |
|
|
if (OUST_MAC == st->oust) { |
if (OUST_MAC == st->oust && FMT__MAX != fmt) { |
if ( ! st->wantws) { |
if ( ! st->wantws) { |
printf(" Ns "); |
printf(" Ns "); |
st->wantws = 1; |
st->wantws = 1; |
Line 708 formatcode(struct state *st, const char *buf, size_t * |
|
Line 710 formatcode(struct state *st, const char *buf, size_t * |
|
putchar('e'); |
putchar('e'); |
} |
} |
|
|
|
if (FMT__MAX == fmt) |
|
return(0); |
|
|
if ( ! nomacro && FMT_CODE == fmt) |
if ( ! nomacro && FMT_CODE == fmt) |
printf(" Qc "); |
printf(" Qc "); |
|
|
if (FMT__MAX != fmt) |
st->wantws = ' ' == last; |
st->wantws = ' ' == last; |
return(1); |
} |
} |
|
|
/* |
/* |
|
|
formatcodeln(struct state *st, const char *linemac, |
formatcodeln(struct state *st, const char *linemac, |
const char *buf, size_t *start, size_t end, int nomacro) |
const char *buf, size_t *start, size_t end, int nomacro) |
{ |
{ |
|
int gotmacro, wantws; |
|
|
assert(OUST_NL == st->oust); |
assert(OUST_NL == st->oust); |
assert(st->wantws); |
assert(st->wantws); |
printf(".%s ", linemac); |
printf(".%s ", linemac); |
st->oust = OUST_MAC; |
st->oust = OUST_MAC; |
|
|
last = ' '; |
gotmacro = 0; |
while (*start < end) { |
while (*start < end) { |
if (*start + 1 < end && '<' == buf[*start + 1]) { |
wantws = ' ' == buf[*start] || '\n' == buf[*start]; |
formatcode(st, buf, start, end, nomacro, 1); |
if (wantws) { |
|
last = ' '; |
|
do { |
|
(*start)++; |
|
} while (*start < end && ' ' == buf[*start]); |
|
} |
|
|
|
if (*start + 1 < end && '<' == buf[*start + 1] && |
|
'A' <= buf[*start] && 'Z' >= buf[*start]) { |
|
st->wantws |= wantws; |
|
gotmacro = formatcode(st, buf, |
|
start, end, nomacro, 1); |
continue; |
continue; |
} |
} |
|
|
if (OUST_MAC == st->oust) { |
if (gotmacro) { |
if ( ! st->wantws && |
if (*start < end || st->outbuflen) { |
' ' != buf[*start] && |
if (st->wantws || |
'\n' != buf[*start]) |
(wantws && !st->outbuflen)) |
printf(" Ns "); |
printf(" No "); |
st->wantws = 1; |
else |
|
printf(" Ns "); |
|
} |
|
gotmacro = 0; |
} |
} |
|
outbuf_flush(st); |
|
st->wantws = wantws; |
|
|
|
if (*start >= end) |
|
break; |
|
|
|
if (st->wantws) { |
|
putchar(' '); |
|
st->wantws = 0; |
|
} |
|
|
/* |
/* |
* Since we're already on a macro line, we want to make |
* Since we're already on a macro line, we want to make |
* sure that we don't inadvertently invoke a macro. |
* sure that we don't inadvertently invoke a macro. |
Line 754 formatcodeln(struct state *st, const char *linemac, |
|
Line 784 formatcodeln(struct state *st, const char *linemac, |
|
* something that needn't be escaped. |
* something that needn't be escaped. |
*/ |
*/ |
if (' ' == last && end - *start > 1 && |
if (' ' == last && end - *start > 1 && |
isupper((int)buf[*start]) && |
isupper((unsigned char)buf[*start]) && |
islower((int)buf[*start + 1]) && |
islower((unsigned char)buf[*start + 1]) && |
(end - *start == 2 || |
(end - *start == 2 || ' ' == buf[*start + 2])) |
' ' == buf[*start + 2])) |
|
printf("\\&"); |
printf("\\&"); |
|
|
if ('\n' == buf[*start]) |
putchar(last = buf[*start]); |
putchar(last = ' '); |
|
else |
|
putchar(last = buf[*start]); |
|
|
|
/* Protect against character escapes. */ |
/* Protect against character escapes. */ |
|
|
if ('\\' == last) |
if ('\\' == last) |
putchar('e'); |
putchar('e'); |
|
|
Line 1195 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 1222 ordinary(struct state *st, const char *buf, size_t sta |
|
* Escape initial control characters. |
* Escape initial control characters. |
*/ |
*/ |
while (start < end) { |
while (start < end) { |
if (start < end - 1 && '<' == buf[start + 1]) |
if (start < end - 1 && '<' == buf[start + 1] && |
|
'A' <= buf[start] && 'Z' >= buf[start]) |
break; |
break; |
else if ('\n' == buf[start]) |
else if ('\n' == buf[start]) |
break; |
break; |
Line 1231 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 1259 ordinary(struct state *st, const char *buf, size_t sta |
|
outbuf_addchar(st); |
outbuf_addchar(st); |
} |
} |
|
|
if (start < end - 1 && '<' == buf[start + 1]) { |
if (start < end - 1 && '<' == buf[start + 1] && |
|
'A' <= buf[start] && 'Z' >= buf[start]) { |
formatcode(st, buf, &start, end, 0, seq); |
formatcode(st, buf, &start, end, 0, seq); |
if (OUST_MAC == st->oust) { |
if (OUST_MAC == st->oust) { |
/* |
/* |
Line 1269 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 1298 ordinary(struct state *st, const char *buf, size_t sta |
|
*/ |
*/ |
|
|
if ( ! st->wantws && start < end && |
if ( ! st->wantws && start < end && |
'<' != buf[start + 1]) { |
('<' != buf[start + 1] || |
|
'A' > buf[start] || |
|
'Z' < buf[start])) { |
printf(" Ns "); |
printf(" Ns "); |
st->wantws = 1; |
st->wantws = 1; |
} |
} |