diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2010-09-27 21:25:29 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2010-09-27 21:25:29 +0000 |
| commit | 1d4e2c60a5e3dc90cf35c40cb7d7ac6f9acf2f9a (patch) | |
| tree | 77963a0cf4fba75f35f9807c3a8437c6de38425d /usr.bin/mandoc/term_ps.c | |
| parent | d630c25e397247352d682f68c0fcd257cb4774a8 (diff) | |
Merge the last bits of 1.10.6 (released today), most were already in:
* ignore double-.Pp
* ignore .Pp before .Bd and .Bl (unless -compact in specified)
* avoid double blank line upon .Pp, .br and friends in literal context
* cast enums to int when passing them to exit(3) to please lint(1)
While merging, fix a regression introduced by kristaps@:
Outside literal mode, double blank lines must both be printed.
To achieve this again after kristaps@ improvements in 1.10.6,
treat such blank lines as .sp (instead of .Pp as in 1.10.5)
and drop .Pp before .sp just like dropping .Pp before .Pp.
Diffstat (limited to 'usr.bin/mandoc/term_ps.c')
| -rw-r--r-- | usr.bin/mandoc/term_ps.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/mandoc/term_ps.c b/usr.bin/mandoc/term_ps.c index 7c4a96a2056..371b31aa58b 100644 --- a/usr.bin/mandoc/term_ps.c +++ b/usr.bin/mandoc/term_ps.c @@ -1,4 +1,4 @@ -/* $Id: term_ps.c,v 1.12 2010/09/06 07:49:35 jsg Exp $ */ +/* $Id: term_ps.c,v 1.13 2010/09/27 21:25:28 schwarze Exp $ */ /* * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -372,7 +372,7 @@ ps_growbuf(struct termp *p, size_t sz) if (NULL == p->engine.ps.psmarg) { perror(NULL); - exit(MANDOCLEVEL_SYSERR); + exit((int)MANDOCLEVEL_SYSERR); } } @@ -583,6 +583,7 @@ ps_putchar(struct termp *p, char c) /* See ps_printf(). */ if ( ! (PS_MARGINS & p->engine.ps.flags)) { + /* LINTED */ putchar(c); p->engine.ps.pdfbytes++; return; @@ -609,7 +610,7 @@ pdf_obj(struct termp *p, size_t obj) p->engine.ps.pdfobjsz * sizeof(size_t)); if (NULL == p->engine.ps.pdfobjs) { perror(NULL); - exit(MANDOCLEVEL_SYSERR); + exit((int)MANDOCLEVEL_SYSERR); } } |