Index: trunk/scconfig/Rev.h
===================================================================
--- trunk/scconfig/Rev.h	(revision 9823)
+++ trunk/scconfig/Rev.h	(revision 9824)
@@ -1 +1 @@
-static const int myrev = 9814;
+static const int myrev = 9823;
Index: trunk/scconfig/Rev.tab
===================================================================
--- trunk/scconfig/Rev.tab	(revision 9823)
+++ trunk/scconfig/Rev.tab	(revision 9824)
@@ -1,4 +1,4 @@
-9814	configure	librnd 4.1.0
+9823	configure	librnd 4.1.0: switch over to librnd font2
 9380	configure	io_orcad
 9359	configure	drc infrastructure in libcschem
 9254	configure	new plugin: funcmap
Index: trunk/src/sch-rnd/Makefile.in
===================================================================
--- trunk/src/sch-rnd/Makefile.in	(revision 9823)
+++ trunk/src/sch-rnd/Makefile.in	(revision 9824)
@@ -95,7 +95,7 @@
 include $(ROOT)/Makefile.conf
 include $(LIBRND_MAK)
 
-RNDLIB_LDLIBS = -lrnd-hid -lrnd-font -lrnd-poly -lrnd-core -lrnd-3rd
+RNDLIB_LDLIBS = -lrnd-hid -lrnd-font2 -lrnd-poly -lrnd-core -lrnd-3rd
 ROOT=@/local/csch/root@
 CC=@cc/cc@
 CFLAGS=-I. @/local/csch/CFLAGS@ @/local/csch/c89flags@ @?/local/rnd/CFLAGS@ $(CFLAGS_LIBRND) @?/local/csch/librnd_extra_inc@
Index: trunk/src/sch-rnd/font_rnd.c
===================================================================
--- trunk/src/sch-rnd/font_rnd.c	(revision 9823)
+++ trunk/src/sch-rnd/font_rnd.c	(revision 9824)
@@ -31,7 +31,7 @@
 #include <ctype.h>
 #include <genht/htsp.h>
 #include <genht/hash.h>
-#include <librnd/font/font.h>
+#include <librnd/font2/font.h>
 #include <librnd/hid/hid_inlines.h>
 #include <librnd/core/rotate.h>
 #include <librnd/core/safe_fs_dir.h>
@@ -113,7 +113,7 @@
 #define HASH_GET(hash, name)        hash_get(hash, name)
 #define RND_LHT_ERROR               iolht_error
 
-#include <librnd/font/font_lht.h>
+#include <librnd/font2/font_lht.h>
 
 
 /* text object fields:
@@ -434,7 +434,7 @@
 	ctx.gc = gc;
 
 	rnd_font_draw_string_justify(font, text_str, x, y, size, size, 0,
-		RND_FONT_MIRROR_Y, -3, 0, 0, RND_FONT_TINY_CHEAP,
+		RND_FONT_MIRROR_Y, -3, 0, RND_FONT_TINY_CHEAP,
 		0, 0, rf_draw_atom_cb, &ctx);
 }
 
@@ -445,7 +445,7 @@
 	ctx.gc = gc;
 
 	rnd_font_draw_string_justify(font, text_str, x, y, size, size, rot,
-		mirrory ? RND_FONT_MIRROR_Y : 0, -3, 0, 0, RND_FONT_TINY_CHEAP,
+		mirrory ? RND_FONT_MIRROR_Y : 0, -3, 0, RND_FONT_TINY_CHEAP,
 		0, 0, rf_draw_atom_cb, &ctx);
 }
 
@@ -495,7 +495,7 @@
 	rnd_rotate(&x, &y, xo, yo, cos(rad), sin(rad));
 
 	rnd_font_draw_string_justify(font, text_str, x, y, t->scale, t->scale, deg,
-		RND_FONT_MIRROR_Y, 0, 0, 0, RND_FONT_TINY_CHEAP,
+		RND_FONT_MIRROR_Y, 0, 0, RND_FONT_TINY_CHEAP,
 		C2P(t->extra_glyph), C2P(t->extra_spc), rf_draw_atom_cb, &ctx);
 }