version 1.14, 2014/04/01 19:50:34 |
version 1.18, 2014/04/02 22:36:56 |
Line 179 formatescape(const char *buf, size_t *start, size_t en |
|
Line 179 formatescape(const char *buf, size_t *start, size_t en |
|
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 sv, nstart, nend, i, j; |
size_t sv, nstart, nend, i, j, textsz; |
int hasdouble; |
const char *text; |
|
int hasdouble; |
|
|
/* |
/* |
* 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. |
*/ |
*/ |
hasdouble = 0; |
|
for (sv = nstart = *start; nstart < end; nstart++) { |
for (sv = nstart = *start; nstart < end; nstart++) { |
/* Do we have a double-colon? */ |
|
if (':' == buf[nstart] && |
|
nstart > sv && |
|
':' == buf[nstart - 1]) |
|
hasdouble = 1; |
|
if ('>' != buf[nstart]) |
if ('>' != buf[nstart]) |
continue; |
continue; |
else if (dsz == 1) |
else if (dsz == 1) |
Line 201 trylink(const char *buf, size_t *start, size_t end, si |
|
Line 196 trylink(const char *buf, size_t *start, size_t end, si |
|
assert(nstart > 0); |
assert(nstart > 0); |
if (' ' != buf[nstart - 1]) |
if (' ' != buf[nstart - 1]) |
continue; |
continue; |
i = nstart; |
for (i = nstart, 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) |
Line 218 trylink(const char *buf, size_t *start, size_t end, si |
|
Line 212 trylink(const char *buf, size_t *start, size_t end, si |
|
if (dsz > 1) |
if (dsz > 1) |
nend--; |
nend--; |
|
|
|
/* Re-scan to see if we have a title. */ |
|
text = &buf[*start]; |
|
for (textsz = *start; textsz < nend; textsz++) |
|
if ('|' == buf[textsz]) |
|
break; |
|
|
|
if (textsz < nend) { |
|
sv = textsz + 1; |
|
textsz = textsz - *start; |
|
} else |
|
textsz = 0; |
|
|
|
/* Now see if we're a Perl manual. */ |
|
for (hasdouble = 0, i = sv + 1; i < end; i++) |
|
if (':' == buf[i] && ':' == buf[i - 1]) { |
|
hasdouble = 1; |
|
break; |
|
} |
|
|
/* |
/* |
* Provide for some common invocations of the link primitive. |
* Provide for some common invocations of the link primitive. |
* First, allow us to link to other Perl manuals. |
* First, allow us to link to other Perl manuals. |
Line 239 trylink(const char *buf, size_t *start, size_t end, si |
|
Line 252 trylink(const char *buf, size_t *start, size_t end, si |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
/* |
/* |
* Doclifting: if we're a bold "-xx" and we're in the SYNOPSIS section, |
* Doclifting: if we're a bold "-xx" and we're in the SYNOPSIS section, |
* then it's likely that we're a flag. |
* then it's likely that we're a flag. |
|
|
* been printed to the current line. |
* been printed to the current line. |
* If "nomacro", then we don't print any macros, just contained data |
* If "nomacro", then we don't print any macros, just contained data |
* (e.g., following "Sh" or "Nm"). |
* (e.g., following "Sh" or "Nm"). |
|
* "pos" is only significant in SYNOPSIS, and should be 0 when invoked |
|
* as the first format code on a line (for decoration as an "Nm"), |
|
* non-zero otherwise. |
* Return whether we've printed a macro or not--in other words, whether |
* Return whether we've printed a macro or not--in other words, whether |
* this should trigger a subsequent newline (this should be ignored when |
* this should trigger a subsequent newline (this should be ignored when |
* reentrant). |
* reentrant). |
*/ |
*/ |
static int |
static int |
formatcode(struct state *st, const char *buf, |
formatcode(struct state *st, const char *buf, size_t *start, |
size_t *start, size_t end, int reentrant, int nomacro) |
size_t end, int reentrant, int nomacro, int pos) |
{ |
{ |
enum fmt fmt; |
enum fmt fmt; |
size_t i, j, dsz; |
size_t i, j, dsz; |
Line 430 formatcode(struct state *st, const char *buf, |
|
Line 445 formatcode(struct state *st, const char *buf, |
|
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) |
|
printf("Nm "); |
else |
else |
printf("Ar "); |
printf("Ar "); |
break; |
break; |
Line 482 formatcode(struct state *st, const char *buf, |
|
Line 499 formatcode(struct state *st, const char *buf, |
|
} |
} |
} |
} |
if (*start + 1 < end && '<' == buf[*start + 1]) { |
if (*start + 1 < end && '<' == buf[*start + 1]) { |
formatcode(st, buf, start, end, 1, nomacro); |
formatcode(st, buf, start, end, 1, nomacro, 1); |
continue; |
continue; |
} |
} |
|
|
Line 544 formatcodeln(struct state *st, const char *buf, |
|
Line 561 formatcodeln(struct state *st, const char *buf, |
|
last = ' '; |
last = ' '; |
while (*start < end) { |
while (*start < end) { |
if (*start + 1 < end && '<' == buf[*start + 1]) { |
if (*start + 1 < end && '<' == buf[*start + 1]) { |
formatcode(st, buf, start, end, 1, nomacro); |
formatcode(st, buf, start, end, 1, nomacro, 1); |
continue; |
continue; |
} |
} |
/* |
/* |
Line 862 dosynopsisop(const char *buf, int *last, |
|
Line 879 dosynopsisop(const char *buf, int *last, |
|
} |
} |
|
|
/* |
/* |
|
* Format multiple "Nm" manpage names in the NAME section. |
|
*/ |
|
static void |
|
donamenm(struct state *st, const char *buf, size_t *start, size_t end) |
|
{ |
|
size_t word; |
|
|
|
while (*start < end && ' ' == buf[*start]) |
|
(*start)++; |
|
|
|
if (end == *start) { |
|
puts(".Nm unknown"); |
|
return; |
|
} |
|
|
|
while (*start < end) { |
|
fputs(".Nm ", stdout); |
|
for (word = *start; word < end; word++) |
|
if (',' == buf[word]) |
|
break; |
|
formatcodeln(st, buf, start, word, 1); |
|
if (*start == end) { |
|
putchar('\n'); |
|
continue; |
|
} |
|
assert(',' == buf[*start]); |
|
puts(" ,"); |
|
(*start)++; |
|
while (*start < end && ' ' == buf[*start]) |
|
(*start)++; |
|
} |
|
} |
|
|
|
/* |
* Ordinary paragraph. |
* Ordinary paragraph. |
* Well, this is really the hardest--POD seems to assume that, for |
* Well, this is really the hardest--POD seems to assume that, for |
* example, a leading space implies a newline, and so on. |
* example, a leading space implies a newline, and so on. |
|
|
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; |
|
int seq; |
|
|
if ( ! st->parsing || st->paused) |
if ( ! st->parsing || st->paused) |
return; |
return; |
Line 884 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 936 ordinary(struct state *st, const char *buf, size_t sta |
|
* To wit, print out a "Nm" and "Nd" in that format. |
* To wit, print out a "Nm" and "Nd" in that format. |
*/ |
*/ |
if (SECT_NAME == st->sect) { |
if (SECT_NAME == st->sect) { |
for (i = end - 1; i > start; i--) |
for (i = end - 2; i > start; i--) |
if ('-' == buf[i]) |
if ('-' == buf[i] && ' ' == buf[i + 1]) |
break; |
break; |
if ('-' == buf[i]) { |
if ('-' == buf[i]) { |
j = i; |
j = i; |
Line 893 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 945 ordinary(struct state *st, const char *buf, size_t sta |
|
for ( ; i > start; i--) |
for ( ; i > start; i--) |
if ('-' != buf[i]) |
if ('-' != buf[i]) |
break; |
break; |
printf(".Nm "); |
donamenm(st, buf, &start, i + 1); |
formatcodeln(st, buf, &start, i + 1, 1); |
|
putchar('\n'); |
|
start = j + 1; |
start = j + 1; |
printf(".Nd "); |
while (start < end && ' ' == buf[start]) |
|
start++; |
|
fputs(".Nd ", stdout); |
formatcodeln(st, buf, &start, end, 1); |
formatcodeln(st, buf, &start, end, 1); |
putchar('\n'); |
putchar('\n'); |
return; |
return; |
Line 911 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 963 ordinary(struct state *st, const char *buf, size_t sta |
|
last = '\n'; |
last = '\n'; |
opstack = 0; |
opstack = 0; |
|
|
while (start < end) { |
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. |
Line 950 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 1002 ordinary(struct state *st, const char *buf, size_t sta |
|
* following that, a newline. |
* following that, a newline. |
* Consume all whitespace so we don't |
* Consume all whitespace so we don't |
* accidentally start an implicit literal line. |
* accidentally start an implicit literal line. |
|
* If the macro ends with a flush comma or |
|
* period, let mdoc(7) handle it for us. |
*/ |
*/ |
if (formatcode(st, buf, &start, end, 0, 0)) { |
if (formatcode(st, buf, &start, end, 0, 0, seq)) { |
|
if ((start == end - 1 || |
|
(start < end - 1 && |
|
(' ' == buf[start + 1] || |
|
'\n' == buf[start + 1]))) && |
|
('.' == buf[start] || |
|
',' == buf[start])) { |
|
putchar(' '); |
|
putchar(buf[start++]); |
|
} |
putchar(last = '\n'); |
putchar(last = '\n'); |
while (start < end && ' ' == buf[start]) |
while (start < end && ' ' == buf[start]) |
start++; |
start++; |