=================================================================== RCS file: /cvs/mandoc/man.c,v retrieving revision 1.63 retrieving revision 1.68 diff -u -p -r1.63 -r1.68 --- mandoc/man.c 2010/05/08 08:36:44 1.63 +++ mandoc/man.c 2010/05/15 15:54:39 1.68 @@ -1,4 +1,4 @@ -/* $Id: man.c,v 1.63 2010/05/08 08:36:44 kristaps Exp $ */ +/* $Id: man.c,v 1.68 2010/05/15 15:54:39 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -32,7 +32,6 @@ const char *const __man_merrnames[WERRMAX] = { "invalid character", /* WNPRINT */ - "invalid manual section", /* WMSEC */ "invalid date format", /* WDATE */ "scope of prior line violated", /* WLNSCOPE */ "over-zealous prior line scope violation", /* WLNSCOPE2 */ @@ -174,6 +173,8 @@ man_free1(struct man *man) free(man->meta.source); if (man->meta.vol) free(man->meta.vol); + if (man->meta.msec) + free(man->meta.msec); } @@ -404,8 +405,7 @@ man_ptext(struct man *m, int line, char *buf) assert(i); if (' ' == buf[i - 1] || '\t' == buf[i - 1]) { - assert(i > 1); - if ('\\' != buf[i - 2]) + if (i > 1 && '\\' != buf[i - 2]) if ( ! man_pwarn(m, line, i - 1, WTSPACE)) return(0); @@ -413,7 +413,6 @@ man_ptext(struct man *m, int line, char *buf) /* Spin back to non-space. */ ; /* Jump ahead of escaped whitespace. */ - assert(i); i += '\\' == buf[i] ? 2 : 1; buf[i] = '\0'; @@ -421,6 +420,19 @@ man_ptext(struct man *m, int line, char *buf) if ( ! man_word_alloc(m, line, 0, buf)) return(0); + + /* + * End-of-sentence check. If the last character is an unescaped + * EOS character, then flag the node as being the end of a + * sentence. The front-end will know how to interpret this. + */ + + /* FIXME: chain of close delims. */ + + assert(i); + + if (mandoc_eos(buf, (size_t)i)) + m->last->flags |= MAN_EOS; descope: /*