make the path to ar(1) configurable, needed by NixOS;

[mandoc.git] / term_ps.c

diff --git a/term_ps.c b/term_ps.c
index 12ca7d67165c3698ebdb095b2bd1ff7961b6b6ba..374d3d9a6abd2b16deb853553b54138f53cf5ff3 100644 (file)
--- a/term_ps.c
+++ b/term_ps.c
@@ -1,15 +1,16 @@
-/*     $Id: term_ps.c,v 1.72 2015/01/21 19:40:54 schwarze Exp $ */
+/* $Id: term_ps.c,v 1.92 2020/09/06 14:45:22 schwarze Exp $ */

 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014,2015,2016,2017,2020 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2017 Marc Espie <espie@openbsd.org>

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


@@ -20,6 +21,9 @@
 #include <sys/types.h>
 
 #include <assert.h>
 #include <sys/types.h>
 
 #include <assert.h>

+#if HAVE_ERR
+#include <err.h>
+#endif

 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>


@@ -30,6 +34,7 @@
 #include "mandoc_aux.h"
 #include "out.h"
 #include "term.h"
 #include "mandoc_aux.h"
 #include "out.h"
 #include "term.h"

+#include "manconf.h"

 #include "main.h"
 
 /* These work the buffer used by the header and footer. */
 #include "main.h"
 
 /* These work the buffer used by the header and footer. */


@@ -62,6 +67,7 @@ struct        termp_ps {
        size_t            pscol;        /* visible column (AFM units) */
        size_t            pscolnext;    /* used for overstrike */
        size_t            psrow;        /* visible row (AFM units) */
        size_t            pscol;        /* visible column (AFM units) */
        size_t            pscolnext;    /* used for overstrike */
        size_t            psrow;        /* visible row (AFM units) */

+       size_t            lastrow;      /* psrow of the previous word */

        char             *psmarg;       /* margin buf */
        size_t            psmargsz;     /* margin buf size */
        size_t            psmargcur;    /* cur index in margin buf */
        char             *psmarg;       /* margin buf */
        size_t            psmargsz;     /* margin buf size */
        size_t            psmargcur;    /* cur index in margin buf */


@@ -73,6 +79,7 @@ struct        termp_ps {
        size_t            lineheight;   /* line height (AFM units) */
        size_t            top;          /* body top (AFM units) */
        size_t            bottom;       /* body bottom (AFM units) */
        size_t            lineheight;   /* line height (AFM units) */
        size_t            top;          /* body top (AFM units) */
        size_t            bottom;       /* body bottom (AFM units) */

+       const char       *medianame;    /* for DocumentMedia and PageSize */

        size_t            height;       /* page height (AFM units */
        size_t            width;        /* page width (AFM units) */
        size_t            lastwidth;    /* page width before last ll */
        size_t            height;       /* page height (AFM units */
        size_t            width;        /* page width (AFM units) */
        size_t            lastwidth;    /* page width before last ll */


@@ -86,7 +93,7 @@ struct        termp_ps {
        size_t            pdfobjsz;     /* size of pdfobjs */
 };
 
        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);
                                const struct roffsu *);
 static size_t            ps_width(const struct termp *, int);
 static void              ps_advance(struct termp *, size_t);


@@ -94,19 +101,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_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_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);
 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_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(const struct mchars *, char *);
+static void              ps_setwidth(struct termp *, int, int);
+static struct termp     *pspdf_alloc(const struct manoutput *, enum termtype);

 static void              pdf_obj(struct termp *, size_t);
 
 /*
 static void              pdf_obj(struct termp *, size_t);
 
 /*


@@ -507,44 +512,35 @@ static    const struct font fonts[TERMFONT__MAX] = {
 };
 
 void *
 };
 
 void *

-pdf_alloc(const struct mchars *mchars, char *outopts)
+pdf_alloc(const struct manoutput *outopts)

 {
 {

-       struct termp    *p;
-
-       if (NULL != (p = pspdf_alloc(mchars, outopts)))
-               p->type = TERMTYPE_PDF;
-
-       return(p);
+       return pspdf_alloc(outopts, TERMTYPE_PDF);

 }
 
 void *
 }
 
 void *

-ps_alloc(const struct mchars *mchars, char *outopts)
+ps_alloc(const struct manoutput *outopts)

 {
 {

-       struct termp    *p;
-
-       if (NULL != (p = pspdf_alloc(mchars, outopts)))
-               p->type = TERMTYPE_PS;
-
-       return(p);
+       return pspdf_alloc(outopts, TERMTYPE_PS);

 }
 
 static struct termp *
 }
 
 static struct termp *

-pspdf_alloc(const struct mchars *mchars, char *outopts)
+pspdf_alloc(const struct manoutput *outopts, enum termtype type)

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

-       const char      *toks[2];

        const char      *pp;
        const char      *pp;

-       char            *v;

 
 

-       p = mandoc_calloc(1, sizeof(struct termp));
-       p->symtab = mchars;
+       p = mandoc_calloc(1, sizeof(*p));
+       p->tcol = p->tcols = mandoc_calloc(1, sizeof(*p->tcol));
+       p->maxtcol = 1;
+       p->type = type;
+

        p->enc = TERMENC_ASCII;
        p->fontq = mandoc_reallocarray(NULL,
        p->enc = TERMENC_ASCII;
        p->fontq = mandoc_reallocarray(NULL,

-           (p->fontsz = 8), sizeof(enum termfont));
+           (p->fontsz = 8), sizeof(*p->fontq));

        p->fontq[0] = p->fontl = TERMFONT_NONE;
        p->fontq[0] = p->fontl = TERMFONT_NONE;

-       p->ps = mandoc_calloc(1, sizeof(struct termp_ps));
+       p->ps = mandoc_calloc(1, sizeof(*p->ps));

 
        p->advance = ps_advance;
        p->begin = ps_begin;
 
        p->advance = ps_advance;
        p->begin = ps_begin;


@@ -555,22 +551,9 @@ pspdf_alloc(const struct mchars *mchars, char *outopts)
        p->setwidth = ps_setwidth;
        p->width = ps_width;
 
        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). */
 
        /* Default to US letter (millimetres). */
 

+       p->ps->medianame = "Letter";

        pagex = 216;
        pagey = 279;
 
        pagex = 216;
        pagey = 279;
 


@@ -581,21 +564,28 @@ pspdf_alloc(const struct mchars *mchars, char *outopts)
         * only happens once, I'm not terribly concerned.
         */
 
         * only happens once, I'm not terribly concerned.
         */
 

-       if (pp && strcasecmp(pp, "letter")) {
-               if (0 == strcasecmp(pp, "a3")) {
+       pp = outopts->paper;
+       if (pp != NULL && strcasecmp(pp, "letter") != 0) {
+               if (strcasecmp(pp, "a3") == 0) {
+                       p->ps->medianame = "A3";

                        pagex = 297;
                        pagey = 420;
                        pagex = 297;
                        pagey = 420;

-               } else if (0 == strcasecmp(pp, "a4")) {
+               } else if (strcasecmp(pp, "a4") == 0) {
+                       p->ps->medianame = "A4";

                        pagex = 210;
                        pagey = 297;
                        pagex = 210;
                        pagey = 297;

-               } else if (0 == strcasecmp(pp, "a5")) {
+               } else if (strcasecmp(pp, "a5") == 0) {
+                       p->ps->medianame = "A5";

                        pagex = 148;
                        pagey = 210;
                        pagex = 148;
                        pagey = 210;

-               } else if (0 == strcasecmp(pp, "legal")) {
+               } else if (strcasecmp(pp, "legal") == 0) {
+                       p->ps->medianame = "Legal";

                        pagex = 216;
                        pagey = 356;
                        pagex = 216;
                        pagey = 356;

-               } else if (2 != sscanf(pp, "%ux%u", &pagex, &pagey))
-                       fprintf(stderr, "%s: Unknown paper\n", pp);
+               } else if (sscanf(pp, "%ux%u", &pagex, &pagey) == 2)
+                       p->ps->medianame = "CustomSize";
+               else
+                       warnx("%s: Unknown paper", pp);

        }
 
        /*
        }
 
        /*


@@ -607,8 +597,8 @@ pspdf_alloc(const struct mchars *mchars, char *outopts)
 
        /* Remember millimetres -> AFM units. */
 
 
        /* Remember millimetres -> AFM units. */
 

-       pagex = PNT2AFM(p, ((double)pagex * 2.834));
-       pagey = PNT2AFM(p, ((double)pagey * 2.834));
+       pagex = PNT2AFM(p, ((double)pagex * 72.0 / 25.4));
+       pagey = PNT2AFM(p, ((double)pagey * 72.0 / 25.4));

 
        /* Margins are 1/9 the page x and y. */
 
 
        /* Margins are 1/9 the page x and y. */
 


@@ -629,11 +619,11 @@ pspdf_alloc(const struct mchars *mchars, char *outopts)
        p->ps->lineheight = lineheight;
 
        p->defrmargin = pagex - (marginx * 2);
        p->ps->lineheight = lineheight;
 
        p->defrmargin = pagex - (marginx * 2);

-       return(p);
+       return p;

 }
 
 static void
 }
 
 static void

-ps_setwidth(struct termp *p, int iop, size_t width)
+ps_setwidth(struct termp *p, int iop, int width)

 {
        size_t   lastwidth;
 
 {
        size_t   lastwidth;
 


@@ -641,8 +631,8 @@ ps_setwidth(struct termp *p, int iop, size_t width)
        if (iop > 0)
                p->ps->width += width;
        else if (iop == 0)
        if (iop > 0)
                p->ps->width += width;
        else if (iop == 0)

-               p->ps->width = width ? width : p->ps->lastwidth;
-       else if (p->ps->width > width)
+               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 = 0;
                p->ps->width -= width;
        else
                p->ps->width = 0;


@@ -656,10 +646,8 @@ pspdf_free(void *arg)
 
        p = (struct termp *)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);
 
        free(p->ps);
        term_free(p);


@@ -746,7 +734,7 @@ ps_closepage(struct termp *p)
 
        /*
         * Close out a page that we've already flushed to output.  In
 
        /*
         * Close out a page that we've already flushed to output.  In

-        * PostScript, we simply note that the page must be showed.  In
+        * PostScript, we simply note that the page must be shown.  In

         * PDF, we must now create the Length, Resource, and Page node
         * for the page contents.
         */
         * PDF, we must now create the Length, Resource, and Page node
         * for the page contents.
         */


@@ -755,8 +743,6 @@ ps_closepage(struct termp *p)
        ps_printf(p, "%s", p->ps->psmarg);
 
        if (TERMTYPE_PS != p->type) {
        ps_printf(p, "%s", p->ps->psmarg);
 
        if (TERMTYPE_PS != p->type) {

-               ps_printf(p, "ET\n");
-

                len = p->ps->pdfbytes - p->ps->pdflastpg;
                base = p->ps->pages * 4 + p->ps->pdfbody;
 
                len = p->ps->pdfbytes - p->ps->pdflastpg;
                base = p->ps->pages * 4 + p->ps->pdfbody;
 


@@ -772,7 +758,7 @@ ps_closepage(struct termp *p)
                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, "/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");
+               ps_printf(p, ">>\n>>\nendobj\n");

 
                /* Page node. */
                pdf_obj(p, base + 3);
 
                /* Page node. */
                pdf_obj(p, base + 3);


@@ -796,6 +782,9 @@ ps_end(struct termp *p)
 {
        size_t           i, xref, base;
 
 {
        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
        /*
         * At the end of the file, do one last showpage.  This is the
         * same behaviour as groff(1) and works for multiple pages as


@@ -834,7 +823,7 @@ ps_end(struct termp *p)
        ps_printf(p, "<<\n");
        ps_printf(p, "/Type /Catalog\n");
        ps_printf(p, "/Pages 2 0 R\n");
        ps_printf(p, "<<\n");
        ps_printf(p, "/Type /Catalog\n");
        ps_printf(p, "/Pages 2 0 R\n");

-       ps_printf(p, ">>\n");
+       ps_printf(p, ">>\nendobj\n");

        xref = p->ps->pdfbytes;
        ps_printf(p, "xref\n");
        ps_printf(p, "0 %zu\n", base + 1);
        xref = p->ps->pdfbytes;
        ps_printf(p, "xref\n");
        ps_printf(p, "0 %zu\n", base + 1);


@@ -858,6 +847,7 @@ ps_end(struct termp *p)
 static void
 ps_begin(struct termp *p)
 {
 static void
 ps_begin(struct termp *p)
 {

+       size_t           width, height;

        int              i;
 
        /*
        int              i;
 
        /*


@@ -875,6 +865,7 @@ ps_begin(struct termp *p)
        p->ps->flags = PS_MARGINS;
        p->ps->pscol = p->ps->left;
        p->ps->psrow = p->ps->header;
        p->ps->flags = PS_MARGINS;
        p->ps->pscol = p->ps->left;
        p->ps->psrow = p->ps->header;

+       p->ps->lastrow = 0; /* impossible row */

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


@@ -899,21 +890,44 @@ ps_begin(struct termp *p)
         */
 
        if (TERMTYPE_PS == p->type) {
         */
 
        if (TERMTYPE_PS == p->type) {

+               width = AFM2PNT(p, p->ps->width);
+               height = AFM2PNT(p, p->ps->height);
+

                ps_printf(p, "%%!PS-Adobe-3.0\n");
                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, "%%!PS-Adobe-3.0\n");
                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));
+               ps_printf(p, "%%%%DocumentMedia: man-%s %zu %zu 0 () ()\n",
+                   p->ps->medianame, width, height);

                ps_printf(p, "%%%%DocumentNeededResources: font");
 
                for (i = 0; i < (int)TERMFONT__MAX; i++)
                        ps_printf(p, " %s", fonts[i].name);
 
                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");
+               ps_printf(p, "\n%%%%DocumentSuppliedResources: "
+                   "procset MandocProcs 1.0 0\n");
+               ps_printf(p, "%%%%EndComments\n");
+               ps_printf(p, "%%%%BeginProlog\n");
+               ps_printf(p, "%%%%BeginResource: procset MandocProcs "
+                   "10170 10170\n");
+               /* The font size is effectively hard-coded for now. */
+               ps_printf(p, "/fs %zu def\n", p->ps->scale);
+               for (i = 0; i < (int)TERMFONT__MAX; i++)
+                       ps_printf(p, "/f%d { /%s fs selectfont } def\n",
+                           i, fonts[i].name);
+               ps_printf(p, "/s { 3 1 roll moveto show } bind def\n");
+               ps_printf(p, "/c { exch currentpoint exch pop "
+                   "moveto show } bind def\n");
+               ps_printf(p, "%%%%EndResource\n");
+               ps_printf(p, "%%%%EndProlog\n");
+               ps_printf(p, "%%%%BeginSetup\n");
+               ps_printf(p, "%%%%BeginFeature: *PageSize %s\n",
+                   p->ps->medianame);
+               ps_printf(p, "<</PageSize [%zu %zu]>>setpagedevice\n",
+                   width, height);
+               ps_printf(p, "%%%%EndFeature\n");
+               ps_printf(p, "%%%%EndSetup\n");

        } else {
                ps_printf(p, "%%PDF-1.1\n");
                pdf_obj(p, 1);
        } else {
                ps_printf(p, "%%PDF-1.1\n");
                pdf_obj(p, 1);


@@ -928,7 +942,7 @@ ps_begin(struct termp *p)
                        ps_printf(p, "/Subtype /Type1\n");
                        ps_printf(p, "/Name /F%d\n", i);
                        ps_printf(p, "/BaseFont /%s\n", fonts[i].name);
                        ps_printf(p, "/Subtype /Type1\n");
                        ps_printf(p, "/Name /F%d\n", i);
                        ps_printf(p, "/BaseFont /%s\n", fonts[i].name);

-                       ps_printf(p, ">>\n");
+                       ps_printf(p, ">>\nendobj\n");

                }
        }
 
                }
        }
 


@@ -953,9 +967,7 @@ ps_pletter(struct termp *p, int c)
                if (TERMTYPE_PS == p->type) {
                        ps_printf(p, "%%%%Page: %zu %zu\n",
                            p->ps->pages + 1, p->ps->pages + 1);
                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, "f%d\n", (int)p->ps->lastf);

                } else {
                        pdf_obj(p, p->ps->pdfbody +
                            p->ps->pages * 4);
                } else {
                        pdf_obj(p, p->ps->pdfbody +
                            p->ps->pages * 4);


@@ -980,10 +992,13 @@ ps_pletter(struct termp *p, int c)
                        ps_printf(p, "%.3f %.3f Td\n(",
                            AFM2PNT(p, p->ps->pscol),
                            AFM2PNT(p, p->ps->psrow));
                        ps_printf(p, "%.3f %.3f Td\n(",
                            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));
+               } else {
+                       ps_printf(p, "%.3f", AFM2PNT(p, p->ps->pscol));
+                       if (p->ps->psrow != p->ps->lastrow)
+                               ps_printf(p, " %.3f",
+                                   AFM2PNT(p, p->ps->psrow));
+                       ps_printf(p, "(");
+               }

                p->ps->flags |= PS_INLINE;
        }
 
                p->ps->flags |= PS_INLINE;
        }
 


@@ -998,9 +1013,7 @@ ps_pletter(struct termp *p, int c)
 
        switch (c) {
        case '(':
 
        switch (c) {
        case '(':

-               /* FALLTHROUGH */

        case ')':
        case ')':

-               /* FALLTHROUGH */

        case '\\':
                ps_putchar(p, '\\');
                break;
        case '\\':
                ps_putchar(p, '\\');
                break;


@@ -1033,47 +1046,65 @@ ps_pclose(struct termp *p)
        if ( ! (PS_INLINE & p->ps->flags))
                return;
 
        if ( ! (PS_INLINE & p->ps->flags))
                return;
 

-       if (TERMTYPE_PS != p->type) {
+       if (TERMTYPE_PS != p->type)

                ps_printf(p, ") Tj\nET\n");
                ps_printf(p, ") Tj\nET\n");

-       } else
-               ps_printf(p, ") show\n");
+       else if (p->ps->psrow == p->ps->lastrow)
+               ps_printf(p, ")c\n");
+       else {
+               ps_printf(p, ")s\n");
+               p->ps->lastrow = p->ps->psrow;
+       }

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

+/* If we have a `last' char that wasn't printed yet, print it now. */

 static void
 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 (p->ps->last != '\0') {
-               assert( ! (p->ps->flags & PS_BACKSP));
-               if (p->ps->nextf != p->ps->lastf) {
-                       ps_pclose(p);
-                       ps_setfont(p, p->ps->nextf);
-               }
-               p->ps->nextf = 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)
 {
 }
 
 static void
 ps_letter(struct termp *p, int arg)
 {

-       size_t          savecol, wx;
+       size_t          savecol;

        char            c;
 
        c = arg >= 128 || arg <= 0 ? '?' : arg;
        char            c;
 
        c = arg >= 128 || arg <= 0 ? '?' : arg;


@@ -1139,43 +1170,12 @@ ps_letter(struct termp *p, int arg)
         * Use them and print it.
         */
 
         * Use them and print it.
         */
 

-       if (p->ps->last != '\0') {
-               if (p->ps->nextf != p->ps->lastf) {
-                       ps_pclose(p);
-                       ps_setfont(p, p->ps->nextf);
-               }
-               p->ps->nextf = TERMFONT_NONE;
-
-               /*
-                * For an overstrike, if a previous character
-                * was wider, advance to center the new one.
-                */
-
-               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;
-               }
-
-               ps_pletter(p, p->ps->last);
-
-               /*
-                * 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;
-               }
-       }
+       ps_plast(p);

 
        /*
         * Do not print the current character yet because font
 
        /*
         * Do not print the current character yet because font

-        * instructions might follow; only remember it.
-        * For the first character, nothing else is done.
-        * The final character will get printed from ps_fclose().
+        * instructions might follow; only remember the character.
+        * It will get printed later from ps_plast().

         */
 
        p->ps->last = c;
         */
 
        p->ps->last = c;


@@ -1208,7 +1208,8 @@ ps_advance(struct termp *p, size_t len)
         * and readjust our column settings.
         */
 
         * and readjust our column settings.
         */
 

-       ps_fclose(p);
+       ps_plast(p);
+       ps_pclose(p);

        p->ps->pscol += len;
 }
 
        p->ps->pscol += len;
 }
 


@@ -1218,7 +1219,8 @@ ps_endline(struct termp *p)
 
        /* Close out any scopes we have open: we're at eoln. */
 
 
        /* 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
 
        /*
         * If we're in the margin, don't try to recalculate our current


@@ -1249,6 +1251,12 @@ ps_endline(struct termp *p)
        }
 
        ps_closepage(p);
        }
 
        ps_closepage(p);

+
+       if ((int)p->tcol->offset > p->ti)
+               p->tcol->offset -= p->ti;
+       else 
+               p->tcol->offset = 0;
+       p->ti = 0;

 }
 
 static void
 }
 
 static void


@@ -1267,8 +1275,7 @@ ps_setfont(struct termp *p, enum termfont f)
                return;
 
        if (TERMTYPE_PS == p->type)
                return;
 
        if (TERMTYPE_PS == p->type)

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

        else
                ps_printf(p, "/F%d %zu Tf\n",
                    (int)f, p->ps->scale);
        else
                ps_printf(p, "/F%d %zu Tf\n",
                    (int)f, p->ps->scale);


@@ -1283,10 +1290,10 @@ ps_width(const struct termp *p, int c)
        else
                c -= 32;
 
        else
                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;
 ps_hspan(const struct termp *p, const struct roffsu *su)
 {
        double           r;


@@ -1338,7 +1345,7 @@ ps_hspan(const struct termp *p, const struct roffsu *su)
                break;
        }
 
                break;
        }
 

-       return(r);
+       return r * 24.0;

 }
 
 static void
 }
 
 static void