version 1.39, 2015/02/13 15:35:15 |
version 1.44, 2015/02/14 12:47:09 |
Line 135 static const char fmts[FMT__MAX] = { |
|
Line 135 static const char fmts[FMT__MAX] = { |
|
'Z' /* FMT_NULL */ |
'Z' /* FMT_NULL */ |
}; |
}; |
|
|
static int last; |
static unsigned char last; |
|
|
|
|
static void |
static void |
Line 160 outbuf_addchar(struct state *st) |
|
Line 160 outbuf_addchar(struct state *st) |
|
if ('\\' == last) |
if ('\\' == last) |
st->outbuf[st->outbuflen++] = 'e'; |
st->outbuf[st->outbuflen++] = 'e'; |
st->outbuf[st->outbuflen] = '\0'; |
st->outbuf[st->outbuflen] = '\0'; |
st->wantws = 0; |
|
} |
} |
|
|
static void |
static void |
Line 174 outbuf_addstr(struct state *st, const char *str) |
|
Line 173 outbuf_addstr(struct state *st, const char *str) |
|
memcpy(st->outbuf + st->outbuflen, str, slen+1); |
memcpy(st->outbuf + st->outbuflen, str, slen+1); |
st->outbuflen += slen; |
st->outbuflen += slen; |
last = str[slen - 1]; |
last = str[slen - 1]; |
st->wantws = 0; |
|
} |
} |
|
|
static void |
static void |
Line 184 outbuf_flush(struct state *st) |
|
Line 182 outbuf_flush(struct state *st) |
|
if (0 == st->outbuflen) |
if (0 == st->outbuflen) |
return; |
return; |
|
|
|
if (OUST_TXT == st->oust && st->wantws) |
|
putchar(' '); |
|
|
fputs(st->outbuf, stdout); |
fputs(st->outbuf, stdout); |
*st->outbuf = '\0'; |
*st->outbuf = '\0'; |
st->outbuflen = 0; |
st->outbuflen = 0; |
|
|
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) |
{ |
{ |
enum fmt fmt; |
|
size_t i, j, dsz; |
size_t i, j, dsz; |
|
enum fmt fmt; |
|
int wantws; |
unsigned char uc; |
unsigned char uc; |
|
|
assert(*start + 1 < end); |
assert(*start + 1 < end); |
Line 563 formatcode(struct state *st, const char *buf, size_t * |
|
Line 565 formatcode(struct state *st, const char *buf, size_t * |
|
* allows to break at this point as well. |
* allows to break at this point as well. |
*/ |
*/ |
|
|
st->wantws |= ' ' == buf[*start]; |
wantws = ' ' == buf[*start] || |
|
(OUST_MAC == st->oust ? st->wantws : ! st->outbuflen); |
|
|
/* |
/* |
* If we are on a text line and there is no |
* If we are on a text line and there is no |
Line 573 formatcode(struct state *st, const char *buf, size_t * |
|
Line 576 formatcode(struct state *st, const char *buf, size_t * |
|
* lest we clobber out output state. |
* lest we clobber out output state. |
*/ |
*/ |
|
|
if (OUST_MAC != st->oust && !st->wantws) { |
if (OUST_MAC != st->oust && ! wantws) { |
if (OUST_NL != st->oust) |
if (OUST_NL != st->oust) |
putchar('\n'); |
putchar('\n'); |
printf(".Pf "); |
printf(".Pf "); |
|
st->wantws = 0; |
} |
} |
|
|
outbuf_flush(st); |
outbuf_flush(st); |
|
|
/* Whitespace is easier to suppress on macro lines. */ |
/* Whitespace is easier to suppress on macro lines. */ |
|
|
if (OUST_MAC == st->oust && !st->wantws) |
if (OUST_MAC == st->oust && ! wantws) |
printf(" Ns "); |
printf(" Ns "); |
|
|
/* Unless we are on a macro line, start one. */ |
/* Unless we are on a macro line, start one. */ |
|
|
if (OUST_MAC != st->oust && st->wantws) { |
if (OUST_MAC != st->oust && wantws) { |
if (OUST_NL != st->oust) |
if (OUST_NL != st->oust) |
putchar('\n'); |
putchar('\n'); |
putchar('.'); |
putchar('.'); |
Line 687 formatcode(struct state *st, const char *buf, size_t * |
|
Line 691 formatcode(struct state *st, const char *buf, size_t * |
|
} |
} |
if (*start + 1 < end && '<' == buf[*start + 1] && |
if (*start + 1 < end && '<' == buf[*start + 1] && |
'A' <= buf[*start] && 'Z' >= buf[*start]) { |
'A' <= buf[*start] && 'Z' >= buf[*start]) { |
formatcode(st, buf, start, end, nomacro, 1); |
if ( ! formatcode(st, buf, start, end, nomacro, 1)) |
|
st->wantws = 1; |
continue; |
continue; |
} |
} |
|
|
Line 729 formatcode(struct state *st, const char *buf, size_t * |
|
Line 734 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 "); |
|
|
st->wantws = ' ' == last; |
st->wantws = ' ' == last; |
return(1); |
return(FMT__MAX != fmt); |
} |
} |
|
|
/* |
/* |
|
|
start++; |
start++; |
if (start < end && '\n' == buf[start]) |
if (start < end && '\n' == buf[start]) |
start++; |
start++; |
if (start < end) |
goto again; |
goto again; |
|
return; |
|
} |
} |
|
|
|
/* Other preprocessor directives. */ |
|
if ('#' == buf[i]) { |
|
fputs(".Fd ", stdout); |
|
start = i; |
|
while(start < end && '\n' != buf[start]) |
|
putchar(buf[start++]); |
|
putchar('\n'); |
|
if (start < end && '\n' == buf[start]) |
|
start++; |
|
goto again; |
|
} |
|
|
/* Parse function declaration. */ |
/* Parse function declaration. */ |
ifo = ifa = ifc = 0; |
ifo = ifa = ifc = 0; |
inl = end; |
inl = end; |
Line 1309 donamenm(struct state *st, const char *buf, size_t *st |
|
Line 1321 donamenm(struct state *st, const char *buf, size_t *st |
|
* |
* |
* Uses formatcode() to go to OUST_MAC mode |
* Uses formatcode() to go to OUST_MAC mode |
* and outbuf_flush() to go to OUST_TXT mode. |
* and outbuf_flush() to go to OUST_TXT mode. |
* Main text mode wantws handling is in this function. |
* In text mode, wantws requests white space before the text |
|
* currently contained in the outbuf, not before upcoming text. |
* Must make sure to go back to OUST_NL/wantws mode before returning. |
* Must make sure to go back to OUST_NL/wantws mode before returning. |
*/ |
*/ |
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; |
int seq; |
enum mdoc_type mtype; |
|
int eos, noeos, seq; |
|
|
if ( ! st->parsing || st->paused) |
if ( ! st->parsing || st->paused) |
return; |
return; |
Line 1382 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 1396 ordinary(struct state *st, const char *buf, size_t sta |
|
&start, end, &opstack)) |
&start, end, &opstack)) |
continue; |
continue; |
|
|
/* |
/* Merely buffer non-whitespace. */ |
* On whitespace, flush the output buffer |
|
* and allow breaking to a macro line. |
|
* Otherwise, buffer text and clear wantws. |
|
*/ |
|
|
|
last = buf[start++]; |
last = buf[start++]; |
if (' ' != last) { |
if ( ! isspace(last)) |
outbuf_addchar(st); |
outbuf_addchar(st); |
|
if (start < end && |
|
! isspace((unsigned char)buf[start])) |
continue; |
continue; |
|
|
|
/* |
|
* 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; |
|
if (wend && ')' == st->outbuf[wend] && |
|
'(' == st->outbuf[wend - 1]) { |
|
mtype = dict_get(st->outbuf, --wend); |
|
if (MDOC_Fo == mtype || MDOC_MAX == mtype) { |
|
st->outbuflen = wend; |
|
st->outbuf[wend] = '\0'; |
|
mdoc_newln(st); |
|
if (MDOC_Fo == mtype) |
|
fputs(".Fn ", stdout); |
|
else |
|
fputs(".Xr ", stdout); |
|
st->oust = OUST_MAC; |
|
} |
} |
} |
|
|
if ( ! strcmp(st->outbuf + st->outbuflen - 2, "()") && |
/* |
dict_get(st->outbuf, st->outbuflen - 2) == |
* On whitespace, flush the output buffer |
MDOC_Fo) { |
* and allow breaking to a macro line. |
st->outbuflen -= 2; |
*/ |
st->outbuf[st->outbuflen] = '\0'; |
|
|
outbuf_flush(st); |
|
|
|
/* |
|
* End macro lines, and |
|
* end text lines at the end of sentences. |
|
*/ |
|
|
|
if (OUST_MAC == st->oust || (eos && wend > 1 && |
|
islower((unsigned char)st->outbuf[wend - 1]))) { |
|
if (MDOC_MAX == mtype) |
|
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); |
fputs(".Fn ", stdout); |
|
outbuf_flush(st); |
|
mdoc_newln(st); |
|
continue; |
|
} |
} |
|
|
outbuf_flush(st); |
/* Advance to the next word. */ |
putchar(' '); |
|
|
while ('\n' != buf[start] && |
|
isspace((unsigned char)buf[start])) |
|
start++; |
st->wantws = 1; |
st->wantws = 1; |
} |
} |
|
|