Index: trunk/src/brave.c =================================================================== --- trunk/src/brave.c (revision 36634) +++ trunk/src/brave.c (revision 36635) @@ -53,7 +53,7 @@ static desc_t desc[] = { {PCB_BRAVE_NOXOR, "noxor", "avoid xor drawing", "use alternative rendering instead of xor draw", 0}, {PCB_BRAVE_NO_ENFORCE_CLR_MOVE, "enforceclrmove", "do not enforce object clearance on line point or line move", 0}, - {PCB_BRAVE_NEWFONT, "newfont", "new font renderer", "use the new, librnd-generalized font rendering engine", 0}, + {PCB_BRAVE_OLDFONT, "oldfont", "old font renderer", "use the old font rendering engine", 0}, {0, NULL, NULL, NULL} }; Index: trunk/src/brave.h =================================================================== --- trunk/src/brave.h (revision 36634) +++ trunk/src/brave.h (revision 36635) @@ -4,7 +4,7 @@ PCB_BRAVE_OFF = 0, PCB_BRAVE_NOXOR = 1, PCB_BRAVE_NO_ENFORCE_CLR_MOVE = 4, - PCB_BRAVE_NEWFONT = 8, + PCB_BRAVE_OLDFONT = 16, PCB_BRAVE_max } pcb_brave_t; Index: trunk/src/obj_text.c =================================================================== --- trunk/src/obj_text.c (revision 36634) +++ trunk/src/obj_text.c (revision 36635) @@ -434,7 +434,7 @@ unsigned char *rendered; int ctr; - if (!(pcb_brave & PCB_BRAVE_NEWFONT)) + if (pcb_brave & PCB_BRAVE_OLDFONT) return pcb_text_invalid_chars_orig(pcb, FontPtr, Text); if (FontPtr == NULL) @@ -456,7 +456,7 @@ { pcb_text_bbox_orig(FontPtr, Text); - if (pcb_brave & PCB_BRAVE_NEWFONT) { + if (!(pcb_brave & PCB_BRAVE_OLDFONT)) { rnd_coord_t cx[4], cy[4]; unsigned char *rendered = pcb_text_render_str(Text); double scx, scy; @@ -1367,7 +1367,7 @@ RND_INLINE void pcb_text_draw_string_(pcb_draw_info_t *info, pcb_font_t *font, const unsigned char *string, rnd_coord_t x0, rnd_coord_t y0, double scx, double scy, double rotdeg, pcb_text_mirror_t mirror, rnd_coord_t thickness, rnd_coord_t min_line_width, int xordraw, rnd_coord_t xordx, rnd_coord_t xordy, pcb_text_tiny_t tiny, pcb_draw_text_cb cb, void *cb_ctx) { - if (pcb_brave & PCB_BRAVE_NEWFONT) + if (!(pcb_brave & PCB_BRAVE_OLDFONT)) pcb_text_draw_string_rnd(info, font, string, x0, y0, scx, scy, rotdeg, mirror, thickness, min_line_width, xordraw, xordx, xordy, tiny, cb, cb_ctx); else pcb_text_draw_string_orig(info, font, string, x0, y0, scx, scy, rotdeg, mirror, thickness, min_line_width, xordraw, xordx, xordy, tiny, cb, cb_ctx); Index: trunk/src_plugins/fontmode/fontmode.c =================================================================== --- trunk/src_plugins/fontmode/fontmode.c (revision 36634) +++ trunk/src_plugins/fontmode/fontmode.c (revision 36635) @@ -463,7 +463,7 @@ rnd_event(&pcb->hidlib, RND_EVENT_BOARD_CHANGED, NULL); rnd_event(&pcb->hidlib, PCB_EVENT_LAYERS_CHANGED, NULL); - if (pcb_brave & PCB_BRAVE_NEWFONT) + if (!(pcb_brave & PCB_BRAVE_OLDFONT)) font2editor_new(pcb, &font->rnd_font, lfont, lorig, lwidth, lsilk); else font2editor_old(pcb, font, lfont, lorig, lwidth, lsilk); @@ -756,7 +756,7 @@ pcb_font_t *font = pcb_font(pcb, 0, 1); editor2font(pcb, font); - if (pcb_brave & PCB_BRAVE_NEWFONT) + if (!(pcb_brave & PCB_BRAVE_OLDFONT)) rnd_font_normalize(&font->rnd_font); else pcb_font_set_info(font); Index: trunk/src_plugins/io_lihata/write.c =================================================================== --- trunk/src_plugins/io_lihata/write.c (revision 36634) +++ trunk/src_plugins/io_lihata/write.c (revision 36635) @@ -1586,7 +1586,7 @@ static lht_node_t *build_font(pcb_font_t *font) { - if (pcb_brave & PCB_BRAVE_NEWFONT) + if (!(pcb_brave & PCB_BRAVE_OLDFONT)) return build_font_rnd(&font->rnd_font); else return build_font_old(font); Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 36634) +++ trunk/src_plugins/io_pcb/file.c (revision 36635) @@ -391,7 +391,7 @@ static void WritePCBFontData(FILE *FP) { - if (pcb_brave & PCB_BRAVE_NEWFONT) + if (!(pcb_brave & PCB_BRAVE_OLDFONT)) WritePCBFontData_rnd(FP); else WritePCBFontData_old(FP);