summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mdoc.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/mdoc.c b/mdoc.c
index 23a661be..4794b0d9 100644
--- a/mdoc.c
+++ b/mdoc.c
@@ -280,12 +280,18 @@ mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)
continue;
if (end - c < 3)
break;
- if (isalpha((unsigned char)c[-2]) &&
- isalpha((unsigned char)c[-1]) &&
- c[1] == ' ' &&
- isupper((unsigned char)(c[2] == ' ' ? c[3] : c[2])) &&
- (c[-2] != 'n' || c[-1] != 'c') &&
- (c[-2] != 'v' || c[-1] != 's'))
+ if (c[1] != ' ' ||
+ isalpha((unsigned char)c[-2]) == 0 ||
+ isalpha((unsigned char)c[-1]) == 0 ||
+ (c[-2] == 'n' && c[-1] == 'c') ||
+ (c[-2] == 'v' && c[-1] == 's'))
+ continue;
+ c += 2;
+ if (*c == ' ')
+ c++;
+ if (*c == ' ')
+ c++;
+ if (isupper((unsigned char)(*c)))
mandoc_msg(MANDOCERR_EOS, mdoc->parse,
line, (int)(c - buf), NULL);
}