=================================================================== RCS file: /cvs/mandoc/term_ps.c,v retrieving revision 1.59 retrieving revision 1.65 diff -u -p -r1.59 -r1.65 --- mandoc/term_ps.c 2014/04/20 16:46:05 1.59 +++ mandoc/term_ps.c 2014/08/24 23:43:13 1.65 @@ -1,4 +1,4 @@ -/* $Id: term_ps.c,v 1.59 2014/04/20 16:46:05 schwarze Exp $ */ +/* $Id: term_ps.c,v 1.65 2014/08/24 23:43:13 schwarze Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons * Copyright (c) 2014 Ingo Schwarze @@ -15,9 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include @@ -69,6 +67,7 @@ struct termp_ps { size_t psmargcur; /* cur index in margin buf */ char last; /* character buffer */ enum termfont lastf; /* last set font */ + enum termfont nextf; /* building next font here */ size_t scale; /* font scaling factor */ size_t pages; /* number of pages shown */ size_t lineheight; /* line height (AFM units) */ @@ -408,6 +407,103 @@ static const struct font fonts[TERMFONT__MAX] = { { 400 }, { 541 }, } }, + { "Times-BoldItalic", { + { 250 }, + { 389 }, + { 555 }, + { 500 }, + { 500 }, + { 833 }, + { 778 }, + { 333 }, + { 333 }, + { 333 }, + { 500 }, + { 570 }, + { 250 }, + { 333 }, + { 250 }, + { 278 }, + { 500 }, + { 500 }, + { 500 }, + { 500 }, + { 500 }, + { 500 }, + { 500 }, + { 500 }, + { 500 }, + { 500 }, + { 333 }, + { 333 }, + { 570 }, + { 570 }, + { 570 }, + { 500 }, + { 832 }, + { 667 }, + { 667 }, + { 667 }, + { 722 }, + { 667 }, + { 667 }, + { 722 }, + { 778 }, + { 389 }, + { 500 }, + { 667 }, + { 611 }, + { 889 }, + { 722 }, + { 722 }, + { 611 }, + { 722 }, + { 667 }, + { 556 }, + { 611 }, + { 722 }, + { 667 }, + { 889 }, + { 667 }, + { 611 }, + { 611 }, + { 333 }, + { 278 }, + { 333 }, + { 570 }, + { 500 }, + { 333 }, + { 500 }, + { 500 }, + { 444 }, + { 500 }, + { 444 }, + { 333 }, + { 500 }, + { 556 }, + { 278 }, + { 278 }, + { 500 }, + { 278 }, + { 778 }, + { 556 }, + { 500 }, + { 500 }, + { 500 }, + { 389 }, + { 389 }, + { 278 }, + { 556 }, + { 444 }, + { 667 }, + { 500 }, + { 444 }, + { 389 }, + { 348 }, + { 220 }, + { 348 }, + { 570 }, + } }, }; void * @@ -628,12 +724,8 @@ pdf_obj(struct termp *p, size_t obj) if ((obj - 1) >= p->ps->pdfobjsz) { p->ps->pdfobjsz = obj + 128; - p->ps->pdfobjs = realloc(p->ps->pdfobjs, - p->ps->pdfobjsz * sizeof(size_t)); - if (NULL == p->ps->pdfobjs) { - perror(NULL); - exit((int)MANDOCLEVEL_SYSERR); - } + p->ps->pdfobjs = mandoc_reallocarray(p->ps->pdfobjs, + p->ps->pdfobjsz, sizeof(size_t)); } p->ps->pdfobjs[(int)obj - 1] = p->ps->pdfbytes; @@ -918,11 +1010,8 @@ ps_pletter(struct termp *p, int c) f = (int)p->ps->lastf; - if (c <= 32 || (c - 32 >= MAXCHAR)) { - ps_putchar(p, ' '); - p->ps->pscol += (size_t)fonts[f].gly[0].wx; - return; - } + if (c <= 32 || c - 32 >= MAXCHAR) + c = 32; ps_putchar(p, (char)c); c -= 32; @@ -962,11 +1051,13 @@ ps_fclose(struct termp *p) * Following this, close out any scope that's open. */ - if ('\0' != p->ps->last) { - if (p->ps->lastf != TERMFONT_NONE) { + if (p->ps->last != '\0') { + assert(p->ps->last != 8); + if (p->ps->nextf != p->ps->lastf) { ps_pclose(p); - ps_setfont(p, TERMFONT_NONE); + ps_setfont(p, p->ps->nextf); } + p->ps->nextf = TERMFONT_NONE; ps_pletter(p, p->ps->last); p->ps->last = '\0'; } @@ -980,50 +1071,54 @@ ps_fclose(struct termp *p) static void ps_letter(struct termp *p, int arg) { - char cc, c; + char c; c = arg >= 128 || arg <= 0 ? '?' : arg; /* - * State machine dictates whether to buffer the last character - * or not. Basically, encoded words are detected by checking if - * we're an "8" and switching on the buffer. Then we put "8" in - * our buffer, and on the next charater, flush both character - * and buffer. Thus, "regular" words are detected by having a - * regular character and a regular buffer character. + * 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(). */ - if ('\0' == p->ps->last) { - assert(8 != c); - p->ps->last = c; - return; - } else if (8 == p->ps->last) { - assert(8 != c); - p->ps->last = '\0'; - } else if (8 == c) { - assert(8 != p->ps->last); + if (c == 8) { + assert(p->ps->last != '\0'); + assert(p->ps->last != 8); if ('_' == p->ps->last) { - if (p->ps->lastf != TERMFONT_UNDER) { - ps_pclose(p); - ps_setfont(p, TERMFONT_UNDER); + switch (p->ps->nextf) { + case TERMFONT_BI: + break; + case TERMFONT_BOLD: + p->ps->nextf = TERMFONT_BI; + break; + default: + p->ps->nextf = TERMFONT_UNDER; } - } else if (p->ps->lastf != TERMFONT_BOLD) { - ps_pclose(p); - ps_setfont(p, TERMFONT_BOLD); + } else { + switch (p->ps->nextf) { + case TERMFONT_BI: + break; + case TERMFONT_UNDER: + p->ps->nextf = TERMFONT_BI; + break; + default: + p->ps->nextf = TERMFONT_BOLD; + } } - p->ps->last = c; - return; - } else { - if (p->ps->lastf != TERMFONT_NONE) { + } else if (p->ps->last != '\0' && p->ps->last != 8) { + if (p->ps->nextf != p->ps->lastf) { ps_pclose(p); - ps_setfont(p, TERMFONT_NONE); + ps_setfont(p, p->ps->nextf); } - cc = p->ps->last; - p->ps->last = c; - c = cc; + p->ps->nextf = TERMFONT_NONE; + ps_pletter(p, p->ps->last); } - - ps_pletter(p, c); + p->ps->last = c; } static void @@ -1108,9 +1203,10 @@ ps_width(const struct termp *p, int c) { if (c <= 32 || c - 32 >= MAXCHAR) - return((size_t)fonts[(int)TERMFONT_NONE].gly[0].wx); + c = 0; + else + c -= 32; - c -= 32; return((size_t)fonts[(int)TERMFONT_NONE].gly[c].wx); } @@ -1123,31 +1219,41 @@ ps_hspan(const struct termp *p, const struct roffsu *s * All of these measurements are derived by converting from the * native measurement to AFM units. */ - switch (su->unit) { + case SCALE_BU: + /* + * Traditionally, the default unit is fixed to the + * output media. So this would refer to the point. In + * mandoc(1), however, we stick to the default terminal + * scaling unit so that output is the same regardless + * the media. + */ + r = PNT2AFM(p, su->scale * 72.0 / 240.0); + break; case SCALE_CM: - r = PNT2AFM(p, su->scale * 28.34); + r = PNT2AFM(p, su->scale * 72.0 / 2.54); break; - case SCALE_IN: - r = PNT2AFM(p, su->scale * 72); - break; - case SCALE_PC: - r = PNT2AFM(p, su->scale * 12); - break; - case SCALE_PT: - r = PNT2AFM(p, su->scale * 100); - break; case SCALE_EM: r = su->scale * fonts[(int)TERMFONT_NONE].gly[109 - 32].wx; break; - case SCALE_MM: - r = PNT2AFM(p, su->scale * 2.834); - break; case SCALE_EN: r = su->scale * fonts[(int)TERMFONT_NONE].gly[110 - 32].wx; break; + case SCALE_IN: + r = PNT2AFM(p, su->scale * 72.0); + break; + case SCALE_MM: + r = su->scale * + fonts[(int)TERMFONT_NONE].gly[109 - 32].wx / 100.0; + break; + case SCALE_PC: + r = PNT2AFM(p, su->scale * 12.0); + break; + case SCALE_PT: + r = PNT2AFM(p, su->scale * 1.0); + break; case SCALE_VS: r = su->scale * p->ps->lineheight; break; @@ -1169,7 +1275,5 @@ ps_growbuf(struct termp *p, size_t sz) sz = PS_BUFSLOP; p->ps->psmargsz += sz; - - p->ps->psmarg = mandoc_realloc - (p->ps->psmarg, p->ps->psmargsz); + p->ps->psmarg = mandoc_realloc(p->ps->psmarg, p->ps->psmargsz); }