Do not confuse .Bl -column lists that just broken another block

[mandoc.git] / term_ps.c

diff --git a/term_ps.c b/term_ps.c
index e27c81197ce1d44bb75d60dc97140703d1cb21b8..12ca7d67165c3698ebdb095b2bd1ff7961b6b6ba 100644 (file)
--- a/term_ps.c
+++ b/term_ps.c
@@ -1,7 +1,7 @@
-/*     $Id: term_ps.c,v 1.67 2014/10/27 20:41:58 schwarze Exp $ */
+/*     $Id: term_ps.c,v 1.72 2015/01/21 19:40:54 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014, 2015 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
@@ -27,11 +27,10 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "mandoc.h"
 #include "mandoc_aux.h"
 #include "out.h"
-#include "main.h"
 #include "term.h"
+#include "main.h"
 
 /* These work the buffer used by the header and footer. */
 #define        PS_BUFSLOP        128
@@ -61,6 +60,7 @@ struct        termp_ps {
 #define        PS_NEWPAGE       (1 << 2)       /* new page, no words yet */
 #define        PS_BACKSP        (1 << 3)       /* last character was backspace */
        size_t            pscol;        /* visible column (AFM units) */
+       size_t            pscolnext;    /* used for overstrike */
        size_t            psrow;        /* visible row (AFM units) */
        char             *psmarg;       /* margin buf */
        size_t            psmargsz;     /* margin buf size */
@@ -106,7 +106,7 @@ 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 struct termp     *pspdf_alloc(const struct mchars *, char *);
 static void              pdf_obj(struct termp *, size_t);
 
 /*
@@ -507,29 +507,29 @@ static    const struct font fonts[TERMFONT__MAX] = {
 };
 
 void *
-pdf_alloc(char *outopts)
+pdf_alloc(const struct mchars *mchars, char *outopts)
 {
        struct termp    *p;
 
-       if (NULL != (p = pspdf_alloc(outopts)))
+       if (NULL != (p = pspdf_alloc(mchars, outopts)))
                p->type = TERMTYPE_PDF;
 
        return(p);
 }
 
 void *
-ps_alloc(char *outopts)
+ps_alloc(const struct mchars *mchars, char *outopts)
 {
        struct termp    *p;
 
-       if (NULL != (p = pspdf_alloc(outopts)))
+       if (NULL != (p = pspdf_alloc(mchars, outopts)))
                p->type = TERMTYPE_PS;
 
        return(p);
 }
 
 static struct termp *
-pspdf_alloc(char *outopts)
+pspdf_alloc(const struct mchars *mchars, char *outopts)
 {
        struct termp    *p;
        unsigned int     pagex, pagey;
@@ -539,7 +539,11 @@ pspdf_alloc(char *outopts)
        char            *v;
 
        p = mandoc_calloc(1, sizeof(struct termp));
+       p->symtab = mchars;
        p->enc = TERMENC_ASCII;
+       p->fontq = mandoc_reallocarray(NULL,
+           (p->fontsz = 8), sizeof(enum termfont));
+       p->fontq[0] = p->fontl = TERMFONT_NONE;
        p->ps = mandoc_calloc(1, sizeof(struct termp_ps));
 
        p->advance = ps_advance;
@@ -634,12 +638,14 @@ ps_setwidth(struct termp *p, int iop, size_t width)
        size_t   lastwidth;
 
        lastwidth = p->ps->width;
-       if (0 < iop)
+       if (iop > 0)
                p->ps->width += width;
-       else if (0 > iop)
+       else if (iop == 0)
+               p->ps->width = width ? width : p->ps->lastwidth;
+       else if (p->ps->width > width)
                p->ps->width -= width;
        else
-               p->ps->width = width ? width : p->ps->lastwidth;
+               p->ps->width = 0;
        p->ps->lastwidth = lastwidth;
 }
 
@@ -1067,7 +1073,7 @@ ps_fclose(struct termp *p)
 static void
 ps_letter(struct termp *p, int arg)
 {
-       size_t          savecol;
+       size_t          savecol, wx;
        char            c;
 
        c = arg >= 128 || arg <= 0 ? '?' : arg;
@@ -1139,7 +1145,30 @@ ps_letter(struct termp *p, int arg)
                        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;
+               }
        }
 
        /*
@@ -1153,13 +1182,19 @@ ps_letter(struct termp *p, int arg)
 
        /*
         * For an overstrike, back up to the previous position.
+        * If the previous character is wider than any it overstrikes,
+        * remember the current position, because it might also be
+        * wider than all that will overstrike it.
         */
 
        if (savecol != SIZE_MAX) {
+               if (p->ps->pscolnext < p->ps->pscol)
+                       p->ps->pscolnext = p->ps->pscol;
                ps_pclose(p);
                p->ps->pscol = savecol;
                p->ps->flags &= ~PS_BACKSP;
-       }
+       } else
+               p->ps->pscolnext = 0;
 }
 
 static void