Added a new config directive `html-local-head', which permits me to

[sgt/halibut] / bk_ps.c

diff --git a/bk_ps.c b/bk_ps.c
index d64bc6a..5409290 100644 (file)
--- a/bk_ps.c
+++ b/bk_ps.c
@@ -74,15 +74,13 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
      *  - a string is shown
      */
     fprintf(fp,
-           "/t {\n"
-           "  exch /y exch def {\n"
-           "    /x exch def\n"
-           "    x type /arraytype eq {x aload pop scalefont setfont} if\n"
-           "    x type dup /integertype eq exch /realtype eq or "
-                                                       "{x y moveto} if\n"
-           "    x type /stringtype eq {x show} if\n"
-           "  } forall\n"
-           "} bind def\n");
+           "/tdict 4 dict dup begin\n"
+           "  /arraytype {aload pop scalefont setfont} bind def\n"
+           "  /realtype {1 index moveto} bind def\n"
+           "  /integertype /realtype load def\n"
+           "  /stringtype {show} bind def\n"
+           "end def\n"
+           "/t { tdict begin {dup type exec} forall end pop } bind def\n");
 
     fprintf(fp, "%%%%EndResource\n");
     fprintf(fp, "%%%%EndProlog\n");
@@ -101,7 +99,7 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
        fprintf(fp, "%%%%IncludeResource: font %s\n", fe->font->name);
 
     /*
-     * Re-encode and re-metric the fonts.
+     * Re-encode the fonts.
      */
     font_index = 0;
     for (fe = doc->fonts->head; fe; fe = fe->next) {
@@ -115,16 +113,10 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
        fprintf(fp, "{1 index /FID ne {def} {pop pop} ifelse} forall\n");
        fprintf(fp, "/Encoding [\n");
        for (i = 0; i < 256; i++)
-           fprintf(fp, "/%s\n", fe->vector[i] ? fe->vector[i] : ".notdef");
-       fprintf(fp, "] def /Metrics 256 dict dup begin\n");
-       for (i = 0; i < 256; i++) {
-           if (fe->indices[i] >= 0) {
-               double width = fe->font->widths[fe->indices[i]];
-               fprintf(fp, "/%s %g def\n", fe->vector[i],
-                       1000.0 * width / 4096.0);
-           }
-       }
-       fprintf(fp, "end def currentdict end\n");
+           fprintf(fp, "/%s%c", fe->vector[i] ? fe->vector[i] : ".notdef",
+                   i % 4 == 3 ? '\n' : ' ');
+       fprintf(fp, "] def\n");
+       fprintf(fp, "currentdict end\n");
        fprintf(fp, "/fontname-%s exch definefont /%s exch def\n\n",
               fe->name, fe->name);
     }
@@ -140,6 +132,7 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
 
        pageno++;
        fprintf(fp, "%%%%Page: %d %d\n", pageno, pageno);
+       fprintf(fp, "save\n");
 
 #if 0
        {
@@ -151,12 +144,12 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
             */
            for (xr = page->first_xref; xr; xr = xr->next) {
                fprintf(fp, "gsave 0.7 setgray %g %g moveto",
-                       xr->lx/4096.0, xr->ty/4096.0);
+                       xr->lx/FUNITS_PER_PT, xr->ty/FUNITS_PER_PT);
                fprintf(fp, " %g %g lineto %g %g lineto",
-                       xr->lx/4096.0, xr->by/4096.0,
-                       xr->rx/4096.0, xr->by/4096.0);
+                       xr->lx/FUNITS_PER_PT, xr->by/FUNITS_PER_PT,
+                       xr->rx/FUNITS_PER_PT, xr->by/FUNITS_PER_PT);
                fprintf(fp, " %g %g lineto closepath fill grestore\n",
-                       xr->rx/4096.0, xr->ty/4096.0);
+                       xr->rx/FUNITS_PER_PT, xr->ty/FUNITS_PER_PT);
            }
        }
 #endif
@@ -164,8 +157,9 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
        for (r = page->first_rect; r; r = r->next) {
            fprintf(fp, "%g %g moveto %g 0 rlineto 0 %g rlineto "
                    "-%g 0 rlineto closepath fill\n",
-                   r->x / 4096.0, r->y / 4096.0, r->w / 4096.0,
-                   r->h / 4096.0, r->w / 4096.0);
+                   r->x / FUNITS_PER_PT, r->y / FUNITS_PER_PT,
+                   r->w / FUNITS_PER_PT, r->h / FUNITS_PER_PT,
+                   r->w / FUNITS_PER_PT);
        }
 
        frag = page->first_text;
@@ -182,7 +176,7 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
                 frag_end && frag_end->y == frag->y;
                 frag_end = frag_end->next);
 
-           fprintf(fp, "%g[", frag->y / 4096.0);
+           fprintf(fp, "%g[", frag->y / FUNITS_PER_PT);
 
            fe = NULL;
            fs = -1;
@@ -194,7 +188,7 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
                fe = frag->fe;
                fs = frag->fontsize;
 
-               fprintf(fp, "%g(", frag->x/4096.0);
+               fprintf(fp, "%g(", frag->x/FUNITS_PER_PT);
                for (c = frag->text; *c; c++) {
                    if (*c == '(' || *c == ')' || *c == '\\')
                        fputc('\\', fp);
@@ -208,7 +202,7 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
            fprintf(fp, "]t\n");
        }
 
-       fprintf(fp, "showpage\n");
+       fprintf(fp, "restore showpage\n");
     }
 
     fprintf(fp, "%%%%EOF\n");