Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 6035) +++ trunk/scconfig/Rev.h (revision 6036) @@ -1 +1 @@ -static const int myrev = 5676; +static const int myrev = 6035; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 6035) +++ trunk/scconfig/Rev.tab (revision 6036) @@ -1,3 +1,4 @@ +6035 configure switch over to librnd4's font engine (from local copy of pcb-rnd's) 5676 configure new plugin: act_read (for scripting) 5371 configure new source file for triangle calculations in lib 5098 configure new engine plugin: forge Index: trunk/src/libcschem/Makefile.dep =================================================================== --- trunk/src/libcschem/Makefile.dep (revision 6035) +++ trunk/src/libcschem/Makefile.dep (revision 6036) @@ -83,9 +83,9 @@ cnc_text.h ../libcschem/cnc_text_dyn.h ../libcschem/cnc_text.h \ cnc_grp_child.h ../libcschem/cnc_any_obj.h ../libcschem/concrete.h \ ../libcschem/rotate.h ../../src_3rd/gengeo2d/xform.h \ - ../../src_3rd/gengeo2d/vect.h cnc_conn.h ../libcschem/vtoidpath.h \ - op_common.h operation.h undo.h rotate.h util_wirenet.h \ - ../libcschem/cnc_line.h ../../src_3rd/gengeo2d/sline.h \ + ../../src_3rd/gengeo2d/vect.h cnc_grp.h cnc_conn.h \ + ../libcschem/vtoidpath.h op_common.h operation.h undo.h rotate.h \ + util_wirenet.h ../libcschem/cnc_line.h ../../src_3rd/gengeo2d/sline.h \ ../../src_3rd/gengeo2d/box.h ../../src_3rd/gengeo2d/cline.h cnc_obj.o: cnc_obj.c config.h event.h undo.h concrete.h \ ../libcschem/common_types.h ../libcschem/config.h ../libcschem/rtree.h \ @@ -209,7 +209,7 @@ ../../src_3rd/gengeo2d/typecfg_long_double.h ../../src_3rd/opc89.h \ ../../src_3rd/gengeo2d/common.h ../../src_3rd/gengeo2d/prim.h \ ../libcschem/TODO.h ../libcschem/engine.h plug_library.h integrity.h \ - concrete.h undo.h + concrete.h undo.h actions_csch.h oidpath.o: oidpath.c config.h oidpath.h ../libcschem/vtoid.h \ ../libcschem/common_types.h ../libcschem/config.h concrete.h \ ../libcschem/rtree.h ../libcschem/attrib.h ../libcschem/oidpath.h \ Index: trunk/src/sch-rnd/Makefile.dep =================================================================== --- trunk/src/sch-rnd/Makefile.dep (revision 6035) +++ trunk/src/sch-rnd/Makefile.dep (revision 6036) @@ -170,7 +170,7 @@ ../../src_3rd/gengeo2d/common.h ../../src_3rd/gengeo2d/prim.h \ ../libcschem/TODO.h ../libcschem/event.h ../sch-rnd/draw.h \ ../sch-rnd/search.h ../sch-rnd/funchash_core.h \ - ../sch-rnd/funchash_core_list.h ../sch-rnd/multi.h \ + ../sch-rnd/funchash_core_list.h ../sch-rnd/multi.h ../sch-rnd/sheet.h \ ../plugins/gui/layersel.h ../plugins/gui/sheetsel.h ../plugins/gui/act.h \ ../plugins/gui/status.h ../plugins/gui/infobar.c ../sch-rnd/conf_core.h \ ../plugins/gui/title.c ../plugins/gui/edit_act.c \ @@ -291,11 +291,12 @@ ../plugins/lib_alien/lib_alien.o: ../plugins/lib_alien/lib_alien.c \ ../libcschem/config.h ../plugins/lib_alien/read_helper.o: ../plugins/lib_alien/read_helper.c \ - ../libcschem/config.h ../libcschem/util_wirenet.h \ + ../libcschem/config.h ../libcschem/libcschem.h \ + ../../src_3rd/libminuid/libminuid.h ../libcschem/util_wirenet.h \ ../libcschem/cnc_line.h ../libcschem/concrete.h \ ../libcschem/common_types.h ../libcschem/rtree.h ../libcschem/attrib.h \ ../libcschem/oidpath.h ../libcschem/vtoid.h \ - ../../src_3rd/libuundo/uundo.h ../../src_3rd/libminuid/libminuid.h \ + ../../src_3rd/libuundo/uundo.h \ ../../src_3rd/gengeo2d/typecfg_long_double.h ../../src_3rd/opc89.h \ ../../src_3rd/gengeo2d/common.h ../../src_3rd/gengeo2d/prim.h \ ../libcschem/TODO.h ../libcschem/cnc_pen.h ../libcschem/cnc_grp.h \ @@ -302,8 +303,9 @@ ../libcschem/cnc_arc.h ../libcschem/cnc_text.h \ ../libcschem/cnc_text_dyn.h ../libcschem/cnc_poly.h \ ../libcschem/vtcoutline.h ../libcschem/cnc_any_obj.h \ - ../libcschem/concrete.h ../libcschem/operation.h ../sch-rnd/style.h \ - ../sch-rnd/sheet.h ../plugins/lib_alien/read_helper.h + ../libcschem/concrete.h ../libcschem/operation.h ../libcschem/project.h \ + ../libcschem/engine.h ../sch-rnd/style.h ../sch-rnd/sheet.h \ + ../plugins/lib_alien/read_helper.h ../plugins/place/place.o: ../plugins/place/place.c ../libcschem/config.h \ ../libcschem/search.h ../libcschem/concrete.h \ ../libcschem/common_types.h ../libcschem/rtree.h ../libcschem/attrib.h \ @@ -737,6 +739,7 @@ ../libcschem/cnc_grp.h ../libcschem/cnc_text.h \ ../libcschem/cnc_text_dyn.h ../libcschem/cnc_obj.h ../libcschem/event.h \ ../libcschem/attrib.h ../libcschem/cnc_pen.h ../libcschem/cnc_text.h \ + ../libcschem/cnc_conn.h ../libcschem/vtoidpath.h \ ../libcschem/operation.h ../libcschem/op_common.h \ ../libcschem/operation.h ../libcschem/plug_io.h ../libcschem/abstract.h \ ../libcschem/event.h ../libcschem/util_wirenet.h ../libcschem/cnc_line.h \ @@ -808,7 +811,8 @@ ../../src_3rd/gengeo2d/typecfg_long_double.h ../../src_3rd/opc89.h \ ../../src_3rd/gengeo2d/common.h ../../src_3rd/gengeo2d/prim.h \ ../libcschem/TODO.h ../libcschem/plug_library.h ../libcschem/event.h \ - sheet.h conf_core.h build_run.h + ../libcschem/plug_io.h ../libcschem/abstract.h sheet.h conf_core.h \ + build_run.h font.o: font.c ../libcschem/config.h ../libcschem/cnc_pen.h \ ../libcschem/concrete.h ../libcschem/common_types.h ../libcschem/rtree.h \ ../libcschem/attrib.h ../libcschem/oidpath.h ../libcschem/vtoid.h \ @@ -817,10 +821,7 @@ ../../src_3rd/gengeo2d/common.h ../../src_3rd/gengeo2d/prim.h \ ../libcschem/TODO.h ../libcschem/cnc_text.h ../libcschem/cnc_text_dyn.h \ ../libcschem/rotate.h conf_core.h draw.h font.h font_rnd.c \ - ../../src_3rd/rnd_inclib/font/font.h \ - ../../src_3rd/rnd_inclib/font/glyph.h \ - ../../src_3rd/rnd_inclib/font/vtgla.h font_internal.c \ - ../../src_3rd/rnd_inclib/font/font_lht.h + font_internal.c main_act.o: main_act.c ../libcschem/config.h crosshair.h conf_core.h \ build_run.h ../libcschem/undo.h ../libcschem/concrete.h \ ../libcschem/common_types.h ../libcschem/rtree.h ../libcschem/attrib.h \ @@ -899,7 +900,8 @@ ../../src_3rd/gengeo2d/typecfg_long_double.h ../../src_3rd/opc89.h \ ../../src_3rd/gengeo2d/common.h ../../src_3rd/gengeo2d/prim.h \ ../libcschem/TODO.h ../libcschem/search.h ../libcschem/operation.h \ - ../libcschem/concrete.h funchash_core.h funchash_core_list.h conf_core.h \ + ../libcschem/concrete.h ../libcschem/util_wirenet.h \ + ../libcschem/cnc_line.h funchash_core.h funchash_core_list.h conf_core.h \ select.h sheet.o: sheet.c ../libcschem/config.h \ ../../src_3rd/libminuid/libminuid.h ../libcschem/concrete.h \ Index: trunk/src/sch-rnd/Makefile.in =================================================================== --- trunk/src/sch-rnd/Makefile.in (revision 6035) +++ trunk/src/sch-rnd/Makefile.in (revision 6036) @@ -39,9 +39,6 @@ $(ROOT)/src_3rd/libuundo/uundo.o $(ROOT)/src_3rd/libuundo/uundo_debug.o $(ROOT)/src_3rd/load_cache/load_cache.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 @@ -102,7 +99,7 @@ CQUOTE=$(LIBRND_LIBDIR)/scconfig/cquote -RNDLIB_LDLIBS = -lrnd-poly -lrnd-hid -lrnd-3rd +RNDLIB_LDLIBS = -lrnd-font -lrnd-poly -lrnd-hid -lrnd-3rd ROOT=@/local/csch/root@ CC=@cc/cc@ CFLAGS=@/local/csch/CFLAGS@ @/local/csch/c89flags@ @?/local/pcb/CFLAGS@ $(CFLAGS_LIBRND) @?/local/csch/librnd_extra_inc@ Index: trunk/src/sch-rnd/font_rnd.c =================================================================== --- trunk/src/sch-rnd/font_rnd.c (revision 6035) +++ trunk/src/sch-rnd/font_rnd.c (revision 6036) @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -111,9 +111,9 @@ #define PARSE_COORD(dst, src) parse_coord(dst, src) #define PARSE_DOUBLE(dst, src) parse_double(dst, src) #define HASH_GET(hash, name) hash_get(hash, name) -#define LHT_ERROR iolht_error +#define RND_LHT_ERROR iolht_error -#include +#include /* text object fields: