version 1.43, 2015/02/14 11:12:48 |
version 1.44, 2015/02/14 12:47:09 |
Line 1328 donamenm(struct state *st, const char *buf, size_t *st |
|
Line 1328 donamenm(struct state *st, const char *buf, size_t *st |
|
static void |
static void |
ordinary(struct state *st, const char *buf, size_t start, size_t end) |
ordinary(struct state *st, const char *buf, size_t start, size_t end) |
{ |
{ |
size_t i, j, opstack; |
size_t i, j, opstack, wend; |
enum mdoc_type mtype; |
enum mdoc_type mtype; |
int seq; |
int eos, noeos, seq; |
|
|
if ( ! st->parsing || st->paused) |
if ( ! st->parsing || st->paused) |
return; |
return; |
Line 1399 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 1399 ordinary(struct state *st, const char *buf, size_t sta |
|
/* Merely buffer non-whitespace. */ |
/* Merely buffer non-whitespace. */ |
|
|
last = buf[start++]; |
last = buf[start++]; |
if ( ! isspace(last)) { |
if ( ! isspace(last)) |
outbuf_addchar(st); |
outbuf_addchar(st); |
|
if (start < end && |
|
! isspace((unsigned char)buf[start])) |
continue; |
continue; |
} |
|
|
|
/* Detect function names. */ |
/* |
|
* Found the end of a word. |
|
* Rewind trailing delimiters. |
|
*/ |
|
|
|
eos = noeos = 0; |
|
for (wend = st->outbuflen; wend; wend--) |
|
if ('.' == st->outbuf[wend - 1] || |
|
'!' == st->outbuf[wend - 1] || |
|
'?' == st->outbuf[wend - 1]) |
|
eos = 1; |
|
else if ('|' == st->outbuf[wend - 1] || |
|
',' == st->outbuf[wend - 1] || |
|
';' == st->outbuf[wend - 1] || |
|
':' == st->outbuf[wend - 1]) |
|
noeos = 1; |
|
else if ('\'' != st->outbuf[wend - 1] && |
|
'"' != st->outbuf[wend - 1] && |
|
')' != st->outbuf[wend - 1] && |
|
']' != st->outbuf[wend - 1]) |
|
break; |
|
eos &= ! noeos; |
|
|
|
/* |
|
* Detect function names. |
|
*/ |
|
|
mtype = MDOC_Fa; |
mtype = MDOC_Fa; |
if (st->outbuflen > 2 && |
if (wend && ')' == st->outbuf[wend] && |
')' == st->outbuf[st->outbuflen - 1] && |
'(' == st->outbuf[wend - 1]) { |
'(' == st->outbuf[st->outbuflen - 2]) { |
mtype = dict_get(st->outbuf, --wend); |
mtype = dict_get(st->outbuf, |
|
st->outbuflen - 2); |
|
if (MDOC_Fo == mtype || MDOC_MAX == mtype) { |
if (MDOC_Fo == mtype || MDOC_MAX == mtype) { |
st->outbuflen -= 2; |
st->outbuflen = wend; |
st->outbuf[st->outbuflen] = '\0'; |
st->outbuf[wend] = '\0'; |
mdoc_newln(st); |
mdoc_newln(st); |
if (MDOC_Fo == mtype) |
if (MDOC_Fo == mtype) |
fputs(".Fn ", stdout); |
fputs(".Fn ", stdout); |
Line 1436 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 1460 ordinary(struct state *st, const char *buf, size_t sta |
|
* end text lines at the end of sentences. |
* end text lines at the end of sentences. |
*/ |
*/ |
|
|
if (OUST_MAC == st->oust || (start > 3 && |
if (OUST_MAC == st->oust || (eos && wend > 1 && |
('.' == buf[start - 2] || |
islower((unsigned char)st->outbuf[wend - 1]))) { |
'!' == buf[start - 2] || |
|
'?' == buf[start - 2]) && |
|
islower((unsigned char)buf[start - 3]) && |
|
islower((unsigned char)buf[start - 4]))) { |
|
if (MDOC_MAX == mtype) |
if (MDOC_MAX == mtype) |
fputs(" 3", stdout); |
fputs(" 3", stdout); |
|
if (MDOC_Fa != mtype) |
|
for (wend += 2; |
|
'\0' != st->outbuf[wend]; |
|
wend++) |
|
printf(" %c", |
|
st->outbuf[wend]); |
mdoc_newln(st); |
mdoc_newln(st); |
} |
} |
|
|
/* Advance to the next word. */ |
/* Advance to the next word. */ |
|
|
while (isspace((unsigned char)buf[start])) |
while ('\n' != buf[start] && |
|
isspace((unsigned char)buf[start])) |
start++; |
start++; |
st->wantws = 1; |
st->wantws = 1; |
} |
} |