=================================================================== RCS file: /cvs/mandoc/term_ps.c,v retrieving revision 1.4 retrieving revision 1.6 diff -u -p -r1.4 -r1.6 --- mandoc/term_ps.c 2010/06/09 08:07:13 1.4 +++ mandoc/term_ps.c 2010/06/10 23:56:33 1.6 @@ -1,4 +1,4 @@ -/* $Id: term_ps.c,v 1.4 2010/06/09 08:07:13 kristaps Exp $ */ +/* $Id: term_ps.c,v 1.6 2010/06/10 23:56:33 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -125,6 +125,8 @@ ps_printf(struct termp *p, const char *fmt, ...) pos = (int)p->engine.ps.psmargcur; vsnprintf(&p->engine.ps.psmarg[pos], PS_BUFSLOP, fmt, ap); p->engine.ps.psmargcur = strlen(p->engine.ps.psmarg); + + va_end(ap); } @@ -143,7 +145,7 @@ ps_putchar(struct termp *p, char c) PS_GROWBUF(p, 2); pos = (int)p->engine.ps.psmargcur++; - p->engine.ps.psmarg[pos] = c; + p->engine.ps.psmarg[pos++] = c; p->engine.ps.psmarg[pos] = '\0'; } @@ -266,11 +268,12 @@ ps_letter(struct termp *p, char c) static void ps_advance(struct termp *p, size_t len) { + size_t i; if (PS_INLINE & p->engine.ps.psstate) { - /* Dump out any existing line scope. */ - ps_printf(p, ") show\n"); - p->engine.ps.psstate &= ~PS_INLINE; + for (i = 0; i < len; i++) + ps_letter(p, ' '); + return; } p->engine.ps.pscol += len ? len * PS_CHAR_WIDTH : 0;