diff options
| -rw-r--r-- | man.c | 4 | ||||
| -rw-r--r-- | mandoc.c | 40 | ||||
| -rw-r--r-- | mdoc.c | 4 | ||||
| -rw-r--r-- | mdoc_macro.c | 29 |
4 files changed, 55 insertions, 22 deletions
@@ -1,4 +1,4 @@ -/* $Id: man.c,v 1.66 2010/05/12 17:08:03 kristaps Exp $ */ +/* $Id: man.c,v 1.67 2010/05/15 06:48:13 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -426,6 +426,8 @@ man_ptext(struct man *m, int line, char *buf) * sentence. The front-end will know how to interpret this. */ + /* FIXME: chain of close delims. */ + assert(i); if (mandoc_eos(buf, (size_t)i)) @@ -1,4 +1,4 @@ -/* $Id: mandoc.c,v 1.13 2010/05/14 14:09:13 kristaps Exp $ */ +/* $Id: mandoc.c,v 1.14 2010/05/15 06:48:13 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -308,19 +308,33 @@ mandoc_eos(const char *p, size_t sz) if (0 == sz) return(0); - switch (p[(int)sz - 1]) { - case ('.'): - /* Escaped periods. */ - if (sz > 1 && '\\' == p[(int)sz - 2]) + /* + * End-of-sentence recognition must include situations where + * some symbols, such as `)', allow prior EOS punctuation to + * propogate outward. + */ + + for ( ; sz; sz--) { + switch (p[(int)sz - 1]) { + case ('\"'): + /* FALLTHROUGH */ + case ('\''): + /* FALLTHROUGH */ + case (')'): + break; + case ('.'): + /* Escaped periods. */ + if (sz > 1 && '\\' == p[(int)sz - 2]) + return(0); + /* FALLTHROUGH */ + case ('!'): + /* FALLTHROUGH */ + case ('?'): + return(1); + default: return(0); - /* FALLTHROUGH */ - case ('!'): - /* FALLTHROUGH */ - case ('?'): - break; - default: - return(0); + } } - return(1); + return(0); } @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.131 2010/05/14 17:31:25 kristaps Exp $ */ +/* $Id: mdoc.c,v 1.132 2010/05/15 06:48:13 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -701,6 +701,8 @@ mdoc_ptext(struct mdoc *m, int line, char *buf) * sentence. The front-end will know how to interpret this. */ + /* FIXME: chain of close delims. */ + assert(i); if (mandoc_eos(buf, (size_t)i)) diff --git a/mdoc_macro.c b/mdoc_macro.c index 079b8aa5..ca6bbeab 100644 --- a/mdoc_macro.c +++ b/mdoc_macro.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_macro.c,v 1.65 2010/05/15 04:47:38 kristaps Exp $ */ +/* $Id: mdoc_macro.c,v 1.66 2010/05/15 06:48:13 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -622,26 +622,41 @@ rew_sub(enum mdoc_type t, struct mdoc *m, static int -append_delims(struct mdoc *mdoc, int line, int *pos, char *buf) +append_delims(struct mdoc *m, int line, int *pos, char *buf) { - int lastarg; + int la; enum margserr ac; char *p; - if (0 == buf[*pos]) + if ('\0' == buf[*pos]) return(1); for (;;) { - lastarg = *pos; - ac = mdoc_zargs(mdoc, line, pos, buf, ARGS_NOWARN, &p); + la = *pos; + ac = mdoc_zargs(m, line, pos, buf, ARGS_NOWARN, &p); if (ARGS_ERROR == ac) return(0); else if (ARGS_EOLN == ac) break; + assert(mdoc_isdelim(p)); - if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) + if ( ! mdoc_word_alloc(m, line, la, p)) return(0); + + /* + * If we encounter end-of-sentence symbols, then trigger + * the double-space. + * + * XXX: it's easy to allow this to propogate outward to + * the last symbol, such that `. )' will cause the + * correct double-spacing. However, (1) groff isn't + * smart enough to do this and (2) it would require + * knowing which symbols break this behaviour, for + * example, `. ;' shouldn't propogate the double-space. + */ + if (mandoc_eos(p, strlen(p))) + m->last->flags |= MDOC_EOS; } return(1); |