1
0
mirror of git://projects.qi-hardware.com/fped.git synced 2024-11-18 07:16:15 +02:00

don't draw center cross in full-page Postscript

This commit is contained in:
Werner Almesberger 2012-01-18 16:10:22 -03:00
parent cb34a28826
commit e2749ea6c5

View File

@ -577,12 +577,14 @@ static void ps_cross(FILE *file, const struct inst *inst)
} }
static void ps_draw_package(FILE *file, const struct pkg *pkg, double zoom) static void ps_draw_package(FILE *file, const struct pkg *pkg, double zoom,
int cross)
{ {
enum inst_prio prio; enum inst_prio prio;
const struct inst *inst; const struct inst *inst;
fprintf(file, "gsave %f dup scale\n", zoom); fprintf(file, "gsave %f dup scale\n", zoom);
if (cross)
ps_cross(file, pkgs->insts[ip_frame]); ps_cross(file, pkgs->insts[ip_frame]);
FOR_INST_PRIOS_UP(prio) { FOR_INST_PRIOS_UP(prio) {
FOR_PKG_INSTS(pkgs, prio, inst) FOR_PKG_INSTS(pkgs, prio, inst)
@ -837,7 +839,7 @@ static void ps_package(FILE *file, const struct pkg *pkg, int page)
/* main drawing */ /* main drawing */
fprintf(file, "gsave %d %d translate\n", fprintf(file, "gsave %d %d translate\n",
(int) (x/(f+2)*f/2)-PAGE_HALF_WIDTH, c); (int) (x/(f+2)*f/2)-PAGE_HALF_WIDTH, c);
ps_draw_package(file, pkg, f); ps_draw_package(file, pkg, f, 1);
active_params = minimal_params; active_params = minimal_params;
@ -851,17 +853,17 @@ static void ps_package(FILE *file, const struct pkg *pkg, int page)
/* x1 package */ /* x1 package */
fprintf(file, "grestore gsave %d %d translate\n", fprintf(file, "grestore gsave %d %d translate\n",
(d+PAGE_HALF_WIDTH)/2, y/6*5+PS_DIVIDER_BORDER); (d+PAGE_HALF_WIDTH)/2, y/6*5+PS_DIVIDER_BORDER);
ps_draw_package(file, pkg, 1); ps_draw_package(file, pkg, 1, 1);
/* x2 package */ /* x2 package */
fprintf(file, "grestore gsave %d %d translate\n", fprintf(file, "grestore gsave %d %d translate\n",
(d+PAGE_HALF_WIDTH)/2, y/3+PS_DIVIDER_BORDER); (d+PAGE_HALF_WIDTH)/2, y/3+PS_DIVIDER_BORDER);
ps_draw_package(file, pkg, 2); ps_draw_package(file, pkg, 2, 1);
} else if (x/(f+1) >= w && y/2 > h) { } else if (x/(f+1) >= w && y/2 > h) {
/* main drawing */ /* main drawing */
fprintf(file, "gsave %d %d translate\n", fprintf(file, "gsave %d %d translate\n",
(int) (x/(f+1)*f/2)-PAGE_HALF_WIDTH, c); (int) (x/(f+1)*f/2)-PAGE_HALF_WIDTH, c);
ps_draw_package(file, pkg, f); ps_draw_package(file, pkg, f, 1);
active_params = minimal_params; active_params = minimal_params;
@ -875,10 +877,10 @@ static void ps_package(FILE *file, const struct pkg *pkg, int page)
/* x1 package */ /* x1 package */
fprintf(file, "grestore gsave %d %d translate\n", fprintf(file, "grestore gsave %d %d translate\n",
(d+PAGE_HALF_WIDTH)/2, c); (d+PAGE_HALF_WIDTH)/2, c);
ps_draw_package(file, pkg, 1); ps_draw_package(file, pkg, 1, 1);
} else { } else {
fprintf(file, "gsave 0 %d translate\n", c); fprintf(file, "gsave 0 %d translate\n", c);
ps_draw_package(file, pkg, f); ps_draw_package(file, pkg, f, 1);
} }
fprintf(file, "grestore\n"); fprintf(file, "grestore\n");
@ -1141,7 +1143,7 @@ static void ps_package_fullpage(FILE *file, const struct pkg *pkg, int page)
f = fx < fy ? fx : fy; f = fx < fy ? fx : fy;
} }
fprintf(file, "%d %d translate\n", (int) (-cx*f), (int) (-cy*f)); fprintf(file, "%d %d translate\n", (int) (-cx*f), (int) (-cy*f));
ps_draw_package(file, pkg, f); ps_draw_package(file, pkg, f, 0);
fprintf(file, "showpage\n"); fprintf(file, "showpage\n");
} }