version 1.12, 2014/04/01 11:58:32 |
version 1.17, 2014/04/02 20:32:41 |
Line 240 trylink(const char *buf, size_t *start, size_t end, si |
|
Line 240 trylink(const char *buf, size_t *start, size_t end, si |
|
} |
} |
|
|
/* |
/* |
|
* Doclifting: if we're a bold "-xx" and we're in the SYNOPSIS section, |
|
* then it's likely that we're a flag. |
|
* Our flag might be followed by an argument, so make sure that we're |
|
* accounting for that, too. |
|
* If we don't have a flag at all, however, then assume we're an "Ar". |
|
*/ |
|
static void |
|
dosynopsisfl(const char *buf, size_t *start, size_t end) |
|
{ |
|
size_t i; |
|
again: |
|
assert(*start + 1 < end); |
|
assert('-' == buf[*start]); |
|
|
|
if ( ! isalnum((int)buf[*start + 1]) && |
|
'?' != buf[*start + 1] && |
|
'-' != buf[*start + 1]) { |
|
(*start)--; |
|
fputs("Ar ", stdout); |
|
return; |
|
} |
|
|
|
(*start)++; |
|
for (i = *start; i < end; i++) |
|
if (isalnum((int)buf[i])) |
|
continue; |
|
else if ('?' == buf[i]) |
|
continue; |
|
else if ('-' == buf[i]) |
|
continue; |
|
else if ('_' == buf[i]) |
|
continue; |
|
else |
|
break; |
|
|
|
assert(i < end); |
|
|
|
if ( ! (' ' == buf[i] || '>' == buf[i])) { |
|
printf("Ar "); |
|
return; |
|
} |
|
|
|
printf("Fl "); |
|
if (end - *start > 1 && |
|
isupper((int)buf[*start]) && |
|
islower((int)buf[*start + 1]) && |
|
(end - *start == 2 || |
|
' ' == buf[*start + 2])) |
|
printf("\\&"); |
|
printf("%.*s ", (int)(i - *start), &buf[*start]); |
|
*start = i; |
|
|
|
if (' ' == buf[i]) { |
|
while (i < end && ' ' == buf[i]) |
|
i++; |
|
assert(i < end); |
|
if ('-' == buf[i]) { |
|
*start = i; |
|
goto again; |
|
} |
|
printf("Ar "); |
|
*start = i; |
|
} |
|
} |
|
|
|
/* |
* We're at the character in front of a format code, which is structured |
* We're at the character in front of a format code, which is structured |
* like X<...> and can contain nested format codes. |
* like X<...> and can contain nested format codes. |
* This consumes the whole format code, and any nested format codes, til |
* This consumes the whole format code, and any nested format codes, til |
Line 248 trylink(const char *buf, size_t *start, size_t end, si |
|
Line 314 trylink(const char *buf, size_t *start, size_t end, si |
|
* 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 360 formatcode(struct state *st, const char *buf, |
|
Line 429 formatcode(struct state *st, const char *buf, |
|
printf("Em "); |
printf("Em "); |
break; |
break; |
case (FMT_BOLD): |
case (FMT_BOLD): |
/* |
if (SECT_SYNOPSIS == st->sect) { |
* Doclifting: if we're a bold "-xx" and we're |
if (1 == dsz && '-' == buf[*start]) |
* in the SYNOPSIS section, then it's likely |
dosynopsisfl(buf, start, end); |
* that we're a flag. |
else if (0 == pos) |
* Be really strict: only do this when the dash |
printf("Nm "); |
* is followed by alnums til the end marker, |
else |
* which mustn't be a custom. |
printf("Ar "); |
*/ |
break; |
if (SECT_SYNOPSIS == st->sect && |
|
end - *start > 1 && |
|
'-' == buf[*start] && |
|
(isalnum((int)buf[*start + 1]) || |
|
'?' == buf[*start + 1])) { |
|
for (i = *start + 1; i < end; i++) |
|
if ( ! isalnum((int)buf[i])) |
|
break; |
|
if (i < end && '>' == buf[i]) { |
|
(*start)++; |
|
printf("Fl "); |
|
break; |
|
} |
|
} |
} |
printf("Sy "); |
printf("Sy "); |
break; |
break; |
Line 430 formatcode(struct state *st, const char *buf, |
|
Line 486 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 492 formatcodeln(struct state *st, const char *buf, |
|
Line 548 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 755 verbatim(struct state *st, const char *buf, size_t sta |
|
Line 811 verbatim(struct state *st, const char *buf, size_t sta |
|
} |
} |
|
|
/* |
/* |
|
* See dosynopsisop(). |
|
*/ |
|
static int |
|
hasmatch(const char *buf, size_t start, size_t end) |
|
{ |
|
size_t stack; |
|
|
|
for (stack = 0; start < end; start++) |
|
if (buf[start] == '[') |
|
stack++; |
|
else if (buf[start] == ']' && 0 == stack) |
|
return(1); |
|
else if (buf[start] == ']') |
|
stack--; |
|
return(0); |
|
} |
|
|
|
/* |
|
* If we're in the SYNOPSIS section and we've encounter braces in an |
|
* ordinary paragraph, then try to see whether we're an [-option]. |
|
* Do this, if we're an opening bracket, by first seeing if we have a |
|
* matching end via hasmatch(). |
|
* If we're an ending bracket, see if we have a stack already. |
|
*/ |
|
static int |
|
dosynopsisop(const char *buf, int *last, |
|
size_t *start, size_t end, size_t *opstack) |
|
{ |
|
|
|
assert('[' == buf[*start] || ']' == buf[*start]); |
|
|
|
if ('[' == buf[*start] && hasmatch(buf, *start + 1, end)) { |
|
if ('\n' != *last) |
|
putchar('\n'); |
|
puts(".Oo"); |
|
(*opstack)++; |
|
} else if ('[' == buf[*start]) |
|
return(0); |
|
|
|
if (']' == buf[*start] && *opstack > 0) { |
|
if ('\n' != *last) |
|
putchar('\n'); |
|
puts(".Oc"); |
|
(*opstack)--; |
|
} else if (']' == buf[*start]) |
|
return(0); |
|
|
|
(*start)++; |
|
*last = '\n'; |
|
while (' ' == buf[*start]) |
|
(*start)++; |
|
return(1); |
|
} |
|
|
|
/* |
|
* 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. |
Line 765 verbatim(struct state *st, const char *buf, size_t sta |
|
Line 910 verbatim(struct state *st, const char *buf, size_t sta |
|
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; |
size_t i, j, opstack; |
|
int seq; |
|
|
if ( ! st->parsing || st->paused) |
if ( ! st->parsing || st->paused) |
return; |
return; |
Line 777 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 923 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 786 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 932 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 802 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 948 ordinary(struct state *st, const char *buf, size_t sta |
|
|
|
st->haspar = 0; |
st->haspar = 0; |
last = '\n'; |
last = '\n'; |
|
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 817 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 964 ordinary(struct state *st, const char *buf, size_t sta |
|
printf("\\&"); |
printf("\\&"); |
else if ('\n' == last && '\'' == buf[start]) |
else if ('\n' == last && '\'' == buf[start]) |
printf("\\&"); |
printf("\\&"); |
#if notyet |
|
/* |
/* |
* If we're in the SYNOPSIS, have square |
* If we're in the SYNOPSIS, have square |
* brackets indicate that we're opening and |
* brackets indicate that we're opening and |
* closing an optional context. |
* closing an optional context. |
*/ |
*/ |
if (SECT_SYNOPSIS == st->sect) { |
if (SECT_SYNOPSIS == st->sect && |
if ('[' == buf[start] || |
('[' == buf[start] || |
']' == buf[start]) { |
']' == buf[start]) && |
if (last != '\n') |
dosynopsisop(buf, &last, |
putchar('\n'); |
&start, end, &opstack)) |
if ('[' == buf[start]) |
continue; |
printf(".Oo\n"); |
|
else |
|
printf(".Oc\n"); |
|
start++; |
|
continue; |
|
} |
|
} |
|
#endif |
|
putchar(last = buf[start++]); |
putchar(last = buf[start++]); |
if ('\\' == last) |
if ('\\' == last) |
putchar('e'); |
putchar('e'); |
Line 851 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 989 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++; |