version 1.38, 2015/02/13 12:40:54 |
version 1.51, 2015/02/19 11:09:44 |
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; |
|
|
assert(*start + 1 < end); |
assert(*start + 1 < end); |
assert('<' == buf[*start + 1]); |
assert('<' == buf[*start + 1]); |
Line 562 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 572 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 612 formatcode(struct state *st, const char *buf, size_t * |
|
Line 617 formatcode(struct state *st, const char *buf, size_t * |
|
else |
else |
printf("Ar "); |
printf("Ar "); |
break; |
break; |
} |
} |
if (0 == strncmp(buf + *start, "NULL", 4) && |
i = 0; |
('=' == buf[*start + 4] || |
uc = buf[*start]; |
'>' == buf[*start + 4])) { |
while (isalnum(uc) || '_' == uc || ' ' == uc) |
|
uc = buf[*start + ++i]; |
|
if ('=' != uc && '>' != uc) |
|
i = 0; |
|
if (4 == i && ! strncmp(buf + *start, "NULL", 4)) { |
printf("Dv "); |
printf("Dv "); |
break; |
break; |
} |
} |
i = 0; |
switch (i ? dict_get(buf + *start, i) : MDOC_MAX) { |
while (isalnum((unsigned char)buf[*start + i]) || |
case MDOC_Fa: |
'_' == buf[*start + i]) |
|
i++; |
|
if (i && MDOC_Fa == dict_get(buf + *start, i)) |
|
printf("Fa "); |
printf("Fa "); |
else |
break; |
|
case MDOC_Vt: |
|
printf("Vt "); |
|
break; |
|
default: |
printf("Sy "); |
printf("Sy "); |
|
break; |
|
} |
break; |
break; |
case (FMT_CODE): |
case (FMT_CODE): |
printf("Qo Li "); |
printf("Qo Li "); |
Line 679 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 721 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); |
} |
} |
|
|
/* |
/* |
Line 1014 command(struct state *st, const char *buf, size_t star |
|
Line 1024 command(struct state *st, const char *buf, size_t star |
|
} |
} |
|
|
/* |
/* |
|
* Put the type provided as an argument into the dictionary. |
|
*/ |
|
static void |
|
register_type(const char *ptype) |
|
{ |
|
const char *pname, *pend; |
|
|
|
pname = ptype; |
|
while (isalnum((unsigned char)*pname) || '_' == *pname) |
|
pname++; |
|
if ((pname - ptype == 6 && ! strncmp(ptype, "struct", 6)) || |
|
(pname - ptype == 4 && ! strncmp(ptype, "enum", 4))) { |
|
while (' ' == *pname) |
|
pname++; |
|
pend = pname; |
|
while (isalnum((unsigned char)*pend) || '_' == *pend) |
|
pend++; |
|
if (pend > pname) |
|
dict_put(pname, pend - pname, MDOC_Vt); |
|
} else |
|
pend = pname; |
|
if (pend > ptype) |
|
dict_put(ptype, pend - ptype, MDOC_Vt); |
|
} |
|
|
|
/* |
* Just pump out the line in a verbatim block. |
* Just pump out the line in a verbatim block. |
* From the perspective of external callers, |
* From the perspective of external callers, |
* always stays in OUST_NL/wantws mode. |
* always stays in OUST_NL/wantws mode. |
|
|
start++; |
start++; |
if (start < end && '\n' == buf[start]) |
if (start < end && '\n' == buf[start]) |
start++; |
start++; |
if (start < end) |
goto again; |
|
} |
|
|
|
/* 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++; |
|
|
|
/* Remember #define for Dv or Fn. */ |
|
|
|
if (strncmp(buf + i + 1, "define", 6) || |
|
! isspace((unsigned char)buf[i + 7])) |
goto again; |
goto again; |
return; |
|
|
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; |
} |
} |
|
|
/* Parse function declaration. */ |
/* Parse function declaration. */ |
|
|
break; |
break; |
} |
} |
switch (buf[i]) { |
switch (buf[i]) { |
|
case '\t': |
|
/* FALLTHROUGH */ |
case ' ': |
case ' ': |
if ( ! ifa) |
if ( ! ifa) |
ifo = i; |
ifo = i; |
|
|
if (buf[i] == '\n') |
if (buf[i] == '\n') |
buf[i] = ' '; |
buf[i] = ' '; |
buf[ifo++] = '\0'; |
buf[ifo++] = '\0'; |
|
register_type(buf + ift); |
printf(".Ft %s", buf + ift); |
printf(".Ft %s", buf + ift); |
if (buf[ifo] == '*') { |
if (buf[ifo] == '*') { |
fputs(" *", stdout); |
fputs(" *", stdout); |
|
|
putchar('\n'); |
putchar('\n'); |
buf[ifa++] = '\0'; |
buf[ifa++] = '\0'; |
printf(".Fo %s\n", buf + ifo); |
printf(".Fo %s\n", buf + ifo); |
dict_put(buf + ifo, MDOC_Fo); |
dict_put(buf + ifo, 0, MDOC_Fo); |
buf[ifc++] = '\0'; |
buf[ifc++] = '\0'; |
for (;;) { |
for (;;) { |
cp = strchr(buf + ifa, ','); |
cp = strchr(buf + ifa, ','); |
|
|
'_' == cp2[-1]) |
'_' == cp2[-1]) |
cp2--; |
cp2--; |
if ('\0' != *cp2) |
if ('\0' != *cp2) |
dict_put(cp2, MDOC_Fa); |
dict_put(cp2, 0, MDOC_Fa); |
printf(".Fa \"%s\"\n", buf + ifa); |
register_type(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; |
} |
} |
Line 1237 donamenm(struct state *st, const char *buf, size_t *st |
|
Line 1308 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 1258 donamenm(struct state *st, const char *buf, size_t *st |
|
Line 1329 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 1273 donamenm(struct state *st, const char *buf, size_t *st |
|
Line 1344 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; |
|
char savechar; |
|
|
if ( ! st->parsing || st->paused) |
if ( ! st->parsing || st->paused) |
return; |
return; |
Line 1293 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 1367 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 1303 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 1378 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 1346 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 1422 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; |
|
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; |
} |
} |
|
|
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) { |
|
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); |
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; |
} |
} |
|
|
Line 1384 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 1532 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 1477 dofile(const struct args *args, const char *fname, |
|
Line 1624 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 sup, end, i, cur = 0; |
|
|
Line 1522 dofile(const struct args *args, const char *fname, |
|
Line 1669 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; |
} |
} |
|
|