version 1.42, 2015/02/14 10:35:02 |
version 1.53, 2015/02/19 13:50:45 |
Line 1059 verbatim(struct state *st, char *buf, size_t start, si |
|
Line 1059 verbatim(struct state *st, char *buf, size_t start, si |
|
{ |
{ |
size_t i, ift, ifo, ifa, ifc, inl; |
size_t i, ift, ifo, ifa, ifc, inl; |
char *cp, *cp2; |
char *cp, *cp2; |
int nopen; |
int indisplay, nopen, wantsp; |
|
|
if ( ! st->parsing || st->paused || start == end) |
if (st->paused || ! st->parsing) |
return; |
return; |
|
|
|
indisplay = wantsp = 0; |
|
|
again: |
again: |
|
if (start == end) { |
|
if (indisplay) |
|
puts(".Ed"); |
|
return; |
|
} |
|
|
|
if ('\n' == buf[start]) { |
|
wantsp = 1; |
|
start++; |
|
goto again; |
|
} |
|
|
/* |
/* |
* If we're in the SYNOPSIS, see if we're an #include block. |
* If we're in the SYNOPSIS, see if we're an #include block. |
* If we are, then print the "In" macro and re-loop. |
* If we are, then print the "In" macro and re-loop. |
|
|
while (i < end && buf[i] == ' ') |
while (i < end && buf[i] == ' ') |
i++; |
i++; |
if (i == end) |
if (i == end) |
return; |
goto again; |
|
|
/* We're an include block! */ |
/* We're an include block! */ |
if (end - i > 10 && |
if (end - i > 10 && |
|
|
start = i + 10; |
start = i + 10; |
while (start < end && ' ' == buf[start]) |
while (start < end && ' ' == buf[start]) |
start++; |
start++; |
|
if (indisplay) |
|
puts(".Ed"); |
|
indisplay = wantsp = 0; |
fputs(".In ", stdout); |
fputs(".In ", stdout); |
/* Stop til the '>' marker or we hit eoln. */ |
/* Stop til the '>' marker or we hit eoln. */ |
while (start < end && |
while (start < end && |
|
|
|
|
/* Other preprocessor directives. */ |
/* Other preprocessor directives. */ |
if ('#' == buf[i]) { |
if ('#' == buf[i]) { |
|
if (indisplay) |
|
puts(".Ed"); |
|
indisplay = wantsp = 0; |
fputs(".Fd ", stdout); |
fputs(".Fd ", stdout); |
start = i; |
start = i; |
while(start < end && '\n' != buf[start]) |
while(start < end && '\n' != buf[start]) |
|
|
putchar('\n'); |
putchar('\n'); |
if (start < end && '\n' == buf[start]) |
if (start < end && '\n' == buf[start]) |
start++; |
start++; |
|
|
|
/* Remember #define for Dv or Fn. */ |
|
|
|
if (strncmp(buf + i + 1, "define", 6) || |
|
! isspace((unsigned char)buf[i + 7])) |
|
goto again; |
|
|
|
ifo = i + 7; |
|
while (ifo < start && |
|
isspace((unsigned char)buf[ifo])) |
|
ifo++; |
|
ifa = ifo; |
|
while ('_' == buf[ifa] || |
|
isalnum((unsigned char)buf[ifa])) |
|
ifa++; |
|
dict_put(buf + ifo, ifa - ifo, |
|
'(' == buf[ifa] ? MDOC_Fo : MDOC_Dv); |
|
|
goto again; |
goto again; |
} |
} |
|
|
|
|
break; |
break; |
} |
} |
switch (buf[i]) { |
switch (buf[i]) { |
|
case '\t': |
|
/* FALLTHROUGH */ |
case ' ': |
case ' ': |
if ( ! ifa) |
if ( ! ifa) |
ifo = i; |
ifo = i; |
|
|
buf[i] = ' '; |
buf[i] = ' '; |
buf[ifo++] = '\0'; |
buf[ifo++] = '\0'; |
register_type(buf + ift); |
register_type(buf + ift); |
|
if (indisplay) |
|
puts(".Ed"); |
|
indisplay = wantsp = 0; |
printf(".Ft %s", buf + ift); |
printf(".Ft %s", buf + ift); |
if (buf[ifo] == '*') { |
if (buf[ifo] == '*') { |
fputs(" *", stdout); |
fputs(" *", stdout); |
|
|
if ('\0' != *cp2) |
if ('\0' != *cp2) |
dict_put(cp2, 0, MDOC_Fa); |
dict_put(cp2, 0, MDOC_Fa); |
register_type(buf + ifa); |
register_type(buf + ifa); |
printf(".Fa \"%s\"\n", buf + ifa); |
if (strchr(buf + ifa, ' ') == NULL) |
|
printf(".Fa %s\n", buf + ifa); |
|
else |
|
printf(".Fa \"%s\"\n", buf + ifa); |
if (cp == NULL) |
if (cp == NULL) |
break; |
break; |
while (*cp == ' ') |
while (*cp == ' ' || *cp == '\t') |
cp++; |
cp++; |
ifa = cp - buf; |
ifa = cp - buf; |
} |
} |
|
|
buf[inl] = '\0'; |
buf[inl] = '\0'; |
puts(buf + ifc); |
puts(buf + ifc); |
} |
} |
start = inl + 1; |
start = inl < end ? inl + 1 : end; |
if (start < end) |
goto again; |
goto again; |
|
return; |
|
} |
} |
} |
} |
|
|
puts(".Bd -literal"); |
if ( ! indisplay) |
for (last = ' '; start < end; start++) { |
puts(".Bd -literal"); |
|
else if (wantsp) |
|
putchar('\n'); |
|
indisplay = 1; |
|
wantsp = 0; |
|
|
|
for (last = '\n'; start < end; start++) { |
/* |
/* |
* Handle accidental macros (newline starting with |
* Handle accidental macros (newline starting with |
* control character) and escapes. |
* control character) and escapes. |
*/ |
*/ |
if ('\n' == last) |
if ('\n' == last) { |
|
if ('\n' == buf[start]) |
|
goto again; |
if ('.' == buf[start] || '\'' == buf[start]) |
if ('.' == buf[start] || '\'' == buf[start]) |
printf("\\&"); |
printf("\\&"); |
|
} |
putchar(last = buf[start]); |
putchar(last = buf[start]); |
if ('\\' == buf[start]) |
if ('\\' == buf[start]) |
printf("e"); |
printf("e"); |
} |
} |
putchar(last = '\n'); |
if ('\n' != last) |
puts(".Ed"); |
putchar('\n'); |
|
if (indisplay) |
|
puts(".Ed"); |
} |
} |
|
|
/* |
/* |
Line 1285 donamenm(struct state *st, const char *buf, size_t *st |
|
Line 1341 donamenm(struct state *st, const char *buf, size_t *st |
|
assert(OUST_NL == st->oust); |
assert(OUST_NL == st->oust); |
assert(st->wantws); |
assert(st->wantws); |
|
|
while (*start < end && ' ' == buf[*start]) |
while (*start < end && isspace((unsigned char)buf[*start])) |
(*start)++; |
(*start)++; |
|
|
if (end == *start) { |
if (end == *start) { |
Line 1306 donamenm(struct state *st, const char *buf, size_t *st |
|
Line 1362 donamenm(struct state *st, const char *buf, size_t *st |
|
printf(" ,"); |
printf(" ,"); |
mdoc_newln(st); |
mdoc_newln(st); |
(*start)++; |
(*start)++; |
while (*start < end && ' ' == buf[*start]) |
while (*start < end && isspace((unsigned char)buf[*start])) |
(*start)++; |
(*start)++; |
} |
} |
} |
} |
Line 1328 donamenm(struct state *st, const char *buf, size_t *st |
|
Line 1384 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; |
int seq; |
enum mdoc_type mtype; |
|
int eos, noeos, seq; |
|
char savechar; |
|
|
if ( ! st->parsing || st->paused) |
if ( ! st->parsing || st->paused) |
return; |
return; |
Line 1342 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 1400 ordinary(struct state *st, const char *buf, size_t sta |
|
*/ |
*/ |
if (SECT_NAME == st->sect) { |
if (SECT_NAME == st->sect) { |
for (i = end - 2; i > start; i--) |
for (i = end - 2; i > start; i--) |
if ('-' == buf[i] && ' ' == buf[i + 1]) |
if ('-' == buf[i] && |
|
isspace((unsigned char)buf[i + 1])) |
break; |
break; |
if ('-' == buf[i]) { |
if ('-' == buf[i]) { |
j = i; |
j = i; |
Line 1352 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 1411 ordinary(struct state *st, const char *buf, size_t sta |
|
break; |
break; |
donamenm(st, buf, &start, i + 1); |
donamenm(st, buf, &start, i + 1); |
start = j + 1; |
start = j + 1; |
while (start < end && ' ' == buf[start]) |
while (start < end && |
|
isspace((unsigned char)buf[start])) |
start++; |
start++; |
formatcodeln(st, "Nd", buf, &start, end, 1); |
formatcodeln(st, "Nd", buf, &start, end, 1); |
mdoc_newln(st); |
mdoc_newln(st); |
Line 1398 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 1458 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 - 1]) && |
|
! isspace((unsigned char)buf[start])) |
continue; |
continue; |
} |
|
|
|
/* Detect function names. */ |
/* |
|
* Found the end of a word. |
|
* Rewind trailing delimiters. |
|
*/ |
|
|
if (st->outbuflen > 2 && |
eos = noeos = 0; |
')' == st->outbuf[st->outbuflen - 1] && |
for (wend = st->outbuflen; wend; wend--) |
'(' == st->outbuf[st->outbuflen - 2] && |
if ('.' == st->outbuf[wend - 1] || |
dict_get(st->outbuf, st->outbuflen - 2) == |
'!' == st->outbuf[wend - 1] || |
MDOC_Fo) { |
'?' == st->outbuf[wend - 1]) |
st->outbuflen -= 2; |
eos = 1; |
st->outbuf[st->outbuflen] = '\0'; |
else if ('|' == st->outbuf[wend - 1] || |
mdoc_newln(st); |
',' == st->outbuf[wend - 1] || |
fputs(".Fn ", stdout); |
';' == st->outbuf[wend - 1] || |
st->oust = OUST_MAC; |
':' == 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; |
|
savechar = '\0'; |
|
if (wend && ')' == st->outbuf[wend] && |
|
'(' == st->outbuf[wend - 1]) { |
|
mtype = dict_get(st->outbuf, --wend); |
|
if (MDOC_Dv == mtype) |
|
mtype = MDOC_Fo; |
|
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; |
|
} |
|
} else { |
|
mtype = dict_get(st->outbuf, wend); |
|
if (MDOC_Dv == mtype) { |
|
savechar = st->outbuf[wend]; |
|
st->outbuf[wend] = '\0'; |
|
mdoc_newln(st); |
|
fputs(".Dv ", stdout); |
|
st->oust = OUST_MAC; |
|
} else |
|
mtype = MDOC_Fa; |
} |
} |
|
|
/* |
/* |
Line 1429 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 1533 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] || |
if (MDOC_MAX == mtype) |
'?' == buf[start - 2]) && |
fputs(" 3", stdout); |
islower((unsigned char)buf[start - 3]) && |
if (MDOC_Fa != mtype) { |
islower((unsigned char)buf[start - 4]))) |
if (MDOC_Dv == mtype) |
|
st->outbuf[wend] = savechar; |
|
else |
|
wend += 2; |
|
while ('\0' != st->outbuf[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; |
} |
} |
Line 1453 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 1566 ordinary(struct state *st, const char *buf, size_t sta |
|
* XXX Some punctuation characters |
* XXX Some punctuation characters |
* are not handled yet. |
* are not handled yet. |
*/ |
*/ |
if ((start == end - 1 || |
if ((start == end - 1 || |
(start < end - 1 && |
(start < end - 1 && |
(' ' == buf[start + 1] || |
(' ' == buf[start + 1] || |
'\n' == buf[start + 1]))) && |
'\n' == buf[start + 1]))) && |
('.' == buf[start] || |
NULL != strchr("|.,;:?!)]", buf[start])) { |
',' == buf[start])) { |
|
putchar(' '); |
putchar(' '); |
putchar(buf[start++]); |
putchar(buf[start++]); |
} |
} |
Line 1546 dofile(const struct args *args, const char *fname, |
|
Line 1658 dofile(const struct args *args, const char *fname, |
|
{ |
{ |
char datebuf[64]; |
char datebuf[64]; |
struct state st; |
struct state st; |
const char *fbase, *fext, *section, *date; |
const char *fbase, *fext, *section, *date, *format; |
char *title, *cp; |
char *title, *cp; |
size_t sup, end, i, cur = 0; |
size_t cur, end; |
|
int verb; |
|
|
if (0 == sz) |
if (0 == sz) |
return; |
return; |
Line 1591 dofile(const struct args *args, const char *fname, |
|
Line 1704 dofile(const struct args *args, const char *fname, |
|
|
|
/* Date. Or the given "tm" if not supplied. */ |
/* Date. Or the given "tm" if not supplied. */ |
|
|
if (NULL == (date = args->date)) { |
date = args->date; |
strftime(datebuf, sizeof(datebuf), "%B %d, %Y", tm); |
format = (NULL == date) ? "%B %d, %Y" : |
|
strcmp(date, "Mdocdate") ? NULL : "$" "Mdocdate: %B %d %Y $"; |
|
|
|
if (NULL != format) { |
|
strftime(datebuf, sizeof(datebuf), format, tm); |
date = datebuf; |
date = datebuf; |
} |
} |
|
|
Line 1616 dofile(const struct args *args, const char *fname, |
|
Line 1733 dofile(const struct args *args, const char *fname, |
|
|
|
/* Main loop over file contents. */ |
/* Main loop over file contents. */ |
|
|
while (cur < sz) { |
cur = 0; |
|
for (;;) { |
|
while (cur < sz && '\n' == buf[cur]) |
|
cur++; |
|
if (cur >= sz) |
|
break; |
|
|
|
verb = isspace((unsigned char)buf[cur]); |
|
|
/* Read until next paragraph. */ |
/* Read until next paragraph. */ |
for (i = cur + 1; i < sz; i++) |
|
if ('\n' == buf[i] && '\n' == buf[i - 1]) { |
for (end = cur + 1; end + 1 < sz; end++) |
/* Consume blank paragraphs. */ |
if ('\n' == buf[end] && '\n' == buf[end + 1] && |
while (i + 1 < sz && '\n' == buf[i + 1]) |
!(verb && end + 2 < sz && |
i++; |
isspace((unsigned char)buf[end + 2]))) |
break; |
break; |
} |
|
|
|
/* Adjust end marker for EOF. */ |
/* Adjust end marker for EOF. */ |
end = i < sz ? i - 1 : |
|
('\n' == buf[sz - 1] ? sz - 1 : sz); |
|
sup = i < sz ? end + 2 : sz; |
|
|
|
|
if (end < sz && '\n' != buf[end]) |
|
end++; |
|
|
/* Process paragraph and adjust start. */ |
/* Process paragraph and adjust start. */ |
|
|
dopar(&st, buf, cur, end); |
dopar(&st, buf, cur, end); |
cur = sup; |
cur = end + 2; |
} |
} |
dict_destroy(); |
dict_destroy(); |
} |
} |