First, properly escape periods with \&. Then consistently refer to

[mandoc.git] / term_ps.c

diff --git a/term_ps.c b/term_ps.c
index 2fb235a9df8e2dc3a38381f2a846eacbab5b68f2..233118b819f69c99c15e416d021aa294a19d4dff 100644 (file)
--- a/term_ps.c
+++ b/term_ps.c
@@ -1,4 +1,4 @@
-/*     $Id: term_ps.c,v 1.38 2010/07/25 19:37:38 kristaps Exp $ */
+/*     $Id: term_ps.c,v 1.48 2011/03/17 08:49:34 kristaps Exp $ */
 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -18,7 +18,7 @@
 #include "config.h"
 #endif
 
-#include <sys/param.h>
+#include <sys/types.h>
 
 #include <assert.h>
 #include <stdarg.h>
@@ -29,6 +29,7 @@
 #include <time.h>
 #include <unistd.h>
 
+#include "mandoc.h"
 #include "out.h"
 #include "main.h"
 #include "term.h"
@@ -353,20 +354,22 @@ static    const struct font fonts[TERMFONT__MAX] = {
 
 /* These work the buffer used by the header and footer. */
 #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;
+
+       p->engine.ps.psmargsz += sz;
+
+       p->engine.ps.psmarg = mandoc_realloc
+               (p->engine.ps.psmarg,
+                p->engine.ps.psmargsz);
+}
 
 static double            ps_hspan(const struct termp *,
                                const struct roffsu *);
@@ -384,6 +387,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 struct termp     *pspdf_alloc(char *);
+static void              pdf_obj(struct termp *, size_t);
 
 
 void *
@@ -419,8 +423,7 @@ pspdf_alloc(char *outopts)
        const char      *pp;
        char            *v;
 
-       if (NULL == (p = term_alloc(TERMENC_ASCII)))
-               return(NULL);
+       p = term_alloc(TERMENC_ASCII);
 
        p->advance = ps_advance;
        p->begin = ps_begin;
@@ -520,6 +523,8 @@ pspdf_free(void *arg)
 
        if (p->engine.ps.psmarg)
                free(p->engine.ps.psmarg);
+       if (p->engine.ps.pdfobjs)
+               free(p->engine.ps.pdfobjs);
 
        term_free(p);
 }
@@ -553,7 +558,7 @@ ps_printf(struct termp *p, const char *fmt, ...)
         * 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;
        len = vsnprintf(&p->engine.ps.psmarg[pos], PS_BUFSLOP, fmt, ap);
@@ -561,8 +566,6 @@ ps_printf(struct termp *p, const char *fmt, ...)
        va_end(ap);
 
        p->engine.ps.psmargcur = strlen(p->engine.ps.psmarg);
-       p->engine.ps.pdfbytes += /* LINTED */
-               len < 0 ? 0 : (size_t)len;
 }
 
 
@@ -574,12 +577,13 @@ ps_putchar(struct termp *p, char c)
        /* See ps_printf(). */
 
        if ( ! (PS_MARGINS & p->engine.ps.flags)) {
+               /* LINTED */
                putchar(c);
                p->engine.ps.pdfbytes++;
                return;
        }
 
-       PS_GROWBUF(p, 2);
+       ps_growbuf(p, 2);
 
        pos = (int)p->engine.ps.psmargcur++;
        p->engine.ps.psmarg[pos++] = c;
@@ -587,6 +591,28 @@ 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((int)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)
 {
@@ -612,19 +638,20 @@ ps_closepage(struct termp *p)
                ps_printf(p, "endstream\nendobj\n");
 
                /* Length of content. */
-               ps_printf(p, "%zu 0 obj\n", base + 1);
+               pdf_obj(p, base + 1);
                ps_printf(p, "%zu\nendobj\n", len);
 
                /* Resource for content. */
-               ps_printf(p, "%zu 0 obj\n", base + 2);
+               pdf_obj(p, base + 2);
                ps_printf(p, "<<\n/ProcSet [/PDF /Text]\n");
                ps_printf(p, "/Font <<\n");
-               for (i = 0; i < 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");
 
                /* Page node. */
-               ps_printf(p, "%zu 0 obj\n<<\n", base + 3);
+               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);
@@ -665,7 +692,8 @@ ps_end(struct termp *p)
                return;
        } 
 
-       ps_printf(p, "2 0 obj\n<<\n/Type /Pages\n");
+       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));
@@ -681,7 +709,7 @@ ps_end(struct termp *p)
                p->engine.ps.pdfbody + 4;
 
        ps_printf(p, "]\n>>\nendobj\n");
-       ps_printf(p, "%zu 0 obj\n", base);
+       pdf_obj(p, base);
        ps_printf(p, "<<\n");
        ps_printf(p, "/Type /Catalog\n");
        ps_printf(p, "/Pages 2 0 R\n");
@@ -689,7 +717,12 @@ ps_end(struct termp *p)
        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");
+       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);
@@ -718,7 +751,7 @@ ps_begin(struct termp *p)
                p->engine.ps.psmarg[0] = '\0';
        }
 
-       p->engine.ps.pdfbytes = 0;
+       /*p->engine.ps.pdfbytes = 0;*/
        p->engine.ps.psmargcur = 0;
        p->engine.ps.flags = PS_MARGINS;
        p->engine.ps.pscol = p->engine.ps.left;
@@ -750,7 +783,6 @@ ps_begin(struct termp *p)
 
        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");
@@ -768,14 +800,13 @@ ps_begin(struct termp *p)
                ps_printf(p, "\n%%%%EndComments\n");
        } else {
                ps_printf(p, "%%PDF-1.1\n");
-               ps_printf(p, "1 0 obj\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++) {
-                       ps_printf(p, "%d 0 obj\n", i + 3);
+                       pdf_obj(p, (size_t)i + 3);
                        ps_printf(p, "<<\n");
                        ps_printf(p, "/Type /Font\n");
                        ps_printf(p, "/Subtype /Type1\n");
@@ -812,8 +843,7 @@ ps_pletter(struct termp *p, int c)
                                        fonts[(int)p->engine.ps.lastf].name, 
                                        p->engine.ps.scale);
                } else {
-                       ps_printf(p, "%zu 0 obj\n", 
-                                       p->engine.ps.pdfbody +
+                       pdf_obj(p, p->engine.ps.pdfbody + 
                                        p->engine.ps.pages * 4);
                        ps_printf(p, "<<\n");
                        ps_printf(p, "/Length %zu 0 R\n", 
@@ -870,7 +900,7 @@ ps_pletter(struct termp *p, int c)
 
        f = (int)p->engine.ps.lastf;
 
-       if (c <= 32 || (c - 32 > MAXCHAR)) {
+       if (c <= 32 || (c - 32 >= MAXCHAR)) {
                ps_putchar(p, ' ');
                p->engine.ps.pscol += (size_t)fonts[f].gly[0].wx;
                return;