X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/halibut/blobdiff_plain/09358aa7f255d1cd8d47dd152c480d4818cb24cf..0f6715c9d3e0febeddacdf2805ac314b2fa86a2e:/bk_ps.c

diff --git a/bk_ps.c b/bk_ps.c
index c9f4223..0f8bc99 100644
--- a/bk_ps.c
+++ b/bk_ps.c
@@ -6,34 +6,11 @@
 #include "halibut.h"
 #include "paper.h"
 
-static void ps_versionid(FILE *fp, word *words);
+static void ps_comment(FILE *fp, char const *leader, 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,
@@ -52,10 +29,10 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
 
     filename = dupstr("output.ps");
     for (p = sourceform; p; p = p->next) {
-	if (p->type == para_Config && p->parent) {
+	if (p->type == para_Config) {
 	    if (!ustricmp(p->keyword, L"ps-filename")) {
 		sfree(filename);
-		filename = utoa_dup(uadv(p->keyword));
+		filename = dupstr(adv(p->origkeyword));
 	    }
 	}
     }
@@ -66,13 +43,46 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
 	return;
     }
 
-    fprintf(fp, "%%!PS-Adobe-1.0\n");
+    fprintf(fp, "%%!PS-Adobe-3.0\n");
+    fprintf(fp, "%%%%Creator: Halibut, %s\n", version);
+    fprintf(fp, "%%%%DocumentData: Clean8Bit\n");
+    fprintf(fp, "%%%%LanguageLevel: 1\n");
     for (pageno = 0, page = doc->pages; page; page = page->next)
 	pageno++;
     fprintf(fp, "%%%%Pages: %d\n", pageno);
+    for (p = sourceform; p; p = p->next)
+	if (p->type == para_Title)
+	    ps_comment(fp, "%%Title: ", p->words);
+    fprintf(fp, "%%%%DocumentNeededResources:\n");
+    for (fe = doc->fonts->head; fe; fe = fe->next)
+	/* XXX This may request the same font multiple times. */
+	fprintf(fp, "%%%%+ font %s\n", fe->font->name);
+    fprintf(fp, "%%%%DocumentSuppliedResources: procset Halibut 0 0\n");
     fprintf(fp, "%%%%EndComments\n");
 
     fprintf(fp, "%%%%BeginProlog\n");
+    fprintf(fp, "%%%%BeginResource: procset Halibut 0 0\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,
+	    "/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");
 
     fprintf(fp, "%%%%BeginSetup\n");
@@ -82,7 +92,11 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
      */
     for (p = sourceform; p; p = p->next)
 	if (p->type == para_VersionID)
-	    ps_versionid(fp, p->words);
+	    ps_comment(fp, "% ", p->words);
+
+    for (fe = doc->fonts->head; fe; fe = fe->next)
+	/* XXX This may request the same font multiple times. */
+	fprintf(fp, "%%%%IncludeResource: font %s\n", fe->font->name);
 
     /*
      * Re-encode and re-metric the fonts.
@@ -99,13 +113,14 @@ 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, "/%s%c", fe->vector[i] ? fe->vector[i] : ".notdef",
+		    i % 4 == 3 ? '\n' : ' ');
 	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);
+			1000.0 * width / FUNITS_PER_PT);
 	    }
 	}
 	fprintf(fp, "end def currentdict end\n");
@@ -119,13 +134,12 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
      */
     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);
-	fprintf(fp, "%%%%BeginPageSetup\n");
-	fprintf(fp, "%%%%EndPageSetup\n");
+	fprintf(fp, "save\n");
 
 #if 0
 	{
@@ -137,12 +151,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
@@ -150,27 +164,52 @@ 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);
 	}
 
-	for (frag = page->first_text; frag; frag = frag->next) {
+	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 / FUNITS_PER_PT);
+
+	    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/FUNITS_PER_PT);
+		for (c = frag->text; *c; c++) {
+		    if (*c == '(' || *c == ')' || *c == '\\')
+			fputc('\\', fp);
+		    fputc(*c, fp);
+		}
+		fprintf(fp, ")");
 
-	    for (c = frag->text; *c; c++) {
-		if (*c == '(' || *c == ')' || *c == '\\')
-		    fputc('\\', fp);
-		fputc(*c, fp);
+		frag = frag->next;
 	    }
 
-	    fprintf(fp, ") show\n");
+	    fprintf(fp, "]t\n");
 	}
 
-	fprintf(fp, "showpage\n");
+	fprintf(fp, "restore showpage\n");
     }
 
     fprintf(fp, "%%%%EOF\n");
@@ -180,9 +219,9 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
     sfree(filename);
 }
 
-static void ps_versionid(FILE *fp, word *words)
+static void ps_comment(FILE *fp, char const *leader, word *words)
 {
-    fprintf(fp, "%% ");
+    fprintf(fp, "%s", leader);
 
     for (; words; words = words->next) {
 	char *text;
@@ -202,7 +241,7 @@ static void ps_versionid(FILE *fp, word *words)
 
 	switch (type) {
 	  case word_Normal:
-	    text = utoa_dup(words->text);
+	    text = utoa_dup(words->text, CS_ASCII);
 	    break;
 	  case word_WhiteSpace:
 	    text = dupstr(" ");