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");
* - 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");
+ "/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");
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 and re-metric the fonts.
+ * Re-encode the fonts.
*/
font_index = 0;
for (fe = doc->fonts->head; fe; fe = fe->next) {
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++)
- 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);
}
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);
+ fprintf(fp, "save\n");
#if 0
{
*/
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
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;
+ fe = NULL;
+ fs = -1;
while (frag) {
- font_encoding *fe;
- int fs;
char *c;
/*
frag_end && frag_end->y == frag->y;
frag_end = frag_end->next);
- fprintf(fp, "%g[", frag->y / 4096.0);
-
- fe = NULL;
- fs = -1;
+ fprintf(fp, "%g[", frag->y / FUNITS_PER_PT);
while (frag && frag != frag_end) {
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);
fprintf(fp, "]t\n");
}
- fprintf(fp, "showpage\n");
+ fprintf(fp, "restore showpage\n");
}
fprintf(fp, "%%%%EOF\n");
~mdw / sgt / halibut / blobdiff