diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2010-07-18 17:00:26 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2010-07-18 17:00:26 +0000 |
commit | 0b38528b1ed620cf8afcbd2dc24687537a6d863f (patch) | |
tree | 55d6f8e4a7e3cfcba996cb4054255a17ae58b1b9 /mandoc.c | |
parent | 29ae66f24ac7fa681d22a8d5315e2faf09350baf (diff) | |
download | mandoc-0b38528b1ed620cf8afcbd2dc24687537a6d863f.tar.gz |
Text ending in a full stop, exclamation mark or question mark
should not flag the end of a sentence if:
1) The punctuation is followed by closing delimiters
and not preceded by alphanumeric characters, like in
"There is no full stop (.) in this sentence"
or
2) The punctuation is a child of a macro
and not preceded by alphanumeric characters, like in
"There is no full stop
.Pq \&.
in this sentence"
"looks fine" to kristaps@; tested by jmc@ and sobrado@
Diffstat (limited to 'mandoc.c')
-rw-r--r-- | mandoc.c | 21 |
1 files changed, 12 insertions, 9 deletions
@@ -240,8 +240,10 @@ mandoc_a2time(int flags, const char *p) int -mandoc_eos(const char *p, size_t sz) +mandoc_eos(const char *p, size_t sz, int enclosed) { + const char *q; + int found; if (0 == sz) return(0); @@ -252,8 +254,9 @@ mandoc_eos(const char *p, size_t sz) * propogate outward. */ - for ( ; sz; sz--) { - switch (p[(int)sz - 1]) { + found = 0; + for (q = p + sz - 1; q >= p; q--) { + switch (*q) { case ('\"'): /* FALLTHROUGH */ case ('\''): @@ -261,22 +264,22 @@ mandoc_eos(const char *p, size_t sz) case (']'): /* FALLTHROUGH */ case (')'): + if (0 == found) + enclosed = 1; break; case ('.'): - /* Escaped periods. */ - if (sz > 1 && '\\' == p[(int)sz - 2]) - return(0); /* FALLTHROUGH */ case ('!'): /* FALLTHROUGH */ case ('?'): - return(1); + found = 1; + break; default: - return(0); + return(found && (!enclosed || isalnum(*q))); } } - return(0); + return(found && !enclosed); } |