]> git.cameronkatri.com Git - mandoc.git/blobdiff - term_ps.c
Make the description of -K autodetection easer to understand.
[mandoc.git] / term_ps.c
index f116b792063a2a1da5b0e038c076d46ee3745fb8..696ff22435926eeff79e4a581b7712ac4b31c676 100644 (file)
--- a/term_ps.c
+++ b/term_ps.c
@@ -1,7 +1,7 @@
-/*     $Id: term_ps.c,v 1.77 2015/10/12 00:08:16 schwarze Exp $ */
+/*     $Id: term_ps.c,v 1.83 2017/02/17 14:31:52 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014, 2015, 2016 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
@@ -20,7 +20,9 @@
 #include <sys/types.h>
 
 #include <assert.h>
+#if HAVE_ERR
 #include <err.h>
+#endif
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -96,20 +98,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_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_plast(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_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_setwidth(struct termp *, int, int);
-static struct termp     *pspdf_alloc(const struct mchars *,
-                               const struct manoutput *);
+static struct termp     *pspdf_alloc(const struct manoutput *);
 static void              pdf_obj(struct termp *, size_t);
 
 /*
@@ -510,29 +509,29 @@ static    const struct font fonts[TERMFONT__MAX] = {
 };
 
 void *
-pdf_alloc(const struct mchars *mchars, const struct manoutput *outopts)
+pdf_alloc(const struct manoutput *outopts)
 {
        struct termp    *p;
 
-       if (NULL != (p = pspdf_alloc(mchars, outopts)))
+       if (NULL != (p = pspdf_alloc(outopts)))
                p->type = TERMTYPE_PDF;
 
        return p;
 }
 
 void *
-ps_alloc(const struct mchars *mchars, const struct manoutput *outopts)
+ps_alloc(const struct manoutput *outopts)
 {
        struct termp    *p;
 
-       if (NULL != (p = pspdf_alloc(mchars, outopts)))
+       if (NULL != (p = pspdf_alloc(outopts)))
                p->type = TERMTYPE_PS;
 
        return p;
 }
 
 static struct termp *
-pspdf_alloc(const struct mchars *mchars, const struct manoutput *outopts)
+pspdf_alloc(const struct manoutput *outopts)
 {
        struct termp    *p;
        unsigned int     pagex, pagey;
@@ -540,7 +539,6 @@ pspdf_alloc(const struct mchars *mchars, const struct manoutput *outopts)
        const char      *pp;
 
        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));
@@ -644,10 +642,8 @@ pspdf_free(void *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);
@@ -784,6 +780,9 @@ ps_end(struct termp *p)
 {
        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
@@ -1027,39 +1026,53 @@ ps_pclose(struct termp *p)
        p->ps->flags &= ~PS_INLINE;
 }
 
+/* If we have a `last' char that wasn't printed yet, print it now. */
 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)
 {
-       size_t          savecol, wx;
+       size_t          savecol;
        char            c;
 
        c = arg >= 128 || arg <= 0 ? '?' : arg;
@@ -1125,43 +1138,12 @@ ps_letter(struct termp *p, int arg)
         * 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
-        * 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;
@@ -1194,7 +1176,8 @@ ps_advance(struct termp *p, size_t len)
         * and readjust our column settings.
         */
 
-       ps_fclose(p);
+       ps_plast(p);
+       ps_pclose(p);
        p->ps->pscol += len;
 }
 
@@ -1204,7 +1187,8 @@ ps_endline(struct termp *p)
 
        /* 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