para_Title was confusing the XHTML backend and preventing it from

[sgt/halibut] / bk_ps.c

diff --git a/bk_ps.c b/bk_ps.c
index ae1feae..358571e 100644 (file)
--- a/bk_ps.c
+++ b/bk_ps.c
@@ -6,32 +6,11 @@
 #include "halibut.h"
 #include "paper.h"
 
+static void ps_versionid(FILE *fp, word *words);
+
 paragraph *ps_config_filename(char *filename)
 {
-    paragraph *p;
-    wchar_t *ufilename, *up;
-    int len;
-
-    p = mknew(paragraph);
-    memset(p, 0, sizeof(*p));
-    p->type = para_Config;
-    p->next = NULL;
-    p->fpos.filename = "<command line>";
-    p->fpos.line = p->fpos.col = -1;
-
-    ufilename = ufroma_dup(filename);
-    len = ustrlen(ufilename) + 2 + lenof(L"ps-filename");
-    p->keyword = mknewa(wchar_t, len);
-    up = p->keyword;
-    ustrcpy(up, L"ps-filename");
-    up = uadv(up);
-    ustrcpy(up, ufilename);
-    up = uadv(up);
-    *up = L'\0';
-    assert(up - p->keyword < len);
-    sfree(ufilename);
-
-    return p;
+    return cmdline_cfg_simple("ps-filename", filename, NULL);
 }
 
 void ps_backend(paragraph *sourceform, keywordlist *keywords,
@@ -50,11 +29,10 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
 
     filename = dupstr("output.ps");
     for (p = sourceform; p; p = p->next) {
-       p->private_data = NULL;
        if (p->type == para_Config && p->parent) {
            if (!ustricmp(p->keyword, L"ps-filename")) {
                sfree(filename);
-               filename = utoa_dup(uadv(p->keyword));
+               filename = dupstr(adv(p->origkeyword));
            }
        }
     }
@@ -72,9 +50,38 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
     fprintf(fp, "%%%%EndComments\n");
 
     fprintf(fp, "%%%%BeginProlog\n");
+    /*
+     * Supply a prologue function which allows a reasonably
+     * compressed representation of the text on the pages.
+     * 
+     * Expects two arguments: a y-coordinate, and then an array.
+     * Elements of the array are processed sequentially as follows:
+     * 
+     *  - a number is treated as an x-coordinate
+     *  - an array is treated as a (font, size) pair
+     *  - a string is shown
+     */
+    fprintf(fp,
+           "/t {\n"
+           "  exch /y exch def {\n"
+           "    /x exch def\n"
+           "    x type [] type eq {x aload pop scalefont setfont} if\n"
+           "    x type dup 1 type eq exch 1.0 type eq or {x y moveto} if\n"
+           "    x type () type eq {x show} if\n"
+           "  } forall\n"
+           "} def\n");
+
     fprintf(fp, "%%%%EndProlog\n");
 
     fprintf(fp, "%%%%BeginSetup\n");
+
+    /*
+     * This is as good a place as any to put version IDs.
+     */
+    for (p = sourceform; p; p = p->next)
+       if (p->type == para_VersionID)
+           ps_versionid(fp, p->words);
+
     /*
      * Re-encode and re-metric the fonts.
      */
@@ -106,11 +113,12 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
     fprintf(fp, "%%%%EndSetup\n");
 
     /*
-     * Output the text.
+     * Output the text and graphics.
      */
     pageno = 0;
     for (page = doc->pages; page; page = page->next) {
-       text_fragment *frag;
+       text_fragment *frag, *frag_end;
+       rect *r;
 
        pageno++;
        fprintf(fp, "%%%%Page: %d %d\n", pageno, pageno);
@@ -137,20 +145,51 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
        }
 #endif
 
-       for (frag = page->first_text; frag; frag = frag->next) {
+       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);
+       }
+
+       frag = page->first_text;
+       while (frag) {
+           font_encoding *fe;
+           int fs;
            char *c;
 
-           fprintf(fp, "%s %d scalefont setfont %g %g moveto (",
-                  frag->fe->name, frag->fontsize,
-                  frag->x/4096.0, frag->y/4096.0);
+           /*
+            * Collect all the adjacent text fragments with the
+            * same y-coordinate.
+            */
+           for (frag_end = frag;
+                frag_end && frag_end->y == frag->y;
+                frag_end = frag_end->next);
+
+           fprintf(fp, "%g[", frag->y / 4096.0);
 
-           for (c = frag->text; *c; c++) {
-               if (*c == '(' || *c == ')' || *c == '\\')
-                   fputc('\\', fp);
-               fputc(*c, fp);
+           fe = NULL;
+           fs = -1;
+
+           while (frag && frag != frag_end) {
+
+               if (frag->fe != fe || frag->fontsize != fs)
+                   fprintf(fp, "[%s %d]", frag->fe->name, frag->fontsize);
+               fe = frag->fe;
+               fs = frag->fontsize;
+
+               fprintf(fp, "%g(", frag->x/4096.0);
+               for (c = frag->text; *c; c++) {
+                   if (*c == '(' || *c == ')' || *c == '\\')
+                       fputc('\\', fp);
+                   fputc(*c, fp);
+               }
+               fprintf(fp, ")");
+
+               frag = frag->next;
            }
 
-           fprintf(fp, ") show\n");
+           fprintf(fp, "]t\n");
        }
 
        fprintf(fp, "showpage\n");
@@ -162,3 +201,42 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
 
     sfree(filename);
 }
+
+static void ps_versionid(FILE *fp, word *words)
+{
+    fprintf(fp, "%% ");
+
+    for (; words; words = words->next) {
+       char *text;
+       int type;
+
+       switch (words->type) {
+         case word_HyperLink:
+         case word_HyperEnd:
+         case word_UpperXref:
+         case word_LowerXref:
+         case word_XrefEnd:
+         case word_IndexRef:
+           continue;
+       }
+
+       type = removeattr(words->type);
+
+       switch (type) {
+         case word_Normal:
+           text = utoa_dup(words->text, CS_ASCII);
+           break;
+         case word_WhiteSpace:
+           text = dupstr(" ");
+           break;
+         case word_Quote:
+           text = dupstr("'");
+           break;
+       }
+
+       fputs(text, fp);
+       sfree(text);
+    }
+
+    fprintf(fp, "\n");
+}