=================================================================== RCS file: /cvs/mandoc/term_ps.c,v retrieving revision 1.58 retrieving revision 1.83 diff -u -p -r1.58 -r1.83 --- mandoc/term_ps.c 2014/03/30 21:28:01 1.58 +++ mandoc/term_ps.c 2017/02/17 14:31:52 1.83 @@ -1,50 +1,50 @@ -/* $Id: term_ps.c,v 1.58 2014/03/30 21:28:01 schwarze Exp $ */ +/* $Id: term_ps.c,v 1.83 2017/02/17 14:31:52 schwarze Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons - * Copyright (c) 2014 Ingo Schwarze + * Copyright (c) 2014, 2015, 2016 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * 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 #include +#if HAVE_ERR +#include +#endif #include #include #include #include #include -#include #include -#include "mandoc.h" #include "mandoc_aux.h" #include "out.h" -#include "main.h" #include "term.h" +#include "manconf.h" +#include "main.h" /* These work the buffer used by the header and footer. */ #define PS_BUFSLOP 128 /* Convert PostScript point "x" to an AFM unit. */ -#define PNT2AFM(p, x) /* LINTED */ \ +#define PNT2AFM(p, x) \ (size_t)((double)(x) * (1000.0 / (double)(p)->ps->scale)) /* Convert an AFM unit "x" to a PostScript points */ -#define AFM2PNT(p, x) /* LINTED */ \ +#define AFM2PNT(p, x) \ ((double)(x) / (1000.0 / (double)(p)->ps->scale)) struct glyph { @@ -62,13 +62,16 @@ 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 pscolnext; /* used for overstrike */ 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 */ size_t pages; /* number of pages shown */ size_t lineheight; /* line height (AFM units) */ @@ -80,14 +83,14 @@ struct termp_ps { size_t left; /* body left (AFM units) */ size_t header; /* header pos (AFM units) */ size_t footer; /* footer pos (AFM units) */ - size_t pdfbytes; /* current output byte */ + size_t pdfbytes; /* current output byte */ size_t pdflastpg; /* byte of last page mark */ size_t pdfbody; /* start of body object */ size_t *pdfobjs; /* table of object offsets */ size_t pdfobjsz; /* size of pdfobjs */ }; -static double ps_hspan(const struct termp *, +static int ps_hspan(const struct termp *, const struct roffsu *); static size_t ps_width(const struct termp *, int); static void ps_advance(struct termp *, size_t); @@ -95,19 +98,17 @@ static void ps_begin(struct termp *); static void ps_closepage(struct termp *); static void ps_end(struct termp *); static void ps_endline(struct termp *); -static void ps_fclose(struct termp *); static void ps_growbuf(struct termp *, size_t); static void ps_letter(struct termp *, int); static void ps_pclose(struct termp *); +static void ps_plast(struct termp *); static void ps_pletter(struct termp *, int); -#if __GNUC__ - 0 >= 4 -__attribute__((__format__ (__printf__, 2, 3))) -#endif -static void ps_printf(struct termp *, const char *, ...); +static void ps_printf(struct termp *, const char *, ...) + __attribute__((__format__ (__printf__, 2, 3))); 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 void ps_setwidth(struct termp *, int, int); +static struct termp *pspdf_alloc(const struct manoutput *); static void pdf_obj(struct termp *, size_t); /* @@ -408,42 +409,140 @@ 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 * -pdf_alloc(char *outopts) +pdf_alloc(const struct manoutput *outopts) { struct termp *p; if (NULL != (p = pspdf_alloc(outopts))) p->type = TERMTYPE_PDF; - return(p); + return p; } void * -ps_alloc(char *outopts) +ps_alloc(const struct manoutput *outopts) { struct termp *p; if (NULL != (p = pspdf_alloc(outopts))) p->type = TERMTYPE_PS; - return(p); + return p; } static struct termp * -pspdf_alloc(char *outopts) +pspdf_alloc(const struct manoutput *outopts) { struct termp *p; unsigned int pagex, pagey; size_t marginx, marginy, lineheight; - const char *toks[2]; const char *pp; - char *v; p = mandoc_calloc(1, sizeof(struct termp)); p->enc = TERMENC_ASCII; + p->fontq = mandoc_reallocarray(NULL, + (p->fontsz = 8), sizeof(enum termfont)); + p->fontq[0] = p->fontl = TERMFONT_NONE; p->ps = mandoc_calloc(1, sizeof(struct termp_ps)); p->advance = ps_advance; @@ -454,21 +553,7 @@ pspdf_alloc(char *outopts) p->letter = ps_letter; p->setwidth = ps_setwidth; p->width = ps_width; - - toks[0] = "paper"; - toks[1] = NULL; - pp = NULL; - - while (outopts && *outopts) - switch (getsubopt(&outopts, UNCONST(toks), &v)) { - case (0): - pp = v; - break; - default: - break; - } - /* Default to US letter (millimetres). */ pagex = 216; @@ -481,6 +566,7 @@ pspdf_alloc(char *outopts) * only happens once, I'm not terribly concerned. */ + pp = outopts->paper; if (pp && strcasecmp(pp, "letter")) { if (0 == strcasecmp(pp, "a3")) { pagex = 297; @@ -495,10 +581,10 @@ pspdf_alloc(char *outopts) pagex = 216; pagey = 356; } else if (2 != sscanf(pp, "%ux%u", &pagex, &pagey)) - fprintf(stderr, "%s: Unknown paper\n", pp); + warnx("%s: Unknown paper", pp); } - /* + /* * This MUST be defined before any PNT2AFM or AFM2PNT * calculations occur. */ @@ -512,10 +598,8 @@ pspdf_alloc(char *outopts) /* Margins are 1/9 the page x and y. */ - marginx = /* LINTED */ - (size_t)((double)pagex / 9.0); - marginy = /* LINTED */ - (size_t)((double)pagey / 9.0); + marginx = (size_t)((double)pagex / 9.0); + marginy = (size_t)((double)pagey / 9.0); /* Line-height is 1.4em. */ @@ -531,26 +615,26 @@ pspdf_alloc(char *outopts) p->ps->lineheight = lineheight; p->defrmargin = pagex - (marginx * 2); - return(p); + return p; } - static void -ps_setwidth(struct termp *p, int iop, size_t width) +ps_setwidth(struct termp *p, int iop, int 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 ? (size_t)width : p->ps->lastwidth; + else if (p->ps->width > (size_t)width) p->ps->width -= width; else - p->ps->width = width ? width : p->ps->lastwidth; + p->ps->width = 0; p->ps->lastwidth = lastwidth; } - void pspdf_free(void *arg) { @@ -558,16 +642,13 @@ pspdf_free(void *arg) p = (struct termp *)arg; - if (p->ps->psmarg) - free(p->ps->psmarg); - if (p->ps->pdfobjs) - free(p->ps->pdfobjs); + free(p->ps->psmarg); + free(p->ps->pdfobjs); free(p->ps); term_free(p); } - static void ps_printf(struct termp *p, const char *fmt, ...) { @@ -585,12 +666,11 @@ ps_printf(struct termp *p, const char *fmt, ...) if ( ! (PS_MARGINS & p->ps->flags)) { len = vprintf(fmt, ap); va_end(ap); - p->ps->pdfbytes += /* LINTED */ - len < 0 ? 0 : (size_t)len; + p->ps->pdfbytes += len < 0 ? 0 : (size_t)len; return; } - /* + /* * XXX: I assume that the in-margin print won't exceed * PS_BUFSLOP (128 bytes), which is reasonable but still an * assumption that will cause pukeage if it's not the case. @@ -606,7 +686,6 @@ ps_printf(struct termp *p, const char *fmt, ...) p->ps->psmargcur = strlen(p->ps->psmarg); } - static void ps_putchar(struct termp *p, char c) { @@ -615,7 +694,6 @@ ps_putchar(struct termp *p, char c) /* See ps_printf(). */ if ( ! (PS_MARGINS & p->ps->flags)) { - /* LINTED */ putchar(c); p->ps->pdfbytes++; return; @@ -628,7 +706,6 @@ ps_putchar(struct termp *p, char c) p->ps->psmarg[pos] = '\0'; } - static void pdf_obj(struct termp *p, size_t obj) { @@ -637,20 +714,14 @@ 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; ps_printf(p, "%zu 0 obj\n", obj); } - static void ps_closepage(struct termp *p) { @@ -683,7 +754,7 @@ ps_closepage(struct termp *p) pdf_obj(p, base + 2); ps_printf(p, "<<\n/ProcSet [/PDF /Text]\n"); ps_printf(p, "/Font <<\n"); - for (i = 0; i < (int)TERMFONT__MAX; i++) + for (i = 0; i < (int)TERMFONT__MAX; i++) ps_printf(p, "/F%d %d 0 R\n", i, 3 + i); ps_printf(p, ">>\n>>\n"); @@ -704,13 +775,14 @@ ps_closepage(struct termp *p) p->ps->flags |= PS_NEWPAGE; } - -/* ARGSUSED */ static void ps_end(struct termp *p) { size_t i, xref, base; + ps_plast(p); + ps_pclose(p); + /* * At the end of the file, do one last showpage. This is the * same behaviour as groff(1) and works for multiple pages as @@ -728,7 +800,7 @@ ps_end(struct termp *p) ps_printf(p, "%%%%Pages: %zu\n", p->ps->pages); ps_printf(p, "%%%%EOF\n"); return; - } + } pdf_obj(p, 2); ps_printf(p, "<<\n/Type /Pages\n"); @@ -740,11 +812,9 @@ ps_end(struct termp *p) ps_printf(p, "/Kids ["); for (i = 0; i < p->ps->pages; i++) - ps_printf(p, " %zu 0 R", i * 4 + - p->ps->pdfbody + 3); + ps_printf(p, " %zu 0 R", i * 4 + p->ps->pdfbody + 3); - base = (p->ps->pages - 1) * 4 + - p->ps->pdfbody + 4; + base = (p->ps->pages - 1) * 4 + p->ps->pdfbody + 4; ps_printf(p, "]\n>>\nendobj\n"); pdf_obj(p, base); @@ -758,8 +828,8 @@ ps_end(struct termp *p) ps_printf(p, "0000000000 65535 f \n"); for (i = 0; i < base; i++) - ps_printf(p, "%.10zu 00000 n \n", - p->ps->pdfobjs[(int)i]); + ps_printf(p, "%.10zu 00000 n \n", + p->ps->pdfobjs[(int)i]); ps_printf(p, "trailer\n"); ps_printf(p, "<<\n"); @@ -772,14 +842,12 @@ ps_end(struct termp *p) ps_printf(p, "%%%%EOF\n"); } - static void ps_begin(struct termp *p) { - time_t t; int i; - /* + /* * Print margins into margin buffer. Nothing gets output to the * screen yet, so we don't need to initialise the primary state. */ @@ -812,24 +880,21 @@ ps_begin(struct termp *p) assert(p->ps->psmarg); assert('\0' != p->ps->psmarg[0]); - /* + /* * Print header and initialise page state. Following this, * stuff gets printed to the screen, so make sure we're sane. */ - t = time(NULL); - if (TERMTYPE_PS == p->type) { ps_printf(p, "%%!PS-Adobe-3.0\n"); - ps_printf(p, "%%%%CreationDate: %s", ctime(&t)); ps_printf(p, "%%%%DocumentData: Clean7Bit\n"); ps_printf(p, "%%%%Orientation: Portrait\n"); ps_printf(p, "%%%%Pages: (atend)\n"); ps_printf(p, "%%%%PageOrder: Ascend\n"); ps_printf(p, "%%%%DocumentMedia: " - "Default %zu %zu 0 () ()\n", - (size_t)AFM2PNT(p, p->ps->width), - (size_t)AFM2PNT(p, p->ps->height)); + "Default %zu %zu 0 () ()\n", + (size_t)AFM2PNT(p, p->ps->width), + (size_t)AFM2PNT(p, p->ps->height)); ps_printf(p, "%%%%DocumentNeededResources: font"); for (i = 0; i < (int)TERMFONT__MAX; i++) @@ -861,7 +926,6 @@ ps_begin(struct termp *p) ps_setfont(p, TERMFONT_NONE); } - static void ps_pletter(struct termp *p, int c) { @@ -874,25 +938,23 @@ ps_pletter(struct termp *p, int c) if (PS_NEWPAGE & p->ps->flags) { if (TERMTYPE_PS == p->type) { - ps_printf(p, "%%%%Page: %zu %zu\n", - p->ps->pages + 1, - p->ps->pages + 1); - ps_printf(p, "/%s %zu selectfont\n", - fonts[(int)p->ps->lastf].name, - p->ps->scale); + ps_printf(p, "%%%%Page: %zu %zu\n", + p->ps->pages + 1, p->ps->pages + 1); + ps_printf(p, "/%s %zu selectfont\n", + fonts[(int)p->ps->lastf].name, + p->ps->scale); } else { - pdf_obj(p, p->ps->pdfbody + - p->ps->pages * 4); + pdf_obj(p, p->ps->pdfbody + + p->ps->pages * 4); ps_printf(p, "<<\n"); - ps_printf(p, "/Length %zu 0 R\n", - p->ps->pdfbody + 1 + - p->ps->pages * 4); + ps_printf(p, "/Length %zu 0 R\n", + p->ps->pdfbody + 1 + p->ps->pages * 4); ps_printf(p, ">>\nstream\n"); } p->ps->pdflastpg = p->ps->pdfbytes; p->ps->flags &= ~PS_NEWPAGE; } - + /* * If we're not in a PostScript "word" context, then open one * now at the current cursor. @@ -900,16 +962,15 @@ ps_pletter(struct termp *p, int c) if ( ! (PS_INLINE & p->ps->flags)) { if (TERMTYPE_PS != p->type) { - ps_printf(p, "BT\n/F%d %zu Tf\n", - (int)p->ps->lastf, - p->ps->scale); + ps_printf(p, "BT\n/F%d %zu Tf\n", + (int)p->ps->lastf, p->ps->scale); ps_printf(p, "%.3f %.3f Td\n(", - AFM2PNT(p, p->ps->pscol), - AFM2PNT(p, p->ps->psrow)); + AFM2PNT(p, p->ps->pscol), + AFM2PNT(p, p->ps->psrow)); } else - ps_printf(p, "%.3f %.3f moveto\n(", - AFM2PNT(p, p->ps->pscol), - AFM2PNT(p, p->ps->psrow)); + ps_printf(p, "%.3f %.3f moveto\n(", + AFM2PNT(p, p->ps->pscol), + AFM2PNT(p, p->ps->psrow)); p->ps->flags |= PS_INLINE; } @@ -923,11 +984,9 @@ ps_pletter(struct termp *p, int c) */ switch (c) { - case ('('): - /* FALLTHROUGH */ - case (')'): - /* FALLTHROUGH */ - case ('\\'): + case '(': + case ')': + case '\\': ps_putchar(p, '\\'); break; default: @@ -938,23 +997,19 @@ 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; p->ps->pscol += (size_t)fonts[f].gly[c].wx; } - static void ps_pclose(struct termp *p) { - /* + /* * Spit out that we're exiting a word context (this is a * "partial close" because we don't check the last-char buffer * or anything). @@ -962,7 +1017,7 @@ ps_pclose(struct termp *p) if ( ! (PS_INLINE & p->ps->flags)) return; - + if (TERMTYPE_PS != p->type) { ps_printf(p, ") Tj\nET\n"); } else @@ -971,86 +1026,145 @@ ps_pclose(struct termp *p) p->ps->flags &= ~PS_INLINE; } - +/* If we have a `last' char that wasn't printed yet, print it now. */ static void -ps_fclose(struct termp *p) +ps_plast(struct termp *p) { + size_t wx; + if (p->ps->last == '\0') + return; + + /* Check the font mode; open a new scope if it doesn't match. */ + + if (p->ps->nextf != p->ps->lastf) { + ps_pclose(p); + ps_setfont(p, p->ps->nextf); + } + p->ps->nextf = TERMFONT_NONE; + /* - * Strong closure: if we have a last-char, spit it out after - * checking that we're in the right font mode. This will of - * course open a new scope, if applicable. - * - * Following this, close out any scope that's open. + * For an overstrike, if a previous character + * was wider, advance to center the new one. */ - if ('\0' != p->ps->last) { - if (p->ps->lastf != TERMFONT_NONE) { - ps_pclose(p); - ps_setfont(p, TERMFONT_NONE); - } - ps_pletter(p, p->ps->last); - p->ps->last = '\0'; + if (p->ps->pscolnext) { + wx = fonts[p->ps->lastf].gly[(int)p->ps->last-32].wx; + if (p->ps->pscol + wx < p->ps->pscolnext) + p->ps->pscol = (p->ps->pscol + + p->ps->pscolnext - wx) / 2; } - if ( ! (PS_INLINE & p->ps->flags)) - return; + ps_pletter(p, p->ps->last); + p->ps->last = '\0'; - ps_pclose(p); + /* + * For an overstrike, if a previous character + * was wider, advance to the end of the old one. + */ + + if (p->ps->pscol < p->ps->pscolnext) { + ps_pclose(p); + p->ps->pscol = p->ps->pscolnext; + } } - static void ps_letter(struct termp *p, int arg) { - char cc, c; + size_t savecol; + char c; - /* LINTED */ 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 a backspace, merely flag it. + * We don't know yet whether it is + * a font instruction or an overstrike. */ - if ('\0' == p->ps->last) { - assert(8 != c); - p->ps->last = c; + if (c == '\b') { + assert(p->ps->last != '\0'); + assert( ! (p->ps->flags & PS_BACKSP)); + p->ps->flags |= PS_BACKSP; return; - } else if (8 == p->ps->last) { - assert(8 != c); - p->ps->last = '\0'; - } else if (8 == c) { - assert(8 != p->ps->last); - if ('_' == p->ps->last) { - if (p->ps->lastf != TERMFONT_UNDER) { - ps_pclose(p); - ps_setfont(p, TERMFONT_UNDER); + } + + /* + * Decode font instructions. + */ + + if (p->ps->flags & PS_BACKSP) { + if (p->ps->last == '_') { + 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); + p->ps->last = c; + p->ps->flags &= ~PS_BACKSP; + return; } - p->ps->last = c; - return; - } else { - if (p->ps->lastf != TERMFONT_NONE) { - ps_pclose(p); - ps_setfont(p, TERMFONT_NONE); + if (p->ps->last == c) { + 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->flags &= ~PS_BACKSP; + return; } - cc = p->ps->last; - p->ps->last = c; - c = cc; - } - ps_pletter(p, c); -} + /* + * 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. + */ + + ps_plast(p); + + /* + * Do not print the current character yet because font + * instructions might follow; only remember the character. + * It will get printed later from ps_plast(). + */ + + p->ps->last = c; + + /* + * For an overstrike, back up to the previous position. + * If the previous character is wider than any it overstrikes, + * remember the current position, because it might also be + * wider than all that will overstrike it. + */ + + if (savecol != SIZE_MAX) { + if (p->ps->pscolnext < p->ps->pscol) + p->ps->pscolnext = p->ps->pscol; + ps_pclose(p); + p->ps->pscol = savecol; + p->ps->flags &= ~PS_BACKSP; + } else + p->ps->pscolnext = 0; +} + static void ps_advance(struct termp *p, size_t len) { @@ -1062,23 +1176,24 @@ ps_advance(struct termp *p, size_t len) * and readjust our column settings. */ - ps_fclose(p); + ps_plast(p); + ps_pclose(p); p->ps->pscol += len; } - static void ps_endline(struct termp *p) { /* Close out any scopes we have open: we're at eoln. */ - ps_fclose(p); + ps_plast(p); + ps_pclose(p); /* * If we're in the margin, don't try to recalculate our current * row. XXX: if the column tries to be fancy with multiple - * lines, we'll do nasty stuff. + * lines, we'll do nasty stuff. */ if (PS_MARGINS & p->ps->flags) @@ -1098,8 +1213,7 @@ ps_endline(struct termp *p) * showpage and restart our row. */ - if (p->ps->psrow >= p->ps->lineheight + - p->ps->bottom) { + if (p->ps->psrow >= p->ps->lineheight + p->ps->bottom) { p->ps->psrow -= p->ps->lineheight; return; } @@ -1107,14 +1221,13 @@ ps_endline(struct termp *p) ps_closepage(p); } - static void ps_setfont(struct termp *p, enum termfont f) { assert(f < TERMFONT__MAX); p->ps->lastf = f; - + /* * If we're still at the top of the page, let the font-setting * be delayed until we actually have stuff to print. @@ -1124,64 +1237,70 @@ ps_setfont(struct termp *p, enum termfont f) return; if (TERMTYPE_PS == p->type) - ps_printf(p, "/%s %zu selectfont\n", - fonts[(int)f].name, - p->ps->scale); + ps_printf(p, "/%s %zu selectfont\n", + fonts[(int)f].name, p->ps->scale); else - ps_printf(p, "/F%d %zu Tf\n", - (int)f, - p->ps->scale); + ps_printf(p, "/F%d %zu Tf\n", + (int)f, p->ps->scale); } - -/* ARGSUSED */ static size_t 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); + return (size_t)fonts[(int)TERMFONT_NONE].gly[c].wx; } - -static double +static int ps_hspan(const struct termp *p, const struct roffsu *su) { double r; - + /* * All of these measurements are derived by converting from the * native measurement to AFM units. */ - switch (su->unit) { - case (SCALE_CM): - r = PNT2AFM(p, su->scale * 28.34); + 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_IN): - r = PNT2AFM(p, su->scale * 72); + case SCALE_CM: + r = PNT2AFM(p, su->scale * 72.0 / 2.54); break; - case (SCALE_PC): - r = PNT2AFM(p, su->scale * 12); + case SCALE_EM: + r = su->scale * + fonts[(int)TERMFONT_NONE].gly[109 - 32].wx; break; - case (SCALE_PT): - r = PNT2AFM(p, su->scale * 100); - break; - case (SCALE_EM): + case SCALE_EN: r = su->scale * - fonts[(int)TERMFONT_NONE].gly[109 - 32].wx; + fonts[(int)TERMFONT_NONE].gly[110 - 32].wx; break; - case (SCALE_MM): - r = PNT2AFM(p, su->scale * 2.834); + case SCALE_IN: + r = PNT2AFM(p, su->scale * 72.0); break; - case (SCALE_EN): + case SCALE_MM: r = su->scale * - fonts[(int)TERMFONT_NONE].gly[110 - 32].wx; + fonts[(int)TERMFONT_NONE].gly[109 - 32].wx / 100.0; break; - case (SCALE_VS): + 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; default: @@ -1189,7 +1308,7 @@ ps_hspan(const struct termp *p, const struct roffsu *s break; } - return(r); + return r * 24.0; } static void @@ -1202,8 +1321,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); } -