X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/halibut/blobdiff_plain/32ca74bb13739f17537968f30b754eba90257992..3ae196b46ee9e2850ea7fc91262b746240df84e9:/bk_ps.c

diff --git a/bk_ps.c b/bk_ps.c
index 5409290..7c0fbb8 100644
--- a/bk_ps.c
+++ b/bk_ps.c
@@ -56,8 +56,13 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
     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);
+	if (!fe->font->info->fp)
+	    fprintf(fp, "%%%%+ font %s\n", fe->font->info->name);
     fprintf(fp, "%%%%DocumentSuppliedResources: procset Halibut 0 0\n");
+    for (fe = doc->fonts->head; fe; fe = fe->next)
+	/* XXX This may request the same font multiple times. */
+	if (fe->font->info->fp)
+	    fprintf(fp, "%%%%+ font %s\n", fe->font->info->name);
     fprintf(fp, "%%%%EndComments\n");
 
     fprintf(fp, "%%%%BeginProlog\n");
@@ -94,9 +99,35 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
 	if (p->type == para_VersionID)
 	    ps_comment(fp, "% ", p->words);
 
-    for (fe = doc->fonts->head; fe; fe = fe->next)
+    /*
+     * Request the correct page size.  We might want to bracket this
+     * with "%%BeginFeature: *PageSize A4" or similar, and "%%EndFeature",
+     * but that would require us to have a way of getting the name of
+     * the page size given its dimensions.
+     */
+    fprintf(fp, "/setpagedevice where {\n");
+    fprintf(fp, "  pop 2 dict dup /PageSize [%g %g] put setpagedevice\n",
+	    doc->paper_width / FUNITS_PER_PT,
+	    doc->paper_height / FUNITS_PER_PT);
+    fprintf(fp, "} if\n");
+
+    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);
+	if (fe->font->info->fp) {
+	    char buf[512];
+	    size_t len;
+	    fprintf(fp, "%%%%BeginResource: font %s\n", fe->font->info->name);
+	    rewind(fe->font->info->fp);
+	    do {
+		len = fread(buf, 1, sizeof(buf), fe->font->info->fp);
+		fwrite(buf, 1, len, fp);
+	    } while (len == sizeof(buf));
+	    fprintf(fp, "%%%%EndResource\n");
+	} else {
+	    fprintf(fp, "%%%%IncludeResource: font %s\n",
+		    fe->font->info->name);
+	}
+    }
 
     /*
      * Re-encode the fonts.
@@ -109,7 +140,8 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
 	sprintf(fname, "f%d", font_index++);
 	fe->name = dupstr(fname);
 
-	fprintf(fp, "/%s findfont dup length dict begin\n", fe->font->name);
+	fprintf(fp, "/%s findfont dup length dict begin\n",
+	    fe->font->info->name);
 	fprintf(fp, "{1 index /FID ne {def} {pop pop} ifelse} forall\n");
 	fprintf(fp, "/Encoding [\n");
 	for (i = 0; i < 256; i++)
@@ -129,6 +161,8 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
     for (page = doc->pages; page; page = page->next) {
 	text_fragment *frag, *frag_end;
 	rect *r;
+	font_encoding *fe;
+	int fs;
 
 	pageno++;
 	fprintf(fp, "%%%%Page: %d %d\n", pageno, pageno);
@@ -163,9 +197,9 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
 	}
 
 	frag = page->first_text;
+	fe = NULL;
+	fs = -1;
 	while (frag) {
-	    font_encoding *fe;
-	    int fs;
 	    char *c;
 
 	    /*
@@ -178,9 +212,6 @@ void ps_backend(paragraph *sourceform, keywordlist *keywords,
 
 	    fprintf(fp, "%g[", frag->y / FUNITS_PER_PT);
 
-	    fe = NULL;
-	    fs = -1;
-
 	    while (frag && frag != frag_end) {
 
 		if (frag->fe != fe || frag->fontsize != fs)