From 63c50855905c3409df3d977f38d5877dc487bde6 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Sat, 15 May 2010 06:48:13 +0000 Subject: More EOS: append_delims() fitted with EOS detection, so ANY macro with appended delimiters will properly EOS. Fixed mandoc_eos() to accept sentence punctuation followed by close-delim buffers. --- mdoc_macro.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) (limited to 'mdoc_macro.c') diff --git a/mdoc_macro.c b/mdoc_macro.c index 8886a6b6..6d5ccb7e 100644 --- a/mdoc_macro.c +++ b/mdoc_macro.c @@ -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); -- cgit