Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 4911) +++ trunk/scconfig/Rev.h (revision 4912) @@ -1 +1 @@ -static const int myrev = 4756; +static const int myrev = 4912; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 4911) +++ trunk/scconfig/Rev.tab (revision 4912) @@ -1,3 +1,4 @@ +4912 configure use pcb-rnd's font engine 4756 configure act_draw plugin for scripting 4703 configure sccbox fix for doc installation 4642 configure back annotation plugin Index: trunk/src/libcschem/cnc_pen.h =================================================================== --- trunk/src/libcschem/cnc_pen.h (revision 4911) +++ trunk/src/libcschem/cnc_pen.h (revision 4912) @@ -55,8 +55,8 @@ char *font_style; /* fields that can be used by the application */ -/* long font_handle; - unsigned font_handle_valid:1;*/ + void *font_handle; + unsigned font_handle_valid:1; /* fields that can be used by the application (temporary for font transition) */ long ttf_handle; Index: trunk/src/libcschem/cnc_text.h =================================================================== --- trunk/src/libcschem/cnc_text.h (revision 4911) +++ trunk/src/libcschem/cnc_text.h (revision 4912) @@ -70,6 +70,7 @@ void *pixmap; long pix_sx, pix_sy; csch_coord_t crd_sx, crd_sy; + double scale; } csch_text_t; #include Index: trunk/src/sch-rnd/Makefile.in =================================================================== --- trunk/src/sch-rnd/Makefile.in (revision 4911) +++ trunk/src/sch-rnd/Makefile.in (revision 4912) @@ -41,6 +41,9 @@ $(ROOT)/src_3rd/load_cache/load_cache.o $(ROOT)/src_3rd/ttf2bbox/ttf_map.o $(ROOT)/src_3rd/ttf2bbox/ttf2bbox.o + $(ROOT)/src_3rd/rnd_inclib/font/font.o + $(ROOT)/src_3rd/rnd_inclib/font/vtgla.o + $(ROOT)/src_3rd/rnd_inclib/font/xform_mx.o @] uniq /local/csch/LIBS_3RD Index: trunk/src/sch-rnd/font.c =================================================================== --- trunk/src/sch-rnd/font.c (revision 4911) +++ trunk/src/sch-rnd/font.c (revision 4912) @@ -56,6 +56,7 @@ long sch_rnd_font_score_debug; #include "font_ttf.c" +#include "font_rnd.c" int sch_rnd_font_resolve_pen(csch_cpen_t *pen) { @@ -85,6 +86,7 @@ static void pen_inval_font(csch_sheet_t *sheet, csch_cpen_t *pen) { + pen->font_handle_valid = 0; pen->ttf_handle_valid = 0; }