Index: trunk/src/layer.c =================================================================== --- trunk/src/layer.c (revision 19119) +++ trunk/src/layer.c (revision 19120) @@ -47,7 +47,7 @@ {"rats", PCB_LYT_VIRTUAL + 2, PCB_LYT_VIRTUAL | PCB_LYT_RAT, NULL, -1 }, {"topassembly", PCB_LYT_VIRTUAL + 3, PCB_LYT_VIRTUAL | PCB_LYT_TOP, "assy", F_assy }, {"bottomassembly", PCB_LYT_VIRTUAL + 4, PCB_LYT_VIRTUAL | PCB_LYT_BOTTOM, "assy", F_assy }, - {"fab", PCB_LYT_VIRTUAL + 5, PCB_LYT_VIRTUAL | PCB_LYT_FAB | PCB_LYT_LOGICAL, "fab", F_fab }, + {"fab", PCB_LYT_VIRTUAL + 5, PCB_LYT_VIRTUAL | PCB_LYT_LOGICAL, "fab", F_fab }, {"plated-drill", PCB_LYT_VIRTUAL + 6, PCB_LYT_VIRTUAL | PCB_LYT_PDRILL, "plated", F_plated }, {"unplated-drill", PCB_LYT_VIRTUAL + 7, PCB_LYT_VIRTUAL | PCB_LYT_UDRILL, "unplated", F_unplated }, {"csect", PCB_LYT_VIRTUAL + 8, PCB_LYT_VIRTUAL | PCB_LYT_CSECT | PCB_LYT_LOGICAL, "csect", F_csect }, @@ -86,7 +86,6 @@ { PCB_LYT_OUTLINE, 2, "outline" }, { PCB_LYT_RAT, 2, "rat" }, { PCB_LYT_INVIS, 2, "invis" }, - { PCB_LYT_FAB, 2, "fab" }, { PCB_LYT_PDRILL, 2, "plateddrill" }, { PCB_LYT_UDRILL, 2, "unplateddrill" }, { PCB_LYT_CSECT, 2, "cross-section" }, Index: trunk/src/layer.h =================================================================== --- trunk/src/layer.h (revision 19119) +++ trunk/src/layer.h (revision 19120) @@ -51,7 +51,6 @@ PCB_LYT_OUTLINE = 0x00001000, /* outline (contour of the board) */ PCB_LYT_RAT = 0x00002000, /* (virtual) rats nest (one, not in the stackup) */ PCB_LYT_INVIS = 0x00004000, /* (virtual) layer is invisible (one, not in the stackup) */ - PCB_LYT_FAB = 0x00010000, /* (virtual) fab drawing (one, not in the stackup) */ PCB_LYT_PDRILL = 0x00020000, /* (virtual) plated drills (affects all physical layers) */ PCB_LYT_UDRILL = 0x00040000, /* (virtual) unplated drills (affects all physical layers) */ PCB_LYT_UI = 0x00080000, /* (virtual) user interface drawings (feature plugins use this for displaying states or debug info) */ @@ -95,6 +94,7 @@ #define PCB_LAYER_SIDED(lyt) (((lyt) & PCB_LYT_COPPER) || ((lyt) & PCB_LYT_SILK) || ((lyt) & PCB_LYT_MASK) || ((lyt) & PCB_LYT_PASTE)) #define PCB_LAYER_IS_ASSY(lyt, purpi) (((lyt) & PCB_LYT_VIRTUAL) && ((purpi) == F_assy)) +#define PCB_LAYER_IS_FAB(lyt, purpi) (((lyt) & PCB_LYT_VIRTUAL) && ((purpi) == F_fab)) #include "globalconst.h" #include "global_typedefs.h" Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 19119) +++ trunk/src_plugins/export_gerber/gerber.c (revision 19120) @@ -424,7 +424,7 @@ suff = "crs"; else if (fmatch(flags, PCB_LYT_INVIS)) suff = "inv"; - else if (fmatch(flags, PCB_LYT_FAB)) + else if (PCB_LAYER_IS_FAB(flags, purpi)) suff = "fab"; else if (fmatch(flags, PCB_LYT_TOP) && PCB_LAYER_IS_ASSY(flags, purpi)) suff = "ast"; @@ -469,7 +469,7 @@ suff = "gbp"; else if (fmatch(flags, PCB_LYT_INVIS)) suff = "inv"; - else if (fmatch(flags, PCB_LYT_FAB)) + else if (PCB_LAYER_IS_FAB(flags, purpi)) suff = "fab"; else if (fmatch(flags, PCB_LYT_TOP) && PCB_LAYER_IS_ASSY(flags, purpi)) suff = "ast"; @@ -515,7 +515,7 @@ suff = "gbp"; else if (fmatch(flags, PCB_LYT_INVIS)) suff = "inv"; - else if (fmatch(flags, PCB_LYT_FAB)) + else if (PCB_LAYER_IS_FAB(flags, purpi)) suff = "fab"; else if (fmatch(flags, PCB_LYT_TOP) && PCB_LAYER_IS_ASSY(flags, purpi)) suff = "ast"; @@ -722,7 +722,7 @@ if (copy_outline_mode == COPY_OUTLINE_SILK && (flags & PCB_LYT_SILK)) stay = 1; if (copy_outline_mode == COPY_OUTLINE_ALL && \ ((flags & PCB_LYT_SILK) || (flags & PCB_LYT_MASK) || - (flags & PCB_LYT_FAB) || PCB_LAYER_IS_ASSY(flags, purpi) || + PCB_LAYER_IS_FAB(flags, purpi) || PCB_LAYER_IS_ASSY(flags, purpi) || (flags & PCB_LYT_OUTLINE))) stay = 1; if (!stay) return 0; @@ -878,7 +878,7 @@ if (copy_outline_mode == COPY_OUTLINE_SILK && (flags & PCB_LYT_SILK)) want_outline = 1; - if (copy_outline_mode == COPY_OUTLINE_ALL && ((flags & PCB_LYT_SILK) || (flags & PCB_LYT_MASK) || (flags & PCB_LYT_FAB) || PCB_LAYER_IS_ASSY(flags, purpi))) + if (copy_outline_mode == COPY_OUTLINE_ALL && ((flags & PCB_LYT_SILK) || (flags & PCB_LYT_MASK) || PCB_LAYER_IS_FAB(flags, purpi) || PCB_LAYER_IS_ASSY(flags, purpi))) want_outline = 1; if (want_outline && !(flags & PCB_LYT_OUTLINE)) { Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 19119) +++ trunk/src_plugins/export_png/png.c (revision 19120) @@ -1278,7 +1278,7 @@ if (flags & PCB_LYT_NOEXPORT) return 0; - if (PCB_LAYER_IS_ASSY(flags, purpi) || (flags & PCB_LYT_FAB) || (flags & PCB_LYT_PASTE) || (flags & PCB_LYT_INVIS) || (flags & PCB_LYT_CSECT)) + if (PCB_LAYER_IS_ASSY(flags, purpi) || PCB_LAYER_IS_FAB(flags, purpi) || (flags & PCB_LYT_PASTE) || (flags & PCB_LYT_INVIS) || (flags & PCB_LYT_CSECT)) return 0; } Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 19119) +++ trunk/src_plugins/export_ps/eps.c (revision 19120) @@ -375,7 +375,7 @@ if (flags & PCB_LYT_NOEXPORT) return 0; - if (PCB_LAYER_IS_ASSY(flags, purpi) || (flags & PCB_LYT_FAB) || (flags & PCB_LYT_CSECT) || (flags & PCB_LYT_INVIS)) + if (PCB_LAYER_IS_ASSY(flags, purpi) || PCB_LAYER_IS_FAB(flags, purpi) || (flags & PCB_LYT_CSECT) || (flags & PCB_LYT_INVIS)) return 0; if ((group >= 0) && pcb_layergrp_is_empty(PCB, group) && (flags & PCB_LYT_OUTLINE)) Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 19119) +++ trunk/src_plugins/export_ps/ps.c (revision 19120) @@ -930,7 +930,7 @@ if (mirror_this) fprintf(global.f, "1 -1 scale\n"); - fprintf(global.f, "%g dup neg scale\n", (flags & PCB_LYT_FAB) ? 1.0 : global.scale_factor); + fprintf(global.f, "%g dup neg scale\n", PCB_LAYER_IS_FAB(flags, purpi) ? 1.0 : global.scale_factor); pcb_fprintf(global.f, "%mi %mi translate\n", -PCB->MaxWidth / 2, -PCB->MaxHeight / 2); /* Keep the drill list from falling off the left edge of the paper, @@ -937,7 +937,7 @@ * even if it means some of the board falls off the right edge. * If users don't want to make smaller boards, or use fewer drill * sizes, they can always ignore this sheet. */ - if (flags & PCB_LYT_FAB) { + if (PCB_LAYER_IS_FAB(flags, purpi)) { pcb_coord_t natural = boffset - PCB_MIL_TO_COORD(500) - PCB->MaxHeight / 2; pcb_coord_t needed = pcb_stub_draw_fab_overhang(); pcb_fprintf(global.f, "%% PrintFab overhang natural %mi, needed %mi\n", natural, needed); @@ -989,7 +989,7 @@ #if 0 /* Try to outsmart ps2pdf's heuristics for page rotation, by putting * text on all pages -- even if that text is blank */ - if (!(flags & PCB_LYT_FAB)) + if (!(PCB_LAYER_IS_FAB(flags, purpi))) fprintf(global.f, "gsave tx ty translate 1 -1 scale 0 0 moveto (Layer %s) show grestore newpath /ty ty ts sub def\n", name); else fprintf(global.f, "gsave tx ty translate 1 -1 scale 0 0 moveto ( ) show grestore newpath /ty ty ts sub def\n"); Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layout.h =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layout.h (revision 19119) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layout.h (revision 19120) @@ -92,7 +92,6 @@ LYT_OUTLINE = PCB_LYT_OUTLINE, LYT_RAT = PCB_LYT_RAT, LYT_INVIS = PCB_LYT_INVIS, - LYT_FAB = PCB_LYT_FAB, LYT_PDRILL = PCB_LYT_PDRILL, LYT_UDRILL = PCB_LYT_UDRILL, LYT_ANYTHING = PCB_LYT_ANYTHING,