version 1.59, 2015/02/23 15:12:06 |
version 1.60, 2015/03/19 09:59:01 |
Line 135 static int trylink(const char *, size_t *, size_t, si |
|
Line 135 static int trylink(const char *, size_t *, size_t, si |
|
static void verbatim(struct state *, char *, size_t, size_t); |
static void verbatim(struct state *, char *, size_t, size_t); |
|
|
static const char *const cmds[CMD__MAX] = { |
static const char *const cmds[CMD__MAX] = { |
"pod", /* CMD_POD */ |
"pod", /* CMD_POD */ |
"head1", /* CMD_HEAD1 */ |
"head1", /* CMD_HEAD1 */ |
"head2", /* CMD_HEAD2 */ |
"head2", /* CMD_HEAD2 */ |
"head3", /* CMD_HEAD3 */ |
"head3", /* CMD_HEAD3 */ |
Line 162 static const char fmts[FMT__MAX] = { |
|
Line 162 static const char fmts[FMT__MAX] = { |
|
'Z' /* FMT_NULL */ |
'Z' /* FMT_NULL */ |
}; |
}; |
|
|
static unsigned char last; |
static unsigned char last; |
|
|
|
|
static void |
static void |
Line 281 formatescape(struct state *st, const char *buf, size_t |
|
Line 281 formatescape(struct state *st, const char *buf, size_t |
|
|
|
/* |
/* |
* TODO: right now, we only recognise the named escapes. |
* TODO: right now, we only recognise the named escapes. |
* Just let the rest of them go. |
* Just let the rest of them go. |
*/ |
*/ |
if (0 == strcmp(esc, "lt")) |
if (0 == strcmp(esc, "lt")) |
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"); |
Line 305 formatescape(struct state *st, const char *buf, size_t |
|
Line 305 formatescape(struct state *st, const char *buf, size_t |
|
static int |
static int |
trylink(const char *buf, size_t *start, size_t end, size_t dsz) |
trylink(const char *buf, size_t *start, size_t end, size_t dsz) |
{ |
{ |
size_t linkstart, realend, linkend, |
size_t linkstart, realend, linkend, |
i, j, textsz, stack; |
i, j, textsz, stack; |
|
|
/* |
/* |
* Scan to the start of the terminus. |
* Scan to the start of the terminus. |
* This function is more or less replicated in the formatcode() |
* This function is more or less replicated in the formatcode() |
* for null or index formatting codes. |
* for null or index formatting codes. |
* However, we're slightly different because we might have |
* However, we're slightly different because we might have |
Line 328 trylink(const char *buf, size_t *start, size_t end, si |
|
Line 328 trylink(const char *buf, size_t *start, size_t end, si |
|
assert(realend > 0); |
assert(realend > 0); |
if (' ' != buf[realend - 1]) |
if (' ' != buf[realend - 1]) |
continue; |
continue; |
for (i = realend, j = 0; i < end && j < dsz; j++) |
for (i = realend, j = 0; i < end && j < dsz; j++) |
if ('>' != buf[i++]) |
if ('>' != buf[i++]) |
break; |
break; |
if (dsz == j) |
if (dsz == j) |
break; |
break; |
} |
} |
|
|
Line 386 trylink(const char *buf, size_t *start, size_t end, si |
|
Line 386 trylink(const char *buf, size_t *start, size_t end, si |
|
(j > 3 && 0 == memcmp("smb:", &buf[linkstart], j)) || |
(j > 3 && 0 == memcmp("smb:", &buf[linkstart], j)) || |
(j > 3 && 0 == memcmp("afs:", &buf[linkstart], j))) { |
(j > 3 && 0 == memcmp("afs:", &buf[linkstart], j))) { |
/* Gross. */ |
/* Gross. */ |
printf("Lk %.*s", (int)((dsz > 1 ? realend - 1 : |
printf("Lk %.*s", (int)((dsz > 1 ? realend - 1 : |
realend) - linkstart), &buf[linkstart]); |
realend) - linkstart), &buf[linkstart]); |
return(1); |
return(1); |
} |
} |
|
|
/* See if we qualify as a mailto. */ |
/* See if we qualify as a mailto. */ |
if (j > 6 && 0 == memcmp("mailto:", &buf[linkstart], j)) { |
if (j > 6 && 0 == memcmp("mailto:", &buf[linkstart], j)) { |
printf("Mt %.*s", (int)j, &buf[linkstart]); |
printf("Mt %.*s", (int)j, &buf[linkstart]); |
Line 398 trylink(const char *buf, size_t *start, size_t end, si |
|
Line 398 trylink(const char *buf, size_t *start, size_t end, si |
|
} |
} |
|
|
/* See if we're a foo(5), foo(5x), or foo(5xx) manpage. */ |
/* See if we're a foo(5), foo(5x), or foo(5xx) manpage. */ |
if ((j > 3 && ')' == buf[linkend - 1]) && |
if ((j > 3 && ')' == buf[linkend - 1]) && |
('(' == buf[linkend - 3])) { |
('(' == buf[linkend - 3])) { |
printf("Xr %.*s %c", (int)(j - 3), |
printf("Xr %.*s %c", (int)(j - 3), |
&buf[linkstart], buf[linkend - 2]); |
&buf[linkstart], buf[linkend - 2]); |
return(1); |
return(1); |
} else if ((j > 4 && ')' == buf[linkend - 1]) && |
} else if ((j > 4 && ')' == buf[linkend - 1]) && |
('(' == buf[linkend - 4])) { |
('(' == buf[linkend - 4])) { |
printf("Xr %.*s %.*s", (int)(j - 4), |
printf("Xr %.*s %.*s", (int)(j - 4), |
&buf[linkstart], 2, &buf[linkend - 3]); |
&buf[linkstart], 2, &buf[linkend - 3]); |
return(1); |
return(1); |
} else if ((j > 5 && ')' == buf[linkend - 1]) && |
} else if ((j > 5 && ')' == buf[linkend - 1]) && |
('(' == buf[linkend - 5])) { |
('(' == buf[linkend - 5])) { |
printf("Xr %.*s %.*s", (int)(j - 5), |
printf("Xr %.*s %.*s", (int)(j - 5), |
&buf[linkstart], 3, &buf[linkend - 4]); |
&buf[linkstart], 3, &buf[linkend - 4]); |
return(1); |
return(1); |
} |
} |
Line 421 trylink(const char *buf, size_t *start, size_t end, si |
|
Line 421 trylink(const char *buf, size_t *start, size_t end, si |
|
break; |
break; |
|
|
if (i < linkend) |
if (i < linkend) |
printf("Xr %.*s " PERL_SECTION, |
printf("Xr %.*s " PERL_SECTION, |
(int)j, &buf[linkstart]); |
(int)j, &buf[linkstart]); |
else |
else |
printf("Xr %.*s 1", (int)j, &buf[linkstart]); |
printf("Xr %.*s 1", (int)j, &buf[linkstart]); |
|
|
} |
} |
|
|
printf("Fl "); |
printf("Fl "); |
if (end - *start > 1 && |
if (end - *start > 1 && |
isupper((int)buf[*start]) && |
isupper((int)buf[*start]) && |
islower((int)buf[*start + 1]) && |
islower((int)buf[*start + 1]) && |
(end - *start == 2 || |
(end - *start == 2 || |
|
|
* entering without OUST_MAC and the code is invalid. |
* entering without OUST_MAC and the code is invalid. |
*/ |
*/ |
static int |
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) |
{ |
{ |
size_t i, j, dsz; |
size_t i, j, dsz; |
Line 526 formatcode(struct state *st, const char *buf, size_t * |
|
Line 526 formatcode(struct state *st, const char *buf, size_t * |
|
assert(*start + 1 < end); |
assert(*start + 1 < end); |
assert('<' == buf[*start + 1]); |
assert('<' == buf[*start + 1]); |
|
|
/* |
/* |
* First, look up the format code. |
* First, look up the format code. |
* If it's not valid, treat it as a NOOP. |
* If it's not valid, treat it as a NOOP. |
*/ |
*/ |
for (fmt = 0; fmt < FMT__MAX; fmt++) |
for (fmt = 0; fmt < FMT__MAX; fmt++) |
if (buf[*start] == fmts[fmt]) |
if (buf[*start] == fmts[fmt]) |
break; |
break; |
|
|
Line 561 formatcode(struct state *st, const char *buf, size_t * |
|
Line 561 formatcode(struct state *st, const char *buf, size_t * |
|
formatescape(st, buf, start, end); |
formatescape(st, buf, start, end); |
return(0); |
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 |
* whether it's a custom one. |
* whether it's a custom one. |
*/ |
*/ |
Line 574 formatcode(struct state *st, const char *buf, size_t * |
|
Line 574 formatcode(struct state *st, const char *buf, size_t * |
|
if (' ' != buf[*start - 1]) |
if (' ' != buf[*start - 1]) |
continue; |
continue; |
i = *start; |
i = *start; |
for (j = 0; i < end && j < dsz; j++) |
for (j = 0; i < end && j < dsz; j++) |
if ('>' != buf[i++]) |
if ('>' != buf[i++]) |
break; |
break; |
if (dsz != j) |
if (dsz != j) |
continue; |
continue; |
(*start) += dsz; |
(*start) += dsz; |
break; |
break; |
Line 648 formatcode(struct state *st, const char *buf, size_t * |
|
Line 648 formatcode(struct state *st, const char *buf, size_t * |
|
|
|
switch (fmt) { |
switch (fmt) { |
case (FMT_BOLD): |
case (FMT_BOLD): |
if (SECT_SYNOPSIS == st->sect) { |
if (SECT_SYNOPSIS == st->sect) { |
if (1 == dsz && '-' == buf[*start]) |
if (1 == dsz && '-' == buf[*start]) |
dosynopsisfl(buf, start, end); |
dosynopsisfl(buf, start, end); |
else if (0 == pos) |
else if (0 == pos) |
Line 715 formatcode(struct state *st, const char *buf, size_t * |
|
Line 715 formatcode(struct state *st, const char *buf, size_t * |
|
if ('>' == buf[*start] && 1 == dsz) { |
if ('>' == buf[*start] && 1 == dsz) { |
(*start)++; |
(*start)++; |
break; |
break; |
} else if ('>' == buf[*start] && |
} else if ('>' == buf[*start] && |
' ' == buf[*start - 1]) { |
' ' == buf[*start - 1]) { |
/* |
/* |
* Handle custom delimiters. |
* Handle custom delimiters. |
Line 935 command(struct state *st, const char *buf, size_t star |
|
Line 935 command(struct state *st, const char *buf, size_t star |
|
} else if (end - start == 8) { |
} else if (end - start == 8) { |
if (0 == memcmp(&buf[start], "SYNOPSIS", 8)) |
if (0 == memcmp(&buf[start], "SYNOPSIS", 8)) |
st->sect = SECT_SYNOPSIS; |
st->sect = SECT_SYNOPSIS; |
} |
} |
formatcodeln(st, "Sh", buf, &start, end, 1); |
formatcodeln(st, "Sh", buf, &start, end, 1); |
mdoc_newln(st); |
mdoc_newln(st); |
st->haspar = 1; |
st->haspar = 1; |
Line 960 command(struct state *st, const char *buf, size_t star |
|
Line 960 command(struct state *st, const char *buf, size_t star |
|
st->haspar = 1; |
st->haspar = 1; |
break; |
break; |
case (CMD_OVER): |
case (CMD_OVER): |
/* |
/* |
* If we have an existing list that hasn't had an =item |
* If we have an existing list that hasn't had an =item |
* yet, then make sure that we open it now. |
* yet, then make sure that we open it now. |
* We use the default list type, but that can't be |
* We use the default list type, but that can't be |
Line 977 command(struct state *st, const char *buf, size_t star |
|
Line 977 command(struct state *st, const char *buf, size_t star |
|
break; |
break; |
case (CMD_ITEM): |
case (CMD_ITEM): |
if (0 == st->lpos) { |
if (0 == st->lpos) { |
/* |
/* |
* Bad markup. |
* Bad markup. |
* Try to compensate. |
* Try to compensate. |
*/ |
*/ |
Line 991 command(struct state *st, const char *buf, size_t star |
|
Line 991 command(struct state *st, const char *buf, size_t star |
|
* list, and everything is tagged. |
* list, and everything is tagged. |
*/ |
*/ |
if (LIST__MAX == st->lstack[st->lpos - 1]) { |
if (LIST__MAX == st->lstack[st->lpos - 1]) { |
st->lstack[st->lpos - 1] = |
st->lstack[st->lpos - 1] = |
listguess(buf, start, end); |
listguess(buf, start, end); |
switch (st->lstack[st->lpos - 1]) { |
switch (st->lstack[st->lpos - 1]) { |
case (LIST_BULLET): |
case (LIST_BULLET): |
Line 1033 command(struct state *st, const char *buf, size_t star |
|
Line 1033 command(struct state *st, const char *buf, size_t star |
|
} |
} |
break; |
break; |
case (CMD_BEGIN): |
case (CMD_BEGIN): |
/* |
/* |
* We disregard all types for now. |
* We disregard all types for now. |
* TODO: process at least "text" in a -literal block. |
* TODO: process at least "text" in a -literal block. |
*/ |
*/ |
st->paused = 1; |
st->paused = 1; |
break; |
break; |
case (CMD_FOR): |
case (CMD_FOR): |
/* |
/* |
* We ignore all types of encodings and formats |
* We ignore all types of encodings and formats |
* unilaterally. |
* unilaterally. |
*/ |
*/ |
|
|
goto again; |
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. |
* This handles any number of inclusions, but only when they |
* This handles any number of inclusions, but only when they |
|
|
goto again; |
goto again; |
|
|
/* We're an include block! */ |
/* We're an include block! */ |
if (end - i > 10 && |
if (end - i > 10 && |
0 == memcmp(&buf[i], "#include <", 10)) { |
0 == memcmp(&buf[i], "#include <", 10)) { |
start = i + 10; |
start = i + 10; |
while (start < end && ' ' == buf[start]) |
while (start < end && ' ' == buf[start]) |
|
|
indisplay = wantsp = 0; |
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 && |
'>' != buf[start] && '\n' != buf[start]) |
'>' != buf[start] && '\n' != buf[start]) |
putchar(buf[start++]); |
putchar(buf[start++]); |
putchar('\n'); |
putchar('\n'); |
Line 1317 hasmatch(const char *buf, size_t start, size_t end) |
|
Line 1317 hasmatch(const char *buf, size_t start, size_t end) |
|
{ |
{ |
size_t stack; |
size_t stack; |
|
|
for (stack = 0; start < end; start++) |
for (stack = 0; start < end; start++) |
if (buf[start] == '[') |
if (buf[start] == '[') |
stack++; |
stack++; |
else if (buf[start] == ']' && 0 == stack) |
else if (buf[start] == ']' && 0 == stack) |
Line 1465 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 1465 ordinary(struct state *st, const char *buf, size_t sta |
|
opstack = 0; |
opstack = 0; |
|
|
for (seq = 0; start < end; seq++) { |
for (seq = 0; start < end; seq++) { |
/* |
/* |
* Loop til we get either to a newline or escape. |
* Loop til we get either to a newline or escape. |
* Escape initial control characters. |
* Escape initial control characters. |
*/ |
*/ |
while (start < end) { |
while (start < end) { |
Line 1486 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 1486 ordinary(struct state *st, const char *buf, size_t sta |
|
*/ |
*/ |
|
|
if (SECT_SYNOPSIS == st->sect && |
if (SECT_SYNOPSIS == st->sect && |
('[' == buf[start] || |
('[' == buf[start] || |
']' == buf[start]) && |
']' == buf[start]) && |
dosynopsisop(st, buf, |
dosynopsisop(st, buf, |
&start, end, &opstack)) |
&start, end, &opstack)) |
Line 1659 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 1659 ordinary(struct state *st, const char *buf, size_t sta |
|
for ( ; start < end; start++) |
for ( ; start < end; start++) |
if (' ' != buf[start] && '\t' != buf[start]) |
if (' ' != buf[start] && '\t' != buf[start]) |
break; |
break; |
} |
} |
} |
} |
outbuf_flush(st); |
outbuf_flush(st); |
mdoc_newln(st); |
mdoc_newln(st); |
Line 1692 dopar(struct state *st, char *buf, size_t start, size_ |
|
Line 1692 dopar(struct state *st, char *buf, size_t start, size_ |
|
* POD way. |
* POD way. |
*/ |
*/ |
static void |
static void |
dofile(const struct args *args, const char *fname, |
dofile(const struct args *args, const char *fname, |
const struct tm *tm, char *buf, size_t sz) |
const struct tm *tm, char *buf, size_t sz) |
{ |
{ |
char datebuf[64]; |
char datebuf[64]; |
Line 1788 dofile(const struct args *args, const char *fname, |
|
Line 1788 dofile(const struct args *args, const char *fname, |
|
!(verb && end + 2 < sz && |
!(verb && end + 2 < sz && |
isspace((unsigned char)buf[end + 2]))) |
isspace((unsigned char)buf[end + 2]))) |
break; |
break; |
|
|
/* Adjust end marker for EOF. */ |
/* Adjust end marker for EOF. */ |
|
|
if (end < sz && '\n' != buf[end]) |
if (end < sz && '\n' != buf[end]) |
Line 1817 readfile(const struct args *args, const char *fname) |
|
Line 1817 readfile(const struct args *args, const char *fname) |
|
ssize_t ssz; |
ssize_t ssz; |
struct tm *tm; |
struct tm *tm; |
time_t ttm; |
time_t ttm; |
struct stat st; |
struct stat st; |
|
|
fd = 0 != strcmp("-", fname) ? |
fd = 0 != strcmp("-", fname) ? |
open(fname, O_RDONLY, 0) : STDIN_FILENO; |
open(fname, O_RDONLY, 0) : STDIN_FILENO; |
|
|
if (-1 == fd) { |
if (-1 == fd) { |
Line 1833 readfile(const struct args *args, const char *fname) |
|
Line 1833 readfile(const struct args *args, const char *fname) |
|
} else |
} else |
tm = localtime(&st.st_mtime); |
tm = localtime(&st.st_mtime); |
|
|
/* |
/* |
* Arbitrarily-sized initial buffer. |
* Arbitrarily-sized initial buffer. |
* Should be big enough for most files... |
* Should be big enough for most files... |
*/ |
*/ |
Line 1861 readfile(const struct args *args, const char *fname) |
|
Line 1861 readfile(const struct args *args, const char *fname) |
|
return(0); |
return(0); |
} |
} |
|
|
dofile(args, STDIN_FILENO == fd ? |
dofile(args, STDIN_FILENO == fd ? |
"STDIN" : fname, tm, buf, cur); |
"STDIN" : fname, tm, buf, cur); |
free(buf); |
free(buf); |
if (STDIN_FILENO != fd) |
if (STDIN_FILENO != fd) |
Line 1929 main(int argc, char *argv[]) |
|
Line 1929 main(int argc, char *argv[]) |
|
else if (1 == argc) |
else if (1 == argc) |
fname = *argv; |
fname = *argv; |
|
|
return(readfile(&args, fname) ? |
return(readfile(&args, fname) ? |
EXIT_SUCCESS : EXIT_FAILURE); |
EXIT_SUCCESS : EXIT_FAILURE); |
|
|
usage: |
usage: |
fprintf(stderr, "usage: %s [-d date] " |
fprintf(stderr, "usage: %s [-d date] " |
"[-n title] [-s section] [file]\n", name); |
"[-n title] [-s section] [file]\n", name); |
|
|
return(EXIT_FAILURE); |
return(EXIT_FAILURE); |