]> git.cameronkatri.com Git - mandoc.git/blobdiff - term_ps.c
git.ckatri.com / mandoc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
With the current architecture, we can't support inline equations
[mandoc.git] / term_ps.c
diff --git a/term_ps.c b/term_ps.c
index e8a906858a6e71e33fa27b1f7454d1627d305029..e18030383dbf96b40d07d62ee740dbd1ae74a03f 100644 (file)
--- a/term_ps.c
+++ b/term_ps.c
@@ -1,6 +1,7 @@
-/*     $Id: term_ps.c,v 1.54 2011/10/16 12:20:34 schwarze Exp $ */
+/*     $Id: term_ps.c,v 1.66 2014/08/28 01:37:12 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2014 Ingo Schwarze <schwarze@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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,9 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
 #include "config.h"
-#endif
 
 #include <sys/types.h>
 
 
 #include <sys/types.h>
 
@@ -26,10 +25,10 @@
 #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 <unistd.h>
 
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "out.h"
 #include "main.h"
 #include "term.h"
 #include "out.h"
 #include "main.h"
 #include "term.h"
@@ -38,11 +37,11 @@
 #define        PS_BUFSLOP        128
 
 /* Convert PostScript point "x" to an AFM unit. */
 #define        PS_BUFSLOP        128
 
 /* Convert PostScript point "x" to an AFM unit. */
-#define        PNT2AFM(p, x) /* LINTED */ \
+#define        PNT2AFM(p, x) \
        (size_t)((double)(x) * (1000.0 / (double)(p)->ps->scale))
 
 /* Convert an AFM unit "x" to a PostScript points */
        (size_t)((double)(x) * (1000.0 / (double)(p)->ps->scale))
 
 /* Convert an AFM unit "x" to a PostScript points */
-#define        AFM2PNT(p, x) /* LINTED */ \
+#define        AFM2PNT(p, x) \
        ((double)(x) / (1000.0 / (double)(p)->ps->scale))
 
 struct glyph {
        ((double)(x) / (1000.0 / (double)(p)->ps->scale))
 
 struct glyph {
@@ -67,6 +66,7 @@ struct        termp_ps {
        size_t            psmargcur;    /* cur index in margin buf */
        char              last;         /* character buffer */
        enum termfont     lastf;        /* last set font */
        size_t            psmargcur;    /* cur index in margin buf */
        char              last;         /* character buffer */
        enum termfont     lastf;        /* last set font */
+       enum termfont     nextf;        /* building next font here */
        size_t            scale;        /* font scaling factor */
        size_t            pages;        /* number of pages shown */
        size_t            lineheight;   /* line height (AFM units) */
        size_t            scale;        /* font scaling factor */
        size_t            pages;        /* number of pages shown */
        size_t            lineheight;   /* line height (AFM units) */
@@ -74,10 +74,11 @@ struct      termp_ps {
        size_t            bottom;       /* body bottom (AFM units) */
        size_t            height;       /* page height (AFM units */
        size_t            width;        /* page width (AFM units) */
        size_t            bottom;       /* body bottom (AFM units) */
        size_t            height;       /* page height (AFM units */
        size_t            width;        /* page width (AFM units) */
+       size_t            lastwidth;    /* page width before last ll */
        size_t            left;         /* body left (AFM units) */
        size_t            header;       /* header pos (AFM units) */
        size_t            footer;       /* footer pos (AFM units) */
        size_t            left;         /* body left (AFM units) */
        size_t            header;       /* header pos (AFM units) */
        size_t            footer;       /* footer pos (AFM units) */
-       size_t            pdfbytes;     /* current output byte */
+       size_t            pdfbytes;     /* current output byte */
        size_t            pdflastpg;    /* byte of last page mark */
        size_t            pdfbody;      /* start of body object */
        size_t           *pdfobjs;      /* table of object offsets */
        size_t            pdflastpg;    /* byte of last page mark */
        size_t            pdfbody;      /* start of body object */
        size_t           *pdfobjs;      /* table of object offsets */
@@ -97,9 +98,13 @@ static       void              ps_growbuf(struct termp *, size_t);
 static void              ps_letter(struct termp *, int);
 static void              ps_pclose(struct termp *);
 static void              ps_pletter(struct termp *, int);
 static void              ps_letter(struct termp *, int);
 static void              ps_pclose(struct termp *);
 static void              ps_pletter(struct termp *, int);
+#if __GNUC__ - 0 >= 4
+__attribute__((__format__ (__printf__, 2, 3)))
+#endif
 static void              ps_printf(struct termp *, const char *, ...);
 static void              ps_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 void              ps_setwidth(struct termp *, int, size_t);
 static struct termp     *pspdf_alloc(char *);
 static void              pdf_obj(struct termp *, size_t);
 
 static struct termp     *pspdf_alloc(char *);
 static void              pdf_obj(struct termp *, size_t);
 
@@ -401,6 +406,103 @@ static    const struct font fonts[TERMFONT__MAX] = {
                {  400 },
                {  541 },
        } },
                {  400 },
                {  541 },
        } },
+       { "Times-BoldItalic", {
+               {  250 },
+               {  389 },
+               {  555 },
+               {  500 },
+               {  500 },
+               {  833 },
+               {  778 },
+               {  333 },
+               {  333 },
+               {  333 },
+               {  500 },
+               {  570 },
+               {  250 },
+               {  333 },
+               {  250 },
+               {  278 },
+               {  500 },
+               {  500 },
+               {  500 },
+               {  500 },
+               {  500 },
+               {  500 },
+               {  500 },
+               {  500 },
+               {  500 },
+               {  500 },
+               {  333 },
+               {  333 },
+               {  570 },
+               {  570 },
+               {  570 },
+               {  500 },
+               {  832 },
+               {  667 },
+               {  667 },
+               {  667 },
+               {  722 },
+               {  667 },
+               {  667 },
+               {  722 },
+               {  778 },
+               {  389 },
+               {  500 },
+               {  667 },
+               {  611 },
+               {  889 },
+               {  722 },
+               {  722 },
+               {  611 },
+               {  722 },
+               {  667 },
+               {  556 },
+               {  611 },
+               {  722 },
+               {  667 },
+               {  889 },
+               {  667 },
+               {  611 },
+               {  611 },
+               {  333 },
+               {  278 },
+               {  333 },
+               {  570 },
+               {  500 },
+               {  333 },
+               {  500 },
+               {  500 },
+               {  444 },
+               {  500 },
+               {  444 },
+               {  333 },
+               {  500 },
+               {  556 },
+               {  278 },
+               {  278 },
+               {  500 },
+               {  278 },
+               {  778 },
+               {  556 },
+               {  500 },
+               {  500 },
+               {  500 },
+               {  389 },
+               {  389 },
+               {  278 },
+               {  556 },
+               {  444 },
+               {  667 },
+               {  500 },
+               {  444 },
+               {  389 },
+               {  348 },
+               {  220 },
+               {  348 },
+               {  570 },
+       } },
 };
 
 void *
 };
 
 void *
@@ -445,8 +547,9 @@ pspdf_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->setwidth = ps_setwidth;
        p->width = ps_width;
        p->width = ps_width;
-       
+
        toks[0] = "paper";
        toks[1] = NULL;
 
        toks[0] = "paper";
        toks[1] = NULL;
 
@@ -454,7 +557,7 @@ pspdf_alloc(char *outopts)
 
        while (outopts && *outopts)
                switch (getsubopt(&outopts, UNCONST(toks), &v)) {
 
        while (outopts && *outopts)
                switch (getsubopt(&outopts, UNCONST(toks), &v)) {
-               case (0):
+               case 0:
                        pp = v;
                        break;
                default:
                        pp = v;
                        break;
                default:
@@ -490,7 +593,7 @@ pspdf_alloc(char *outopts)
                        fprintf(stderr, "%s: Unknown paper\n", pp);
        }
 
                        fprintf(stderr, "%s: Unknown paper\n", pp);
        }
 
-       /* 
+       /*
         * This MUST be defined before any PNT2AFM or AFM2PNT
         * calculations occur.
         */
         * This MUST be defined before any PNT2AFM or AFM2PNT
         * calculations occur.
         */
@@ -504,16 +607,14 @@ pspdf_alloc(char *outopts)
 
        /* Margins are 1/9 the page x and y. */
 
 
        /* Margins are 1/9 the page x and y. */
 
-       marginx = /* LINTED */
-               (size_t)((double)pagex / 9.0);
-       marginy = /* LINTED */
-               (size_t)((double)pagey / 9.0);
+       marginx = (size_t)((double)pagex / 9.0);
+       marginy = (size_t)((double)pagey / 9.0);
 
        /* Line-height is 1.4em. */
 
        lineheight = PNT2AFM(p, ((double)p->ps->scale * 1.4));
 
 
        /* Line-height is 1.4em. */
 
        lineheight = PNT2AFM(p, ((double)p->ps->scale * 1.4));
 
-       p->ps->width = (size_t)pagex;
+       p->ps->width = p->ps->lastwidth = (size_t)pagex;
        p->ps->height = (size_t)pagey;
        p->ps->header = pagey - (marginy / 2) - (lineheight / 2);
        p->ps->top = pagey - marginy;
        p->ps->height = (size_t)pagey;
        p->ps->header = pagey - (marginy / 2) - (lineheight / 2);
        p->ps->top = pagey - marginy;
@@ -526,6 +627,20 @@ pspdf_alloc(char *outopts)
        return(p);
 }
 
        return(p);
 }
 
+static void
+ps_setwidth(struct termp *p, int iop, size_t width)
+{
+       size_t   lastwidth;
+
+       lastwidth = p->ps->width;
+       if (0 < iop)
+               p->ps->width += width;
+       else if (0 > iop)
+               p->ps->width -= width;
+       else
+               p->ps->width = width ? width : p->ps->lastwidth;
+       p->ps->lastwidth = lastwidth;
+}
 
 void
 pspdf_free(void *arg)
 
 void
 pspdf_free(void *arg)
@@ -543,7 +658,6 @@ pspdf_free(void *arg)
        term_free(p);
 }
 
        term_free(p);
 }
 
-
 static void
 ps_printf(struct termp *p, const char *fmt, ...)
 {
 static void
 ps_printf(struct termp *p, const char *fmt, ...)
 {
@@ -561,12 +675,11 @@ ps_printf(struct termp *p, const char *fmt, ...)
        if ( ! (PS_MARGINS & p->ps->flags)) {
                len = vprintf(fmt, ap);
                va_end(ap);
        if ( ! (PS_MARGINS & p->ps->flags)) {
                len = vprintf(fmt, ap);
                va_end(ap);
-               p->ps->pdfbytes += /* LINTED */
-                       len < 0 ? 0 : (size_t)len;
+               p->ps->pdfbytes += len < 0 ? 0 : (size_t)len;
                return;
        }
 
                return;
        }
 
-       /* 
+       /*
         * XXX: I assume that the in-margin print won't exceed
         * PS_BUFSLOP (128 bytes), which is reasonable but still an
         * assumption that will cause pukeage if it's not the case.
         * XXX: I assume that the in-margin print won't exceed
         * PS_BUFSLOP (128 bytes), which is reasonable but still an
         * assumption that will cause pukeage if it's not the case.
@@ -582,7 +695,6 @@ ps_printf(struct termp *p, const char *fmt, ...)
        p->ps->psmargcur = strlen(p->ps->psmarg);
 }
 
        p->ps->psmargcur = strlen(p->ps->psmarg);
 }
 
-
 static void
 ps_putchar(struct termp *p, char c)
 {
 static void
 ps_putchar(struct termp *p, char c)
 {
@@ -591,7 +703,6 @@ ps_putchar(struct termp *p, char c)
        /* See ps_printf(). */
 
        if ( ! (PS_MARGINS & p->ps->flags)) {
        /* See ps_printf(). */
 
        if ( ! (PS_MARGINS & p->ps->flags)) {
-               /* LINTED */
                putchar(c);
                p->ps->pdfbytes++;
                return;
                putchar(c);
                p->ps->pdfbytes++;
                return;
@@ -604,7 +715,6 @@ ps_putchar(struct termp *p, char c)
        p->ps->psmarg[pos] = '\0';
 }
 
        p->ps->psmarg[pos] = '\0';
 }
 
-
 static void
 pdf_obj(struct termp *p, size_t obj)
 {
 static void
 pdf_obj(struct termp *p, size_t obj)
 {
@@ -613,20 +723,14 @@ pdf_obj(struct termp *p, size_t obj)
 
        if ((obj - 1) >= p->ps->pdfobjsz) {
                p->ps->pdfobjsz = obj + 128;
 
        if ((obj - 1) >= p->ps->pdfobjsz) {
                p->ps->pdfobjsz = obj + 128;
-               p->ps->pdfobjs = realloc
-                       (p->ps->pdfobjs, 
-                        p->ps->pdfobjsz * sizeof(size_t));
-               if (NULL == p->ps->pdfobjs) {
-                       perror(NULL);
-                       exit((int)MANDOCLEVEL_SYSERR);
-               }
+               p->ps->pdfobjs = mandoc_reallocarray(p->ps->pdfobjs,
+                   p->ps->pdfobjsz, sizeof(size_t));
        }
 
        p->ps->pdfobjs[(int)obj - 1] = p->ps->pdfbytes;
        ps_printf(p, "%zu 0 obj\n", obj);
 }
 
        }
 
        p->ps->pdfobjs[(int)obj - 1] = p->ps->pdfbytes;
        ps_printf(p, "%zu 0 obj\n", obj);
 }
 
-
 static void
 ps_closepage(struct termp *p)
 {
 static void
 ps_closepage(struct termp *p)
 {
@@ -659,7 +763,7 @@ ps_closepage(struct termp *p)
                pdf_obj(p, base + 2);
                ps_printf(p, "<<\n/ProcSet [/PDF /Text]\n");
                ps_printf(p, "/Font <<\n");
                pdf_obj(p, base + 2);
                ps_printf(p, "<<\n/ProcSet [/PDF /Text]\n");
                ps_printf(p, "/Font <<\n");
-               for (i = 0; i < (int)TERMFONT__MAX; i++) 
+               for (i = 0; i < (int)TERMFONT__MAX; i++)
                        ps_printf(p, "/F%d %d 0 R\n", i, 3 + i);
                ps_printf(p, ">>\n>>\n");
 
                        ps_printf(p, "/F%d %d 0 R\n", i, 3 + i);
                ps_printf(p, ">>\n>>\n");
 
@@ -680,8 +784,6 @@ ps_closepage(struct termp *p)
        p->ps->flags |= PS_NEWPAGE;
 }
 
        p->ps->flags |= PS_NEWPAGE;
 }
 
-
-/* ARGSUSED */
 static void
 ps_end(struct termp *p)
 {
 static void
 ps_end(struct termp *p)
 {
@@ -704,7 +806,7 @@ ps_end(struct termp *p)
                ps_printf(p, "%%%%Pages: %zu\n", p->ps->pages);
                ps_printf(p, "%%%%EOF\n");
                return;
                ps_printf(p, "%%%%Pages: %zu\n", p->ps->pages);
                ps_printf(p, "%%%%EOF\n");
                return;
-       } 
+       }
 
        pdf_obj(p, 2);
        ps_printf(p, "<<\n/Type /Pages\n");
 
        pdf_obj(p, 2);
        ps_printf(p, "<<\n/Type /Pages\n");
@@ -716,11 +818,9 @@ ps_end(struct termp *p)
        ps_printf(p, "/Kids [");
 
        for (i = 0; i < p->ps->pages; i++)
        ps_printf(p, "/Kids [");
 
        for (i = 0; i < p->ps->pages; i++)
-               ps_printf(p, " %zu 0 R", i * 4 +
-                               p->ps->pdfbody + 3);
+               ps_printf(p, " %zu 0 R", i * 4 + p->ps->pdfbody + 3);
 
 
-       base = (p->ps->pages - 1) * 4 + 
-               p->ps->pdfbody + 4;
+       base = (p->ps->pages - 1) * 4 + p->ps->pdfbody + 4;
 
        ps_printf(p, "]\n>>\nendobj\n");
        pdf_obj(p, base);
 
        ps_printf(p, "]\n>>\nendobj\n");
        pdf_obj(p, base);
@@ -734,8 +834,8 @@ ps_end(struct termp *p)
        ps_printf(p, "0000000000 65535 f \n");
 
        for (i = 0; i < base; i++)
        ps_printf(p, "0000000000 65535 f \n");
 
        for (i = 0; i < base; i++)
-               ps_printf(p, "%.10zu 00000 n \n", 
-                               p->ps->pdfobjs[(int)i]);
+               ps_printf(p, "%.10zu 00000 n \n",
+                   p->ps->pdfobjs[(int)i]);
 
        ps_printf(p, "trailer\n");
        ps_printf(p, "<<\n");
 
        ps_printf(p, "trailer\n");
        ps_printf(p, "<<\n");
@@ -748,14 +848,12 @@ ps_end(struct termp *p)
        ps_printf(p, "%%%%EOF\n");
 }
 
        ps_printf(p, "%%%%EOF\n");
 }
 
-
 static void
 ps_begin(struct termp *p)
 {
 static void
 ps_begin(struct termp *p)
 {
-       time_t           t;
        int              i;
 
        int              i;
 
-       /* 
+       /*
         * Print margins into margin buffer.  Nothing gets output to the
         * screen yet, so we don't need to initialise the primary state.
         */
         * Print margins into margin buffer.  Nothing gets output to the
         * screen yet, so we don't need to initialise the primary state.
         */
@@ -788,24 +886,21 @@ ps_begin(struct termp *p)
        assert(p->ps->psmarg);
        assert('\0' != p->ps->psmarg[0]);
 
        assert(p->ps->psmarg);
        assert('\0' != p->ps->psmarg[0]);
 
-       /* 
+       /*
         * Print header and initialise page state.  Following this,
         * stuff gets printed to the screen, so make sure we're sane.
         */
 
         * Print header and initialise page state.  Following this,
         * stuff gets printed to the screen, so make sure we're sane.
         */
 
-       t = time(NULL);
-
        if (TERMTYPE_PS == p->type) {
                ps_printf(p, "%%!PS-Adobe-3.0\n");
        if (TERMTYPE_PS == p->type) {
                ps_printf(p, "%%!PS-Adobe-3.0\n");
-               ps_printf(p, "%%%%CreationDate: %s", ctime(&t));
                ps_printf(p, "%%%%DocumentData: Clean7Bit\n");
                ps_printf(p, "%%%%Orientation: Portrait\n");
                ps_printf(p, "%%%%Pages: (atend)\n");
                ps_printf(p, "%%%%PageOrder: Ascend\n");
                ps_printf(p, "%%%%DocumentMedia: "
                ps_printf(p, "%%%%DocumentData: Clean7Bit\n");
                ps_printf(p, "%%%%Orientation: Portrait\n");
                ps_printf(p, "%%%%Pages: (atend)\n");
                ps_printf(p, "%%%%PageOrder: Ascend\n");
                ps_printf(p, "%%%%DocumentMedia: "
-                               "Default %zu %zu 0 () ()\n",
-                               (size_t)AFM2PNT(p, p->ps->width),
-                               (size_t)AFM2PNT(p, p->ps->height));
+                   "Default %zu %zu 0 () ()\n",
+                   (size_t)AFM2PNT(p, p->ps->width),
+                   (size_t)AFM2PNT(p, p->ps->height));
                ps_printf(p, "%%%%DocumentNeededResources: font");
 
                for (i = 0; i < (int)TERMFONT__MAX; i++)
                ps_printf(p, "%%%%DocumentNeededResources: font");
 
                for (i = 0; i < (int)TERMFONT__MAX; i++)
@@ -824,7 +919,7 @@ ps_begin(struct termp *p)
                        ps_printf(p, "<<\n");
                        ps_printf(p, "/Type /Font\n");
                        ps_printf(p, "/Subtype /Type1\n");
                        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, "/Name /F%d\n", i);
                        ps_printf(p, "/BaseFont /%s\n", fonts[i].name);
                        ps_printf(p, ">>\n");
                }
                        ps_printf(p, "/BaseFont /%s\n", fonts[i].name);
                        ps_printf(p, ">>\n");
                }
@@ -837,7 +932,6 @@ ps_begin(struct termp *p)
        ps_setfont(p, TERMFONT_NONE);
 }
 
        ps_setfont(p, TERMFONT_NONE);
 }
 
-
 static void
 ps_pletter(struct termp *p, int c)
 {
 static void
 ps_pletter(struct termp *p, int c)
 {
@@ -850,25 +944,23 @@ ps_pletter(struct termp *p, int c)
 
        if (PS_NEWPAGE & p->ps->flags) {
                if (TERMTYPE_PS == p->type) {
 
        if (PS_NEWPAGE & p->ps->flags) {
                if (TERMTYPE_PS == p->type) {
-                       ps_printf(p, "%%%%Page: %zu %zu\n", 
-                                       p->ps->pages + 1, 
-                                       p->ps->pages + 1);
-                       ps_printf(p, "/%s %zu selectfont\n", 
-                                       fonts[(int)p->ps->lastf].name, 
-                                       p->ps->scale);
+                       ps_printf(p, "%%%%Page: %zu %zu\n",
+                           p->ps->pages + 1, p->ps->pages + 1);
+                       ps_printf(p, "/%s %zu selectfont\n",
+                           fonts[(int)p->ps->lastf].name,
+                           p->ps->scale);
                } else {
                } else {
-                       pdf_obj(p, p->ps->pdfbody + 
-                                       p->ps->pages * 4);
+                       pdf_obj(p, p->ps->pdfbody +
+                           p->ps->pages * 4);
                        ps_printf(p, "<<\n");
                        ps_printf(p, "<<\n");
-                       ps_printf(p, "/Length %zu 0 R\n", 
-                                       p->ps->pdfbody + 1 +
-                                       p->ps->pages * 4);
+                       ps_printf(p, "/Length %zu 0 R\n",
+                           p->ps->pdfbody + 1 + p->ps->pages * 4);
                        ps_printf(p, ">>\nstream\n");
                }
                p->ps->pdflastpg = p->ps->pdfbytes;
                p->ps->flags &= ~PS_NEWPAGE;
        }
                        ps_printf(p, ">>\nstream\n");
                }
                p->ps->pdflastpg = p->ps->pdfbytes;
                p->ps->flags &= ~PS_NEWPAGE;
        }
-       
+
        /*
         * If we're not in a PostScript "word" context, then open one
         * now at the current cursor.
        /*
         * If we're not in a PostScript "word" context, then open one
         * now at the current cursor.
@@ -876,16 +968,15 @@ ps_pletter(struct termp *p, int c)
 
        if ( ! (PS_INLINE & p->ps->flags)) {
                if (TERMTYPE_PS != p->type) {
 
        if ( ! (PS_INLINE & p->ps->flags)) {
                if (TERMTYPE_PS != p->type) {
-                       ps_printf(p, "BT\n/F%d %zu Tf\n", 
-                                       (int)p->ps->lastf,
-                                       p->ps->scale);
+                       ps_printf(p, "BT\n/F%d %zu Tf\n",
+                           (int)p->ps->lastf, p->ps->scale);
                        ps_printf(p, "%.3f %.3f Td\n(",
                        ps_printf(p, "%.3f %.3f Td\n(",
-                                       AFM2PNT(p, p->ps->pscol),
-                                       AFM2PNT(p, p->ps->psrow));
+                           AFM2PNT(p, p->ps->pscol),
+                           AFM2PNT(p, p->ps->psrow));
                } else
                } else
-                       ps_printf(p, "%.3f %.3f moveto\n(", 
-                                       AFM2PNT(p, p->ps->pscol),
-                                       AFM2PNT(p, p->ps->psrow));
+                       ps_printf(p, "%.3f %.3f moveto\n(",
+                           AFM2PNT(p, p->ps->pscol),
+                           AFM2PNT(p, p->ps->psrow));
                p->ps->flags |= PS_INLINE;
        }
 
                p->ps->flags |= PS_INLINE;
        }
 
@@ -899,11 +990,11 @@ ps_pletter(struct termp *p, int c)
         */
 
        switch (c) {
         */
 
        switch (c) {
-       case ('('):
+       case '(':
                /* FALLTHROUGH */
                /* FALLTHROUGH */
-       case (')'):
+       case ')':
                /* FALLTHROUGH */
                /* FALLTHROUGH */
-       case ('\\'):
+       case '\\':
                ps_putchar(p, '\\');
                break;
        default:
                ps_putchar(p, '\\');
                break;
        default:
@@ -914,23 +1005,19 @@ ps_pletter(struct termp *p, int c)
 
        f = (int)p->ps->lastf;
 
 
        f = (int)p->ps->lastf;
 
-       if (c <= 32 || (c - 32 >= MAXCHAR)) {
-               ps_putchar(p, ' ');
-               p->ps->pscol += (size_t)fonts[f].gly[0].wx;
-               return;
-       } 
+       if (c <= 32 || c - 32 >= MAXCHAR)
+               c = 32;
 
        ps_putchar(p, (char)c);
        c -= 32;
        p->ps->pscol += (size_t)fonts[f].gly[c].wx;
 }
 
 
        ps_putchar(p, (char)c);
        c -= 32;
        p->ps->pscol += (size_t)fonts[f].gly[c].wx;
 }
 
-
 static void
 ps_pclose(struct termp *p)
 {
 
 static void
 ps_pclose(struct termp *p)
 {
 
-       /* 
+       /*
         * Spit out that we're exiting a word context (this is a
         * "partial close" because we don't check the last-char buffer
         * or anything).
         * Spit out that we're exiting a word context (this is a
         * "partial close" because we don't check the last-char buffer
         * or anything).
@@ -938,7 +1025,7 @@ ps_pclose(struct termp *p)
 
        if ( ! (PS_INLINE & p->ps->flags))
                return;
 
        if ( ! (PS_INLINE & p->ps->flags))
                return;
-       
+
        if (TERMTYPE_PS != p->type) {
                ps_printf(p, ") Tj\nET\n");
        } else
        if (TERMTYPE_PS != p->type) {
                ps_printf(p, ") Tj\nET\n");
        } else
@@ -947,7 +1034,6 @@ ps_pclose(struct termp *p)
        p->ps->flags &= ~PS_INLINE;
 }
 
        p->ps->flags &= ~PS_INLINE;
 }
 
-
 static void
 ps_fclose(struct termp *p)
 {
 static void
 ps_fclose(struct termp *p)
 {
@@ -960,11 +1046,13 @@ ps_fclose(struct termp *p)
         * Following this, close out any scope that's open.
         */
 
         * Following this, close out any scope that's open.
         */
 
-       if ('\0' != p->ps->last) {
-               if (p->ps->lastf != TERMFONT_NONE) {
+       if (p->ps->last != '\0') {
+               assert(p->ps->last != 8);
+               if (p->ps->nextf != p->ps->lastf) {
                        ps_pclose(p);
                        ps_pclose(p);
-                       ps_setfont(p, TERMFONT_NONE);
+                       ps_setfont(p, p->ps->nextf);
                }
                }
+               p->ps->nextf = TERMFONT_NONE;
                ps_pletter(p, p->ps->last);
                p->ps->last = '\0';
        }
                ps_pletter(p, p->ps->last);
                p->ps->last = '\0';
        }
@@ -975,58 +1063,59 @@ ps_fclose(struct termp *p)
        ps_pclose(p);
 }
 
        ps_pclose(p);
 }
 
-
 static void
 ps_letter(struct termp *p, int arg)
 {
 static void
 ps_letter(struct termp *p, int arg)
 {
-       char            cc, c;
+       char            c;
 
 
-       /* LINTED */
        c = arg >= 128 || arg <= 0 ? '?' : arg;
 
        /*
        c = arg >= 128 || arg <= 0 ? '?' : arg;
 
        /*
-        * State machine dictates whether to buffer the last character
-        * or not.  Basically, encoded words are detected by checking if
-        * we're an "8" and switching on the buffer.  Then we put "8" in
-        * our buffer, and on the next charater, flush both character
-        * and buffer.  Thus, "regular" words are detected by having a
-        * regular character and a regular buffer character.
+        * When receiving an initial character, merely buffer it,
+        * because a backspace might follow to specify formatting.
+        * When receiving a backspace, use the buffered character
+        * to build the font instruction and clear the buffer.
+        * Only when there are two non-backspace characters in a row,
+        * activate the font built so far and print the first of them;
+        * the second, again, merely gets buffered.
+        * The final character will get printed from ps_fclose().
         */
 
         */
 
-       if ('\0' == p->ps->last) {
-               assert(8 != c);
-               p->ps->last = c;
-               return;
-       } else if (8 == p->ps->last) {
-               assert(8 != c);
-               p->ps->last = '\0';
-       } else if (8 == c) {
-               assert(8 != p->ps->last);
+       if (c == 8) {
+               assert(p->ps->last != '\0');
+               assert(p->ps->last != 8);
                if ('_' == p->ps->last) {
                if ('_' == p->ps->last) {
-                       if (p->ps->lastf != TERMFONT_UNDER) {
-                               ps_pclose(p);
-                               ps_setfont(p, TERMFONT_UNDER);
+                       switch (p->ps->nextf) {
+                       case TERMFONT_BI:
+                               break;
+                       case TERMFONT_BOLD:
+                               p->ps->nextf = TERMFONT_BI;
+                               break;
+                       default:
+                               p->ps->nextf = TERMFONT_UNDER;
+                       }
+               } else {
+                       switch (p->ps->nextf) {
+                       case TERMFONT_BI:
+                               break;
+                       case TERMFONT_UNDER:
+                               p->ps->nextf = TERMFONT_BI;
+                               break;
+                       default:
+                               p->ps->nextf = TERMFONT_BOLD;
                        }
                        }
-               } else if (p->ps->lastf != TERMFONT_BOLD) {
-                       ps_pclose(p);
-                       ps_setfont(p, TERMFONT_BOLD);
                }
                }
-               p->ps->last = c;
-               return;
-       } else {
-               if (p->ps->lastf != TERMFONT_NONE) {
+       } else if (p->ps->last != '\0' && p->ps->last != 8) {
+               if (p->ps->nextf != p->ps->lastf) {
                        ps_pclose(p);
                        ps_pclose(p);
-                       ps_setfont(p, TERMFONT_NONE);
+                       ps_setfont(p, p->ps->nextf);
                }
                }
-               cc = p->ps->last;
-               p->ps->last = c;
-               c = cc;
+               p->ps->nextf = TERMFONT_NONE;
+               ps_pletter(p, p->ps->last);
        }
        }
-
-       ps_pletter(p, c);
+       p->ps->last = c;
 }
 
 }
 
-
 static void
 ps_advance(struct termp *p, size_t len)
 {
 static void
 ps_advance(struct termp *p, size_t len)
 {
@@ -1042,7 +1131,6 @@ ps_advance(struct termp *p, size_t len)
        p->ps->pscol += len;
 }
 
        p->ps->pscol += len;
 }
 
-
 static void
 ps_endline(struct termp *p)
 {
 static void
 ps_endline(struct termp *p)
 {
@@ -1054,7 +1142,7 @@ ps_endline(struct termp *p)
        /*
         * If we're in the margin, don't try to recalculate our current
         * row.  XXX: if the column tries to be fancy with multiple
        /*
         * If we're in the margin, don't try to recalculate our current
         * row.  XXX: if the column tries to be fancy with multiple
-        * lines, we'll do nasty stuff. 
+        * lines, we'll do nasty stuff.
         */
 
        if (PS_MARGINS & p->ps->flags)
         */
 
        if (PS_MARGINS & p->ps->flags)
@@ -1074,8 +1162,7 @@ ps_endline(struct termp *p)
         * showpage and restart our row.
         */
 
         * showpage and restart our row.
         */
 
-       if (p->ps->psrow >= p->ps->lineheight + 
-                       p->ps->bottom) {
+       if (p->ps->psrow >= p->ps->lineheight + p->ps->bottom) {
                p->ps->psrow -= p->ps->lineheight;
                return;
        }
                p->ps->psrow -= p->ps->lineheight;
                return;
        }
@@ -1083,14 +1170,13 @@ ps_endline(struct termp *p)
        ps_closepage(p);
 }
 
        ps_closepage(p);
 }
 
-
 static void
 ps_setfont(struct termp *p, enum termfont f)
 {
 
        assert(f < TERMFONT__MAX);
        p->ps->lastf = f;
 static void
 ps_setfont(struct termp *p, enum termfont f)
 {
 
        assert(f < TERMFONT__MAX);
        p->ps->lastf = f;
-       
+
        /*
         * If we're still at the top of the page, let the font-setting
         * be delayed until we actually have stuff to print.
        /*
         * If we're still at the top of the page, let the font-setting
         * be delayed until we actually have stuff to print.
@@ -1100,64 +1186,70 @@ 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, "/%s %zu selectfont\n",
+                   fonts[(int)f].name, p->ps->scale);
        else
        else
-               ps_printf(p, "/F%d %zu Tf\n", 
-                               (int)f, 
-                               p->ps->scale);
+               ps_printf(p, "/F%d %zu Tf\n",
+                   (int)f, p->ps->scale);
 }
 
 }
 
-
-/* ARGSUSED */
 static size_t
 ps_width(const struct termp *p, int c)
 {
 
        if (c <= 32 || c - 32 >= MAXCHAR)
 static size_t
 ps_width(const struct termp *p, int c)
 {
 
        if (c <= 32 || c - 32 >= MAXCHAR)
-               return((size_t)fonts[(int)TERMFONT_NONE].gly[0].wx);
+               c = 0;
+       else
+               c -= 32;
 
 
-       c -= 32;
        return((size_t)fonts[(int)TERMFONT_NONE].gly[c].wx);
 }
 
        return((size_t)fonts[(int)TERMFONT_NONE].gly[c].wx);
 }
 
-
 static double
 ps_hspan(const struct termp *p, const struct roffsu *su)
 {
        double           r;
 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.
         */
        /*
         * All of these measurements are derived by converting from the
         * native measurement to AFM units.
         */
-
        switch (su->unit) {
        switch (su->unit) {
-       case (SCALE_CM):
-               r = PNT2AFM(p, su->scale * 28.34);
+       case SCALE_BU:
+               /*
+                * Traditionally, the default unit is fixed to the
+                * output media.  So this would refer to the point.  In
+                * mandoc(1), however, we stick to the default terminal
+                * scaling unit so that output is the same regardless
+                * the media.
+                */
+               r = PNT2AFM(p, su->scale * 72.0 / 240.0);
                break;
                break;
-       case (SCALE_IN):
-               r = PNT2AFM(p, su->scale * 72);
+       case SCALE_CM:
+               r = PNT2AFM(p, su->scale * 72.0 / 2.54);
                break;
                break;
-       case (SCALE_PC):
-               r = PNT2AFM(p, su->scale * 12);
-               break;
-       case (SCALE_PT):
-               r = PNT2AFM(p, su->scale * 100);
+       case SCALE_EM:
+               r = su->scale *
+                   fonts[(int)TERMFONT_NONE].gly[109 - 32].wx;
                break;
                break;
-       case (SCALE_EM):
+       case SCALE_EN:
                r = su->scale *
                r = su->scale *
-                       fonts[(int)TERMFONT_NONE].gly[109 - 32].wx;
+                   fonts[(int)TERMFONT_NONE].gly[110 - 32].wx;
                break;
                break;
-       case (SCALE_MM):
-               r = PNT2AFM(p, su->scale * 2.834);
+       case SCALE_IN:
+               r = PNT2AFM(p, su->scale * 72.0);
                break;
                break;
-       case (SCALE_EN):
+       case SCALE_MM:
                r = su->scale *
                r = su->scale *
-                       fonts[(int)TERMFONT_NONE].gly[110 - 32].wx;
+                   fonts[(int)TERMFONT_NONE].gly[109 - 32].wx / 100.0;
                break;
                break;
-       case (SCALE_VS):
+       case SCALE_PC:
+               r = PNT2AFM(p, su->scale * 12.0);
+               break;
+       case SCALE_PT:
+               r = PNT2AFM(p, su->scale * 1.0);
+               break;
+       case SCALE_VS:
                r = su->scale * p->ps->lineheight;
                break;
        default:
                r = su->scale * p->ps->lineheight;
                break;
        default:
@@ -1178,8 +1270,5 @@ ps_growbuf(struct termp *p, size_t sz)
                sz = PS_BUFSLOP;
 
        p->ps->psmargsz += sz;
                sz = PS_BUFSLOP;
 
        p->ps->psmargsz += sz;
-
-       p->ps->psmarg = mandoc_realloc
-               (p->ps->psmarg, p->ps->psmargsz);
+       p->ps->psmarg = mandoc_realloc(p->ps->psmarg, p->ps->psmargsz);
 }
 }
-
A git conversion mirror of mandoc.bsd.lv