=================================================================== RCS file: /cvs/mandoc/term_ps.c,v retrieving revision 1.66 retrieving revision 1.70 diff -u -p -r1.66 -r1.70 --- mandoc/term_ps.c 2014/08/28 01:37:12 1.66 +++ mandoc/term_ps.c 2014/12/01 08:05:52 1.70 @@ -1,4 +1,4 @@ -/* $Id: term_ps.c,v 1.66 2014/08/28 01:37:12 schwarze Exp $ */ +/* $Id: term_ps.c,v 1.70 2014/12/01 08:05:52 schwarze Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons * Copyright (c) 2014 Ingo Schwarze @@ -27,11 +27,10 @@ #include #include -#include "mandoc.h" #include "mandoc_aux.h" #include "out.h" -#include "main.h" #include "term.h" +#include "main.h" /* These work the buffer used by the header and footer. */ #define PS_BUFSLOP 128 @@ -59,12 +58,13 @@ struct termp_ps { #define PS_INLINE (1 << 0) /* we're in a word */ #define PS_MARGINS (1 << 1) /* we're in the margins */ #define PS_NEWPAGE (1 << 2) /* new page, no words yet */ +#define PS_BACKSP (1 << 3) /* last character was backspace */ size_t pscol; /* visible column (AFM units) */ size_t psrow; /* visible row (AFM units) */ char *psmarg; /* margin buf */ size_t psmargsz; /* margin buf size */ size_t psmargcur; /* cur index in margin buf */ - char last; /* character buffer */ + char last; /* last non-backspace seen */ enum termfont lastf; /* last set font */ enum termfont nextf; /* building next font here */ size_t scale; /* font scaling factor */ @@ -105,7 +105,7 @@ static void ps_printf(struct termp *, const char *, static void ps_putchar(struct termp *, char); static void ps_setfont(struct termp *, enum termfont); static void ps_setwidth(struct termp *, int, size_t); -static struct termp *pspdf_alloc(char *); +static struct termp *pspdf_alloc(const struct mchars *, char *); static void pdf_obj(struct termp *, size_t); /* @@ -506,29 +506,29 @@ static const struct font fonts[TERMFONT__MAX] = { }; void * -pdf_alloc(char *outopts) +pdf_alloc(const struct mchars *mchars, char *outopts) { struct termp *p; - if (NULL != (p = pspdf_alloc(outopts))) + if (NULL != (p = pspdf_alloc(mchars, outopts))) p->type = TERMTYPE_PDF; return(p); } void * -ps_alloc(char *outopts) +ps_alloc(const struct mchars *mchars, char *outopts) { struct termp *p; - if (NULL != (p = pspdf_alloc(outopts))) + if (NULL != (p = pspdf_alloc(mchars, outopts))) p->type = TERMTYPE_PS; return(p); } static struct termp * -pspdf_alloc(char *outopts) +pspdf_alloc(const struct mchars *mchars, char *outopts) { struct termp *p; unsigned int pagex, pagey; @@ -538,6 +538,7 @@ pspdf_alloc(char *outopts) char *v; p = mandoc_calloc(1, sizeof(struct termp)); + p->symtab = mchars; p->enc = TERMENC_ASCII; p->ps = mandoc_calloc(1, sizeof(struct termp_ps)); @@ -633,12 +634,14 @@ ps_setwidth(struct termp *p, int iop, size_t width) size_t lastwidth; lastwidth = p->ps->width; - if (0 < iop) + if (iop > 0) p->ps->width += width; - else if (0 > iop) + else if (iop == 0) + p->ps->width = width ? width : p->ps->lastwidth; + else if (p->ps->width > width) p->ps->width -= width; else - p->ps->width = width ? width : p->ps->lastwidth; + p->ps->width = 0; p->ps->lastwidth = lastwidth; } @@ -1047,7 +1050,7 @@ ps_fclose(struct termp *p) */ if (p->ps->last != '\0') { - assert(p->ps->last != 8); + assert( ! (p->ps->flags & PS_BACKSP)); if (p->ps->nextf != p->ps->lastf) { ps_pclose(p); ps_setfont(p, p->ps->nextf); @@ -1066,25 +1069,30 @@ ps_fclose(struct termp *p) static void ps_letter(struct termp *p, int arg) { + size_t savecol; char c; c = arg >= 128 || arg <= 0 ? '?' : arg; /* - * When receiving an initial character, merely buffer it, - * because a backspace might follow to specify formatting. - * When receiving a backspace, use the buffered character - * to build the font instruction and clear the buffer. - * Only when there are two non-backspace characters in a row, - * activate the font built so far and print the first of them; - * the second, again, merely gets buffered. - * The final character will get printed from ps_fclose(). + * When receiving a backspace, merely flag it. + * We don't know yet whether it is + * a font instruction or an overstrike. */ - if (c == 8) { + if (c == '\b') { assert(p->ps->last != '\0'); - assert(p->ps->last != 8); - if ('_' == p->ps->last) { + assert( ! (p->ps->flags & PS_BACKSP)); + p->ps->flags |= PS_BACKSP; + return; + } + + /* + * Decode font instructions. + */ + + if (p->ps->flags & PS_BACKSP) { + if (p->ps->last == '_') { switch (p->ps->nextf) { case TERMFONT_BI: break; @@ -1094,7 +1102,11 @@ ps_letter(struct termp *p, int arg) default: p->ps->nextf = TERMFONT_UNDER; } - } else { + p->ps->last = c; + p->ps->flags &= ~PS_BACKSP; + return; + } + if (p->ps->last == c) { switch (p->ps->nextf) { case TERMFONT_BI: break; @@ -1104,8 +1116,26 @@ ps_letter(struct termp *p, int arg) default: p->ps->nextf = TERMFONT_BOLD; } + p->ps->flags &= ~PS_BACKSP; + return; } - } else if (p->ps->last != '\0' && p->ps->last != 8) { + + /* + * This is not a font instruction, but rather + * the next character. Prepare for overstrike. + */ + + savecol = p->ps->pscol; + } else + savecol = SIZE_MAX; + + /* + * We found the next character, so the font instructions + * for the previous one are complete. + * Use them and print it. + */ + + if (p->ps->last != '\0') { if (p->ps->nextf != p->ps->lastf) { ps_pclose(p); ps_setfont(p, p->ps->nextf); @@ -1113,7 +1143,25 @@ ps_letter(struct termp *p, int arg) p->ps->nextf = TERMFONT_NONE; ps_pletter(p, p->ps->last); } + + /* + * Do not print the current character yet because font + * instructions might follow; only remember it. + * For the first character, nothing else is done. + * The final character will get printed from ps_fclose(). + */ + p->ps->last = c; + + /* + * For an overstrike, back up to the previous position. + */ + + if (savecol != SIZE_MAX) { + ps_pclose(p); + p->ps->pscol = savecol; + p->ps->flags &= ~PS_BACKSP; + } } static void