.Bl -column phrases ignore spacing rules for trailing punctuation

[mandoc.git] / term_ps.c

diff --git a/term_ps.c b/term_ps.c
index d4eaa9ba4cbd2b8fc059164d618935d53a7ffd51..e1ce97e5ec2420cefef832c0b04e541650f72f4b 100644 (file)
--- a/term_ps.c
+++ b/term_ps.c
@@ -1,6 +1,6 @@
-/*     $Id: term_ps.c,v 1.12 2010/06/25 19:50:23 kristaps Exp $ */
+/*     $Id: term_ps.c,v 1.42 2010/08/20 01:02:07 schwarze 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


@@ -22,76 +22,506 @@
 
 #include <assert.h>
 #include <stdarg.h>
 
 #include <assert.h>
 #include <stdarg.h>

+#include <stdint.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+#include <time.h>
+#include <unistd.h>

 
 

+#include "mandoc.h"

 #include "out.h"
 #include "main.h"
 #include "term.h"
 
 #include "out.h"
 #include "main.h"
 #include "term.h"
 

-#define        PS_CHAR_WIDTH     6
-#define        PS_CHAR_HEIGHT    12
-#define        PS_CHAR_TOPMARG  (792 - 24)
-#define        PS_CHAR_TOP      (PS_CHAR_TOPMARG - 36)
-#define        PS_CHAR_LEFT      36
-#define        PS_CHAR_BOTMARG   24
-#define        PS_CHAR_BOT      (PS_CHAR_BOTMARG + 36)
+/* 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 */ \
+       ((double)(x) / (1000.0 / (double)(p)->engine.ps.scale))
+
+struct glyph {
+       unsigned short    wx; /* WX in AFM */
+};
+
+struct font {
+       const char       *name; /* FontName in AFM */
+#define        MAXCHAR           95 /* total characters we can handle */
+       struct glyph      gly[MAXCHAR]; /* glyph metrics */
+};
+
+/*
+ * We define, for the time being, three fonts: bold, oblique/italic, and
+ * normal (roman).  The following table hard-codes the font metrics for
+ * ASCII, i.e., 32--127.
+ */
+
+static const struct font fonts[TERMFONT__MAX] = {
+       { "Times-Roman", {
+               { 250 },
+               { 333 },
+               { 408 },
+               { 500 },
+               { 500 },
+               { 833 },
+               { 778 },
+               { 333 },
+               { 333 },
+               { 333 },
+               { 500 },
+               { 564 },
+               { 250 },
+               { 333 },
+               { 250 },
+               { 278 },
+               { 500 },
+               { 500 },
+               { 500 },
+               { 500 },
+               { 500 },
+               { 500 },
+               { 500 },
+               { 500 },
+               { 500 },
+               { 500 },
+               { 278 },
+               { 278 },
+               { 564 },
+               { 564 },
+               { 564 },
+               { 444 },
+               { 921 },
+               { 722 },
+               { 667 },
+               { 667 },
+               { 722 },
+               { 611 },
+               { 556 },
+               { 722 },
+               { 722 },
+               { 333 },
+               { 389 },
+               { 722 },
+               { 611 },
+               { 889 },
+               { 722 },
+               { 722 },
+               { 556 },
+               { 722 },
+               { 667 },
+               { 556 },
+               { 611 },
+               { 722 },
+               { 722 },
+               { 944 },
+               { 722 },
+               { 722 },
+               { 611 },
+               { 333 },
+               { 278 },
+               { 333 },
+               { 469 },
+               { 500 },
+               { 333 },
+               { 444 },
+               { 500 },
+               { 444 },
+               {  500},
+               {  444},
+               {  333},
+               {  500},
+               {  500},
+               {  278},
+               {  278},
+               {  500},
+               {  278},
+               {  778},
+               {  500},
+               {  500},
+               {  500},
+               {  500},
+               {  333},
+               {  389},
+               {  278},
+               {  500},
+               {  500},
+               {  722},
+               {  500},
+               {  500},
+               {  444},
+               {  480},
+               {  200},
+               {  480},
+               {  541},
+       } },
+       { "Times-Bold", {
+               { 250  },
+               { 333  },
+               { 555  },
+               { 500  },
+               { 500  },
+               { 1000 },
+               { 833  },
+               { 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  },
+               { 930  },
+               { 722  },
+               { 667  },
+               { 722  },
+               { 722  },
+               { 667  },
+               { 611  },
+               { 778  },
+               { 778  },
+               { 389  },
+               { 500  },
+               { 778  },
+               { 667  },
+               { 944  },
+               { 722  },
+               { 778  },
+               { 611  },
+               { 778  },
+               { 722  },
+               { 556  },
+               { 667  },
+               { 722  },
+               { 722  },
+               { 1000 },
+               { 722  },
+               { 722  },
+               { 667  },
+               { 333  },
+               { 278  },
+               { 333  },
+               { 581  },
+               { 500  },
+               { 333  },
+               { 500  },
+               { 556  },
+               { 444  },
+               {  556 },
+               {  444 },
+               {  333 },
+               {  500 },
+               {  556 },
+               {  278 },
+               {  333 },
+               {  556 },
+               {  278 },
+               {  833 },
+               {  556 },
+               {  500 },
+               {  556 },
+               {  556 },
+               {  444 },
+               {  389 },
+               {  333 },
+               {  556 },
+               {  500 },
+               {  722 },
+               {  500 },
+               {  500 },
+               {  444 },
+               {  394 },
+               {  220 },
+               {  394 },
+               {  520 },
+       } },
+       { "Times-Italic", {
+               { 250  },
+               { 333  },
+               { 420  },
+               { 500  },
+               { 500  },
+               { 833  },
+               { 778  },
+               { 333  },
+               { 333  },
+               { 333  },
+               { 500  },
+               { 675  },
+               { 250  },
+               { 333  },
+               { 250  },
+               { 278  },
+               { 500  },
+               { 500  },
+               { 500  },
+               { 500  },
+               { 500  },
+               { 500  },
+               { 500  },
+               { 500  },
+               { 500  },
+               { 500  },
+               { 333  },
+               { 333  },
+               { 675  },
+               { 675  },
+               { 675  },
+               { 500  },
+               { 920  },
+               { 611  },
+               { 611  },
+               { 667  },
+               { 722  },
+               { 611  },
+               { 611  },
+               { 722  },
+               { 722  },
+               { 333  },
+               { 444  },
+               { 667  },
+               { 556  },
+               { 833  },
+               { 667  },
+               { 722  },
+               { 611  },
+               { 722  },
+               { 611  },
+               { 500  },
+               { 556  },
+               { 722  },
+               { 611  },
+               { 833  },
+               { 611  },
+               { 556  },
+               { 556  },
+               { 389  },
+               { 278  },
+               { 389  },
+               { 422  },
+               { 500  },
+               { 333  },
+               { 500  },
+               { 500  },
+               { 444  },
+               {  500 },
+               {  444 },
+               {  278 },
+               {  500 },
+               {  500 },
+               {  278 },
+               {  278 },
+               {  444 },
+               {  278 },
+               {  722 },
+               {  500 },
+               {  500 },
+               {  500 },
+               {  500 },
+               {  389 },
+               {  389 },
+               {  278 },
+               {  500 },
+               {  444 },
+               {  667 },
+               {  444 },
+               {  444 },
+               {  389 },
+               {  400 },
+               {  275 },
+               {  400 },
+               {  541 },
+       } },
+};
+
+/* These work the buffer used by the header and footer. */

 #define        PS_BUFSLOP        128
 #define        PS_BUFSLOP        128

-#define        PS_GROWBUF(p, sz) \
-       do if ((p)->engine.ps.psmargcur + (sz) > \
-                       (p)->engine.ps.psmargsz) { \
-               (p)->engine.ps.psmargsz += /* CONSTCOND */ \
-                       MAX(PS_BUFSLOP, (sz)); \
-               (p)->engine.ps.psmarg = realloc \
-                       ((p)->engine.ps.psmarg,  \
-                        (p)->engine.ps.psmargsz); \
-               if (NULL == (p)->engine.ps.psmarg) { \
-                       perror(NULL); \
-                       exit(EXIT_FAILURE); \
-               } \
-       } while (/* CONSTCOND */ 0)

 
 

+static void
+ps_growbuf(struct termp *p, size_t sz)
+{
+       if (p->engine.ps.psmargcur + sz <= p->engine.ps.psmargsz)
+               return;
+
+       if (sz < PS_BUFSLOP)
+               sz = PS_BUFSLOP;

 
 

-static void              ps_letter(struct termp *, char);
+       p->engine.ps.psmargsz += sz;
+
+       p->engine.ps.psmarg = realloc
+               (p->engine.ps.psmarg,
+                p->engine.ps.psmargsz);
+       
+       if (NULL == p->engine.ps.psmarg) {
+               perror(NULL);
+               exit(MANDOCLEVEL_SYSERR);
+       }
+}
+
+static double            ps_hspan(const struct termp *,
+                               const struct roffsu *);
+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_begin(struct termp *);

+static void              ps_closepage(struct termp *);

 static void              ps_end(struct termp *);
 static void              ps_end(struct termp *);

-static void              ps_advance(struct termp *, size_t);

 static void              ps_endline(struct termp *);
 static void              ps_fclose(struct termp *);
 static void              ps_endline(struct termp *);
 static void              ps_fclose(struct termp *);

-static size_t            ps_width(const struct termp *, char);
+static void              ps_letter(struct termp *, char);

 static void              ps_pclose(struct termp *);
 static void              ps_pclose(struct termp *);

-static void              ps_pletter(struct termp *, char);
+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 *);
+static void              pdf_obj(struct termp *, size_t);
+
+
+void *
+pdf_alloc(char *outopts)
+{
+       struct termp    *p;
+
+       if (NULL != (p = pspdf_alloc(outopts)))
+               p->type = TERMTYPE_PDF;
+
+       return(p);
+}

 
 
 void *
 
 
 void *

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

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

+       size_t           pagex, pagey, marginx, marginy, lineheight;
+       const char      *toks[2];
+       const char      *pp;
+       char            *v;

 
        if (NULL == (p = term_alloc(TERMENC_ASCII)))
                return(NULL);
 
 
        if (NULL == (p = term_alloc(TERMENC_ASCII)))
                return(NULL);
 

-       p->defrmargin = 78;
-       p->tabwidth = 5;
-
-       p->type = TERMTYPE_PS;
-       p->letter = ps_letter;
+       p->advance = ps_advance;

        p->begin = ps_begin;
        p->end = ps_end;
        p->begin = ps_begin;
        p->end = ps_end;

-       p->advance = ps_advance;

        p->endline = ps_endline;
        p->endline = ps_endline;

+       p->hspan = ps_hspan;
+       p->letter = ps_letter;

        p->width = ps_width;
        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;
+       pagey = 279;
+
+       /*
+        * The ISO-269 paper sizes can be calculated automatically, but
+        * it would require bringing in -lm for pow() and I'd rather not
+        * do that.  So just do it the easy way for now.  Since this
+        * only happens once, I'm not terribly concerned.
+        */
+
+       if (pp && strcasecmp(pp, "letter")) {
+               if (0 == strcasecmp(pp, "a3")) {
+                       pagex = 297;
+                       pagey = 420;
+               } else if (0 == strcasecmp(pp, "a4")) {
+                       pagex = 210;
+                       pagey = 297;
+               } else if (0 == strcasecmp(pp, "a5")) {
+                       pagex = 148;
+                       pagey = 210;
+               } else if (0 == strcasecmp(pp, "legal")) {
+                       pagex = 216;
+                       pagey = 356;
+               } else if (2 != sscanf(pp, "%zux%zu", &pagex, &pagey))
+                       fprintf(stderr, "%s: Unknown paper\n", pp);
+       } else if (NULL == pp)
+               pp = "letter";
+
+       /* 
+        * This MUST be defined before any PNT2AFM or AFM2PNT
+        * calculations occur.
+        */
+
+       p->engine.ps.scale = 11;
+
+       /* Remember millimetres -> AFM units. */
+
+       pagex = PNT2AFM(p, ((double)pagex * 2.834));
+       pagey = PNT2AFM(p, ((double)pagey * 2.834));
+
+       /* 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);
+
+       /* 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.header = pagey - (marginy / 2) - (lineheight / 2);
+       p->engine.ps.top = pagey - marginy;
+       p->engine.ps.footer = (marginy / 2) - (lineheight / 2);
+       p->engine.ps.bottom = marginy;
+       p->engine.ps.left = marginx;
+       p->engine.ps.lineheight = lineheight;
+
+       p->defrmargin = pagex - (marginx * 2);

        return(p);
 }
 
 
 void
        return(p);
 }
 
 
 void

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

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


@@ -99,6 +529,8 @@ ps_free(void *arg)
 
        if (p->engine.ps.psmarg)
                free(p->engine.ps.psmarg);
 
        if (p->engine.ps.psmarg)
                free(p->engine.ps.psmarg);

+       if (p->engine.ps.pdfobjs)
+               free(p->engine.ps.pdfobjs);

 
        term_free(p);
 }
 
        term_free(p);
 }


@@ -108,7 +540,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);
 


@@ -118,9 +550,11 @@ ps_printf(struct termp *p, const char *fmt, ...)
         * into our growable margin buffer.
         */
 
         * into our growable margin buffer.
         */
 

-       if ( ! (PS_MARGINS & p->engine.ps.psstate)) {
-               vprintf(fmt, ap);
+       if ( ! (PS_MARGINS & p->engine.ps.flags)) {
+               len = vprintf(fmt, ap);

                va_end(ap);
                va_end(ap);

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

                return;
        }
 
                return;
        }
 


@@ -130,13 +564,14 @@ ps_printf(struct termp *p, const char *fmt, ...)
         * assumption that will cause pukeage if it's not the case.
         */
 
         * assumption that will cause pukeage if it's not the case.
         */
 

-       PS_GROWBUF(p, PS_BUFSLOP);
+       ps_growbuf(p, PS_BUFSLOP);

 
        pos = (int)p->engine.ps.psmargcur;
 
        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);

 }
 
 
 }
 
 


@@ -147,12 +582,13 @@ ps_putchar(struct termp *p, char c)
 
        /* See ps_printf(). */
 
 
        /* See ps_printf(). */
 

-       if ( ! (PS_MARGINS & p->engine.ps.psstate)) {
+       if ( ! (PS_MARGINS & p->engine.ps.flags)) {

                putchar(c);
                putchar(c);

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

                return;
        }
 
                return;
        }
 

-       PS_GROWBUF(p, 2);
+       ps_growbuf(p, 2);

 
        pos = (int)p->engine.ps.psmargcur++;
        p->engine.ps.psmarg[pos++] = c;
 
        pos = (int)p->engine.ps.psmargcur++;
        p->engine.ps.psmarg[pos++] = c;


@@ -160,10 +596,87 @@ ps_putchar(struct termp *p, char c)
 }
 
 
 }
 
 

+static void
+pdf_obj(struct termp *p, size_t obj)
+{
+
+       assert(obj > 0);
+
+       if ((obj - 1) >= p->engine.ps.pdfobjsz) {
+               p->engine.ps.pdfobjsz = obj + 128;
+               p->engine.ps.pdfobjs = realloc
+                       (p->engine.ps.pdfobjs, 
+                        p->engine.ps.pdfobjsz * sizeof(size_t));
+               if (NULL == p->engine.ps.pdfobjs) {
+                       perror(NULL);
+                       exit(MANDOCLEVEL_SYSERR);
+               }
+       }
+
+       p->engine.ps.pdfobjs[(int)obj - 1] = p->engine.ps.pdfbytes;
+       ps_printf(p, "%zu 0 obj\n", obj);
+}
+
+
+static void
+ps_closepage(struct termp *p)
+{
+       int              i;
+       size_t           len, base;
+
+       /*
+        * Close out a page that we've already flushed to output.  In
+        * PostScript, we simply note that the page must be showed.  In
+        * PDF, we must now create the Length, Resource, and Page node
+        * for the page contents.
+        */
+
+       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, "ET\n");
+
+               len = p->engine.ps.pdfbytes - p->engine.ps.pdflastpg;
+               base = p->engine.ps.pages * 4 + p->engine.ps.pdfbody;
+
+               ps_printf(p, "endstream\nendobj\n");
+
+               /* Length of content. */
+               pdf_obj(p, base + 1);
+               ps_printf(p, "%zu\nendobj\n", len);
+
+               /* Resource for content. */
+               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++) 
+                       ps_printf(p, "/F%d %d 0 R\n", i, 3 + i);
+               ps_printf(p, ">>\n>>\n");
+
+               /* Page node. */
+               pdf_obj(p, base + 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", base + 2);
+               ps_printf(p, "/Contents %zu 0 R\n", base);
+               ps_printf(p, ">>\nendobj\n");
+       } else
+               ps_printf(p, "showpage\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, base;

 
        /*
         * 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


@@ -171,18 +684,67 @@ ps_end(struct termp *p)
         * well as just one.
         */
 
         * well as just one.
         */
 

-       assert(0 == p->engine.ps.psstate);
-       assert('\0' == p->engine.ps.last);
-       assert(p->engine.ps.psmarg && p->engine.ps.psmarg[0]);
-       printf("%s", p->engine.ps.psmarg);
-       printf("showpage\n");
-       printf("%s\n", "%%EOF");
+       if ( ! (PS_NEWPAGE & p->engine.ps.flags)) {
+               assert(0 == p->engine.ps.flags);
+               assert('\0' == p->engine.ps.last);
+               ps_closepage(p);
+       }
+
+       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;
+       } 
+
+       pdf_obj(p, 2);
+       ps_printf(p, "<<\n/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", i * 4 +
+                               p->engine.ps.pdfbody + 3);
+
+       base = (p->engine.ps.pages - 1) * 4 + 
+               p->engine.ps.pdfbody + 4;
+
+       ps_printf(p, "]\n>>\nendobj\n");
+       pdf_obj(p, base);
+       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", base + 1);
+       ps_printf(p, "0000000000 65535 f \n");
+
+       for (i = 0; i < base; i++)
+               ps_printf(p, "%.10zu 00000 n \n", 
+                               p->engine.ps.pdfobjs[(int)i]);
+
+       ps_printf(p, "trailer\n");
+       ps_printf(p, "<<\n");
+       ps_printf(p, "/Size %zu\n", base + 1);
+       ps_printf(p, "/Root %zu 0 R\n", base);
+       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");

 }
 
 
 static void
 ps_begin(struct termp *p)
 {
 }
 
 
 static void
 ps_begin(struct termp *p)
 {

+       time_t           t;
+       int              i;

 
        /* 
         * Print margins into margin buffer.  Nothing gets output to the
 
        /* 
         * Print margins into margin buffer.  Nothing gets output to the


@@ -194,25 +756,26 @@ 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.psmargcur = 0;

-       p->engine.ps.psstate = PS_MARGINS;
-       p->engine.ps.pscol = PS_CHAR_LEFT;
-       p->engine.ps.psrow = PS_CHAR_TOPMARG;
+       p->engine.ps.flags = PS_MARGINS;
+       p->engine.ps.pscol = p->engine.ps.left;
+       p->engine.ps.psrow = p->engine.ps.header;

 
        ps_setfont(p, TERMFONT_NONE);
 
        (*p->headf)(p, p->argf);
        (*p->endline)(p);
 
 
        ps_setfont(p, TERMFONT_NONE);
 
        (*p->headf)(p, p->argf);
        (*p->endline)(p);
 

-       p->engine.ps.pscol = PS_CHAR_LEFT;
-       p->engine.ps.psrow = PS_CHAR_BOTMARG;
+       p->engine.ps.pscol = p->engine.ps.left;
+       p->engine.ps.psrow = p->engine.ps.footer;

 
        (*p->footf)(p, p->argf);
        (*p->endline)(p);
 
 
        (*p->footf)(p, p->argf);
        (*p->endline)(p);
 

-       p->engine.ps.psstate &= ~PS_MARGINS;
+       p->engine.ps.flags &= ~PS_MARGINS;

 
 

-       assert(0 == p->engine.ps.psstate);
+       assert(0 == p->engine.ps.flags);

        assert(p->engine.ps.psmarg);
        assert('\0' != p->engine.ps.psmarg[0]);
 
        assert(p->engine.ps.psmarg);
        assert('\0' != p->engine.ps.psmarg[0]);
 


@@ -221,29 +784,106 @@ ps_begin(struct termp *p)
         * stuff gets printed to the screen, so make sure we're sane.
         */
 
         * stuff gets printed to the screen, so make sure we're sane.
         */
 

-       printf("%s\n", "%!PS");
+       t = time(NULL);
+
+       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");
+               pdf_obj(p, 1);
+               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++) {
+                       pdf_obj(p, (size_t)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");
+               }
+       }
+
+       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;

        ps_setfont(p, TERMFONT_NONE);
        ps_setfont(p, TERMFONT_NONE);

-       p->engine.ps.pscol = PS_CHAR_LEFT;
-       p->engine.ps.psrow = PS_CHAR_TOP;

 }
 
 
 static void
 }
 
 
 static void

-ps_pletter(struct termp *p, char c)
+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 {
+                       pdf_obj(p, p->engine.ps.pdfbody + 
+                                       p->engine.ps.pages * 4);
+                       ps_printf(p, "<<\n");
+                       ps_printf(p, "/Length %zu 0 R\n", 
+                                       p->engine.ps.pdfbody + 1 +
+                                       p->engine.ps.pages * 4);
+                       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
         * now at the current cursor.
         */
 
        
        /*
         * If we're not in a PostScript "word" context, then open one
         * now at the current cursor.
         */
 

-       if ( ! (PS_INLINE & p->engine.ps.psstate)) {
-               ps_printf(p, "%zu %zu moveto\n(", 
-                               p->engine.ps.pscol, 
-                               p->engine.ps.psrow);
-               p->engine.ps.psstate |= PS_INLINE;
+       if ( ! (PS_INLINE & p->engine.ps.flags)) {
+               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;

        }
 
        }
 

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

        /*
         * We need to escape these characters as per the PostScript
         * specification.  We would also escape non-graphable characters
        /*
         * We need to escape these characters as per the PostScript
         * specification.  We would also escape non-graphable characters


@@ -265,8 +905,17 @@ ps_pletter(struct termp *p, char c)
 
        /* Write the character and adjust where we are on the page. */
 
 
        /* Write the character and adjust where we are on the page. */
 

-       ps_putchar(p, c);
-       p->engine.ps.pscol += PS_CHAR_WIDTH;
+       f = (int)p->engine.ps.lastf;
+
+       if (c <= 32 || (c - 32 > MAXCHAR)) {
+               ps_putchar(p, ' ');
+               p->engine.ps.pscol += (size_t)fonts[f].gly[0].wx;
+               return;
+       } 
+
+       ps_putchar(p, (char)c);
+       c -= 32;
+       p->engine.ps.pscol += (size_t)fonts[f].gly[c].wx;

 }
 
 
 }
 
 


@@ -280,11 +929,15 @@ ps_pclose(struct termp *p)
         * or anything).
         */
 
         * or anything).
         */
 

-       if ( ! (PS_INLINE & p->engine.ps.psstate))
+       if ( ! (PS_INLINE & p->engine.ps.flags))

                return;
        
                return;
        

-       ps_printf(p, ") show\n");
-       p->engine.ps.psstate &= ~PS_INLINE;
+       if (TERMTYPE_PS != p->type) {
+               ps_printf(p, ") Tj\nET\n");
+       } else
+               ps_printf(p, ") show\n");
+
+       p->engine.ps.flags &= ~PS_INLINE;

 }
 
 
 }
 
 


@@ -309,7 +962,7 @@ ps_fclose(struct termp *p)
                p->engine.ps.last = '\0';
        }
 
                p->engine.ps.last = '\0';
        }
 

-       if ( ! (PS_INLINE & p->engine.ps.psstate))
+       if ( ! (PS_INLINE & p->engine.ps.flags))

                return;
 
        ps_pclose(p);
                return;
 
        ps_pclose(p);


@@ -376,7 +1029,7 @@ ps_advance(struct termp *p, size_t len)
         */
 
        ps_fclose(p);
         */
 
        ps_fclose(p);

-       p->engine.ps.pscol += len ? len * PS_CHAR_WIDTH : 0;
+       p->engine.ps.pscol += len;

 }
 
 
 }
 
 


@@ -394,7 +1047,16 @@ ps_endline(struct termp *p)
         * lines, we'll do nasty stuff. 
         */
 
         * lines, we'll do nasty stuff. 
         */
 

-       if (PS_MARGINS & p->engine.ps.psstate)
+       if (PS_MARGINS & p->engine.ps.flags)
+               return;
+
+       /* Left-justify. */
+
+       p->engine.ps.pscol = p->engine.ps.left;
+
+       /* If we haven't printed anything, return. */
+
+       if (PS_NEWPAGE & p->engine.ps.flags)

                return;
 
        /*
                return;
 
        /*


@@ -402,16 +1064,13 @@ ps_endline(struct termp *p)
         * showpage and restart our row.
         */
 
         * showpage and restart our row.
         */
 

-       p->engine.ps.pscol = PS_CHAR_LEFT;
-       if (p->engine.ps.psrow >= PS_CHAR_HEIGHT + PS_CHAR_BOT) {
-               p->engine.ps.psrow -= PS_CHAR_HEIGHT;
+       if (p->engine.ps.psrow >= p->engine.ps.lineheight + 
+                       p->engine.ps.bottom) {
+               p->engine.ps.psrow -= p->engine.ps.lineheight;

                return;
        }
 
                return;
        }
 

-       assert(p->engine.ps.psmarg && p->engine.ps.psmarg[0]);
-       printf("%s", p->engine.ps.psmarg);
-       printf("showpage\n");
-       p->engine.ps.psrow = PS_CHAR_TOP;
+       ps_closepage(p);

 }
 
 
 }
 
 


@@ -419,15 +1078,25 @@ static void
 ps_setfont(struct termp *p, enum termfont f)
 {
 
 ps_setfont(struct termp *p, enum termfont f)
 {
 

-       if (TERMFONT_BOLD == f) 
-               ps_printf(p, "/Courier-Bold\n");
-       else if (TERMFONT_UNDER == f)
-               ps_printf(p, "/Courier-Oblique\n");
-       else
-               ps_printf(p, "/Courier\n");
-
-       ps_printf(p, "10 selectfont\n");
+       assert(f < TERMFONT__MAX);

        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);

 }
 
 
 }
 
 


@@ -436,5 +1105,56 @@ static size_t
 ps_width(const struct termp *p, char c)
 {
 
 ps_width(const struct termp *p, char c)
 {
 

-       return(1);
+       if (c <= 32 || c - 32 >= MAXCHAR)
+               return((size_t)fonts[(int)TERMFONT_NONE].gly[0].wx);
+
+       c -= 32;
+       return((size_t)fonts[(int)TERMFONT_NONE].gly[(int)c].wx);

 }
 }

+
+
+static double
+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);
+               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_VS):
+               r = su->scale * p->engine.ps.lineheight;
+               break;
+       default:
+               r = su->scale;
+               break;
+       }
+
+       return(r);
+}
+