Initial PDF shim over PS. This produces working PDF output with -Tpdf.

[mandoc.git] / term_ps.c

diff --git a/term_ps.c b/term_ps.c
index c3515e623f37ff74619e6dbb7f02919e90eecb61..62847ac89d1049f8b1474f507ed169c9bf9c322f 100644 (file)
--- a/term_ps.c
+++ b/term_ps.c
@@ -1,6 +1,6 @@
-/*     $Id: term_ps.c,v 1.29 2010/07/04 19:42:25 kristaps Exp $ */
+/*     $Id: term_ps.c,v 1.37 2010/07/25 11:44:31 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -33,21 +33,16 @@
 #include "main.h"
 #include "term.h"
 
 #include "main.h"
 #include "term.h"
 

-#define        MINMARGIN_MM    20      /* Minimum 2cm margins. */
-#define        MINMARGIN_PNT   56.68
-#define        DEFPAGEX_MM     216     /* Default page size is US-letter. */
-#define        DEFPAGEY_MM     279
-

 /* Convert PostScript point "x" to an AFM unit. */
 #define        PNT2AFM(p, x) /* LINTED */ \
        (size_t)((double)(x) * (1000.0 / (double)(p)->engine.ps.scale))
 
 /* Convert an AFM unit "x" to a PostScript points */
 #define        AFM2PNT(p, x) /* LINTED */ \
 /* Convert PostScript point "x" to an AFM unit. */
 #define        PNT2AFM(p, x) /* LINTED */ \
        (size_t)((double)(x) * (1000.0 / (double)(p)->engine.ps.scale))
 
 /* Convert an AFM unit "x" to a PostScript points */
 #define        AFM2PNT(p, x) /* LINTED */ \

-       (size_t)((double)(x) / (1000.0 / (double)(p)->engine.ps.scale))
+       ((double)(x) / (1000.0 / (double)(p)->engine.ps.scale))

 
 struct glyph {
 
 struct glyph {

-       size_t            wx; /* WX in AFM */
+       unsigned short    wx; /* WX in AFM */

 };
 
 struct font {
 };
 
 struct font {


@@ -378,6 +373,7 @@ static      double            ps_hspan(const struct termp *,
 static size_t            ps_width(const struct termp *, char);
 static void              ps_advance(struct termp *, size_t);
 static void              ps_begin(struct termp *);
 static size_t            ps_width(const struct termp *, char);
 static void              ps_advance(struct termp *, size_t);
 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_end(struct termp *);
 static void              ps_endline(struct termp *);
 static void              ps_fclose(struct termp *);


@@ -387,10 +383,37 @@ static    void              ps_pletter(struct termp *, int);
 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_printf(struct termp *, const char *, ...);
 static void              ps_putchar(struct termp *, char);
 static void              ps_setfont(struct termp *, enum termfont);

+static struct termp     *pspdf_alloc(char *);
+
+
+void *
+pdf_alloc(char *outopts)
+{
+       struct termp    *p;
+
+       if (NULL == (p = pspdf_alloc(outopts)))
+               return(p);
+
+       p->type = TERMTYPE_PDF;
+       return(p);
+}

 
 
 void *
 ps_alloc(char *outopts)
 
 
 void *
 ps_alloc(char *outopts)

+{
+       struct termp    *p;
+
+       if (NULL == (p = pspdf_alloc(outopts)))
+               return(p);
+
+       p->type = TERMTYPE_PS;
+       return(p);
+}
+
+
+static struct termp *
+pspdf_alloc(char *outopts)

 {
        struct termp    *p;
        size_t           pagex, pagey, marginx, marginy, lineheight;
 {
        struct termp    *p;
        size_t           pagex, pagey, marginx, marginy, lineheight;


@@ -407,7 +430,6 @@ ps_alloc(char *outopts)
        p->endline = ps_endline;
        p->hspan = ps_hspan;
        p->letter = ps_letter;
        p->endline = ps_endline;
        p->hspan = ps_hspan;
        p->letter = ps_letter;

-       p->type = TERMTYPE_PS;

        p->width = ps_width;
        
        toks[0] = "paper";
        p->width = ps_width;
        
        toks[0] = "paper";


@@ -426,8 +448,8 @@ ps_alloc(char *outopts)
 
        /* Default to US letter (millimetres). */
 
 
        /* Default to US letter (millimetres). */
 

-       pagex = DEFPAGEX_MM;
-       pagey = DEFPAGEY_MM;
+       pagex = 216;
+       pagey = 279;

 
        /*
         * The ISO-269 paper sizes can be calculated automatically, but
 
        /*
         * The ISO-269 paper sizes can be calculated automatically, but


@@ -454,16 +476,6 @@ ps_alloc(char *outopts)
        } else if (NULL == pp)
                pp = "letter";
 
        } else if (NULL == pp)
                pp = "letter";
 

-       /* Enforce minimum page size >= (2 times) min-margin. */
-
-       if ((2 * MINMARGIN_MM) >= pagex) {
-               fprintf(stderr, "%s: Insufficient page width\n", pp);
-               pagex = DEFPAGEX_MM;
-       } else if ((2 * MINMARGIN_MM >= pagey)) {
-               fprintf(stderr, "%s: Insufficient page length\n", pp);
-               pagey = DEFPAGEY_MM;
-       }
-

        /* 
         * This MUST be defined before any PNT2AFM or AFM2PNT
         * calculations occur.
        /* 
         * This MUST be defined before any PNT2AFM or AFM2PNT
         * calculations occur.


@@ -483,7 +495,9 @@ ps_alloc(char *outopts)
        marginy = /* LINTED */
                (size_t)((double)pagey / 9.0);
 
        marginy = /* LINTED */
                (size_t)((double)pagey / 9.0);
 

-       lineheight = PNT2AFM(p, 16);
+       /* Line-height is 1.4em. */
+
+       lineheight = PNT2AFM(p, ((double)p->engine.ps.scale * 1.4));

 
        p->engine.ps.width = pagex;
        p->engine.ps.height = pagey;
 
        p->engine.ps.width = pagex;
        p->engine.ps.height = pagey;


@@ -500,7 +514,7 @@ ps_alloc(char *outopts)
 
 
 void
 
 
 void

-ps_free(void *arg)
+pspdf_free(void *arg)

 {
        struct termp    *p;
 
 {
        struct termp    *p;
 


@@ -517,7 +531,7 @@ static void
 ps_printf(struct termp *p, const char *fmt, ...)
 {
        va_list          ap;
 ps_printf(struct termp *p, const char *fmt, ...)
 {
        va_list          ap;

-       int              pos;
+       int              pos, len;

 
        va_start(ap, fmt);
 
 
        va_start(ap, fmt);
 


@@ -528,8 +542,10 @@ ps_printf(struct termp *p, const char *fmt, ...)
         */
 
        if ( ! (PS_MARGINS & p->engine.ps.flags)) {
         */
 
        if ( ! (PS_MARGINS & p->engine.ps.flags)) {

-               vprintf(fmt, ap);
+               len = vprintf(fmt, ap);

                va_end(ap);
                va_end(ap);

+               p->engine.ps.pdfbytes += /* LINTED */
+                       len < 0 ? 0 : (size_t)len;

                return;
        }
 
                return;
        }
 


@@ -542,10 +558,13 @@ ps_printf(struct termp *p, const char *fmt, ...)
        PS_GROWBUF(p, PS_BUFSLOP);
 
        pos = (int)p->engine.ps.psmargcur;
        PS_GROWBUF(p, PS_BUFSLOP);
 
        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);
+       len = vsnprintf(&p->engine.ps.psmarg[pos], PS_BUFSLOP, fmt, ap);

 
        va_end(ap);
 
        va_end(ap);

+
+       p->engine.ps.psmargcur = strlen(p->engine.ps.psmarg);
+       p->engine.ps.pdfbytes += /* LINTED */
+               len < 0 ? 0 : (size_t)len;

 }
 
 
 }
 
 


@@ -558,6 +577,7 @@ ps_putchar(struct termp *p, char c)
 
        if ( ! (PS_MARGINS & p->engine.ps.flags)) {
                putchar(c);
 
        if ( ! (PS_MARGINS & p->engine.ps.flags)) {
                putchar(c);

+               p->engine.ps.pdfbytes++;

                return;
        }
 
                return;
        }
 


@@ -569,10 +589,65 @@ ps_putchar(struct termp *p, char c)
 }
 
 
 }
 
 

+static void
+ps_closepage(struct termp *p)
+{
+       int              i;
+       size_t           len;
+
+       assert(p->engine.ps.psmarg && p->engine.ps.psmarg[0]);
+       ps_printf(p, "%s", p->engine.ps.psmarg);
+
+       if (TERMTYPE_PS == p->type) {
+               ps_printf(p, "showpage\n");
+       } else {
+               ps_printf(p, "ET\n");
+               len = p->engine.ps.pdfbytes - p->engine.ps.pdflastpg;
+               ps_printf(p, "endstream\n");
+               ps_printf(p, "endobj\n");
+               ps_printf(p, "%zu 0 obj\n", 
+                               p->engine.ps.pdfbody +
+                               (p->engine.ps.pages + 1) * 4 + 1);
+               ps_printf(p, "%zu\n", len);
+               ps_printf(p, "endobj\n");
+               ps_printf(p, "%zu 0 obj\n", 
+                               p->engine.ps.pdfbody +
+                               (p->engine.ps.pages + 1) * 4 + 2);
+               ps_printf(p, "<<\n");
+               ps_printf(p, "/ProcSet [/PDF /Text]\n");
+               ps_printf(p, "/Font <<\n");
+               for (i = 0; i < (int)TERMFONT__MAX; i++) 
+                       ps_printf(p, "/F%d %d 0 R\n", i, 3 + i);
+               ps_printf(p, ">>\n");
+               ps_printf(p, ">>\n");
+               ps_printf(p, "%zu 0 obj\n", 
+                               p->engine.ps.pdfbody +
+                               (p->engine.ps.pages + 1) * 4 + 3);
+               ps_printf(p, "<<\n");
+               ps_printf(p, "/Type /Page\n");
+               ps_printf(p, "/Parent 2 0 R\n");
+               ps_printf(p, "/Resources %zu 0 R\n",
+                               p->engine.ps.pdfbody +
+                               (p->engine.ps.pages + 1) * 4 + 2);
+               ps_printf(p, "/Contents %zu 0 R\n",
+                               p->engine.ps.pdfbody +
+                               (p->engine.ps.pages + 1) * 4);
+               ps_printf(p, ">>\n");
+               ps_printf(p, "endobj\n");
+       }
+
+       p->engine.ps.pages++;
+       p->engine.ps.psrow = p->engine.ps.top;
+       assert( ! (PS_NEWPAGE & p->engine.ps.flags));
+       p->engine.ps.flags |= PS_NEWPAGE;
+}
+
+

 /* ARGSUSED */
 static void
 ps_end(struct termp *p)
 {
 /* ARGSUSED */
 static void
 ps_end(struct termp *p)
 {

+       size_t           i, xref;

 
        /*
         * At the end of the file, do one last showpage.  This is the
 
        /*
         * At the end of the file, do one last showpage.  This is the


@@ -580,16 +655,62 @@ ps_end(struct termp *p)
         * well as just one.
         */
 
         * well as just one.
         */
 

-       assert(0 == p->engine.ps.flags);
-       assert('\0' == p->engine.ps.last);
-       assert(p->engine.ps.psmarg && p->engine.ps.psmarg[0]);
-       printf("%s", p->engine.ps.psmarg);
-       p->engine.ps.pages++;
-       printf("showpage\n");
+       if ( ! (PS_NEWPAGE & p->engine.ps.flags)) {
+               assert(0 == p->engine.ps.flags);
+               assert('\0' == p->engine.ps.last);
+               ps_closepage(p);
+       }

 
 

-       printf("%%%%Trailer\n");
-       printf("%%%%Pages: %zu\n", p->engine.ps.pages);
-       printf("%%%%EOF\n");
+       if (TERMTYPE_PS == p->type) {
+               ps_printf(p, "%%%%Trailer\n");
+               ps_printf(p, "%%%%Pages: %zu\n", p->engine.ps.pages);
+               ps_printf(p, "%%%%EOF\n");
+               return;
+       } 
+
+       ps_printf(p, "2 0 obj\n");
+       ps_printf(p, "<<\n");
+       ps_printf(p, "/Type /Pages\n");
+       ps_printf(p, "/MediaBox [0 0 %zu %zu]\n",
+                       (size_t)AFM2PNT(p, p->engine.ps.width),
+                       (size_t)AFM2PNT(p, p->engine.ps.height));
+
+       ps_printf(p, "/Count %zu\n", p->engine.ps.pages);
+       ps_printf(p, "/Kids [");
+
+       for (i = 0; i < p->engine.ps.pages; i++)
+               ps_printf(p, " %zu 0 R", 
+                               p->engine.ps.pdfbody +
+                               (i + 1) * 4 + 3);
+       ps_printf(p, "]\n");
+       ps_printf(p, ">>\n");
+       ps_printf(p, "endobj\n");
+       ps_printf(p, "%zu 0 obj\n",
+                       p->engine.ps.pdfbody +
+                       (p->engine.ps.pages * 4) + 4);
+       ps_printf(p, "<<\n");
+       ps_printf(p, "/Type /Catalog\n");
+       ps_printf(p, "/Pages 2 0 R\n");
+       ps_printf(p, ">>\n");
+       xref = p->engine.ps.pdfbytes;
+       ps_printf(p, "xref\n");
+       ps_printf(p, "0 %zu\n",
+                       p->engine.ps.pdfbody +
+                       (p->engine.ps.pages * 4) + 5);
+       ps_printf(p, "0000000000 65535 f\n");
+       ps_printf(p, "trailer\n");
+       ps_printf(p, "<<\n");
+       ps_printf(p, "/Size %zu\n", 
+                       p->engine.ps.pdfbody +
+                       (p->engine.ps.pages * 4) + 5);
+       ps_printf(p, "/Root %zu 0 R\n", 
+                       p->engine.ps.pdfbody +
+                       (p->engine.ps.pages * 4) + 4);
+       ps_printf(p, "/Info 1 0 R\n");
+       ps_printf(p, ">>\n");
+       ps_printf(p, "startxref\n");
+       ps_printf(p, "%zu\n", xref);
+       ps_printf(p, "%%%%EOF\n");

 }
 
 
 }
 
 


@@ -609,6 +730,7 @@ ps_begin(struct termp *p)
                p->engine.ps.psmarg[0] = '\0';
        }
 
                p->engine.ps.psmarg[0] = '\0';
        }
 

+       p->engine.ps.pdfbytes = 0;

        p->engine.ps.psmargcur = 0;
        p->engine.ps.flags = PS_MARGINS;
        p->engine.ps.pscol = p->engine.ps.left;
        p->engine.ps.psmargcur = 0;
        p->engine.ps.flags = PS_MARGINS;
        p->engine.ps.pscol = p->engine.ps.left;


@@ -638,29 +760,48 @@ ps_begin(struct termp *p)
 
        t = time(NULL);
 
 
        t = time(NULL);
 

-       printf("%%!PS-Adobe-3.0\n");
-       printf("%%%%Creator: mandoc-%s\n", VERSION);
-       printf("%%%%CreationDate: %s", ctime(&t));
-       printf("%%%%DocumentData: Clean7Bit\n");
-       printf("%%%%Orientation: Portrait\n");
-       printf("%%%%Pages: (atend)\n");
-       printf("%%%%PageOrder: Ascend\n");
-       printf("%%%%DocumentMedia: Default %zu %zu 0 () ()\n",
-                       AFM2PNT(p, p->engine.ps.width),
-                       AFM2PNT(p, p->engine.ps.height));
-       printf("%%%%DocumentNeededResources: font");
-       for (i = 0; i < (int)TERMFONT__MAX; i++)
-               printf(" %s", fonts[i].name);
-       printf("\n%%%%EndComments\n");
-
-       printf("%%%%Page: %zu %zu\n", 
-                       p->engine.ps.pages + 1, 
-                       p->engine.ps.pages + 1);
+       if (TERMTYPE_PS == p->type) {
+               ps_printf(p, "%%!PS-Adobe-3.0\n");
+               ps_printf(p, "%%%%Creator: mandoc-%s\n", VERSION);
+               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->engine.ps.width),
+                               (size_t)AFM2PNT(p, p->engine.ps.height));
+               ps_printf(p, "%%%%DocumentNeededResources: font");
+
+               for (i = 0; i < (int)TERMFONT__MAX; i++)
+                       ps_printf(p, " %s", fonts[i].name);
+
+               ps_printf(p, "\n%%%%EndComments\n");
+       } else {
+               ps_printf(p, "%%PDF-1.1\n");
+               ps_printf(p, "1 0 obj\n");
+               ps_printf(p, "<<\n");
+               ps_printf(p, "/Creator mandoc-%s\n", VERSION);
+               ps_printf(p, ">>\n");
+               ps_printf(p, "endobj\n");
+
+               for (i = 0; i < (int)TERMFONT__MAX; i++) {
+                       ps_printf(p, "%d 0 obj\n", i + 3);
+                       ps_printf(p, "<<\n");
+                       ps_printf(p, "/Type /Font\n");
+                       ps_printf(p, "/Subtype /Type1\n");
+                       ps_printf(p, "/Name /F%zu\n", i);
+                       ps_printf(p, "/BaseFont /%s\n", fonts[i].name);
+                       ps_printf(p, ">>\n");
+               }
+       }

 
 

-       ps_setfont(p, TERMFONT_NONE);
+       p->engine.ps.pdfbody = (size_t)TERMFONT__MAX + 3;

        p->engine.ps.pscol = p->engine.ps.left;
        p->engine.ps.psrow = p->engine.ps.top;
        p->engine.ps.flags |= PS_NEWPAGE;
        p->engine.ps.pscol = p->engine.ps.left;
        p->engine.ps.psrow = p->engine.ps.top;
        p->engine.ps.flags |= PS_NEWPAGE;

+       ps_setfont(p, TERMFONT_NONE);

 }
 
 
 }
 
 


@@ -668,6 +809,33 @@ static void
 ps_pletter(struct termp *p, int c)
 {
        int              f;
 ps_pletter(struct termp *p, int c)
 {
        int              f;

+
+       /*
+        * If we haven't opened a page context, then output that we're
+        * in a new page and make sure the font is correctly set.
+        */
+
+       if (PS_NEWPAGE & p->engine.ps.flags) {
+               if (TERMTYPE_PS == p->type) {
+                       ps_printf(p, "%%%%Page: %zu %zu\n", 
+                                       p->engine.ps.pages + 1, 
+                                       p->engine.ps.pages + 1);
+                       ps_printf(p, "/%s %zu selectfont\n", 
+                                       fonts[(int)p->engine.ps.lastf].name, 
+                                       p->engine.ps.scale);
+               } else {
+                       ps_printf(p, "%zu 0 obj\n", 
+                                       p->engine.ps.pdfbody +
+                                       (p->engine.ps.pages + 1) * 4);
+                       ps_printf(p, "<<\n");
+                       ps_printf(p, "/Length %zu 0 R\n", 
+                                       p->engine.ps.pdfbody +
+                                       (p->engine.ps.pages + 1) * 4 + 1);
+                       ps_printf(p, ">>\nstream\n");
+               }
+               p->engine.ps.pdflastpg = p->engine.ps.pdfbytes;
+               p->engine.ps.flags &= ~PS_NEWPAGE;
+       }

        
        /*
         * If we're not in a PostScript "word" context, then open one
        
        /*
         * If we're not in a PostScript "word" context, then open one


@@ -675,11 +843,18 @@ ps_pletter(struct termp *p, int c)
         */
 
        if ( ! (PS_INLINE & p->engine.ps.flags)) {
         */
 
        if ( ! (PS_INLINE & p->engine.ps.flags)) {

-               ps_printf(p, "%zu %zu moveto\n(", 
-                               AFM2PNT(p, p->engine.ps.pscol),
-                               AFM2PNT(p, p->engine.ps.psrow));
+               if (TERMTYPE_PS != p->type) {
+                       ps_printf(p, "BT\n/F%d %zu Tf\n", 
+                                       (int)p->engine.ps.lastf,
+                                       p->engine.ps.scale);
+                       ps_printf(p, "%.3f %.3f Td\n(",
+                                       AFM2PNT(p, p->engine.ps.pscol),
+                                       AFM2PNT(p, p->engine.ps.psrow));
+               } else
+                       ps_printf(p, "%.3f %.3f moveto\n(", 
+                                       AFM2PNT(p, p->engine.ps.pscol),
+                                       AFM2PNT(p, p->engine.ps.psrow));

                p->engine.ps.flags |= PS_INLINE;
                p->engine.ps.flags |= PS_INLINE;

-               p->engine.ps.flags &= ~PS_NEWPAGE;

        }
 
        assert( ! (PS_NEWPAGE & p->engine.ps.flags));
        }
 
        assert( ! (PS_NEWPAGE & p->engine.ps.flags));


@@ -709,13 +884,13 @@ ps_pletter(struct termp *p, int c)
 
        if (c <= 32 || (c - 32 > MAXCHAR)) {
                ps_putchar(p, ' ');
 
        if (c <= 32 || (c - 32 > MAXCHAR)) {
                ps_putchar(p, ' ');

-               p->engine.ps.pscol += fonts[f].gly[0].wx;
+               p->engine.ps.pscol += (size_t)fonts[f].gly[0].wx;

                return;
        } 
 
        ps_putchar(p, (char)c);
        c -= 32;
                return;
        } 
 
        ps_putchar(p, (char)c);
        c -= 32;

-       p->engine.ps.pscol += fonts[f].gly[c].wx;
+       p->engine.ps.pscol += (size_t)fonts[f].gly[c].wx;

 }
 
 
 }
 
 


@@ -732,7 +907,11 @@ ps_pclose(struct termp *p)
        if ( ! (PS_INLINE & p->engine.ps.flags))
                return;
        
        if ( ! (PS_INLINE & p->engine.ps.flags))
                return;
        

-       ps_printf(p, ") show\n");
+       if (TERMTYPE_PS != p->type) {
+               ps_printf(p, ") Tj\nET\n");
+       } else
+               ps_printf(p, ") show\n");
+

        p->engine.ps.flags &= ~PS_INLINE;
 }
 
        p->engine.ps.flags &= ~PS_INLINE;
 }
 


@@ -866,16 +1045,7 @@ ps_endline(struct termp *p)
                return;
        }
 
                return;
        }
 

-       assert(p->engine.ps.psmarg && p->engine.ps.psmarg[0]);
-       printf("%s", p->engine.ps.psmarg);
-       printf("showpage\n");
-       p->engine.ps.pages++;
-       printf("%%%%Page: %zu %zu\n", 
-                       p->engine.ps.pages + 1, 
-                       p->engine.ps.pages + 1);
-       p->engine.ps.psrow = p->engine.ps.top;
-       assert( ! (PS_NEWPAGE & p->engine.ps.flags));
-       p->engine.ps.flags |= PS_NEWPAGE;
+       ps_closepage(p);

 }
 
 
 }
 
 


@@ -884,9 +1054,24 @@ ps_setfont(struct termp *p, enum termfont f)
 {
 
        assert(f < TERMFONT__MAX);
 {
 
        assert(f < TERMFONT__MAX);

-       ps_printf(p, "/%s %zu selectfont\n", 
-                       fonts[(int)f].name, p->engine.ps.scale);

        p->engine.ps.lastf = f;
        p->engine.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.
+        */
+
+       if (PS_NEWPAGE & p->engine.ps.flags)
+               return;
+
+       if (TERMTYPE_PS == p->type)
+               ps_printf(p, "/%s %zu selectfont\n", 
+                               fonts[(int)f].name, 
+                               p->engine.ps.scale);
+       else
+               ps_printf(p, "/F%d %zu Tf\n", 
+                               (int)f, 
+                               p->engine.ps.scale);

 }
 
 
 }
 
 


@@ -896,10 +1081,10 @@ ps_width(const struct termp *p, char c)
 {
 
        if (c <= 32 || c - 32 >= MAXCHAR)
 {
 
        if (c <= 32 || c - 32 >= MAXCHAR)

-               return(fonts[(int)TERMFONT_NONE].gly[0].wx);
+               return((size_t)fonts[(int)TERMFONT_NONE].gly[0].wx);

 
        c -= 32;
 
        c -= 32;

-       return(fonts[(int)TERMFONT_NONE].gly[(int)c].wx);
+       return((size_t)fonts[(int)TERMFONT_NONE].gly[(int)c].wx);

 }
 
 
 }
 
 


@@ -927,14 +1112,14 @@ ps_hspan(const struct termp *p, const struct roffsu *su)
                r = PNT2AFM(p, su->scale * 100);
                break;
        case (SCALE_EM):
                r = PNT2AFM(p, su->scale * 100);
                break;
        case (SCALE_EM):

-               r = su->scale * 
+               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):
                        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 * 
+               r = su->scale *

                        fonts[(int)TERMFONT_NONE].gly[110 - 32].wx;
                break;
        case (SCALE_VS):
                        fonts[(int)TERMFONT_NONE].gly[110 - 32].wx;
                break;
        case (SCALE_VS):